@vcmap/ui 6.3.9 → 6.3.11

package/dist/assets/ui.js

@@ -1 +1 @@
-export * from "./ui-932f5e80.js";
+export * from "./ui-da598216.js";

package/dist/assets/vue.js

@@ -1 +1 @@
-export * from "./vue-f70f4573.js";
+export * from "./vue-20dd2b78.js";

package/dist/assets/{vuetify-9288f7c7.js → vuetify-1429f242.js}

@@ -10,7 +10,7 @@ function loadCss(href) {
     elem.onerror = reject;
     document.head.appendChild(elem);
   });
-} await loadCss('./assets/vuetify-9288f7c7.css');import { watch as Q, onScopeDispose as Ze, effectScope as Zl, shallowRef as K, reactive as it, computed as b, watchEffect as Fe, toRefs as Yt, capitalize as Nn, unref as ot, Fragment as ie, isVNode as Rc, Comment as Nc, warn as ja, getCurrentInstance as Hc, ref as j, provide as De, inject as ye, defineComponent as zc, h as Gt, camelize as Ir, toRaw as Be, createVNode as r, mergeProps as O, onBeforeUnmount as Qe, readonly as Ql, onMounted as Ye, onDeactivated as _r, onActivated as Wc, nextTick as we, TransitionGroup as Jl, Transition as jt, isRef as Tn, toRef as $, onBeforeMount as ra, withDirectives as $e, resolveDirective as gt, vShow as Ct, onUpdated as jc, Text as Uc, resolveDynamicComponent as Yc, markRaw as Gc, Teleport as Kc, cloneVNode as qc, createTextVNode as Tt, onUnmounted as Tr, onBeforeUpdate as Xc, withModifiers as Tl, toDisplayString as Zc, vModelText as Qc, resolveComponent as Jc, render as Ar } from "./vue-f70f4573.js";
+} await loadCss('./assets/vuetify-1429f242.css');import { watch as Q, onScopeDispose as Ze, effectScope as Zl, shallowRef as K, reactive as it, computed as b, watchEffect as Fe, toRefs as Yt, capitalize as Nn, unref as ot, Fragment as ie, isVNode as Rc, Comment as Nc, warn as ja, getCurrentInstance as Hc, ref as j, provide as De, inject as ye, defineComponent as zc, h as Gt, camelize as Ir, toRaw as Be, createVNode as r, mergeProps as O, onBeforeUnmount as Qe, readonly as Ql, onMounted as Ye, onDeactivated as _r, onActivated as Wc, nextTick as we, TransitionGroup as Jl, Transition as jt, isRef as Tn, toRef as $, onBeforeMount as ra, withDirectives as $e, resolveDirective as gt, vShow as Ct, onUpdated as jc, Text as Uc, resolveDynamicComponent as Yc, markRaw as Gc, Teleport as Kc, cloneVNode as qc, createTextVNode as Tt, onUnmounted as Tr, onBeforeUpdate as Xc, withModifiers as Tl, toDisplayString as Zc, vModelText as Qc, resolveComponent as Jc, render as Ar } from "./vue-20dd2b78.js";
 function rt(e, n) {
   let t;
   function a() {

package/dist/assets/vuetify.js

@@ -1 +1 @@
-export * from "./vuetify-9288f7c7.js";
+export * from "./vuetify-1429f242.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/ui",
-  "version": "6.3.9",
+  "version": "6.3.11",
   "author": "Virtual City Systems",
   "license": "MIT",
   "scripts": {
@@ -55,7 +55,7 @@
   },
   "peerDependencies": {
     "@vcmap-cesium/engine": "^11.0.5",
-    "@vcmap/core": "^6.3.8",
+    "@vcmap/core": "^6.3.9",
     "ol": "^10.4.0",
     "vue": "~3.4.38",
     "vuetify": "~3.7.14"

package/plugins/@vcmap-show-case/plugin-editors/src/PluginEditors.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <VcsHelp
-      text="Below all config editors provided by plugins are listed. Important Note: Changes made in editors are not applied!"
+      text="Below all config editors provided by plugins are listed. Changes made in editors are applied by removing and re-adding the plugin with the new config."
     ></VcsHelp>
     <VcsList :items="plugins" :show-title="false" />
   </div>
@@ -10,6 +10,7 @@
 <script>
   import { inject, onUnmounted, ref } from 'vue';
   import { VcsList, createToggleAction, WindowSlot, VcsHelp } from '@vcmap/ui';
+  import deepEqual from 'fast-deep-equal';
   import { name } from '../package.json';
 
   export default {
@@ -42,14 +43,35 @@
                     getConfig: () => {
                       return vcsApp.plugins.getSerializedByKey(plugin.name);
                     },
-                    setConfig(config) {
+                    async setConfig(config) {
                       if (config) {
-                        vcsApp.notifier.add({
-                          type: 'info',
-                          title: plugin.name,
-                          message: JSON.stringify(config, null, 2),
-                        });
-                        console.log(config);
+                        const currentPlugin = vcsApp.plugins.getByKey(
+                          plugin.name,
+                        );
+                        const oldSerialized = currentPlugin?.toJSON?.() ?? {};
+                        if (currentPlugin) {
+                          currentPlugin.destroy?.();
+                          vcsApp.plugins.remove(currentPlugin);
+                        }
+                        await vcsApp.plugins.parseItems(
+                          [config],
+                          vcsApp.dynamicModuleId,
+                        );
+                        const newPlugin = vcsApp.plugins.getByKey(config.name);
+                        const serialized = newPlugin?.toJSON?.() ?? {};
+                        if (!deepEqual(oldSerialized, serialized)) {
+                          vcsApp.notifier.add({
+                            type: 'info',
+                            title: plugin.name,
+                            message: JSON.stringify(serialized, null, 2),
+                          });
+                          console.log(serialized);
+                        } else {
+                          vcsApp.notifier.add({
+                            type: 'warning',
+                            message: `${plugin.name}: no config changes were made. Did you implement toJSON correctly?`,
+                          });
+                        }
                       } else {
                         vcsApp.notifier.add({
                           type: 'warning',

package/plugins/package.json

@@ -3,7 +3,7 @@
     "@vcmap/print": "^4.0.0",
     "@vcmap/walk": "^2.0.0",
     "@vcmap/clipping-tool": "^4.0.0",
-    "@vcmap/transparent-terrain": "^3.0.0",
+    "@vcmap/transparent-terrain": "^4.0.0",
     "@vcmap/height-profile": "^3.0.0",
     "@vcmap/flight": "^3.0.0",
     "@vcmap/swipe-tool": "^4.0.0",
@@ -30,7 +30,7 @@
     "@vcmap/sensorthings": "^1.0.0",
     "@vcmap/cesium-inspector": "^2.0.0",
     "@vcmap/event-control": "^1.0.1",
-    "@vcmap/dynamic-layer": "^3.0.0",
+    "@vcmap/dynamic-layer": "^4.0.0",
     "@vcmap/geofence": "^1.0.2",
     "@vcmap/panorama": "^1.0.0",
     "@vcmap/layer-settings": "^1.0.1"

package/src/components/lists/VcsTreeNode.vue

@@ -22,7 +22,7 @@
         variant="text"
         :disabled="item.children.length === 0"
         :icon="isOpen ? 'mdi-chevron-down' : 'mdi-chevron-right'"
-        @click="bubbleItemToggled(item.name)"
+        @click="toggleCurrentItem"
       />
       <slot name="prepend" v-bind="{ item }">
         <span
@@ -43,7 +43,7 @@
         <VcsTreeviewTitle
           :item="item"
           :cursor-pointer="item.clickable || (openOnClick && isGroup)"
-          @click="(event) => $emit('click', item, event)"
+          @click="handleTitleClick"
         />
       </slot>
       <slot name="append" v-bind="{ item }">
@@ -68,6 +68,9 @@
             :item="child"
             :search="search"
             :custom-filter="customFilter"
+            :show-all-children="
+              showAllChildren || (isGroup && matchesSelf && !hasDescendantMatch)
+            "
             :level="level + 1"
             :open-on-click="openOnClick"
             :item-children="itemChildren"
@@ -115,7 +118,7 @@
 </template>
 
 <script>
-  import { computed, ref, getCurrentInstance } from 'vue';
+  import { computed, ref, getCurrentInstance, watch } from 'vue';
   import { VBtn, VExpandTransition, VIcon, VRow } from 'vuetify/components';
   import { useIconSize } from '../../vuePlugins/vuetify.js';
   import { getForwardSlots } from '../composables.js';
@@ -204,6 +207,10 @@
         type: Function,
         default: undefined,
       },
+      showAllChildren: {
+        type: Boolean,
+        default: false,
+      },
     },
     emits: [
       'itemToggled',
@@ -219,33 +226,85 @@
       const iconSize = useIconSize();
       const forwardSlots = getForwardSlots(slots);
       const treenodeRef = ref(null);
-
-      const isOpen = computed(
-        () =>
-          props.opened.includes(props.item.name) &&
-          props.item[props.itemChildren]?.length,
-      );
+      const searchOpenOverride = ref(undefined);
       const children = computed(() => props.item[props.itemChildren] ?? []);
 
-      const matchFilter = computed(() => {
+      const translatedTitle = (item) =>
+        item.title ? vm.$t(item.title) : item.name;
+
+      const doesItemMatch = (item) => {
         if (!props.search) {
           return true;
         }
         if (props.customFilter) {
-          return props.customFilter(props.item, props.search);
+          return props.customFilter(item, props.search);
         }
-        const translatedTitle = (item) =>
-          item.title ? vm.$t(item.title) : item.name;
 
-        const hasText = (item) =>
+        return (
           translatedTitle(item)
             .toLocaleLowerCase()
-            .indexOf(props.search.toLocaleLowerCase()) > -1 ||
-          item[props.itemChildren]?.some(hasText);
+            .indexOf(props.search.toLocaleLowerCase()) > -1
+        );
+      };
+
+      const doesDescendantMatch = (item) =>
+        item[props.itemChildren]?.some(
+          (child) => doesItemMatch(child) || doesDescendantMatch(child),
+        );
+
+      const matchesSelf = computed(() => doesItemMatch(props.item));
+      const hasDescendantMatch = computed(() =>
+        doesDescendantMatch(props.item),
+      );
 
-        return hasText(props.item);
+      const matchFilter = computed(() => {
+        if (!props.search || props.showAllChildren) {
+          return true;
+        }
+        return matchesSelf.value || hasDescendantMatch.value;
       });
 
+      const searchOpen = computed(
+        () => searchOpenOverride.value ?? hasDescendantMatch.value,
+      );
+
+      const isOpen = computed(
+        () =>
+          children.value.length > 0 &&
+          (props.search
+            ? searchOpen.value
+            : props.opened.includes(props.item.name)),
+      );
+
+      watch(
+        () => props.search,
+        () => {
+          searchOpenOverride.value = undefined;
+        },
+      );
+
+      function toggleCurrentItem() {
+        if (props.search) {
+          searchOpenOverride.value = !isOpen.value;
+          return;
+        }
+        emit('itemToggled', props.item.name);
+      }
+
+      function handleTitleClick(event) {
+        emit('click', props.item, event);
+
+        if (
+          props.search &&
+          !props.item?.clickable &&
+          props.openOnClick &&
+          !props.item?.disabled &&
+          (children.value.length > 0 || props.item.forceNodeDisplay)
+        ) {
+          toggleCurrentItem();
+        }
+      }
+
       function bubbleEvent(eventName) {
         return (...args) => {
           emit(eventName, ...args);
@@ -259,7 +318,11 @@
         isGroup: computed(
           () => children.value.length > 0 || props.item.forceNodeDisplay,
         ),
+        matchesSelf,
+        hasDescendantMatch,
         matchFilter,
+        toggleCurrentItem,
+        handleTitleClick,
         iconSize,
         children,
         // Bubble up events for the nested tree-items

package/src/components/style/VcsFeatureStyleComponent.vue

@@ -66,9 +66,6 @@
     feature.setStyle(style);
     feature[originalStyle] = style;
     const styleOptions = getStyleOptions(style);
-    if (styleOptions.text?.text) {
-      styleOptions.label = styleOptions.text.text;
-    }
     feature[vectorStyleSymbol] = new VectorStyleItem(styleOptions);
   }
 

package/src/components/style/VcsVectorStyleComponent.vue

@@ -7,7 +7,7 @@
       :value-default="valueDefault[key]"
       v-bind="specificProps[key]"
       v-model="localValue[key]"
-      @update:model-value="(v) => $emit(`update:${key}`, v)"
+      @update:model-value="(v) => updateSection(key, v)"
     />
   </v-sheet>
 </template>
@@ -97,6 +97,12 @@
         localValue,
         specificProps,
         componentMap,
+        updateSection(key, value) {
+          if (key === 'text') {
+            localValue.value.label = value?.text;
+          }
+          emit(`update:${key}`, value);
+        },
       };
     },
   };

package/src/components/style/VcsVectorStyleComponent.vue.d.ts

@@ -44,6 +44,7 @@ declare const _default: import("vue").DefineComponent<{
         image: string;
         text: string;
     };
+    updateSection(key: any, value: any): void;
 }, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
         type: ObjectConstructor;