rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: timed color scheme toast (#978)

Browse Source
This commit is contained in:
Aman Harwara
2022-04-15 22:39:49 +05:30
committed by GitHub
parent 9dafdeeddb
commit a9bab0938b
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/Services/ThemeManager.ts
View File

@@ -176,6 +176,7 @@ export class ThemeManager extends ApplicationService {
const themes = this.application.items.getDisplayableItems(ContentType.Theme) as SNTheme[] const themes = this.application.items.getDisplayableItems(ContentType.Theme) as SNTheme[]
const activeTheme = themes.find((theme) => theme.active && !theme.isLayerable()) const activeTheme = themes.find((theme) => theme.active && !theme.isLayerable())
const activeThemeIdentifier = activeTheme ? activeTheme.identifier : DefaultThemeIdentifier
const themeIdentifier = this.application.getPreference( const themeIdentifier = this.application.getPreference(
preference, preference,
@@ -193,12 +194,9 @@ export class ThemeManager extends ApplicationService {
} }
} }
const isPreferredThemeNotActive = activeTheme?.identifier !== themeIdentifier const isPreferredThemeNotActive = activeThemeIdentifier !== themeIdentifier
const isDefaultThemePreferredAndNotActive = if (isPreferredThemeNotActive) {
themeIdentifier === DefaultThemeIdentifier && activeTheme
if (isPreferredThemeNotActive && isDefaultThemePreferredAndNotActive) {
this.showColorSchemeToast(setTheme) this.showColorSchemeToast(setTheme)
} }
} }

2
package.json
View File

@@ -73,7 +73,7 @@
"@standardnotes/filepicker": "1.10.5", "@standardnotes/filepicker": "1.10.5",
"@standardnotes/sncrypto-web": "1.8.2", "@standardnotes/sncrypto-web": "1.8.2",
"@standardnotes/snjs": "2.94.3", "@standardnotes/snjs": "2.94.3",
"@standardnotes/stylekit": "5.22.0", "@standardnotes/stylekit": "5.22.1",
"@zip.js/zip.js": "^2.4.7", "@zip.js/zip.js": "^2.4.7",
"mobx": "^6.5.0", "mobx": "^6.5.0",
"mobx-react-lite": "^3.3.0", "mobx-react-lite": "^3.3.0",

8
yarn.lock
View File

@@ -2508,10 +2508,10 @@
"@standardnotes/sncrypto-common" "^1.7.5" "@standardnotes/sncrypto-common" "^1.7.5"
"@standardnotes/utils" "^1.4.8" "@standardnotes/utils" "^1.4.8"
"@standardnotes/stylekit@5.22.0": "@standardnotes/stylekit@5.22.1":
version "5.22.0" version "5.22.1"
resolved "https://registry.yarnpkg.com/@standardnotes/stylekit/-/stylekit-5.22.0.tgz#9524f57bee328ff61336d9efcee5684f35430b94" resolved "https://registry.yarnpkg.com/@standardnotes/stylekit/-/stylekit-5.22.1.tgz#1e92b1e6428b0891047f9b7d91799203f12156aa"
integrity sha512-u3ywcUS/CJEp04B8XQNVDFtELCyAkwlQr2KiXVVXs1jnuhdMYAbvgLhwZR4MqBrnvTKtHRyH0Ryxd6M32lv7ZA== integrity sha512-JDdO7o7Ik+tfdKoi/VsF7bR+ZTMO/f6dVSyxjbtIb/NCS7KM4apFMBVoZ+ARBXhbhpoBnwyVJHpZBkiB1p2Cjw==
dependencies: dependencies:
"@nanostores/preact" "^0.1.3" "@nanostores/preact" "^0.1.3"
"@reach/listbox" "^0.16.2" "@reach/listbox" "^0.16.2"