fix: make multi-select static work

fixes #63
danielo515 · Oct 11, 2023 · fa5987a · fa5987a · theotheo · Oct 18, 2023
1 parent e523b1f
commit fa5987a
Show file tree

Hide file tree

Showing 4 changed files with 388 additions and 397 deletions.
diff --git a/src/FormModal.ts b/src/FormModal.ts
@@ -132,7 +132,7 @@ export class FormModal extends Modal {
                     {
                         this.formResult[definition.name] = this.formResult[definition.name] || []
                         const options = fieldInput.source == 'fixed'
-                            ? fieldInput.options
+                            ? fieldInput.multi_select_options
                             : get_tfiles_from_folder(fieldInput.folder, this.app).map(file => file.basename);
                         this.svelteComponents.push(new MultiSelect({
                             target: fieldBase.controlEl,

diff --git a/src/core/formDefinition.ts b/src/core/formDefinition.ts
@@ -26,7 +26,7 @@ type inputSelectFixed = {
     options: { value: string; label: string }[];
 }
 type basicInput = { type: FieldType };
-type multiselect = { type: 'multiselect', source: 'notes', folder: string } | { type: 'multiselect', source: 'fixed', options: string[] }
+type multiselect = { type: 'multiselect', source: 'notes', folder: string } | { type: 'multiselect', source: 'fixed', multi_select_options: string[] }
 type inputType =
     | basicInput
     | inputNoteFromFolder
@@ -120,6 +120,7 @@ export type EditableInput = {
     min?: number;
     max?: number;
     options?: { value: string; label: string }[];
+    multi_select_options?: string[];
     query?: string;
 };
 
@@ -145,7 +146,10 @@ export function isMultiSelect(input: unknown): input is multiselect {
     return isObject(input)
         && input.type === 'multiselect'
         && (
-            (input.source === 'notes' && typeof input.folder === 'string') || (input.source === 'fixed' && Array.isArray(input.options))
+            (input.source === 'notes' && typeof input.folder === 'string')
+            || (
+                input.source === 'fixed' && Array.isArray(input.multi_select_options) && input.multi_select_options.every((option: unknown) => typeof option === 'string')
+            )
         )
 }
 

diff --git a/src/exampleModalDefinition.ts b/src/exampleModalDefinition.ts
@@ -49,7 +49,7 @@ export const exampleModalDefinition: FormDefinition = {
             name: "multi_example_2",
             label: "Multi select fixed",
             description: "Allows to pick many notes from a fixed list",
-            input: { type: "multiselect", source: "fixed", options: ['Android', 'iOS', 'Windows', 'MacOS', 'Linux', 'Solaris', 'MS2'] },
+            input: { type: "multiselect", source: "fixed", multi_select_options: ['Android', 'iOS', 'Windows', 'MacOS', 'Linux', 'Solaris', 'MS2'] },
         },
         {
             name: "best_fried",