From f88b9d64d335c1fae7cb48ef9b62a6ed4f0e229f Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Thu, 8 Apr 2021 18:43:15 +0200
Subject: [PATCH] Get rid of types.d.ts in favor of DynamicSvelteComponent

---
 ts/editor-toolbar/ButtonDropdown.svelte   |  4 ++--
 ts/editor-toolbar/ButtonGroup.d.ts        |  4 ++--
 ts/editor-toolbar/ButtonGroup.svelte      | 12 ++++--------
 ts/editor-toolbar/EditorToolbar.svelte    |  7 +++----
 ts/editor-toolbar/WithDropdownMenu.d.ts   |  4 ++--
 ts/editor-toolbar/WithDropdownMenu.svelte |  6 +++---
 ts/editor-toolbar/types.d.ts              |  8 --------
 7 files changed, 16 insertions(+), 29 deletions(-)
 delete mode 100644 ts/editor-toolbar/types.d.ts

diff --git a/ts/editor-toolbar/ButtonDropdown.svelte b/ts/editor-toolbar/ButtonDropdown.svelte
index 3f10acec5..cbae8a69b 100644
--- a/ts/editor-toolbar/ButtonDropdown.svelte
+++ b/ts/editor-toolbar/ButtonDropdown.svelte
@@ -1,5 +1,5 @@
 <script lang="typescript">
-    import type { Buttons } from "./types";
+    import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
     import ButtonGroup from "./ButtonGroup.svelte";
 
     export let id = "";
@@ -10,7 +10,7 @@
         return `dropdown-menu bg-transparent border-0 ${className}`;
     }
 
-    export let buttons: Buttons;
+    export let buttons: DynamicSvelteComponent[];
 </script>
 
 <ButtonGroup {id} className={extendClassName(className)} {props} {buttons} />
diff --git a/ts/editor-toolbar/ButtonGroup.d.ts b/ts/editor-toolbar/ButtonGroup.d.ts
index 2e5496f15..d4131ce9d 100644
--- a/ts/editor-toolbar/ButtonGroup.d.ts
+++ b/ts/editor-toolbar/ButtonGroup.d.ts
@@ -1,7 +1,7 @@
-import type { Buttons } from "./types";
+import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
 
 export interface ButtonGroupProps {
     id: string;
     className?: string;
-    buttons: Buttons;
+    buttons: DynamicSvelteComponent[];
 }
diff --git a/ts/editor-toolbar/ButtonGroup.svelte b/ts/editor-toolbar/ButtonGroup.svelte
index a01639fc4..73a5d62e5 100644
--- a/ts/editor-toolbar/ButtonGroup.svelte
+++ b/ts/editor-toolbar/ButtonGroup.svelte
@@ -1,11 +1,11 @@
 <script lang="typescript">
-    import type { Buttons } from "./types";
+    import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
 
-    export let id = "";
+    export let id;
     export let className = "";
     export let props: Record<string, string> = {};
 
-    export let buttons: Buttons;
+    export let buttons: DynamicSvelteComponent[];
 </script>
 
 <style lang="scss">
@@ -53,11 +53,7 @@
 <ul {id} class={className} {...props}>
     {#each buttons as button}
         <li>
-            {#if Array.isArray(button)}
-                <svelte:self buttons={button} />
-            {:else}
-                <svelte:component this={button.component} {...button} />
-            {/if}
+            <svelte:component this={button.component} {...button} />
         </li>
     {/each}
 </ul>
diff --git a/ts/editor-toolbar/EditorToolbar.svelte b/ts/editor-toolbar/EditorToolbar.svelte
index 20dac37a7..19895d124 100644
--- a/ts/editor-toolbar/EditorToolbar.svelte
+++ b/ts/editor-toolbar/EditorToolbar.svelte
@@ -13,16 +13,15 @@
 </script>
 
 <script lang="typescript">
-    import type { SvelteComponent } from "svelte";
     import type { Readable } from "svelte/store";
+    import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
     import { setContext } from "svelte";
     import { disabledKey, nightModeKey } from "./contextKeys";
 
     import ButtonGroup from "./ButtonGroup.svelte";
-    import type { Buttons } from "./types";
 
-    export let buttons: Readable<Buttons>;
-    export let menus: Readable<SvelteComponent[]>;
+    export let buttons: Readable<DynamicSvelteComponent[]>;
+    export let menus: Readable<DynamicSvelteComponent[]>;
 
     $: _buttons = $buttons;
     $: _menus = $menus;
diff --git a/ts/editor-toolbar/WithDropdownMenu.d.ts b/ts/editor-toolbar/WithDropdownMenu.d.ts
index 44d6adf22..ecdb702a7 100644
--- a/ts/editor-toolbar/WithDropdownMenu.d.ts
+++ b/ts/editor-toolbar/WithDropdownMenu.d.ts
@@ -1,6 +1,6 @@
-import type { ButtonDefinition } from "./types";
+import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
 
 export interface WithDropdownMenuProps {
-    button: ButtonDefinition;
+    button: DynamicSvelteComponent;
     menuId: string;
 }
diff --git a/ts/editor-toolbar/WithDropdownMenu.svelte b/ts/editor-toolbar/WithDropdownMenu.svelte
index 3ae27f060..caa8b8d90 100644
--- a/ts/editor-toolbar/WithDropdownMenu.svelte
+++ b/ts/editor-toolbar/WithDropdownMenu.svelte
@@ -1,10 +1,10 @@
 <script lang="typescript">
-    import type { ButtonDefinition } from "./types";
+    import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
 
-    export let button: ButtonDefinition;
+    export let button: DynamicSvelteComponent;
     export let menuId: string;
 
-    function extend({ className, props, ...rest }: ButtonDefinition): ButtonDefinition {
+    function extend({ className, props, ...rest }: DynamicSvelteComponent): DynamicSvelteComponent {
         return {
             className: `${className} dropdown-toggle`,
             props: {
diff --git a/ts/editor-toolbar/types.d.ts b/ts/editor-toolbar/types.d.ts
deleted file mode 100644
index 871b4d461..000000000
--- a/ts/editor-toolbar/types.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
-
-export interface ButtonDefinition extends DynamicSvelteComponent {
-    id?: string;
-    className?: string;
-}
-
-export type Buttons = ButtonDefinition | Buttons[];