fix: get user default config from idb each time a new sheet is created

Covers case where user sets default config on one tab and uses it on another
mgreminger · Nov 17, 2024 · b1b9967 · b1b9967
1 parent bfc8bd6
commit b1b9967
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 24 deletions.
diff --git a/src/App.svelte b/src/App.svelte
@@ -13,9 +13,7 @@
            history, insertedSheets, activeCell, getSheetJson, getSheetObject, resetSheet, sheetId,
            mathCellChanged, nonMathCellChanged, addCell, prefersReducedMotion, modifierKey,
            inCellInsertMode, config, unsavedChange, incrementActiveCell,
-           decrementActiveCell, deleteCell, activeMathField, autosaveNeeded, mathJaxLoaded,
-           userDefaultConfig
-          } from "./stores";
+           decrementActiveCell, deleteCell, activeMathField, autosaveNeeded, mathJaxLoaded } from "./stores";
   import { isDefaultConfig, type Config, normalizeConfig } from "./sheet/Sheet";
   import type { Statement, SubQueryStatement } from "./parser/types";
   import type { SystemDefinition } from "./cells/SystemCell";
@@ -358,16 +356,6 @@
     $prefersReducedMotion = mediaQueryList.matches
     mediaQueryList.addEventListener('change', handleMotionPreferenceChange);
 
-    let tempUserDefaultConfig: Config | undefined = undefined;
-    try {
-      tempUserDefaultConfig = await get('defaultConfig');
-    } catch(e) {
-      console.log('Error retrieving user default config');
-      tempUserDefaultConfig = undefined;
-    }
-
-    $userDefaultConfig = tempUserDefaultConfig ?? getDefaultConfig();
-
     $unsavedChange = false;
     $autosaveNeeded = false;
     await refreshSheet(true);
@@ -732,7 +720,7 @@
 
   async function initializeBlankSheet() {
     currentStateObject = null;
-    resetSheet();
+    await resetSheet();
     await tick();
     addCell('math');
     await tick();

diff --git a/src/SetDefaultConfigDialog.svelte b/src/SetDefaultConfigDialog.svelte
@@ -1,27 +1,41 @@
 <script lang="ts">
+  import { onMount } from "svelte";
+  import { get, set } from 'idb-keyval';
   import { Button } from "carbon-components-svelte";
   import CheckmarkOutline from "carbon-icons-svelte/lib/CheckmarkOutline.svelte";
   import { type Config, configsEqual, getDefaultConfig } from "./sheet/Sheet";
-  import { config, userDefaultConfig } from "./stores";
-  import { set } from 'idb-keyval';
+  import { config } from "./stores";
+
+  let userDefaultConfig: Config | undefined = getDefaultConfig();
+
+  onMount(async () => {
+    try {
+      userDefaultConfig = await get('defaultConfig');
+    } catch(e) {
+      console.warn('Error attempting to load user default config');
+      userDefaultConfig = undefined;
+    }
+    userDefaultConfig = userDefaultConfig ?? getDefaultConfig();
+  });
 
   async function setDefaultConfig() {
     let saveError = false;
 
     try {
       await set('defaultConfig', $config);
     } catch (e) {
+      console.warn('Error attempting to save user default config');
       saveError = true;
     }
 
     if (saveError) {
-      $userDefaultConfig = getDefaultConfig();
+      userDefaultConfig = getDefaultConfig();
     } else {
-      $userDefaultConfig = {...$config};
+      userDefaultConfig = JSON.parse(JSON.stringify($config));
     }
   }
 
-  $: configsMatch = configsEqual($config, $userDefaultConfig)
+  $: configsMatch = configsEqual($config, userDefaultConfig)
 
 </script>
 

diff --git a/src/stores.ts b/src/stores.ts
@@ -1,4 +1,5 @@
 import { type Writable, writable, type Readable, readable, get } from 'svelte/store';
+import { get as idbGet } from 'idb-keyval';
 
 import type { Cell } from './cells/Cells';
 import { BaseCell, type CellTypes } from './cells/BaseCell';
@@ -17,7 +18,7 @@ import InsertCell from "./cells/InsertCell";
 import type { History } from './database/types';
 import type { Result, FiniteImagResult, PlotResult, 
               MatrixResult, SystemResult, DataTableResult } from './resultTypes';
-import { type InsertedSheet, type Sheet, getDefaultConfig } from './sheet/Sheet';
+import { type Config, type InsertedSheet, type Sheet, getDefaultConfig } from './sheet/Sheet';
 
 const defaultTitle = 'New Sheet';
 
@@ -54,8 +55,6 @@ export const inCellInsertMode = writable(false);
 
 export const mathJaxLoaded = writable(false);
 
-export const userDefaultConfig = writable(getDefaultConfig());
-
 export async function addCell(type: CellTypes, index?: number) {
   const currentCells = get(cells);
   const currentResults = get(results);
@@ -135,8 +134,18 @@ export function getSheetJson() {
   return ' ' + JSON.stringify(sheet);
 }
 
-export function resetSheet() {
-  config.set({...get(userDefaultConfig)});
+export async function resetSheet() {
+  let defaultConfig: Config | undefined;
+
+  try {
+    defaultConfig = await idbGet('defaultConfig');
+  } catch(e) {
+    console.warn('Error retrieving default config for idb');
+    defaultConfig = undefined;
+  }
+  defaultConfig = defaultConfig ?? getDefaultConfig();
+
+  config.set(defaultConfig);
   cells.set([]);
   title.set(defaultTitle);
   results.set([]);