@vcmap/ui 5.3.3 → 6.0.0-rc.2

package/plugins/@vcmap-show-case/list-example/src/ListExample.vue

@@ -1,56 +1,46 @@
 <template>
   <v-sheet>
     <VcsFormSection heading="Settings">
-      <v-container class="py-0 px-1">
+      <v-container class="py-0 px-4">
         <v-row no-gutters>
           <v-col>
-            <v-switch
-              v-model="selectable"
-              label="Selectable"
-              class="ma-0"
-              dense
-            />
+            <v-switch v-model="selectable" label="Selectable" />
           </v-col>
           <v-col>
             <v-switch
               :disabled="!selectable"
               v-model="selectSingle"
               label=" Single Select"
-              class="ma-0"
-              dense
             />
           </v-col>
         </v-row>
         <v-row no-gutters>
           <v-col>
-            <v-switch
-              dense
-              v-model="searchable"
-              label="Searchable"
-              class="ma-0"
-            />
+            <v-switch v-model="searchable" label="Searchable" />
+          </v-col>
+          <v-col>
+            <v-switch v-model="draggable" label="Draggable" />
           </v-col>
+        </v-row>
+        <v-row no-gutters>
           <v-col>
             <v-switch
-              dense
-              v-model="draggable"
-              label="Draggable"
+              v-model="prependIndex"
+              label="Prepend Index"
               class="ma-0"
             />
           </v-col>
+          <v-col>
+            <v-switch v-model="appendIndex" label="Append Index" />
+          </v-col>
         </v-row>
       </v-container>
     </VcsFormSection>
     <VcsFormSection heading="Title">
-      <v-container class="py-0 px-1">
+      <v-container class="py-0 px-4">
         <v-row no-gutters>
           <v-col>
-            <v-switch
-              dense
-              v-model="showTitle"
-              label="Show Title"
-              class="ma-0"
-            />
+            <v-switch v-model="showTitle" label="Show Title" />
           </v-col>
           <v-col>
             <vcs-text-field
@@ -66,28 +56,22 @@
               v-model="titleActions"
               label="Title Actions"
               class="ma-0"
-              dense
             />
           </v-col>
           <v-col>
-            <v-switch
-              dense
-              v-model="titleIcon"
-              label="Title Icon"
-              class="ma-0"
-            />
+            <v-switch v-model="titleIcon" label="Title Icon" class="ma-0" />
           </v-col>
         </v-row>
       </v-container>
     </VcsFormSection>
     <VcsFormSection heading="Item">
-      <v-container class="py-1 px-1">
+      <v-container class="py-2 px-4">
         <v-row no-gutters>
           <v-dialog v-model="dialog" width="400">
-            <template #activator="{ on }">
-              <vcs-form-button v-on="on"> Add An item </vcs-form-button>
+            <template #activator="{ props }">
+              <vcs-form-button v-bind="props"> Add An item </vcs-form-button>
             </template>
-            <v-card class="pa-2">
+            <v-card class="py-2 px-4">
               <v-form @submit.prevent="add">
                 <vcs-text-field
                   v-model="newItem.name"
@@ -99,52 +83,22 @@
                   label="Title"
                   :rules="required"
                 />
+                <v-switch label="visible" v-model="newItem.visible" />
+                <v-switch label="disabled" v-model="newItem.disabled" />
+                <v-switch label="random icon" v-model="newItem.icon" />
+                <v-switch label="hasUpdate" v-model="newItem.hasUpdate" />
                 <v-switch
-                  dense
-                  label="visible"
-                  v-model="newItem.visible"
-                  class="ma-0"
-                />
-                <v-switch
-                  dense
-                  label="disabled"
-                  v-model="newItem.disabled"
-                  class="ma-0"
-                />
-                <v-switch
-                  dense
-                  label="random icon"
-                  v-model="newItem.icon"
-                  class="ma-0"
-                />
-                <v-switch
-                  dense
-                  label="hasUpdate"
-                  v-model="newItem.hasUpdate"
-                  class="ma-0"
-                />
-                <v-switch
-                  dense
                   label="rename action"
                   v-model="newItem.renameAction"
