@vcmap/ui 6.0.0-rc.3 → 6.0.0-rc.5

package/dist/assets/vuetify.js

@@ -1 +1 @@
-export * from "./vuetify-760ced3b.js";
+export * from "./vuetify-88a2fabe.js";

package/index.d.ts

@@ -116,8 +116,6 @@ export { default as VcsFormButton } from "./src/components/buttons/VcsFormButton
 export type * from "./src/components/buttons/VcsFormButton.vue.d.ts";
 export { default as VcsActionButtonList } from "./src/components/buttons/VcsActionButtonList.vue";
 export type * from "./src/components/buttons/VcsActionButtonList.vue.d.ts";
-export { default as VcsTooltip } from "./src/components/notification/VcsTooltip.vue";
-export type * from "./src/components/notification/VcsTooltip.vue.d.ts";
 export { default as VcsHelp } from "./src/components/notification/VcsHelp.vue";
 export type * from "./src/components/notification/VcsHelp.vue.d.ts";
 export { default as VcsTable } from "./src/components/tables/VcsTable.vue";
@@ -160,8 +158,8 @@ export { default as VcsTextPage } from "./src/application/VcsTextPage.vue";
 export type * from "./src/application/VcsTextPage.vue.d.ts";
 export { default as VcsList } from "./src/components/lists/VcsList.vue";
 export type * from "./src/components/lists/VcsList.vue.d.ts";
-export { default as VcsListItem } from "./src/components/lists/VcsListItem.vue";
-export type * from "./src/components/lists/VcsListItem.vue.d.ts";
+export { default as VcsListItemComponent } from "./src/components/lists/VcsListItemComponent.vue";
+export type * from "./src/components/lists/VcsListItemComponent.vue.d.ts";
 export { default as VcsTreeview } from "./src/components/lists/VcsTreeview.vue";
 export type * from "./src/components/lists/VcsTreeview.vue.d.ts";
 export { default as VcsTreeviewLeaf } from "./src/components/lists/VcsTreeviewLeaf.vue";
@@ -222,8 +220,8 @@ export * from "./src/components/modelHelper.js";
 export type * from "./src/components/modelHelper.d.ts";
 export { createMapButtonAction, createToggleAction, createOverviewMapAction, createModalAction, createLinkAction, createGoToViewpointAction, createZoomToFeatureAction } from "./src/actions/actionHelper.js";
 export type * from "./src/actions/actionHelper.d.ts";
-export { parseAndSanitizeMarkdown, replaceAttributes } from "./src/application/markdownHelper.js";
-export type * from "./src/application/markdownHelper.d.ts";
+export { parseAndSanitizeMarkdown, renderTemplate } from "./src/components/form-output/markdownHelper.js";
+export type * from "./src/components/form-output/markdownHelper.d.ts";
 export { createStateRefAction, StateActionState } from "./src/actions/stateRefAction.js";
 export type * from "./src/actions/stateRefAction.d.ts";
 export { createLayerToggleAction, createZoomToExtentAction, createExtentFeatureAction, setupExtentComponentActions } from "./src/actions/extentActions.js";
