@vcmap/ui 5.0.0 → 5.0.2

package/src/manager/toolbox/toolboxManager.js

@@ -5,6 +5,7 @@ import { reactive } from 'vue';
 import { vcsAppSymbol } from '../../pluginHelper.js';
 import ButtonManager from '../buttonManager.js';
 import { ActionPattern } from '../../components/lists/VcsActionList.vue';
+import { getActionFromOptions } from '../../actions/actionHelper.js';
 
 /**
  * Possible group types. Define behaviour of group:
@@ -266,13 +267,14 @@ class ToolboxManager {
 
     if (type === ToolboxType.SINGLE) {
       check(toolboxComponentOptions.action, ActionPattern);
+      const action = getActionFromOptions(toolboxComponentOptions.action);
       /**
        * @type {SingleToolboxComponent}
        */
       toolboxComponent = {
         ...toolboxComponent,
         get action() {
-          return reactive(toolboxComponentOptions.action);
+          return reactive(action);
         },
       };
     } else if (type === ToolboxType.SELECT) {
@@ -290,13 +292,14 @@ class ToolboxManager {
           },
         ],
       });
+      const action = getActionFromOptions(toolboxComponentOptions.action);
       /**
        * @type {SelectToolboxComponent}
        */
       toolboxComponent = {
         ...toolboxComponent,
         get action() {
-          return reactive(toolboxComponentOptions.action);
+          return reactive(action);
         },
       };
     } else {

package/src/manager/window/windowManager.js

@@ -338,7 +338,10 @@ class WindowManager {
    * @private
    */
   _handleSlotsChanged(changedSlot) {
-    if (changedSlot === WindowSlot.STATIC) {
+    if (
+      changedSlot === WindowSlot.STATIC ||
+      changedSlot === WindowSlot.DYNAMIC_LEFT
+    ) {
       const staticWindow = this._findWindowBySlot(WindowSlot.STATIC);
       const dynamicWindowLeft = this._findWindowBySlot(WindowSlot.DYNAMIC_LEFT);
       if (staticWindow && dynamicWindowLeft) {

package/src/navigation/MapNavigation.vue

@@ -40,10 +40,7 @@
   import { computed, inject, ref, reactive, onUnmounted } from 'vue';
   import { ObliqueMap, CesiumMap } from '@vcmap/core';
   import { VContainer, VRow } from 'vuetify/lib';
-  import {
-    createGoToViewpointAction,
-    createOverviewMapAction,
-  } from '../actions/actionHelper.js';
+  import { createOverviewMapAction } from '../actions/actionHelper.js';
   import {
     getWindowComponentOptions,
     overviewMapLayerSymbol,
@@ -55,24 +52,24 @@
   import OrientationToolsButton from './OrientationToolsButton.vue';
 
   /**
-   * @description Creates a go-to viewpoint action from a startingViewpointName defined in a module
+   * @description Creates a go-to viewpoint action from a startingViewpointName defined in a module. If no startingViewpointName is defined, uses default map view as fallback.
    * @param {VcsUiApp} app
-   * @returns {{action: import("vue").Reactive<{}>, destroy: function():void}}
+   * @returns {{ action: import("vue").Reactive<VcsAction>, destroy: function():void }}
    */
   function setupHomeButton(app) {
-    const initialAction = {
-      icon: undefined,
-      title: undefined,
-      active: undefined,
-      callback: undefined,
-    };
-    const action = reactive({ ...initialAction });
-    /**
-     * Gets the starting viewpoint of the last added module, where a startingViewpointName was defined
-     * and sets it on the home button action.
-     */
-    const updateStartingViewpoint = () => {
-      let viewpoint = null;
+    let defaultViewpoint;
+    let listener;
+    if (app.maps.activeMap) {
+      defaultViewpoint = app.maps.activeMap?.getViewpointSync();
+    } else {
+      listener = app.maps.mapActivated.addEventListener((map) => {
+        defaultViewpoint = map.getViewpointSync();
+        listener();
+      });
+    }
+
+    const getStartingViewpoint = () => {
+      let viewpoint;
       for (let idx = app.modules.length - 1; idx >= 0; idx--) {
         const { startingViewpointName } = app.modules[idx].config;
         if (
@@ -83,35 +80,21 @@
           break;
         }
       }
-      if (!viewpoint) {
-        Object.assign(action, { ...initialAction });
-      } else {
-        Object.assign(
-          action,
-          createGoToViewpointAction(
-            {
-              name: 'home-action',
-              title: 'navigation.homeButton',
-              icon: '$vcsHomePoint',
-            },
-            viewpoint,
-            app.viewpoints,
-            app.maps,
-          ),
-        );
-      }
+      return viewpoint;
     };
 
-    const listener = [
-      app.moduleAdded.addEventListener(updateStartingViewpoint),
-      app.moduleRemoved.addEventListener(updateStartingViewpoint),
-    ];
-
-    const destroy = () => {
-      listener.forEach((cb) => cb());
-    };
+    const action = reactive({
+      name: 'home-action',
+      title: 'navigation.homeButton',
+      icon: '$vcsHomePoint',
+      async callback() {
+        await app.maps.activeMap?.gotoViewpoint(
+          getStartingViewpoint() || defaultViewpoint,
+        );
+      },
+    });
 
-    return { action, destroy };
+    return { action, destroy: () => listener?.() };
   }
 
   /**
@@ -241,9 +224,11 @@
         if (overviewDestroy) {
           overviewDestroy();
         }
+        if (homeDestroy) {
+          homeDestroy();
+        }
         postRenderHandler();
         overviewMapListeners.forEach((cb) => cb());
-        homeDestroy();
       });
 
       return {

package/src/vcsUiApp.js

@@ -83,7 +83,7 @@ import { callbackClassRegistry } from './callback/vcsCallback.js';
  * @property {function():P} [toJSON] - should return the plugin's serialization excluding all default values
  * @property {function():P} [getDefaultOptions] - should return the plugin's default options
  * @property {function(boolean=):S|Promise<S>} [getState] - should return the plugin's state or a promise for said state. is passed a "for url" flag. If true, only the state relevant for sharing a URL should be passed and short keys shall be used
- * @property {Array<PluginConfigEditor>} [getConfigEditors] - should return components for configuring the plugin or custom items defined by the plugin
+ * @property {function():Array<PluginConfigEditor>} [getConfigEditors] - should return components for configuring the plugin or custom items defined by the plugin
  * @property {function():Promise<void>} destroy
  * @api
  */

package/dist/assets/index-cfed33b1.js

@@ -1 +0,0 @@
-import{initAppFromAppConfig as p}from"./ui.e84ce9.js";p("#app","app.config.json");