From 7d32d909ba2496f06bd835880c27a65a49016c8a Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Fri, 16 Apr 2021 02:51:03 +0200
Subject: [PATCH 1/2] Remove unnecessary comments / dead code

---
 ts/sveltelib/WithBase.svelte | 17 -----------------
 ts/sveltelib/preferences.ts  |  6 ------
 2 files changed, 23 deletions(-)
 delete mode 100644 ts/sveltelib/WithBase.svelte

diff --git a/ts/sveltelib/WithBase.svelte b/ts/sveltelib/WithBase.svelte
deleted file mode 100644
index f3a8eb7ef..000000000
--- a/ts/sveltelib/WithBase.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-Copyright: Ankitects Pty Ltd and contributors
-License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
--->
-<script lang="typescript">
-    import useAsync from "sveltelib/async";
-    import { setupI18n } from "anki/i18n";
-    import { checkNightMode } from "anki/nightmode";
-
-    const nightMode = checkNightMode();
-
-    const { loading, value: i18n } = useAsync(() => setupI18n());
-</script>
-
-{#if !$loading}
-    <slot i18n={$i18n} {nightMode} />
-{/if}
diff --git a/ts/sveltelib/preferences.ts b/ts/sveltelib/preferences.ts
index a53505f0c..b22811253 100644
--- a/ts/sveltelib/preferences.ts
+++ b/ts/sveltelib/preferences.ts
@@ -1,14 +1,8 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-// languageServerHost taken from MIT sources - see below.
 
 import { Writable, writable, get } from "svelte/store";
 
-// import pb from "anki/backend_proto";
-// export async function getGraphPreferences(): Promise<pb.BackendProto.GraphPreferences> {
-// export async function setGraphPreferences(prefs: PreferencePayload): Promise<void> {
-// pb.BackendProto.GraphPreferences.toObject(Preferences, {
-
 export interface CustomStore<T> extends Writable<T> {
     subscribe: (getter: (value: T) => void) => () => void;
     set: (value: T) => void;

From 4a8a0519992b22f2a74861446ad2998074788c70 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Fri, 16 Apr 2021 03:10:39 +0200
Subject: [PATCH 2/2] Satisfy ./script/svelte-check

---
 ts/editor-toolbar/ButtonGroup.svelte       | 2 +-
 ts/editor-toolbar/CommandIconButton.svelte | 2 +-
 ts/editor-toolbar/EditorToolbar.svelte     | 5 ++++-
 ts/graphs/WithGraphData.svelte             | 7 +++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ts/editor-toolbar/ButtonGroup.svelte b/ts/editor-toolbar/ButtonGroup.svelte
index 18ff29fe0..1e328e901 100644
--- a/ts/editor-toolbar/ButtonGroup.svelte
+++ b/ts/editor-toolbar/ButtonGroup.svelte
@@ -7,7 +7,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { getContext } from "svelte";
     import { nightModeKey } from "./contextKeys";
 
-    export let id: string;
+    export let id: string | undefined = undefined;
     export let className = "";
     export let buttons: ToolbarItem[];
 
diff --git a/ts/editor-toolbar/CommandIconButton.svelte b/ts/editor-toolbar/CommandIconButton.svelte
index ec53827fc..42343fb19 100644
--- a/ts/editor-toolbar/CommandIconButton.svelte
+++ b/ts/editor-toolbar/CommandIconButton.svelte
@@ -56,7 +56,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         updateButton(command);
 
         commandMap.subscribe((map: Map<string, boolean>): (() => void) => {
-            active = map.get(command);
+            active = Boolean(map.get(command));
             return () => map.delete(command);
         });
     }
diff --git a/ts/editor-toolbar/EditorToolbar.svelte b/ts/editor-toolbar/EditorToolbar.svelte
index 13a0d9b7c..7d63939cc 100644
--- a/ts/editor-toolbar/EditorToolbar.svelte
+++ b/ts/editor-toolbar/EditorToolbar.svelte
@@ -24,8 +24,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { disabledKey, nightModeKey } from "./contextKeys";
 
     import ButtonGroup from "./ButtonGroup.svelte";
+    import type { ButtonGroupProps } from "./ButtonGroup";
 
-    export let buttons: Readable<ToolbarItem[]>;
+    export let buttons: Readable<
+        (ToolbarItem<typeof ButtonGroup> & ButtonGroupProps)[]
+    >;
     export let menus: Readable<ToolbarItem[]>;
 
     $: _buttons = $buttons;
diff --git a/ts/graphs/WithGraphData.svelte b/ts/graphs/WithGraphData.svelte
index 4ab436a22..674ef6d28 100644
--- a/ts/graphs/WithGraphData.svelte
+++ b/ts/graphs/WithGraphData.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import type { Writable } from "svelte/store";
-    import type { PreferencePayload } from "sveltelib/preferences";
+    import type { PreferenceRaw, PreferencePayload } from "sveltelib/preferences";
 
     import pb from "anki/backend_proto";
     import { postRequest } from "anki/postrequest";
@@ -60,7 +60,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             setGraphPreferences,
             pb.BackendProto.GraphPreferences.toObject.bind(
                 pb.BackendProto.GraphPreferences
-            )
+            ) as (
+                preferences: pb.BackendProto.GraphPreferences,
+                options: { defaults: boolean }
+            ) => PreferenceRaw<pb.BackendProto.GraphPreferences>
         )
     );