@vcmap/module-selector 2.0.0-rc.2 → 2.0.0

package/dist/index.js

@@ -10,11 +10,11 @@ function loadCss(href) {
     elem.onerror = reject;
     document.head.appendChild(elem);
   });
-} await loadCss('data:text/css;base64,LnYtY2FyZFtkYXRhLXYtMWRjYTRjN2Rde2Rpc3BsYXk6ZmxleDtmbGV4LWRpcmVjdGlvbjpjb2x1bW47anVzdGlmeS1jb250ZW50OmNlbnRlcjthbGlnbi1pdGVtczpjZW50ZXI7aGVpZ2h0OjE1MHB4O3dpZHRoOjE1MHB4O2FzcGVjdC1yYXRpbzoxO3RyYW5zaXRpb246YmFja2dyb3VuZC1jb2xvciAuM3N9LmZpeGVkLWNhcmRbZGF0YS12LTFkY2E0YzdkXXtoZWlnaHQ6MTUwcHg7d2lkdGg6MTUwcHg7YXNwZWN0LXJhdGlvOjF9LnNlbGVjdGVkLWNhcmRbZGF0YS12LTFkY2E0YzdkXXtiYWNrZ3JvdW5kLWNvbG9yOnJnYih2YXIoLS12LXRoZW1lLXByaW1hcnkpKTtjb2xvcjpyZ2IodmFyKC0tdi10aGVtZS1vbi1wcmltYXJ5KSl9Cg==');import { VcsFormButton as A, WindowSlot as D, createToggleAction as O, ButtonLocation as j } from "../../../assets/ui.js";
-import { defineComponent as E, inject as F, computed as V, resolveComponent as c, openBlock as r, createBlock as p, withCtx as l, createVNode as a, createTextVNode as u, toDisplayString as m, createCommentVNode as S, createElementBlock as h, Fragment as B, renderList as N, normalizeClass as T, ref as b } from "../../../assets/vue.js";
+} await loadCss('data:text/css;base64,LnYtY2FyZFtkYXRhLXYtYzMzMDgwZDdde2Rpc3BsYXk6ZmxleDtmbGV4LWRpcmVjdGlvbjpjb2x1bW47anVzdGlmeS1jb250ZW50OmNlbnRlcjthbGlnbi1pdGVtczpjZW50ZXI7aGVpZ2h0OjE1MHB4O3dpZHRoOjE1MHB4O2FzcGVjdC1yYXRpbzoxO3RyYW5zaXRpb246YmFja2dyb3VuZC1jb2xvciAuM3N9LmZpeGVkLWNhcmRbZGF0YS12LWMzMzA4MGQ3XXtoZWlnaHQ6MTUwcHg7d2lkdGg6MTUwcHg7YXNwZWN0LXJhdGlvOjF9LnNlbGVjdGVkLWNhcmRbZGF0YS12LWMzMzA4MGQ3XXtiYWNrZ3JvdW5kLWNvbG9yOnJnYih2YXIoLS12LXRoZW1lLXByaW1hcnkpKTtjb2xvcjpyZ2IodmFyKC0tdi10aGVtZS1vbi1wcmltYXJ5KSl9Cg==');import { VcsFormButton as z, WindowSlot as D, createToggleAction as O, ButtonLocation as j } from "../../../assets/ui.js";
+import { defineComponent as E, inject as F, computed as V, resolveComponent as r, openBlock as u, createBlock as M, withCtx as l, createVNode as a, createTextVNode as c, toDisplayString as m, createCommentVNode as h, createElementBlock as B, Fragment as I, renderList as N, normalizeClass as b, ref as T } from "../../../assets/vue.js";
 import { VSheet as J, VContainer as L, VRow as P, VCol as R, VCard as G, VIcon as H, VCardTitle as K } from "../../../assets/vuetify.js";
 import { VcsModule as U } from "../../../assets/core.js";
