From 4379f1e84fcc82b59e18c98dc6abf2b41444968b Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Fri, 23 Apr 2021 16:43:36 +0200
Subject: [PATCH] Make dynamicComponents usable for addons, rather than the
 components directly

rawButton({ html: ... })

instead of

{ component: RawButton, html: ... }
---
 qt/aqt/editor.py                       | 12 +++----
 ts/editor-toolbar/SelectButton.d.ts    | 18 +++++++++++
 ts/editor-toolbar/SelectButton.svelte  |  7 +---
 ts/editor-toolbar/dynamicComponents.ts |  9 ++++++
 ts/editor/addons.ts                    | 45 +++++++++++++++-----------
 ts/sass/base.scss                      |  3 +-
 6 files changed, 60 insertions(+), 34 deletions(-)
 create mode 100644 ts/editor-toolbar/SelectButton.d.ts

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 808cdf86c..0b0f9ce07 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -155,7 +155,7 @@ class Editor:
         gui_hooks.editor_did_init_left_buttons(lefttopbtns, self)
 
         lefttopbtns_defs = [
-            f"$editorToolbar.addButton({{ component: editorToolbar.RawButton, html: `{button}` }}, 'notetype');"
+            f"$editorToolbar.addButton(editorToolbar.rawButton({{ html: `{button}` }}), 'notetype');"
             for button in lefttopbtns
         ]
         lefttopbtns_js = "\n".join(lefttopbtns_defs)
@@ -167,7 +167,7 @@ class Editor:
 
         righttopbtns_defs = "\n".join(
             [
-                f"{{ component: editorToolbar.RawButton, html: `{button}` }},"
+                f"editorToolbar.rawButton({{ html: `{button}` }}),"
                 for button in righttopbtns
             ]
         )
@@ -1277,13 +1277,9 @@ gui_hooks.editor_will_munge_html.append(reverse_url_quoting)
 
 def set_cloze_button(editor: Editor) -> None:
     if editor.note.model()["type"] == MODEL_CLOZE:
-        editor.web.eval(
-            'document.getElementById("editorToolbar").showButton("template", "cloze"); '
-        )
+        editor.web.eval('$editorToolbar.showButton("template", "cloze"); ')
     else:
-        editor.web.eval(
-            'document.getElementById("editorToolbar").hideButton("template", "cloze"); '
-        )
+        editor.web.eval('$editorToolbar.hideButton("template", "cloze"); ')
 
 
 gui_hooks.editor_did_load_note.append(set_cloze_button)
diff --git a/ts/editor-toolbar/SelectButton.d.ts b/ts/editor-toolbar/SelectButton.d.ts
new file mode 100644
index 000000000..854f7eb97
--- /dev/null
+++ b/ts/editor-toolbar/SelectButton.d.ts
@@ -0,0 +1,18 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+import type { ToolbarItem } from "./types";
+
+export interface Option {
+    label: string;
+    value: string;
+    selected: boolean;
+}
+
+export interface SelectButtonProps {
+    id: string;
+    className?: string;
+    tooltip?: string;
+    buttons: ToolbarItem[];
+    disables: boolean;
+    options: Option[];
+}
diff --git a/ts/editor-toolbar/SelectButton.svelte b/ts/editor-toolbar/SelectButton.svelte
index 559ab8cfc..81afa44d8 100644
--- a/ts/editor-toolbar/SelectButton.svelte
+++ b/ts/editor-toolbar/SelectButton.svelte
@@ -4,16 +4,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import type { Readable } from "svelte/store";
+    import type { Option } from "./SelectButton";
     import { onMount, createEventDispatcher, getContext } from "svelte";
     import { disabledKey } from "./contextKeys";
     import SelectOption from "./SelectOption.svelte";
 
-    interface Option {
-        label: string;
-        value: string;
-        selected: boolean;
-    }
-
     export let id: string;
     export let className = "";
     export let tooltip: string;