-                  class="ma-0"
-                />
-                <v-switch
-                  dense
-                  label="console.log action"
-                  v-model="newItem.action"
-                  class="ma-0"
                 />
+                <v-switch label="console.log action" v-model="newItem.action" />
                 <v-switch
                   label="console.log on clicked"
                   v-model="newItem.clicked"
-                  class="ma-0"
                 />
                 <v-switch
-                  dense
                   label="console.log selected state"
                   v-model="newItem.selected"
-                  class="ma-0"
                 />
                 <vcs-form-button type="submit"> Add </vcs-form-button>
               </v-form>
@@ -154,7 +108,7 @@
       </v-container>
     </VcsFormSection>
     <VcsFormSection heading="Selection">
-      <v-container class="py-1 px-1">
+      <v-container class="py-2 px-4">
         <v-row no-gutters>
           <template v-if="selectable">
             <v-col>
@@ -190,7 +144,14 @@
       v-model="selected"
       @item-moved="move"
       @item-renamed="({ item, newTitle }) => (item.title = newTitle)"
-    />
+    >
+      <template #[`item.prepend-title`]="{ index }" v-if="prependIndex">
+        {{ index }}
+      </template>
+      <template #[`item.append-title`]="{ index }" v-if="appendIndex">
+        {{ index }}
+      </template>
+    </vcs-list>
   </v-sheet>
 </template>
 
@@ -212,8 +173,8 @@
     VContainer,
     VRow,
     VCol,
-  } from 'vuetify/lib';
-  import { computed, ref } from 'vue';
+  } from 'vuetify/components';
+  import { computed, reactive, ref } from 'vue';
 
   function getRandomIcon() {
     const keys = Object.keys(Icons);
@@ -272,6 +233,8 @@
       const searchable = ref(true);
       const selectSingle = ref(false);
       const showSelection = ref(false);
+      const prependIndex = ref(false);
+      const appendIndex = ref(false);
       const showTitle = ref(true);
       const title = ref('Title');
       const titleActionsArray = ref([]);
@@ -298,6 +261,8 @@
         selectSingle,
         selected,
         showSelection,
+        prependIndex,
+        appendIndex,
         showTitle,
         title,
         titleActionsArray,
@@ -310,13 +275,13 @@
           (v) => v.length > 0 || 'Input must have a length',
         ],
         add() {
-          const item = {
+          const item = reactive({
             name: newItem.value.name,
             title: newItem.value.title,
             disabled: newItem.value.disabled,
             visible: newItem.value.visible,
             hasUpdate: newItem.value.hasUpdate,
-          };
+          });
 
           if (newItem.value.icon) {
             item.icon = getRandomIcon();
@@ -339,9 +304,11 @@
           }
 
           if (newItem.value.clicked) {
-            item.clicked = () => {
-              console.log(`${item.name} just got clicked`);
-            };
+            item.clickedCallbacks = [
+              () => {
+                console.log(`${item.name} just got clicked`);
+              },
+            ];
           }
 
           if (newItem.value.selected) {

package/plugins/@vcmap-show-case/notifier-tester/src/NotifierTester.vue

@@ -6,9 +6,9 @@
     <v-list>
       <v-list-item v-for="type in types" :key="type">
         {{ type }}
-        <v-list-item-action @click="notify(type)">
-          <v-icon>mdi-plus</v-icon>
-        </v-list-item-action>
+        <template #append>
+          <v-icon @click="notify(type)">mdi-plus</v-icon>
+        </template>
       </v-list-item>
     </v-list>
     <v-divider />
@@ -23,12 +23,11 @@
     VSheet,
     VList,
     VListItem,
-    VListItemAction,
     VTextField,
     VIcon,
     VCard,
     VDivider,
-  } from 'vuetify/lib';
+  } from 'vuetify/components';
   import { NotificationType, VcsCheckbox } from '@vcmap/ui';
   import { computed, inject, ref } from 'vue';
 
