Merge pull request #14 from author-more/fix/icon-set-status-persistance

fix: icon set's state to persist across restarts
author-more · Sep 6, 2024 · 50a5db0 · 50a5db0
2 parents 56768cd + d55ebca
commit 50a5db0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -68,11 +68,6 @@ function App() {
   }, []);
 
   useEffect(() => {
-    sendMessage("set-plugin-data", {
-      scope: DATA_KEY_ICON_SETS_SETTINGS,
-      data: iconSetsSettings,
-    });
-
     const [result, controller] = getIconSetsByVariant(
       iconLibraries,
       iconSetsSettings,
@@ -226,13 +221,19 @@ function App() {
       (typeof defaultIconSetSettings)[keyof typeof defaultIconSetSettings]
     >,
   ) {
-    setIconSetsSettings((currentSettings) => ({
-      ...currentSettings,
+    const settingsUpdated = {
+      ...iconSetsSettings,
       [id]: {
-        ...currentSettings[id],
+        ...iconSetsSettings[id],
         ...settings,
       },
-    }));
+    };
+
+    setIconSetsSettings(settingsUpdated);
+    sendMessage("set-plugin-data", {
+      scope: DATA_KEY_ICON_SETS_SETTINGS,
+      data: settingsUpdated,
+    });
   }
 
   return (

diff --git a/tests/settings.spec.ts b/tests/settings.spec.ts
@@ -13,7 +13,7 @@ test.describe("settings", () => {
     await iconSetToggleButton.click();
 
     const event = eventLog.filter(({ type }) => type === "set-plugin-data");
-    expect(event[1]).toMatchObject({
+    expect(event[0]).toMatchObject({
       type: "set-plugin-data",
       content: {
         scope: "iconSetsSettings",
@@ -41,7 +41,7 @@ test.describe("settings", () => {
     await changeStyleSelect.selectOption({ label: "solid" });
 
     const event = eventLog.filter(({ type }) => type === "set-plugin-data");
-    expect(event[2]).toMatchObject({
+    expect(event[1]).toMatchObject({
       type: "set-plugin-data",
       content: {
         scope: "iconSetsSettings",