diff --git a/ts/editor-toolbar/dynamicComponents.ts b/ts/editor-toolbar/dynamicComponents.ts
index 5774421b6..a3c2238a0 100644
--- a/ts/editor-toolbar/dynamicComponents.ts
+++ b/ts/editor-toolbar/dynamicComponents.ts
@@ -1,5 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+import RawButton from "./RawButton.svelte";
 import LabelButton from "./LabelButton.svelte";
 import type { LabelButtonProps } from "./LabelButton";
 import IconButton from "./IconButton.svelte";
@@ -8,6 +9,8 @@ import CommandIconButton from "./CommandIconButton.svelte";
 import type { CommandIconButtonProps } from "./CommandIconButton";
 import ColorPicker from "./ColorPicker.svelte";
 import type { ColorPickerProps } from "./ColorPicker";
+import SelectButton from "./SelectButton.svelte";
+import type { SelectButtonProps } from "./SelectButton";
 import ButtonGroup from "./ButtonGroup.svelte";
 import type { ButtonGroupProps } from "./ButtonGroup";
 
@@ -25,6 +28,9 @@ import type { WithShortcutProps } from "./WithShortcut";
 
 import { dynamicComponent } from "sveltelib/dynamicComponent";
 
+export const rawButton = dynamicComponent<typeof RawButton, { html: string }>(
+    RawButton
+);
 export const labelButton = dynamicComponent<typeof LabelButton, LabelButtonProps>(
     LabelButton
 );
@@ -38,6 +44,9 @@ export const commandIconButton = dynamicComponent<
 export const colorPicker = dynamicComponent<typeof ColorPicker, ColorPickerProps>(
     ColorPicker
 );
+export const selectButton = dynamicComponent<typeof SelectButton, SelectButtonProps>(
+    SelectButton
+);
 
 export const buttonGroup = dynamicComponent<typeof ButtonGroup, ButtonGroupProps>(
     ButtonGroup
diff --git a/ts/editor/addons.ts b/ts/editor/addons.ts
index 4cd3af6be..2dfc2a628 100644
--- a/ts/editor/addons.ts
+++ b/ts/editor/addons.ts
@@ -1,24 +1,31 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import { default as RawButton } from "editor-toolbar/RawButton.svelte";
-import { default as LabelButton } from "editor-toolbar/LabelButton.svelte";
-import { default as IconButton } from "editor-toolbar/IconButton.svelte";
-import { default as CommandIconButton } from "editor-toolbar/CommandIconButton.svelte";
-import { default as SelectButton } from "editor-toolbar/SelectButton.svelte";
+import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
 
-import { default as DropdownMenu } from "editor-toolbar/DropdownMenu.svelte";
-import { default as DropdownItem } from "editor-toolbar/DropdownItem.svelte";
-import { default as ButtonDropdown } from "editor-toolbar/DropdownMenu.svelte";
-import { default as WithDropdownMenu } from "editor-toolbar/WithDropdownMenu.svelte";
+import {
+    rawButton,
+    labelButton,
+    iconButton,
+    commandIconButton,
+    selectButton,
+    dropdownMenu,
+    dropdownItem,
+    buttonDropdown,
+    withDropdownMenu,
+} from "editor-toolbar/dynamicComponents";
 
-export const editorToolbar = {
-    RawButton,
-    LabelButton,
-    IconButton,
-    CommandIconButton,
-    SelectButton,
-    DropdownMenu,
-    DropdownItem,
-    ButtonDropdown,
-    WithDropdownMenu,
+export const editorToolbar: Record<
+    string,
+    (props: Record<string, unknown>) => DynamicSvelteComponent
+> = {
+    rawButton,
+    labelButton,
+    iconButton,
+    commandIconButton,
+    selectButton,
+
+    dropdownMenu,
+    dropdownItem,
+    buttonDropdown,
+    withDropdownMenu,
 };
diff --git a/ts/sass/base.scss b/ts/sass/base.scss
index 25b2809b9..40fe2973e 100644
--- a/ts/sass/base.scss
+++ b/ts/sass/base.scss
@@ -9,6 +9,7 @@ $link-hover-decoration: none;
 @import "ts/sass/bootstrap/bootstrap-reboot";
 @import "ts/sass/bootstrap/bootstrap-utilities";
 
-body, html {
+body,
+html {
     overscroll-behavior: none;
 }