fix: Merge settings for background script (#32)

Author: CrawlerCode

src/background.ts

@@ -1,5 +1,4 @@
-import { getStorage } from "./hooks/useStorage";
-import { Settings } from "./provider/SettingsProvider";
+import { getSettings } from "./provider/SettingsProvider";
 
 /**
  * Open options page on install and set uninstall URL
@@ -16,7 +15,7 @@ chrome.runtime.onInstalled.addListener(({ reason }) => {
  * and re-register on Redmine URL change
  */
 const registerContentScript = async () => {
-  const settings = await getStorage<Partial<Settings>>("settings", {});
+  const settings = await getSettings();
   if (!settings.redmineURL) return;
 
   // Unregister content script
@@ -27,7 +26,7 @@ const registerContentScript = async () => {
     .catch(() => undefined);
 
   // If showCurrentIssueTimer is disabled, do not register content script
-  if (!settings.features?.showCurrentIssueTimer) return;
+  if (!settings.features.showCurrentIssueTimer) return;
 
   // Register content script
   await chrome.scripting.registerContentScripts([

src/provider/SettingsProvider.tsx

@@ -1,6 +1,6 @@
 import deepmerge from "deepmerge";
 import { ReactNode, createContext, use } from "react";
-import useStorage from "../hooks/useStorage";
+import useStorage, { getStorage } from "../hooks/useStorage";
 
 export type Settings = {
   language: string;
@@ -55,17 +55,22 @@ const defaultSettings: Settings = {
   },
 };
 
+export const getSettings = async () => {
+  const data = await getStorage<Partial<Settings>>("settings", defaultSettings);
+  return deepmerge<Settings>(defaultSettings, data);
+};
+
 const SettingsContext = createContext({
   settings: defaultSettings,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   setSettings: (_data: Settings) => undefined,
 });
 
 export const SettingsProvider = ({ children }: { children: ReactNode }) => {
-  const { data, setData } = useStorage<Settings>("settings", defaultSettings);
+  const { data, setData } = useStorage<Partial<Settings>>("settings", defaultSettings);
 
   // Migrate old settings TODO: Remove in future
-  if (data.features.roundTimeNearestQuarterHour === true) {
+  if (data?.features?.roundTimeNearestQuarterHour === true) {
     data.features.roundTimeNearestQuarterHour = undefined;
     data.features.roundToNearestInterval = true;
     data.features.roundingInterval = 15;
@@ -81,7 +86,7 @@ export const SettingsProvider = ({ children }: { children: ReactNode }) => {
           if (newData.redmineURL !== data.redmineURL) {
             chrome.runtime.sendMessage("settings-changed:redmineURL");
           }
-          if (newData.features.showCurrentIssueTimer !== data.features.showCurrentIssueTimer) {
+          if (newData.features.showCurrentIssueTimer !== data.features?.showCurrentIssueTimer) {
             chrome.runtime.sendMessage("settings-changed:showCurrentIssueTimer");
           }
         },