refactor: avoid macro modal duplication

mishamyrt · Apr 6, 2024 · 2a7356e · 2a7356e
1 parent 7c9e7ae
commit 2a7356e
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 18 deletions.
diff --git a/ui/src/features/keys/index.ts b/ui/src/features/keys/index.ts
@@ -1,5 +1,5 @@
+export * from './macro'
 export * from './record-keystroke'
 export * from './restore-default'
 export * from './select-action'
 export * from './select-key'
-export * from './select-macro'
diff --git a/ui/src/features/keys/macro/index.ts b/ui/src/features/keys/macro/index.ts
@@ -0,0 +1,7 @@
+import EditMacroModal from './ui/EditMacroModal.svelte'
+import SelectMacros from './ui/SelectMacros.svelte'
+
+export {
+  EditMacroModal,
+  SelectMacros
+}
diff --git a/...eys/select-macro/lib/__tests__/convert.ts → ...tures/keys/macro/lib/__tests__/convert.ts b/...eys/select-macro/lib/__tests__/convert.ts → ...tures/keys/macro/lib/__tests__/convert.ts
diff --git a/...s/select-macro/lib/__tests__/normalize.ts → ...res/keys/macro/lib/__tests__/normalize.ts b/...s/select-macro/lib/__tests__/normalize.ts → ...res/keys/macro/lib/__tests__/normalize.ts
diff --git a/.../keys/select-macro/lib/__tests__/order.ts → ...eatures/keys/macro/lib/__tests__/order.ts b/.../keys/select-macro/lib/__tests__/order.ts → ...eatures/keys/macro/lib/__tests__/order.ts
diff --git a/...features/keys/select-macro/lib/convert.ts → ui/src/features/keys/macro/lib/convert.ts b/...features/keys/select-macro/lib/convert.ts → ui/src/features/keys/macro/lib/convert.ts
diff --git a/...c/features/keys/select-macro/lib/index.ts → ui/src/features/keys/macro/lib/index.ts b/...c/features/keys/select-macro/lib/index.ts → ui/src/features/keys/macro/lib/index.ts
diff --git a/...atures/keys/select-macro/lib/normalize.ts → ui/src/features/keys/macro/lib/normalize.ts b/...atures/keys/select-macro/lib/normalize.ts → ui/src/features/keys/macro/lib/normalize.ts
diff --git a/...eatures/keys/select-macro/lib/observer.ts → ui/src/features/keys/macro/lib/observer.ts b/...eatures/keys/select-macro/lib/observer.ts → ui/src/features/keys/macro/lib/observer.ts
diff --git a/...c/features/keys/select-macro/lib/order.ts → ui/src/features/keys/macro/lib/order.ts b/...c/features/keys/select-macro/lib/order.ts → ui/src/features/keys/macro/lib/order.ts
diff --git a/...features/keys/select-macro/model/index.ts → ui/src/features/keys/macro/model/index.ts b/...features/keys/select-macro/model/index.ts → ui/src/features/keys/macro/model/index.ts
diff --git a/...features/keys/select-macro/model/store.ts → ui/src/features/keys/macro/model/store.ts b/...features/keys/select-macro/model/store.ts → ui/src/features/keys/macro/model/store.ts
diff --git a/...features/keys/select-macro/model/types.ts → ui/src/features/keys/macro/model/types.ts b/...features/keys/select-macro/model/types.ts → ui/src/features/keys/macro/model/types.ts
diff --git a/...es/keys/select-macro/ui/MacroModal.svelte → ...tures/keys/macro/ui/EditMacroModal.svelte b/...es/keys/select-macro/ui/MacroModal.svelte → ...tures/keys/macro/ui/EditMacroModal.svelte
diff --git a/...es/keys/select-macro/ui/MacroSteps.svelte → .../features/keys/macro/ui/MacroSteps.svelte b/...es/keys/select-macro/ui/MacroSteps.svelte → .../features/keys/macro/ui/MacroSteps.svelte
@@ -27,6 +27,13 @@
   }
 
   $: macroSteps = $currentMacroStepsStore
+  $: dndZoneParams = {
+    items: macroSteps,
+    flipDurationMs,
+    dropTargetStyle: {
+      outline: 'none'
+    }
+  }
 
   onMount(() => {
     subscriptions = observeStepsOn(stepsContainer,
@@ -51,13 +58,7 @@
   <div
     class="steps"
     bind:this={stepsContainer}
-    use:dndzone="{{
-      items: macroSteps,
-      flipDurationMs,
-      dropTargetStyle: {
-        outline: 'none'
-      }
-    }}"
+    use:dndzone="{dndZoneParams}"
     on:consider="{handleDndConsider}"
     on:finalize="{handleDndFinalize}"
   >

diff --git a/...res/keys/select-macro/ui/KeyMacros.svelte → ...eatures/keys/macro/ui/SelectMacros.svelte b/...res/keys/select-macro/ui/KeyMacros.svelte → ...eatures/keys/macro/ui/SelectMacros.svelte
@@ -5,7 +5,6 @@
   import { MoreButton } from '$shared/ui'
 
   import { macroCreated, macroEdited } from '../model'
-  import MacroModal from './MacroModal.svelte'
 
   export let keyCode: string
 
@@ -61,7 +60,6 @@
       </div>
     </FormRow>
   {/each}
-  <MacroModal />
 </FormGroup>
 <div class="add">
   <Stack direction="horizontal" align="start" justify="space-between">

diff --git a/ui/src/features/keys/select-macro/index.ts b/ui/src/features/keys/select-macro/index.ts
diff --git a/ui/src/pages/keys/KeysPage.svelte b/ui/src/pages/keys/KeysPage.svelte
@@ -4,6 +4,7 @@
 
   import { selectedKeyStore } from '$entities/keys'
   import { DeviceSupports } from '$features/device'
+  import { EditMacroModal } from '$features/keys'
   import { KeySettings, KeysNotSupported } from '$widgets'
 
   $: selectedKey = $selectedKeyStore
@@ -28,4 +29,5 @@
       <KeysNotSupported slot="not-supported" />
     </DeviceSupports>
   </Stack>
+  <EditMacroModal />
 </div>
diff --git a/ui/src/widgets/ui/KeySettings.svelte b/ui/src/widgets/ui/KeySettings.svelte
@@ -4,8 +4,7 @@
   import { actionChanged, keyMapStore } from '$entities/keys'
   import { getShortName } from '$entities/keys/lib'
   import type { KeyAction } from '$entities/keys/model/types'
-  import { CustomActionToggle, KeyActionSelect, KeystrokeInput } from '$features/keys'
-  import KeyMacros from '$features/keys/select-macro/ui/KeyMacros.svelte'
+  import { CustomActionToggle, KeyActionSelect, KeystrokeInput, SelectMacros } from '$features/keys'
 
   export let keyCode: string
   export let secondary: boolean = false
@@ -56,5 +55,5 @@
   {/if}
 </FormGroup>
 {#if selectedType === 'macro'}
-  <KeyMacros {keyCode} />
+  <SelectMacros {keyCode} />
 {/if}