From 139f680d447303d54c50eec8a0a60883e57abdac Mon Sep 17 00:00:00 2001 From: sethburkart123 Date: Wed, 19 Jun 2024 22:39:19 +1000 Subject: [PATCH] fix: theme auto enabling attempting to reach unitialized variables --- src/SEQTA.ts | 2 +- src/seqta/ui/themes/enableCurrent.ts | 1 + src/seqta/ui/themes/setTheme.ts | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SEQTA.ts b/src/SEQTA.ts index 1d003689..d093481a 100644 --- a/src/SEQTA.ts +++ b/src/SEQTA.ts @@ -59,12 +59,12 @@ async function init() { const icon = document.querySelector('link[rel*="icon"]')! as HTMLLinkElement icon.href = icon48 - enableCurrentTheme() try { // wait until settingsState has been loaded from storage await initializeSettingsState(); if (settingsState.onoff) { + enableCurrentTheme() // TEMP FIX for bug! -> this is a hack to get the injected.css file to have HMR in development mode as this import system is currently broken with crxjs if (import.meta.env.MODE === 'development') { diff --git a/src/seqta/ui/themes/enableCurrent.ts b/src/seqta/ui/themes/enableCurrent.ts index 4ce9e82d..1fea1bdd 100644 --- a/src/seqta/ui/themes/enableCurrent.ts +++ b/src/seqta/ui/themes/enableCurrent.ts @@ -5,6 +5,7 @@ import { settingsState } from '../../utils/listeners/SettingsState'; export const enableCurrentTheme = async () => { + console.log('enableCurrentTheme', settingsState.selectedTheme, await localforage.getItem(settingsState.selectedTheme)); if (settingsState.selectedTheme) { const theme = await localforage.getItem(settingsState.selectedTheme) as CustomTheme; if (theme) { diff --git a/src/seqta/ui/themes/setTheme.ts b/src/seqta/ui/themes/setTheme.ts index ca1f3759..71405b1e 100644 --- a/src/seqta/ui/themes/setTheme.ts +++ b/src/seqta/ui/themes/setTheme.ts @@ -1,4 +1,3 @@ -import browser from 'webextension-polyfill'; import localforage from 'localforage'; import { CustomTheme } from '../../../interface/types/CustomThemes'; import { applyTheme } from './applyTheme';