only use saved mode if enableAi is on

Author: shakyShane

special-pages/pages/new-tab/app/omnibar/components/OmnibarConsumer.js

@@ -46,21 +46,10 @@ function OmnibarReadyState({ config, tabId }) {
     const { setEnableAi, setMode } = useContext(OmnibarContext);
     const modeForCurrentTab = useModeWithLocalPersistence(tabId, defaultMode);
 
-    /**
-     * Respect the current tab's mode only if 'enableAi' is on.
-     * Otherwise always search
-     *
-     * @type {Mode}
-     */
-    const mode = (() => {
-        if (enableAi) return modeForCurrentTab;
-        return /** @type {const} */ ('search');
-    })();
-
     return (
         <>
             {showAiSetting && <AiSetting enableAi={enableAi} setEnableAi={setEnableAi} />}
-            <Omnibar mode={mode} setMode={setMode} enableAi={showAiSetting && enableAi} tabId={tabId} />
+            <Omnibar mode={modeForCurrentTab} setMode={setMode} enableAi={showAiSetting && enableAi} tabId={tabId} />
         </>
     );
 }

special-pages/pages/new-tab/app/omnibar/components/PersistentOmnibarValuesProvider.js

@@ -102,11 +102,15 @@ export function useModeWithLocalPersistence(tabId, defaultMode) {
         if (!service) return;
         return service.onConfig((v) => {
             if (tabId && v.source === 'manual') {
-                values?.update({ id: tabId, value: v.data.mode });
+                if (v.data.enableAi === false) {
+                    values?.updateAll({ value: 'search' });
+                } else {
+                    values?.update({ id: tabId, value: v.data.mode });
+                }
             }
             setState(v.data.mode);
         });
-    }, [service, tabId, values]);
+    }, [service, tabId, values, defaultMode]);
 
     return mode;
 }

special-pages/pages/new-tab/app/tabs/PersistentValue.js

@@ -22,6 +22,18 @@ export class PersistentValue {
         }
     }
 
+    /**
+     * Updates the value with every entry
+     *
+     * @param {object} args
+     * @param {T} args.value
+     */
+    updateAll({ value }) {
+        for (const [key] of this.#values) {
+            this.#values.set(key, value);
+        }
+    }
+
     /**
      * @param {object} params
      * @param {string[]} params.preserve