-const k = "@vcmap/module-selector", W = "2.0.0-rc.2", Z = "^6.0";
+const S = "@vcmap/module-selector", W = "2.0.0", Z = "^6.0";
 async function $(e, o) {
   const t = await fetch(e, {
     method: "GET"
@@ -29,8 +29,9 @@ async function $(e, o) {
   }
 }
 async function Q(e) {
-  const o = "moduleSelector_module_id";
-  e.getModuleById(o) && await e.removeModule(o);
+  var f, y;
+  const o = "moduleSelector_module_id", t = (f = e.maps.activeMap) == null ? void 0 : f.name;
+  e.getModuleById(o) && await e.removeModule(o), e.maps.activeMap || await e.maps.setActiveMap(t || ((y = [...e.maps][0]) == null ? void 0 : y.name));
 }
 const x = "moduleSelector_window_id", X = E({
   name: "ModuleSelector",
@@ -42,7 +43,7 @@ const x = "moduleSelector_window_id", X = E({
     VCard: G,
     VIcon: H,
     VCardTitle: K,
-    VcsFormButton: A
+    VcsFormButton: z
   },
   props: {
     modules: {
@@ -61,46 +62,46 @@ const x = "moduleSelector_window_id", X = E({
     }
   },
   setup(e) {
-    const o = F("vcsApp"), t = o.plugins.getByKey(k), { modules: s } = e, C = V(() => {
+    const o = F("vcsApp"), t = o.plugins.getByKey(S), { modules: s } = e, f = V(() => {
       const n = e.modules[t.selectedMainModuleIndex.value];
       return (n == null ? void 0 : n.type) === "group" ? n.cards : [];
-    }), I = (n) => {
+    }), y = (n) => {
       t.selectedMainModuleIndex.value === n ? t.selectedMainModuleIndex.value = null : t.selectedMainModuleIndex.value = n;
-    }, v = (n) => {
+    }, p = (n) => {
       t.selectedNestedModuleIndex.value === n ? t.selectedNestedModuleIndex.value = null : t.selectedNestedModuleIndex.value = n;
-    }, g = () => {
+    }, k = () => {
       t.selectedNestedModuleIndex.value = null, t.selectedMainModuleIndex.value = null;
-    }, M = async () => {
+    }, _ = async () => {
       var i;
       await Q(o);
-      const n = t.selectedMainModuleIndex.value, y = t.selectedNestedModuleIndex.value;
-      if (n === null) return;
-      const d = s[n], w = (d == null ? void 0 : d.type) === "group" ? (i = d.cards) == null ? void 0 : i[y] : null;
-      w != null && w.moduleUrl ? await $(w.moduleUrl, o) : (d == null ? void 0 : d.type) === "url" && await $(d.moduleUrl, o), o.windowManager.remove(x);
-    }, _ = V(() => {
+      const n = t.selectedMainModuleIndex.value, C = t.selectedNestedModuleIndex.value;
+      if (n === null && !e.basisModule) return;
+      const d = s[n], g = (d == null ? void 0 : d.type) === "group" ? (i = d.cards) == null ? void 0 : i[C] : null;
+      g != null && g.moduleUrl ? await $(g.moduleUrl, o) : (d == null ? void 0 : d.type) === "url" && await $(d.moduleUrl, o), o.windowManager.remove(x);
+    }, w = V(() => {
       if (!e.requireModuleSelection) return !1;
-      const n = t.selectedMainModuleIndex.value, y = t.selectedNestedModuleIndex.value, d = s[n];
-      return n == null || (d == null ? void 0 : d.type) === "group" && d.cards && y == null;
+      const n = t.selectedMainModuleIndex.value, C = t.selectedNestedModuleIndex.value, d = s[n];
+      return n == null || (d == null ? void 0 : d.type) === "group" && d.cards && C == null;
     });
     return {
-      nestedCards: C,
+      nestedCards: f,
       plugin: t,
-      selectModule: I,
-      selectNestedModule: v,
-      showMainCards: g,
-      startApplication: M,
-      isButtonDisabled: _
+      selectModule: y,
+      selectNestedModule: p,
+      showMainCards: k,
+      startApplication: _,
+      isButtonDisabled: w
     };
   }
 }), Y = (e, o) => {
   const t = e.__vccOpts || e;
-  for (const [s, C] of o)
-    t[s] = C;
+  for (const [s, f] of o)
+    t[s] = f;
   return t;
 };
-function ee(e, o, t, s, C, I) {
-  const v = c("v-icon"), g = c("v-card-title"), M = c("v-card"), _ = c("v-col"), n = c("v-row"), y = c("VcsFormButton"), d = c("v-container"), w = c("v-sheet");
-  return r(), p(w, {
+function ee(e, o, t, s, f, y) {
+  const p = r("v-icon"), k = r("v-card-title"), _ = r("v-card"), w = r("v-col"), n = r("v-row"), C = r("VcsFormButton"), d = r("v-container"), g = r("v-sheet");
+  return u(), M(g, {
     class: "module-selector",
     elevation: "1"
   }, {
@@ -112,23 +113,23 @@ function ee(e, o, t, s, C, I) {
             "no-gutters": ""
           }, {
             default: l(() => [
-              e.basisModule && !e.nestedCards.length ? (r(), p(_, {
+              e.basisModule && !e.nestedCards.length ? (u(), M(w, {
                 key: 0,
                 cols: "auto",
                 class: "pa-2"
               }, {
                 default: l(() => [
-                  a(M, {
+                  a(_, {
                     class: "pa-3 fixed-card selected-card",
                     outlined: ""
                   }, {
                     default: l(() => [
-                      e.basisModule.icon ? (r(), p(v, {
+                      e.basisModule.icon ? (u(), M(p, {
                         key: 0,
                         size: "50"
                       }, {
                         default: l(() => [
-                          u(
+                          c(
                             m(e.basisModule.icon),
                             1
                             /* TEXT */
@@ -136,10 +137,10 @@ function ee(e, o, t, s, C, I) {
                         ]),
                         _: 1
                         /* STABLE */
-                      })) : S("v-if", !0),
-                      a(g, { class: "text-center" }, {
+                      })) : h("v-if", !0),
+                      a(k, { class: "text-center" }, {
                         default: l(() => [
-                          u(
+                          c(
                             m(e.$st(e.basisModule.title)),
                             1
                             /* TEXT */
@@ -155,30 +156,30 @@ function ee(e, o, t, s, C, I) {
                 ]),
                 _: 1
                 /* STABLE */
-              })) : S("v-if", !0),
-              e.nestedCards.length ? (r(), h(
-                B,
+              })) : h("v-if", !0),
+              e.nestedCards.length ? (u(), B(
+                I,
                 { key: 2 },
                 [
-                  a(_, {
+                  a(w, {
                     cols: "auto",
                     class: "pa-2"
                   }, {
                     default: l(() => [
-                      a(M, {
+                      a(_, {
                         class: "fixed-card hover-card",
                         outlined: "",
                         onClick: o[0] || (o[0] = (i) => e.showMainCards())
                       }, {
                         default: l(() => [
-                          a(v, { size: "50" }, {
+                          a(p, { size: "50" }, {
                             default: l(() => [
-                              u("mdi-arrow-left")
+                              c("mdi-arrow-left")
                             ]),
                             _: 1
                             /* STABLE */
                           }),
-                          u(
+                          c(
                             " " + m(e.$st("moduleSelector.cardBack")),
                             1
                             /* TEXT */
@@ -191,35 +192,35 @@ function ee(e, o, t, s, C, I) {
                     _: 1
                     /* STABLE */
                   }),
-                  (r(!0), h(
-                    B,
+                  (u(!0), B(
+                    I,
                     null,
-                    N(e.nestedCards, (i, f) => (r(), p(
-                      _,
+                    N(e.nestedCards, (i, v) => (u(), M(
+                      w,
                       {
-                        key: f,
+                        key: v,
                         cols: "auto",
                         class: "pa-2"
                       },
                       {
                         default: l(() => [
-                          a(M, {
-                            class: T(["fixed-card hover-card", {
-                              "selected-card": e.plugin.selectedNestedModuleIndex.value === f
+                          a(_, {
+                            class: b(["fixed-card hover-card", {
+                              "selected-card": e.plugin.selectedNestedModuleIndex.value === v
                             }]),
                             outlined: "",
-                            onClick: (z) => e.selectNestedModule(f)
+                            onClick: (A) => e.selectNestedModule(v)
                           }, {
                             default: l(() => [
-                              i.icon ? (r(), p(
-                                v,
+                              i.icon ? (u(), M(
+                                p,
                                 {
                                   key: 0,
                                   size: "50"
                                 },
                                 {
                                   default: l(() => [
-                                    u(
+                                    c(
                                       m(i.icon),
                                       1
                                       /* TEXT */
@@ -230,13 +231,13 @@ function ee(e, o, t, s, C, I) {
                                 },
                                 1024
                                 /* DYNAMIC_SLOTS */
-                              )) : S("v-if", !0),
+                              )) : h("v-if", !0),
                               a(
-                                g,
+                                k,
                                 { class: "text-center" },
                                 {
                                   default: l(() => [
-                                    u(
+                                    c(
                                       m(e.$st(i.title)),
                                       1
                                       /* TEXT */
@@ -265,35 +266,35 @@ function ee(e, o, t, s, C, I) {
                 ],
                 64
                 /* STABLE_FRAGMENT */
-              )) : (r(!0), h(
-                B,
+              )) : (u(!0), B(
+                I,
                 { key: 1 },
-                N(e.modules, (i, f) => (r(), p(
-                  _,
+                N(e.modules, (i, v) => (u(), M(
+                  w,
                   {
                     cols: "auto",
                     class: "pa-2",
-                    key: f
+                    key: v
                   },
                   {
                     default: l(() => [
-                      a(M, {
-                        class: T(["fixed-card hover-card", {
-                          "selected-card": e.plugin.selectedMainModuleIndex.value === f
+                      a(_, {
+                        class: b(["fixed-card hover-card", {
+                          "selected-card": e.plugin.selectedMainModuleIndex.value === v
                         }]),
                         outlined: "",
-                        onClick: (z) => e.selectModule(f)
+                        onClick: (A) => e.selectModule(v)
                       }, {
                         default: l(() => [
-                          i.icon ? (r(), p(
-                            v,
+                          i.icon ? (u(), M(
+                            p,
                             {
                               key: 0,
                               size: "50"
                             },
                             {
                               default: l(() => [
-                                u(
+                                c(
                                   m(i.icon),
                                   1
                                   /* TEXT */
@@ -304,13 +305,13 @@ function ee(e, o, t, s, C, I) {
                             },
                             1024
                             /* DYNAMIC_SLOTS */
-                          )) : S("v-if", !0),
+                          )) : h("v-if", !0),
                           a(
-                            g,
+                            k,
                             { class: "text-center" },
                             {
                               default: l(() => [
-                                u(
+                                c(
                                   m(e.$st(i.title)),
                                   1
                                   /* TEXT */
@@ -342,14 +343,14 @@ function ee(e, o, t, s, C, I) {
           }),
           a(n, { justify: "end" }, {
             default: l(() => [
-              a(y, {
+              a(C, {
                 variant: "filled",
                 class: "ma-5",
                 onClick: e.startApplication,
                 disabled: e.isButtonDisabled
               }, {
                 default: l(() => [
-                  u(
+                  c(
                     m(e.$st("moduleSelector.startButton")),
                     1
                     /* TEXT */
@@ -371,7 +372,7 @@ function ee(e, o, t, s, C, I) {
     /* STABLE */
   });
 }
-const te = /* @__PURE__ */ Y(X, [["render", ee], ["__scopeId", "data-v-1dca4c7d"]]), q = () => ({
+const te = /* @__PURE__ */ Y(X, [["render", ee], ["__scopeId", "data-v-c33080d7"]]), q = () => ({
   windowTitle: "moduleSelector.title",
   position: {
     left: "33%",
@@ -383,7 +384,7 @@ const te = /* @__PURE__ */ Y(X, [["render", ee], ["__scopeId", "data-v-1dca4c7d"
 function se(e) {
   return {
     get name() {
-      return k;
+      return S;
     },
     get version() {
       return W;
@@ -394,8 +395,8 @@ function se(e) {
     get config() {
       return { ...q(), ...e };
     },
-    selectedMainModuleIndex: b(void 0),
-    selectedNestedModuleIndex: b(void 0),
+    selectedMainModuleIndex: T(void 0),
+    selectedNestedModuleIndex: T(void 0),
     initialize(o) {
       const t = {
         id: x,
@@ -418,16 +419,16 @@ function se(e) {
         },
         t,
         o.windowManager,
-        k
+        S
       );
       return o.navbarManager.add(
         {
           id: s.name,
           action: s
         },
-        k,
+        S,
         j.PROJECT
-      ), e.isActiveOnStart && o.windowManager.add(t, k), Promise.resolve();
+      ), e.isActiveOnStart && o.windowManager.add(t, S), Promise.resolve();
     },
     getDefaultOptions: q,
     toJSON() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/module-selector",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",

package/src/ModuleSelector.vue

@@ -174,7 +174,7 @@
         const mainModuleIndex = plugin.selectedMainModuleIndex.value;
         const nestedModuleIndex = plugin.selectedNestedModuleIndex.value;
 
-        if (mainModuleIndex === null) return;
+        if (mainModuleIndex === null && !props.basisModule) return;
 
         const mainModule = modules[mainModuleIndex!];
         const nestedModule =

package/src/moduleHelper.ts

@@ -24,8 +24,12 @@ export async function loadModule(
 
 export async function unloadModule(app: VcsUiApp): Promise<void> {
   const moduleId = `moduleSelector_module_id`;
+  const activeMapName = app.maps.activeMap?.name;
   const module = app.getModuleById(moduleId);
   if (module) {
     await app.removeModule(moduleId);
   }
+  if (!app.maps.activeMap) {
+    await app.maps.setActiveMap(activeMapName || [...app.maps][0]?.name);
+  }
 }