@vcmap/module-selector 2.0.2 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/module-selector",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -45,28 +45,28 @@
   ],
   "prettier": "@vcsuite/eslint-config/prettier.js",
   "peerDependencies": {
-    "@vcmap/core": "^6.0.0",
-    "@vcmap/ui": "^6.0.1",
+    "@vcmap/core": "^6.0.5",
+    "@vcmap/ui": "^6.0.7",
     "vue": "~3.4.38",
     "vuetify": "^3.7.3"
   },
   "devDependencies": {
-    "@vcmap/plugin-cli": "^4.0.0",
+    "@vcmap/plugin-cli": "^4.0.1",
     "@vcsuite/eslint-config": "^3.0.8",
-    "@vitest/coverage-v8": "^2.1.1",
+    "@vitest/coverage-v8": "^2.1.4",
     "jest-canvas-mock": "^2.5.2",
     "jsdom": "^24.1.1",
     "resize-observer-polyfill": "^1.5.1",
-    "typescript": "^5.6.2",
-    "vitest": "^2.1.1",
-    "vue-tsc": "^2.1.6"
+    "typescript": "^5.6.3",
+    "vitest": "^2.1.4",
+    "vue-tsc": "^2.1.10"
   },
   "mapVersion": "^6.0",
   "dependencies": {
     "@vcsuite/logger": "^1.0.1",
     "@vcsuite/parsers": "^2.0.0",
-    "fast-deep-equal": "^3.1.3",
     "@vcsuite/publisher-sdk": "^5.2.12",
+    "fast-deep-equal": "^3.1.3",
     "node-fetch": "^2.7.0"
   }
 }

package/src/config/ModuleSelectorConfigEditor.vue

@@ -39,24 +39,6 @@
           </v-row>
         </v-container>
       </VcsFormSection>
-      <VcsFormSection
-        heading="moduleSelector.configEditor.windowPosition"
-        :expandable="true"
-      >
-        <WindowPositionSettings
-          v-model="localConfig.position!"
-          :position-keys="[
-            'top',
-            'right',
-            'bottom',
-            'left',
-            'width',
-            'maxWidth',
-            'height',
-            'maxHeight',
-          ]"
-        />
-      </VcsFormSection>
       <VcsFormSection heading="moduleSelector.configEditor.baseModule">
         <v-container class="py-0 px-1">
           <v-row no-gutters>
@@ -199,6 +181,24 @@
         />
       </v-dialog>
     </VcsFormSection>
+    <VcsFormSection
+      heading="moduleSelector.configEditor.windowPosition"
+      :expandable="true"
+    >
+      <WindowPositionSettings
+        v-model="localConfig.position!"
+        :position-keys="[
+          'top',
+          'right',
+          'bottom',
+          'left',
+          'width',
+          'maxWidth',
+          'height',
+          'maxHeight',
+        ]"
+      />
+    </VcsFormSection>
   </AbstractConfigEditor>
 </template>
 
@@ -222,6 +222,7 @@
     reactive,
     Ref,
     ref,
+    toRaw,
     watch,
   } from 'vue';
   import {
@@ -528,11 +529,27 @@
       });
 
       const apply = (): void => {
-        props.setConfig({
-          ...localConfig.value,
+        const position = toRaw(localConfig.value?.position) as Record<
+          string,
+          unknown
+        >;
+        const isPositionDefined = Object.values(position).some(
+          (value) => value !== undefined,
+        );
+
+        const config = {
+          ...toRaw(localConfig.value),
           modules: removeIdAndActionsFromArray(listItemArray.value),
-          basisModule: basisModule.value,
-        });
+          basisModule: toRaw(basisModule.value),
+        };
+
+        if (isPositionDefined) {
+          config.position = position;
+        } else {
+          delete config.position;
+        }
+
+        props.setConfig(config);
       };
 
       const updateItem = (): void => {

package/src/index.ts

@@ -47,7 +47,7 @@ export type PluginState = {
   smi?: number | undefined | null;
   // selectedNestedModuleIndex
   snmi?: number | undefined | null;
-  // module elector window open
+  // module selector window open
   w?: boolean;
   modules?: Array<Module<ModuleType>>;
 };
@@ -124,8 +124,8 @@ export default function plugin(
             this.selectedMainModuleIndex.value,
             this.selectedNestedModuleIndex.value,
             app,
-            configInput.modules!,
-            configInput.basisModule,
+            this.config.modules,
+            this.config.basisModule,
           );
         }
       }
@@ -150,7 +150,7 @@ export default function plugin(
         ButtonLocation.PROJECT,
       );
 
-      if ((state && state.w) || (!state && configInput.isActiveOnStart)) {
+      if ((state && state.w) || (!state && this.config.isActiveOnStart)) {
         app.windowManager.add(moduleSelectorComponent, name);
       }
 
@@ -293,7 +293,7 @@ export default function plugin(
                 createdAt: 'Created at',
                 updatedAt: 'Updated at',
                 createdBy: 'Created by',
-                updatedBy: 'Created by',
+                updatedBy: 'Updated by',
               },
             },
             TooltipAddModule: 'Add module',