@vcmap/ui 5.3.7 → 6.0.0-rc.10

package/src/components/{form-inputs-controls → section}/VcsFormSection.vue

@@ -2,18 +2,17 @@
   <section class="vcs-form-section">
     <slot name="header" :heading="heading" :actions="actions">
       <div
-        class="vcs-form-section-header d-flex base lighten-3"
+        class="vcs-form-section-header d-flex bg-base-lighten-3"
         :aria-expanded="open"
       >
-        <div class="d-flex justify-space-between w-full">
+        <div class="d-flex justify-space-between w-100">
           <div class="d-flex align-center" :class="{ 'px-2': !expandable }">
             <v-btn
               :ripple="false"
               dense
-              plain
+              variant="text"
               icon
-              small
-              text
+              :size="fontSize * 2"
               :disabled="disabled"
               elevation="0"
               @click="open = !open"
@@ -24,8 +23,8 @@
                 open ? 'mdi-chevron-down' : 'mdi-chevron-right'
               }}</v-icon>
             </v-btn>
-            <strong :class="{ 'text--disabled': disabled }">{{
-              $t(heading)
+            <strong :class="{ 'text-disabled': disabled }">{{
+              $st(heading)
             }}</strong>
           </div>
           <VcsActionButtonList
@@ -37,7 +36,7 @@
         </div>
       </div>
     </slot>
-    <VcsHelp :text="helpText" :show="showHelp" class="base lighten-4">
+    <VcsHelp :text="helpText" v-if="showHelp && ($slots.help || helpText)">
       <slot name="help" />
     </VcsHelp>
     <article class="section-content" v-if="showContent">
@@ -48,7 +47,8 @@
 
 <script>
   import { computed, reactive, ref } from 'vue';
-  import { VBtn, VIcon } from 'vuetify/lib';
+  import { VBtn, VIcon } from 'vuetify/components';
+  import { useFontSize } from '../../vuePlugins/vuetify.js';
   import VcsActionButtonList from '../buttons/VcsActionButtonList.vue';
   import VcsHelp from '../notification/VcsHelp.vue';
 
@@ -134,22 +134,28 @@
         return props.headerActions;
       });
 
+      const fontSize = useFontSize();
+
       return {
         open,
         showContent,
         showHelp,
         actions,
+        fontSize,
       };
     },
   };
 </script>
 
 <style lang="scss" scoped>
-  @import '../../styles/shades.scss';
   .vcs-form-section-header {
-    height: 40px;
+    height: calc(var(--v-vcs-font-size) * 2 + 14px);
   }
   .v-alert--text:before {
     background-color: transparent;
   }
+  // remove hover shadow over button
+  :deep(.v-btn__overlay) {
+    --v-hover-opacity: 0;
+  }
 </style>

package/src/components/{form-inputs-controls → section}/VcsFormSection.vue.d.ts

@@ -29,11 +29,12 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
 }, {
-    open: any;
-    showContent: import("vue").ComputedRef<any>;
+    open: import("vue").Ref<boolean>;
+    showContent: import("vue").ComputedRef<boolean>;
     showHelp: import("vue").ComputedRef<boolean>;
     actions: import("vue").ComputedRef<VcsAction>;
-}, {}, {}, {}, import("vue/types/v3-component-options.js").ComponentOptionsMixin, import("vue/types/v3-component-options.js").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{
+    fontSize: import("vue").ComputedRef<number>;
+}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     heading: {
         type: StringConstructor;
         default: undefined;
@@ -68,8 +69,8 @@ declare const _default: import("vue").DefineComponent<{
     headerActions: unknown[];
     heading: string;
     actionButtonListOverflowCount: number;
+    helpText: string;
     expandable: boolean;
     startOpen: boolean;
-    helpText: string;
-}>;
+}, {}>;
 export default _default;

package/src/components/style/MenuWrapper.vue

@@ -1,35 +1,29 @@
 <template>
-  <v-sheet>
+  <v-sheet class="menu-wrapper">
     <div class="d-flex align-center py-1">
       <VcsCheckbox
-        :value="!!value"
-        @change="handleCheckbox"
+        :model-value="!!modelValue"
+        @update:modelValue="handleCheckbox"
         :disabled="disabled"
       />
       <v-menu
         :close-on-content-click="false"
-        :close-on-click="false"
+        persistent
         v-model="isMenuOpen"
         :absolute="true"