@@ -38,7 +37,6 @@
       VSheet,
       VList,
       VListItem,
-      VListItemAction,
       VTextField,
       VIcon,
       VCard,

package/plugins/@vcmap-show-case/panel-tester/src/PanelExample.vue

@@ -20,8 +20,8 @@
 </template>
 <style></style>
 <script>
-  import { computed, inject, ref } from 'vue';
-  import { VDivider } from 'vuetify/lib';
+  import { computed, inject } from 'vue';
+  import { VDivider } from 'vuetify/components';
   import { VcsToolButton, PanelLocation } from '@vcmap/ui';
   import { name as owner } from '../package.json';
   import IframePanelExample from './IframePanelExample.vue';
@@ -34,7 +34,6 @@
     setup() {
       const app = inject('vcsApp');
       const panelLocations = Object.values(PanelLocation);
-      const componentIds = ref(app.panelManager.componentIds);
 
       const sampleIds = {
         [PanelLocation.LEFT]: 'panel-1',
@@ -117,7 +116,7 @@
         panelLocations,
         isActive(location) {
           return computed(() =>
-            componentIds.value.includes(
+            app.panelManager.componentIds.includes(
               app.panelManager.getLocation(location)?.id,
             ),
           );

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

@@ -14,12 +14,8 @@
           v-if="module.description && toggleable"
           :tooltip="module.description"
         >
-          <template #activator="{ on, attrs }">
-            <v-icon
-              right
-              v-bind="{ ...$attrs, ...attrs }"
-              v-on="{ ...$listeners, ...on }"
-            >
+          <template #activator="{ props }">
+            <v-icon right v-bind="{ ...$attrs, ...props }">
               mdi-help-circle
             </v-icon>
           </template>
@@ -31,7 +27,7 @@
 
 <script>
   import { VcsTooltip } from '@vcmap/ui';
-  import { VChip, VContainer, VIcon, VList } from 'vuetify/lib';
+  import { VChip, VContainer, VIcon, VList } from 'vuetify/components';
 
   export default {
     name: 'ModulesListComponent',

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

@@ -11,19 +11,15 @@
         :loading="loading === project.name"
       >
         <v-list-item>
-          <v-list-item-content>
-            <v-list-item-title class="font-weight-bold">
-              {{ project.name }}
-            </v-list-item-title>
-            <v-list-item-subtitle>{{
-              project.description
-            }}</v-list-item-subtitle>
-            <ModulesListComponent
-              :modules="project.modules"
-              @toggle-module="toggleModule"
-              :toggleable="false"
-            />
-          </v-list-item-content>
+          <v-list-item-title class="font-weight-bold">
+            {{ project.name }}
+          </v-list-item-title>
+          <v-list-item-subtitle>{{ project.description }}</v-list-item-subtitle>
+          <ModulesListComponent
+            :modules="project.modules"
+            @toggle-module="toggleModule"
+            :toggleable="false"
+          />
           <v-list-item-action>
             <v-avatar color="success" size="30" v-if="project.active">
               <v-icon>mdi-check</v-icon>
@@ -48,13 +44,12 @@
     VCard,
     VIcon,
     VListItem,
-    VListItemContent,
     VListItemTitle,
     VListItemSubtitle,
     VListItemAction,
     VAvatar,
     VDivider,
-  } from 'vuetify/lib';
+  } from 'vuetify/components';
   import ModulesListComponent from './ModulesListComponent.vue';
 
   export default {
@@ -66,7 +61,6 @@
       VCard,
       VIcon,
       VListItem,
-      VListItemContent,
       VListItemTitle,
       VListItemSubtitle,
       VListItemAction,

package/plugins/@vcmap-show-case/search-example/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@vcmap-show-case/search-example",
+  "version": "1.0.0",
+  "mapVersion": "^6.0.0"
+}

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

@@ -0,0 +1,75 @@
+import { name, version, mapVersion } from '../package.json';
+import SearchImpl from './searchImpl.js';
+
+const defaultLines = [
+  'Dragonfruit',
+  'Cherry',
+  'Peach',
+  'Banana',
+  'Grape',
+  'Fig',
+  'Kiwi',
+  'Watermelon',
+  'Mango',
+  'Strawberry',
+  'Apple',
+  'Raspberry',
+  'Honeydew',
+  'Lemon',
+  'Cantaloupe',
+  'Orange',
+  'Papaya',
+  'Date',
+  'Blackberry',
+  'Grapefruit',
+  'Nectarine',
+  'Apricot',
+  'Blueberry',
+  'Clementine',
+  'Elderberry',
+  'Gooseberry',
+  'Pineapple',
+  'Plum',
+  'Lime',
+  'Pomegranate',
+  'Quince',
+  'Tangerine',
+  'Mulberry',
+  'Lychee',
+  'Passionfruit',
+  'Kumquat',
+  'Cranberry',
+  'Jackfruit',
+  'Olive',
+  'Ugli fruit',
+];
+
+export default function searchExample(config) {
+  let impl;
+
+  return {
+    get name() {
+      return name;
+    },
+    get version() {
+      return version;
+    },
+    get mapVersion() {
+      return mapVersion;
+    },
+    /**
+     * @param {import("@vcmap/ui").VcsUiApp} app
+     */
+    initialize(app) {
+      impl = new SearchImpl(
+        config.lines ?? defaultLines,
+        config.withIcon ?? true,
+        config.withPOI ?? true,
+      );
+      app.search.add(impl, name);
+    },
+    destroy() {
+      impl?.destroy();
+    },
+  };
+}

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

@@ -0,0 +1,99 @@
+import { wgs84ToMercatorTransformer } from '@vcmap/core';
+import {
+  Icons,
+  MarkdownBalloonFeatureInfoView,
+  featureInfoViewSymbol,
+} from '@vcmap/ui';
+import { Feature } from 'ol';
+import { getSize } from 'ol/extent';
+import { Point } from 'ol/geom';
+import { name } from '../package.json';
+
+const berlinExtend = [13.301518, 52.445959, 13.489982, 52.527032];
+const berlinSize = getSize(berlinExtend);
+
+const featureInfo = new MarkdownBalloonFeatureInfoView({
+  template: '# Search\n{{properties.title}}',
+});
+
+/**
+ * @param {string} title
+ * @returns {import("ol").Feature}
+ */
+function randomPOI(title) {
+  const feature = new Feature({
+    geometry: new Point(
+      wgs84ToMercatorTransformer([
+        berlinExtend[0] + Math.random() * berlinSize[0],
+        berlinExtend[1] + Math.random() * berlinSize[1],
+      ]),
+    ),
+    properties: {
+      title,
+    },
+  });
+  feature[featureInfoViewSymbol] = featureInfo;
+  return feature;
+}
+
+/**
+ * @param {string} line
+ * @param {boolean} withIcon
+ * @param {boolean} withPOI
+ * @returns {import("@vcmap/ui").ResultItem}
+ */
+function lineToResultItem(line, withIcon, withPOI) {
+  let icon;
+  if (withIcon) {
+    const icons = Object.keys(Icons);
+    icon = icons[Math.floor(Math.random() * icons.length)];
+  }
+
+  let clicked;
+  let feature;
+  if (withPOI) {
+    feature = randomPOI(line);
+  } else {
+    clicked = async () => {
+      console.log(line);
+    };
+  }
+
+  return {
+    title: line,
+    icon,
+    clicked,
+    feature,
+  };
+}
+
+/**
+ * @implements {import("@vcmap/ui").SearchImpl}
+ */
+export default class SearchImpl {
+  /**
+   * @param {string[]} lines
+   * @param {boolean} withIcon
+   * @param {boolean} withPOI
+   */
+  constructor(lines, withIcon, withPOI) {
+    this.name = name;
+    this.lines = lines;
+    this.withIcon = withIcon;
+    this.withPOI = withPOI;
+  }
+
+  search(query) {
+    return Promise.resolve(
+      this.lines
+        .filter((l) => l.toLowerCase().includes(query.toLowerCase()))
+        .map((line) => lineToResultItem(line, this.withIcon, this.withPOI)),
+    );
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  abort() {}
+
+  // eslint-disable-next-line class-methods-use-this
+  destroy() {}
+}

package/plugins/@vcmap-show-case/simple-graph/src/SimpleGraphComponent.vue

@@ -13,7 +13,7 @@
   />
 </template>
 <script>
-  import { VSparkline } from 'vuetify/lib';
+  import { VSparkline } from 'vuetify/components';
 
   export default {
     name: 'SimpleGraphComponent',

package/plugins/@vcmap-show-case/style-input-example/src/StyleExample.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script>
-  import { VSheet } from 'vuetify/lib';
+  import { VSheet } from 'vuetify/components';
   import { onMounted, ref, watchEffect } from 'vue';
   import {
     VcsFormSection,

package/plugins/@vcmap-show-case/table-example/src/DataTableExample.vue

@@ -1,17 +1,28 @@
 <template>
   <v-sheet>
     <v-sheet class="px-2 d-grid">
-      <v-switch v-model="selectable" label="Selectable" class="ma-0" />
+      <v-switch
+        v-model="selectable"
+        label="Selectable"
+        density="compact"
+        class="mx-1"
+      />
       <v-switch
         :disabled="!selectable"
         v-model="selectSingle"
         label=" Single Select"
-        class="ma-0"
+        density="compact"
+        class="mx-1"
+      />
+      <v-switch
+        v-model="searchable"
+        label="Searchable"
+        density="compact"
+        class="mx-1"
       />
-      <v-switch v-model="searchable" label="Searchable" class="ma-0" />
       <v-dialog v-model="dialog" width="400">
-        <template #activator="{ on }">
-          <vcs-form-button v-on="on"> Add An item </vcs-form-button>
+        <template #activator="{ props }">
+          <vcs-form-button v-bind="props"> Add An item </vcs-form-button>
         </template>
         <v-card class="pa-2">
           <v-form @submit.prevent="add">
@@ -37,10 +48,10 @@
 
     <vcs-data-table
       :items="items"
-      item-key="id"
       :headers="headers"
       :show-select="selectable"
-      :single-select="selectSingle"
+      :select-strategy="selectSingle ? 'single' : 'page'"
+      :items-per-page="2"
       :show-searchbar="searchable"
       v-model="selected"
     >
@@ -49,7 +60,6 @@
         <VcsActionButtonList
           v-if="item.actions"
           :actions="item.actions"
-          :block-overflow="true"
           :overflow-count="2"
         />
       </template>
@@ -65,24 +75,24 @@
     VcsCheckbox,
     VcsActionButtonList,
   } from '@vcmap/ui';
-  import { VSwitch, VSheet, VDialog, VCard, VForm } from 'vuetify/lib';
+  import { VSwitch, VSheet, VDialog, VCard, VForm } from 'vuetify/components';
   import { ref } from 'vue';
 
   const defaultHeaders = [
     {
-      text: 'Name',
-      value: 'name',
+      title: 'Name',
+      key: 'name',
     },
     {
-      text: 'Type',
-      value: 'type',
+      title: 'Type',
+      key: 'type',
     },
     {
-      text: 'Datum',
-      value: 'date',
+      title: 'Datum',
+      key: 'date',
       sort: (a, b) => new Date(b) - new Date(a),
     },
-    { text: 'Actions', value: 'actions', sortable: false },
+    { title: 'Actions', key: 'actions', sortable: false },
   ];
 
   const defaultItems = [
@@ -113,6 +123,12 @@
       type: 'Baz',
       date: '11/2/2012 14:03',
     },
+    {
+      id: 3,
+      name: 'foo-bar',
+      type: 'Foo Bar',
+      date: '18/4/1992 21:53',
+    },
   ];
 
   export default {