Add toggle to disable swipe events, change store provider to always r…

…eturn requested key and not record

src/extensionPreferences/baseStore.ts

@@ -1,4 +1,4 @@
 export default interface PrefStore {
-    get: (key: string) => Promise<Record<string, unknown>>;
+    get: (key: string) => Promise<unknown>;
     set: (key: string, value: unknown) => Promise<void>;
 }

src/extensionPreferences/userScriptStore.ts

@@ -7,8 +7,8 @@ export default class UserScriptStore {
     set(key: string, value: unknown) {
         return GM.setValue(key, value);
     }
-    get(key: string) {
-        return GM.getValue(key);
+    async get(key: string) {
+        return (await GM.getValue(key))[key];
     }
     name = "gmStore";
 }

src/extensionPreferences/webExtensionStore.ts

@@ -6,8 +6,8 @@ export default class WebExtStore {
         keyValuePair[key] = value;
         return browser.storage.sync.set(keyValuePair);
     }
-    get(key: string) {
-        return browser.storage.sync.get(key);
+    async get(key: string) {
+        return (await browser.storage.sync.get(key))[key];
     }
     name = "webExtStore";
 }

src/features/base.ts

@@ -44,13 +44,13 @@ export class SettingToggle extends SettingOption {
     }
     async loadPD() {
         const prefData = await store.get(this.settingId)
-        const value = !!prefData[this.settingId]
+        const value = !!prefData
         this.element.querySelector("input")!.checked = value;
         this.callback(value);
     }
     async toggleSetting() {
         const prefData = await store.get(this.settingId)
-        const old_value = prefData[this.settingId]
+        const old_value = prefData
         const new_value = !old_value
         await store.set(this.settingId, new_value);
         console.log("updating", this.settingId, old_value, new_value);

src/features/sidebar/index.ts

@@ -3,6 +3,7 @@ import "swiped-events";
 import buildSubredditSidebar from "./subredditSidebar";
 import buildUserSidebar from "./userSidebar";
 import "./css/prefs.css";
+import { store } from "../../extensionPreferences";
 
 const eventListeners: { [id: string]: ((event: Event) => void)[] } = {
     toggleUser: [],
@@ -40,7 +41,7 @@ function swipeWrapper(callback: ((event: Event) => void)): ((event: Event) => vo
     }
     return wrapped;
 }
-
+const swipeDisabledKey = "swipeDisabled"
 export default class Sidebar extends OLFeature {
     moduleName = "Sidebar";
     moduleId = "sidebar";
@@ -59,6 +60,7 @@ export default class Sidebar extends OLFeature {
                 })
             );
         }
+        this.settingOptions.push(new SettingToggle("Disable swipe events", "Reload is required to apply", swipeDisabledKey, (toggle) => {}))
         await this.setupSubredditSidebar();
         await this.setupUserSidebar();
         this.setSidebarEvents();
@@ -78,11 +80,17 @@ export default class Sidebar extends OLFeature {
         this.userToggle = user.activeToggle;
     }
 
-    setSidebarEvents() {
+    async setSidebarEvents() {
         console.log("Setting up sidebar events, handlers:", this.subToggle, this.userToggle)
         setEventListener("toggleSub", this.subToggle);
         setEventListener("toggleUser", this.userToggle);
         document.body.dataset.swipeUnit = "vw"
+        // @ts-ignore
+        const swipeDisabled = await store.get(swipeDisabledKey)
+        console.log("Swipe disabled?", swipeDisabled)
+        if ( swipeDisabled !== undefined && swipeDisabled) {
+            return
+        }
         setEventListener("swiped-right",  swipeWrapper((event) => {
             if (this.subSide && this.subSide.classList.contains("active")) {
                 this.subToggle();

src/features/themeSwitch.ts

@@ -11,7 +11,7 @@ export default class WhiteTheme extends OLFeature {
     async init () {
         this.settingOptions.push(
             new SettingToggle("White theme", "Enables white theme instead of dark.", whiteThemeKey, async (theme) => {
-                const { systemTheme } = await store.get(systemThemeKey)
+                const systemTheme = await store.get(systemThemeKey)
                 if (systemTheme !== undefined && systemTheme) {
                     console.log("Systemtheme key is set, not enabling white theme")
                     return

src/header/index.ts

@@ -102,7 +102,7 @@ async function addSubSidebarButton(header: HTMLDivElement) {
     btn.classList.add("material-symbols-outlined");
     btn.onclick = () => {
         const evt = new Event("toggleSub");
-        document.dispatchEvent(evt);
+        document.body.dispatchEvent(evt);
     };
     header.querySelector(".aux-buttons")!.appendChild(btn);
 }
@@ -114,7 +114,7 @@ function addUserSidebarButton(header: HTMLDivElement) {
     btn.id = "user-sidebar-open";
     btn.onclick = () => {
         const evt = new Event("toggleUser");
-        document.dispatchEvent(evt);
+        document.body.dispatchEvent(evt);
     };
     header.prepend(btn);
 }