-        :disabled="!value || disabled"
-        min-width="300"
-        max-width="300"
+        :disabled="!modelValue || disabled"
+        width="300"
       >
-        <template #activator="{ on, attrs }">
-          <VcsTooltip :tooltip="name">
-            <template #activator="{ on: tooltipOn, attrs: tooltipAttrs }">
-              <v-card
-                rounded
-                height="24px"
-                width="32px"
-                v-bind="{ ...attrs, ...tooltipAttrs }"
-                v-on="{ ...on, ...tooltipOn }"
-                class="tiled-background"
-              >
-                <slot name="preview" />
-              </v-card>
-            </template>
-          </VcsTooltip>
+        <template #activator="{ props }">
+          <v-card
+            rounded
+            height="24px"
+            width="32px"
+            v-bind="props"
+            class="tiled-background"
+          >
+            <slot name="preview" />
+          </v-card>
         </template>
         <VcsFormSection
           :heading="name"
@@ -55,27 +49,28 @@
           <slot name="content" />
         </VcsFormSection>
       </v-menu>
-      <span class="ml-2">{{ $t(name) }}</span>
+      <span class="ml-2">{{ $st(name) }}</span>
     </div>
   </v-sheet>
 </template>
 
 <script>
-  import { ref } from 'vue';
-  import { VSheet, VMenu, VCard } from 'vuetify/lib';
-  import VcsFormSection from '../form-inputs-controls/VcsFormSection.vue';
+  import { ref, toRaw } from 'vue';
+  import { VSheet, VMenu, VCard } from 'vuetify/components';
+  import VcsFormSection from '../section/VcsFormSection.vue';
   import VcsCheckbox from '../form-inputs-controls/VcsCheckbox.vue';