@@ -234,7 +232,7 @@ export { createListItemDeleteAction, createListItemBulkAction, createListExportA
 export type * from "./src/actions/listActions.d.ts";
 export { default as VcsCallback, executeCallbacks } from "./src/callback/vcsCallback.js";
 export type * from "./src/callback/vcsCallback.d.ts";
-export { default as VcsApp, setupMapNavbar, setupPluginMountedListeners, setupCategoryManagerWindow } from "./src/application/VcsApp.vue";
+export { default as VcsApp, setupMapNavbar, setupPluginMountedListeners, setupCategoryManagerWindow, categoryManagerWindowId } from "./src/application/VcsApp.vue";
 export type * from "./src/application/VcsApp.vue.d.ts";
 export { default as ContentTreeCollection, createContentTreeCollection } from "./src/contentTree/contentTreeCollection.js";
 export type * from "./src/contentTree/contentTreeCollection.d.ts";
@@ -266,7 +264,7 @@ export { getWindowComponentOptions, default as OverviewMap } from "./src/navigat
 export type * from "./src/navigation/overviewMap.d.ts";
 export { createVueI18n, setupI18n } from "./src/vuePlugins/i18n.js";
 export type * from "./src/vuePlugins/i18n.d.ts";
-export { createVcsThemes, createVcsVuetify, getColorByKey, getDefaultPrimaryColor, useItemHeight } from "./src/vuePlugins/vuetify.js";
+export { createVcsThemes, createVcsVuetify, isDark, getDefaultPrimaryColor, getColorByKey, useItemHeight, useFontSize } from "./src/vuePlugins/vuetify.js";
 export type * from "./src/vuePlugins/vuetify.d.ts";
 export { downloadURI, downloadBlob, downloadText, downloadCanvas } from "./src/downloadHelper.js";
 export type * from "./src/downloadHelper.d.ts";

package/index.js

@@ -13,8 +13,8 @@ export {
 } from './src/actions/actionHelper.js';
 export {
   parseAndSanitizeMarkdown,
-  replaceAttributes,
-} from './src/application/markdownHelper.js';
+  renderTemplate,
+} from './src/components/form-output/markdownHelper.js';
 export {
   createStateRefAction,
   StateActionState,
@@ -58,6 +58,7 @@ export {
   setupMapNavbar,
   setupPluginMountedListeners,
   setupCategoryManagerWindow,
+  categoryManagerWindowId,
 } from './src/application/VcsApp.vue';
 export { default as VcsAppWrapper } from './src/application/VcsAppWrapper.vue';
 export { default as VcsMap } from './src/application/VcsMap.vue';
@@ -188,9 +189,11 @@ export { i18nPluginSymbol } from './src/i18n/i18nCollection.js';
 export {
   createVcsThemes,
   createVcsVuetify,
-  getColorByKey,
+  isDark,
   getDefaultPrimaryColor,
+  getColorByKey,
   useItemHeight,
+  useFontSize,
 } from './src/vuePlugins/vuetify.js';
 export {
   downloadURI,
@@ -231,7 +234,6 @@ export { default as VcsButton } from './src/components/buttons/VcsButton.vue';
 export { default as VcsToolButton } from './src/components/buttons/VcsToolButton.vue';
 export { default as VcsFormButton } from './src/components/buttons/VcsFormButton.vue';
 export { default as VcsActionButtonList } from './src/components/buttons/VcsActionButtonList.vue';
-export { default as VcsTooltip } from './src/components/notification/VcsTooltip.vue';
 export { default as VcsHelp } from './src/components/notification/VcsHelp.vue';
 export { default as VcsTable } from './src/components/tables/VcsTable.vue';
 export { default as VcsDataTable } from './src/components/tables/VcsDataTable.vue';
@@ -258,7 +260,7 @@ export {
   validateActions,
 } from './src/components/lists/VcsActionList.vue';
 export { default as VcsList } from './src/components/lists/VcsList.vue';
-export { default as VcsListItem } from './src/components/lists/VcsListItem.vue';
+export { default as VcsListItemComponent } from './src/components/lists/VcsListItemComponent.vue';
 export { default as VcsTreeview } from './src/components/lists/VcsTreeview.vue';
 export { default as VcsTreeviewLeaf } from './src/components/lists/VcsTreeviewLeaf.vue';
 export { default as VcsTreeviewSearchbar } from './src/components/lists/VcsTreeviewSearchbar.vue';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/ui",
-  "version": "6.0.0-rc.3",
+  "version": "6.0.0-rc.5",
   "author": "Virtual City Systems",
   "license": "MIT",
   "scripts": {
@@ -50,8 +50,8 @@
     "@vcsuite/parsers": "^1.0.3",
     "dompurify": "^3.1.6",
     "fast-deep-equal": "^3.1.3",
-    "marked": "^13.0.2",
-    "semver": "^7.5.4",
+    "marked": "^14.0.0",
+    "semver": "^7.6.3",
     "uuid": "^10.0.0",
     "vue-i18n": "^9.13.1"
   },
@@ -59,33 +59,33 @@
     "@vcmap-cesium/engine": "^10.0.1",
     "@vcmap/core": "6.0.0-rc.3",
     "ol": "^10.0.0",
-    "vue": "~3.4.27",
-    "vuetify": "^3.6.13"
+    "vue": "~3.4.38",
+    "vuetify": "^3.7.0"
   },
   "devDependencies": {
     "@histoire/plugin-vue": "^0.17.17",
     "@vcmap/rollup-plugin-vcs-ol": "^1.0.2",
     "@vcsuite/eslint-config": "^3.0.5",
-    "@vitejs/plugin-vue": "^5.0.4",
-    "@vitest/coverage-v8": "^1.6.0",
+    "@vitejs/plugin-vue": "^5.1.2",
+    "@vitest/coverage-v8": "^2.0.5",
     "@vue/test-utils": "^2.4.6",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-vuetify": "^2.4.0",
     "histoire": "^0.17.17",
     "jest-canvas-mock": "^2.5.2",
-    "jsdoc": "^3.6.7",
+    "jsdoc": "^4.0.3",
     "jsdoc-plugin-intersection": "^1.0.4",
-    "jsdoc-plugin-typescript": "^2.0.6",
-    "jsdom": "^22.1.0",
+    "jsdoc-plugin-typescript": "^2.2.1",
+    "jsdom": "^24.1.1",
     "resize-observer-polyfill": "1.5.1",
     "rollup-plugin-strip-pragma": "^1.0.0",
-    "sass": "^1.77.1",
-    "tar": "^6.1.14",
+    "sass": "^1.77.8",
+    "tar": "^7.4.3",
     "typescript": "^5.4.5",
-    "vite": "^5.2.11",
-    "vite-plugin-vuetify": "^2.0.3",
-    "vitest": "^1.6.0",
-    "vue-tsc": "^2.0.17"
+    "vite": "^5.4.1",
+    "vite-plugin-vuetify": "^2.0.4",
+    "vitest": "^2.0.5",
+    "vue-tsc": "^2.0.29"
   },
   "stylelint": {
     "extends": "stylelint-config-standard",

package/plugins/@vcmap-show-case/form-inputs-example/src/FormInputsExample.vue

@@ -77,7 +77,7 @@
                 :disabled="disabled"
                 id="arrayInput"
                 type="number"
-                v-model="array"
+                v-model="state.arrayInput"
                 :rules="[arrayTest]"
               />
             </v-col>
@@ -272,7 +272,7 @@
               />
             </v-col>
           </v-row>
-          <VcsCoordinate :disabled="disabled" v-model="array" />
+          <VcsCoordinate :disabled="disabled" v-model="state.arrayInput" />
         </v-container>
       </template>
     </VcsFormSection>
@@ -556,7 +556,6 @@
       return {
         // no object-destruction of reactive objects! or use toRef()
         state: plugin.state,
-        array: ref([1, 2, 3]),
         // do not put the whole config here, since it would become reactive
         selectOptions: plugin.config.selectOptions,
         form,

package/plugins/@vcmap-show-case/project-selector/src/ModulesListComponent.vue

@@ -10,29 +10,36 @@
         @click="toggle(module)"
       >
         {{ module.name || module.configUrl }}
-        <VcsTooltip
+        <v-icon
           v-if="module.description && toggleable"
-          :tooltip="module.description"
+          right
+          v-bind="{ ...$attrs, ...props }"
         >
-          <template #activator="{ props }">
-            <v-icon right v-bind="{ ...$attrs, ...props }">
-              mdi-help-circle
-            </v-icon>
-          </template>
-        </VcsTooltip>
+          mdi-help-circle
+        </v-icon>
+        <v-tooltip
+          v-if="module.description && toggleable"
+          :text="module.description"
+          activator="parent"
+        />
       </v-chip>
     </v-list>
   </v-container>
 </template>
 
 <script>
-  import { VcsTooltip } from '@vcmap/ui';
-  import { VChip, VContainer, VIcon, VList } from 'vuetify/components';
+  import {
+    VChip,
+    VContainer,
+    VIcon,
+    VList,
+    VTooltip,
+  } from 'vuetify/components';
 
   export default {
     name: 'ModulesListComponent',
     components: {
-      VcsTooltip,
+      VTooltip,
       VContainer,
       VList,
       VChip,

package/plugins/@vcmap-show-case/search-example/src/index.js

@@ -65,6 +65,7 @@ export default function searchExample(config) {
         config.lines ?? defaultLines,
         config.withIcon ?? true,
         config.withPOI ?? true,
+        config.withActions ?? true,
       );
       app.search.add(impl, name);
     },

package/plugins/@vcmap-show-case/search-example/src/searchImpl.js

@@ -36,17 +36,42 @@ function randomPOI(title) {
   return feature;
 }
 
+function getRandomIcon() {
+  const keys = Object.keys(Icons);
+  const index = Math.floor(keys.length * Math.random());
+  return `$${keys[index]}`;
+}
+
 /**
  * @param {string} line
  * @param {boolean} withIcon
  * @param {boolean} withPOI
+ * @param {boolean} withActions
  * @returns {import("@vcmap/ui").ResultItem}
  */
-function lineToResultItem(line, withIcon, withPOI) {
+function lineToResultItem(line, withIcon, withPOI, withActions) {
   let icon;
   if (withIcon) {
-    const icons = Object.keys(Icons);
-    icon = icons[Math.floor(Math.random() * icons.length)];
+    icon = getRandomIcon();
+  }
+
+  let actions;
+  if (withActions) {
+    actions = [
+      {
+        name: 'action-1',
+        icon,
+        callback() {
+          console.log('Action 1');
+        },
+      },
+      {
+        name: 'action-2',
+        callback() {
+          console.log('Action 2');
+        },
+      },
+    ];
   }
 
   let clicked;
@@ -64,6 +89,7 @@ function lineToResultItem(line, withIcon, withPOI) {
     icon,
     clicked,
     feature,
+    actions,
   };
 }
 
@@ -75,19 +101,23 @@ export default class SearchImpl {
    * @param {string[]} lines
    * @param {boolean} withIcon
    * @param {boolean} withPOI
+   * @param {boolean} withActions
    */
-  constructor(lines, withIcon, withPOI) {
+  constructor(lines, withIcon, withPOI, withActions) {
     this.name = name;
     this.lines = lines;
     this.withIcon = withIcon;
     this.withPOI = withPOI;
+    this.withActions = withActions;
   }
 
   search(query) {
     return Promise.resolve(
       this.lines
         .filter((l) => l.toLowerCase().includes(query.toLowerCase()))
-        .map((line) => lineToResultItem(line, this.withIcon, this.withPOI)),
+        .map((line) =>
+          lineToResultItem(line, this.withIcon, this.withPOI, this.withActions),
+        ),
     );
   }
 

package/plugins/@vcmap-show-case/toolbox-example/src/index.js

@@ -227,7 +227,8 @@ export default async function toolboxExample() {
       this._stopWatching = watch(
         () => disabled.value,
         () => {
-          selectToolboxAction.disabled = disabled.value;
+          app.toolboxManager.get(selectToolboxComponent.id).action.disabled =
+            disabled.value;
           app.toolboxManager.get(
             groupToolboxComponentExampleOptions.id,
           ).disabled = disabled.value;

package/plugins/package.json

@@ -1,27 +1,7 @@
 {
   "dependencies": {
-    "@vcmap/print": "^1.0.2",
-    "@vcmap/swipe-tool": "^1.0.3",
-    "@vcmap/export": "^1.0.1",
-    "@vcmap/shadow": "^2.0.0",
-    "@vcmap/draw": "^2.0.0",
-    "@vcmap/create-link": "^1.0.1",
-    "@vcmap/search-nominatim": "^1.0.1",
-    "@vcmap/multi-view": "^1.1.0",
-    "@vcmap/cesium-filters": "^1.0.1",
-    "@vcmap/viewshed": "^2.0.1",
-    "@vcmap/measurement": "^1.0.2",
-    "@vcmap/flight": "^1.1.0",
-    "@vcmap/transparent-terrain": "^1.0.1",
-    "@vcmap/search-coordinate": "^1.0.0",
-    "@vcmap/clipping-tool": "^1.0.0",
-    "@vcmap/height-profile": "^1.0.0",
-    "@vcmap/search-wfs": "^1.0.0",
-    "@vcmap/search-esri": "^1.0.0",
-    "@vcmap/link-button": "^1.0.0",
-    "@vcmap/walk": "^1.0.2"
-  },
-  "optionalDependencies": {
-    "@vcmap/planning": "^5.2.0"
+    "@vcmap/print": "https://github.com/virtualcitySYSTEMS/map-print.git#main",
+    "@vcmap/multi-view": "https://github.com/virtualcitySYSTEMS/map-multi-view.git",
+    "@vcmap/transparent-terrain": "https://github.com/virtualcitySYSTEMS/map-transparent-terrain.git"
   }
 }