-  import VcsTooltip from '../notification/VcsTooltip.vue';
 
   /**
    * @description A wrapper for style components, that provides:
    * - a 32 x 24 px preview
-   * - a checkbox that emits null when unchecked and the value of the valueDefault prop when checked again. If the vauleDefault is undefined or null, the valueFallback will be emitted.
+   * - a checkbox that emits null when unchecked and the value of the valueDefault prop when checked again.
+   *   If the valueDefault is undefined or null, the valueFallback will be emitted.
    * - a menu that pops up when clicking the preview. It has also a reset button that emits the value of the valueDefault prop when clicked
-   * @vue-prop {Object} [value] - Style options that are modelled by the checkbox.
+   * @vue-prop {Object} [modelValue] - Style options that are modelled by the checkbox.
    * @vue-prop {string} name - The name that is displayed in the header of the menu and in the tooltip of the preview.
    * @vue-prop {Object} [valueDefault] - The default Options, that are applied when clicking reset or setting the checkbox from null to true.
    * @vue-prop {Object} valueFallback - The fallback Options, in case the valueDefault is null or undefined. These are applied when the checkbox is checked again and the default value is null. The fallback value must not be null or undefined.
+   * @vue-prop {boolean} [disabled=false] - Disable the input
    */
   export default {
     name: 'MenuWrapper',
@@ -84,13 +79,11 @@
       VMenu,
       VCard,
       VcsFormSection,
-      VcsTooltip,
       VcsCheckbox,
     },
     props: {
-      value: {
+      modelValue: {
         default: undefined,
-        required: false,
         type: Object,
       },
       valueDefault: {
@@ -110,21 +103,25 @@
         type: Boolean,
       },
     },
+    emits: ['update:modelValue'],
     setup(props, { emit }) {
       const isMenuOpen = ref(false);
 
       return {
         isMenuOpen,
         reset() {
-          emit('input', props.valueDefault);
+          emit('update:modelValue', structuredClone(toRaw(props.valueDefault)));
         },
         close() {
           isMenuOpen.value = false;
         },
         handleCheckbox(value) {
           emit(
-            'input',
-            value ? props.valueDefault || props.valueFallback : null,
+            'update:modelValue',
+            value
+              ? structuredClone(toRaw(props.valueDefault)) ||
+                  structuredClone(toRaw(props.valueFallback))
+              : null,
           );
         },
       };

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

@@ -1,7 +1,6 @@
 declare const _default: import("vue").DefineComponent<{
-    value: {
+    modelValue: {
         default: undefined;
-        required: false;
         type: ObjectConstructor;
     };
     valueDefault: {
@@ -25,10 +24,9 @@ declare const _default: import("vue").DefineComponent<{
     reset(): void;
     close(): void;
     handleCheckbox(value: any): void;
-}, {}, {}, {}, import("vue/types/v3-component-options.js").ComponentOptionsMixin, import("vue/types/v3-component-options.js").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{
-    value: {
+}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    modelValue: {
         default: undefined;
-        required: false;
         type: ObjectConstructor;
     };
     valueDefault: {
@@ -47,9 +45,11 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
         type: BooleanConstructor;
     };
-}>>, {
-    value: Record<string, any>;
+}>> & {
+    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+}, {
     disabled: boolean;
+    modelValue: Record<string, any>;
     valueDefault: Record<string, any>;
-}>;
+}, {}>;
 export default _default;

package/src/components/style/VcsFeatureStyleComponent.vue

@@ -1,6 +1,7 @@
 <template>
   <VcsVectorStyleComponent
-    :value="styleOptions"
+    class="vcs-feature-style-component"
+    :model-value="styleOptions"
     @update:fill="updateFill"
     @update:stroke="updateStroke"
     @update:image="updateImage"

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

@@ -11,21 +11,21 @@ declare const _default: import("vue").DefineComponent<{
         image: undefined;
         text: undefined;
     }>;
-    valueDefault: import("@vcmap/core").VectorStyleItemOptions;
+    valueDefault: import("@vcmap/core", { with: { "resolution-mode": "import" } }).VectorStyleItemOptions;
     updateFill(update: any): void;
     updateStroke(update: any): void;
     updateText(update: any): void;
     updateImage(update: any): void;
-}, {}, {}, {}, import("vue/types/v3-component-options.js").ComponentOptionsMixin, import("vue/types/v3-component-options.js").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{
+}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     featureProperties: {
         type: ObjectConstructor;
         required: true;
     };
-}>>, {}>;
+}>>, {}, {}>;
 export default _default;
 export type StyleOptions = {
-    fill?: any | null | undefined;
-    stroke?: any | null | undefined;
-    image?: any | null | undefined;
-    text?: any | null | undefined;
+    fill?: import("ol/style/Fill").Options | null | undefined;
+    stroke?: import("ol/style/Stroke").Options | null | undefined;
+    image?: import("ol/style/Image").Options | null | undefined;
+    text?: import("ol/style/Text").Options | null | undefined;
 };

package/src/components/style/VcsFillMenu.vue

@@ -1,32 +1,32 @@
 <template>
   <MenuWrapper
-    v-bind="{ value, valueDefault, disabled }"
+    class="vcs-fill-menu"
     :value-fallback="{ color: [255, 255, 255, 1] }"
-    v-on="$listeners"
     name="components.style.fill"
+    v-bind="{ ...$attrs, ...$props }"
   >
     <template #preview>
       <v-sheet :color="rgbaString" width="100%" height="100%" />
     </template>
     <template #content>
-      <VcsFillSelector :value="value" v-on="$listeners" />
+      <VcsFillSelector v-bind="{ ...$attrs, ...$props }" />
     </template>
   </MenuWrapper>
 </template>
 
 <script>
   import { computed } from 'vue';
-  import { VSheet } from 'vuetify/lib';
+  import { VSheet } from 'vuetify/components';
+  import { useProxiedAtomicModel } from '../modelHelper.js';
   import VcsFillSelector from './VcsFillSelector.vue';
   import MenuWrapper from './MenuWrapper.vue';
   import { useColorObject, rgbaObjectToString } from './composables.js';
 
   /**
    * @description A wrapper for the VcsFillSelector, that has a small color preview and a menu that pops up when clicking the preview, containing the fill selector.
-   * When clicking the reset button, the valueDefault is emitted, when unchecking the checkbox in front of the preview, null is emitted. If it is checked again, valueDefault is emitted. If the valueDefault is undefined or null, { color: [255, 255, 255, 1] } is emitted.
-   * @vue-prop {import("ol/style/Fill").Options} [value] - The Fill Options
-   * @vue-prop {import("ol/style/Fill").Options} [valueDefault] - The default Fill Options
-   * @vue-prop {boolean} [disabled=false] - Disable the input
+   * When clicking the reset button, the valueDefault is emitted, when unchecking the checkbox in front of the preview, null is emitted.
+   * If it is checked again, valueDefault is emitted. If the valueDefault is undefined or null, { color: [255, 255, 255, 1] } is emitted.
+   * @vue-prop {import("ol/style/Fill").Options} [modelValue] - The Fill Options
    */
   export default {
     name: 'VcsFillMenu',
@@ -36,21 +36,14 @@
       MenuWrapper,
     },
     props: {
-      value: {
+      modelValue: {
         type: Object,
         default: undefined,
       },
-      valueDefault: {
-        type: Object,
-        default: undefined,
-      },
-      disabled: {
-        type: Boolean,
-        default: false,
-      },
     },
-    setup(props) {
-      const rgbaObject = useColorObject(() => props.value?.color);
+    setup(props, { emit }) {
+      const localValue = useProxiedAtomicModel(props, 'modelValue', emit);
+      const rgbaObject = useColorObject(() => localValue.value?.color);
       return {
         rgbaString: computed(() => rgbaObjectToString(rgbaObject.value)),
       };

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

@@ -1,34 +1,16 @@
 declare const _default: import("vue").DefineComponent<{
-    value: {
+    modelValue: {
         type: ObjectConstructor;
         default: undefined;
     };
-    valueDefault: {
-        type: ObjectConstructor;
-        default: undefined;
-    };
-    disabled: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }, {
     rgbaString: import("vue").ComputedRef<string>;
-}, {}, {}, {}, import("vue/types/v3-component-options.js").ComponentOptionsMixin, import("vue/types/v3-component-options.js").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{
-    value: {
+}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    modelValue: {
         type: ObjectConstructor;
         default: undefined;
     };
-    valueDefault: {
-        type: ObjectConstructor;
-        default: undefined;
-    };
-    disabled: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }>>, {
-    value: Record<string, any>;
-    disabled: boolean;
-    valueDefault: Record<string, any>;
-}>;
+    modelValue: Record<string, any>;
+}, {}>;
 export default _default;

package/src/components/style/VcsFillSelector.vue

@@ -1,43 +1,40 @@
 <template>
-  <v-sheet>
-    <v-color-picker
-      :value="rgbaObject"
-      @input="updateColor"
-      mode="rgba"
-      :hide-mode-switch="true"
-      :disabled="!value"
-    />
-  </v-sheet>
+  <v-color-picker
+    class="vcs-fill-selector"
+    :model-value="rgbaObject"
+    @update:model-value="updateColor"
+    mode="rgba"
+    :disabled="!modelValue"
+    width="100%"
+  />
 </template>
 
 <script>
-  import { VSheet, VColorPicker } from 'vuetify/lib';
+  import { VColorPicker } from 'vuetify/components';
   import { useColorObject } from './composables.js';
+  import { useProxiedComplexModel } from '../modelHelper.js';
 
   /**
    * @description Allows to model a JSON representation of ol/Fill vector style with a vuetify VColorPicker.
-   * @vue-prop {import("ol/style/Fill").Options} value - The Fill Options
+   * @vue-prop {import("ol/style/Fill").Options} [modelValue] - The Fill Options
    */
   export default {
     name: 'VcsFillSelector',
     components: {
-      VSheet,
       VColorPicker,
     },
     props: {
-      value: {
+      modelValue: {
         type: Object,
         default: undefined,
       },
     },
     setup(props, { emit }) {
+      const localValue = useProxiedComplexModel(props, 'modelValue', emit);
       return {
-        rgbaObject: useColorObject(() => props.value?.color),
+        rgbaObject: useColorObject(() => localValue.value?.color),
         updateColor(rgba) {
-          const fill = {
-            color: [rgba.r, rgba.g, rgba.b, rgba.a],
-          };
-          emit('input', fill);
+          localValue.value.color = [rgba.r, rgba.g, rgba.b, rgba.a];
         },
       };
     },

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

@@ -1,5 +1,5 @@
 declare const _default: import("vue").DefineComponent<{
-    value: {
+    modelValue: {
         type: ObjectConstructor;
         default: undefined;
     };
@@ -11,12 +11,12 @@ declare const _default: import("vue").DefineComponent<{
         a: number;
     }>;
     updateColor(rgba: any): void;
-}, {}, {}, {}, import("vue/types/v3-component-options.js").ComponentOptionsMixin, import("vue/types/v3-component-options.js").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{
-    value: {
+}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    modelValue: {
         type: ObjectConstructor;
         default: undefined;
     };
 }>>, {
-    value: Record<string, any>;
-}>;
+    modelValue: Record<string, any>;
+}, {}>;
 export default _default;

package/src/components/style/VcsImageMenu.vue

@@ -1,21 +1,23 @@
 <template>
   <MenuWrapper
-    v-bind="{ value, valueDefault }"
+    class="vcs-image-menu"
     :value-fallback="{
       radius: 10,
       fill: { color: [255, 255, 255, 1] },
       stroke: { color: [0, 0, 0, 1], width: 2 },
     }"
-    v-on="$listeners"
     name="components.style.image"
+    v-bind="{ ...$attrs, ...$props }"
   >
     <template #preview>
       <canvas ref="canvas" width="32" height="24" />
     </template>
     <template #content>
       <VcsImageSelector
-        v-bind="{ value, valueDefault, iconOptions, extendedShapeSettings }"
-        v-on="$listeners"
+        v-bind="{
+          ...$attrs,
+          ...$props,
+        }"
         class="pb-2"
       />
     </template>
@@ -24,15 +26,13 @@
 
 <script>
   import { onMounted, ref, watch } from 'vue';
+  import { useProxiedAtomicModel } from '../modelHelper.js';
   import MenuWrapper from './MenuWrapper.vue';
   import VcsImageSelector, { drawImageStyle } from './VcsImageSelector.vue';
 
   /**
    * @description A wrapper for the VcsImageSelector, that has a small shape/icon preview and a menu that pops up when clicking the preview, containing the image selector.
-   * @vue-prop {import("ol/style/RegularShape").Options | import("ol/style/Circle").Options | import("ol/style/Icon").Options} value - The Image options
-   * @vue-prop {import("ol/style/RegularShape").Options | import("ol/style/Circle").Options | import("ol/style/Icon").Options} valueDefault - The default image options
-   * @vue-prop {import("ol/style/Icon").Options} iconOptions - The icon options too choose from. Scale and opacity are ignored.
-   * @vue-prop {boolean} [extendedShapeSettings=false] - If true, there are all the input fields needed to create arbitrary ol RegularShapes.
+   * @vue-prop {import("ol/style/RegularShape").Options | import("ol/style/Circle").Options | import("ol/style/Icon").Options} [modelValue] - The Image options
    */
   export default {
     name: 'VcsImageMenu',
@@ -41,33 +41,21 @@
       VcsImageSelector,
     },
     props: {
-      value: {
+      modelValue: {
         type: Object,
         default: undefined,
       },
-      valueDefault: {
-        type: Object,
-        default: undefined,
-      },
-      iconOptions: {
-        type: Array,
-        default: undefined,
-      },
-      extendedShapeSettings: {
-        type: Boolean,
-        default: false,
-      },
     },
-    setup(props) {
+    setup(props, { emits }) {
       const canvas = ref(null);
+      const localValue = useProxiedAtomicModel(props, 'modelValue', emits);
 
       onMounted(() => {
-        drawImageStyle(canvas.value, props.value, true);
+        drawImageStyle(canvas.value, localValue.value, true);
         watch(
-          () => props.value,
+          () => props.modelValue,
           () => {
-            // XXX Maybe add some sort of timeout funciton, so it draws only once when user stops using the slider
-            drawImageStyle(canvas.value, props.value, true);
+            drawImageStyle(canvas.value, localValue.value, true);
           },
           { deep: true },
         );

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

@@ -1,43 +1,16 @@
 declare const _default: import("vue").DefineComponent<{
-    value: {
+    modelValue: {
         type: ObjectConstructor;
         default: undefined;
     };
-    valueDefault: {
-        type: ObjectConstructor;
-        default: undefined;
-    };
-    iconOptions: {
-        type: ArrayConstructor;
-        default: undefined;
-    };
-    extendedShapeSettings: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }, {
     canvas: import("vue").Ref<null>;
-}, {}, {}, {}, import("vue/types/v3-component-options.js").ComponentOptionsMixin, import("vue/types/v3-component-options.js").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{
-    value: {
+}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    modelValue: {
         type: ObjectConstructor;
         default: undefined;
     };
-    valueDefault: {
-        type: ObjectConstructor;
-        default: undefined;
-    };
-    iconOptions: {
-        type: ArrayConstructor;
-        default: undefined;
-    };
-    extendedShapeSettings: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }>>, {
-    value: Record<string, any>;
-    valueDefault: Record<string, any>;
-    extendedShapeSettings: boolean;
-    iconOptions: unknown[];
-}>;
+    modelValue: Record<string, any>;
+}, {}>;
 export default _default;