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

package/src/components/flight/VcsFlightPlayer.vue

@@ -4,8 +4,8 @@
     <VcsSlider
       v-if="clock"
       type="number"
-      v-model="clock.currentTime"
-      @change="setTime"
+      :model-value="clock.currentTime"
+      @update:modelValue="setTime"
       :step="0"
       :min="clock.startTime"
       :max="clock.endTime"
@@ -25,7 +25,8 @@
         :has-update="btn.hasUpdate"
         :background="btn.background"
         @click.stop="btn.callback($event)"
-        v-bind="{ ...$attrs, ...btn.listeners }"
+        v-bind="{ ...$attrs }"
+        v-on="btn.listeners ? btn.listeners : {}"
       />
       <span>{{ clockTime(clock.endTime) }}</span>
     </div>
@@ -49,6 +50,19 @@
     };
   }
 
+  /**
+   *
+   * @param {import("vue").Ref<Partial<import("@vcmap/core").FlightPlayerClock>>} clock
+   * @param {import("@vcmap/core").FlightPlayerClock} changed
+   */
+  function syncClocks(clock, changed) {
+    Object.keys(getDefaultClock()).forEach((key) => {
+      if (clock.value[key] !== changed[key]) {
+        clock.value[key] = changed[key];
+      }
+    });
+  }
+
   /**
    * @description A component for editing flight anchors.
    * Requires a flightInstance to be provided via vue-provide.
@@ -79,12 +93,19 @@
         flightInstance,
       );
 
+      let clockChangedListener = () => {};
       const playerChangedListener = app.flights.playerChanged.addEventListener(
         (player) => {
+          clockChangedListener();
           if (player?.flightInstanceName === flightInstance.name) {
             isCurrentPlayer.value = true;
             flightInstancePlayer = player;
-            clock.value = player.clock;
+            syncClocks(clock, player.clock);
+            clockChangedListener = player.clock.changed.addEventListener(
+              (changed) => {
+                syncClocks(clock, changed);
+              },
+            );
           } else {
             isCurrentPlayer.value = false;
             flightInstancePlayer = undefined;
@@ -96,7 +117,7 @@
       onMounted(async () => {
         flightInstancePlayer =
           await app.flights.setPlayerForFlight(flightInstance);
-        clock.value = flightInstancePlayer.clock;
+        syncClocks(clock, flightInstancePlayer.clock);
       });
 
       onUnmounted(() => {
@@ -114,6 +135,7 @@
           return `${mins}:${secs < 10 ? 0 : ''}${secs}`;
         },
         setTime(seconds) {
+          clock.value.currentTime = seconds;
           flightInstancePlayer?.goToTime(seconds);
         },
       };

package/src/components/form-inputs-controls/VcsCheckbox.vue

@@ -17,15 +17,16 @@
     <template v-for="slot of forwardSlots" #[slot]="scope">
       <slot :name="slot" v-bind="scope ?? {}" />
     </template>
-    <template #message="{ message }">
+    <template #message="scope">
       <v-tooltip
         ref="errorTooltip"
         :activator="checkbox"
-        v-if="message"
-        :text="$st(message)"
+        v-if="scope?.message"
+        :text="$st(scope?.message)"
         content-class="bg-error"
         :location="tooltipPosition"
       />
+      <slot name="message" v-bind="scope ?? {}"></slot>
     </template>
     <v-tooltip
       v-if="tooltip && !errorTooltip"
@@ -37,9 +38,12 @@
 </template>
 <style lang="scss" scoped>
   .v-input--density-compact :deep(.v-selection-control) {
-    --v-selection-control-size: calc(var(--v-vcs-item-height) - 8px);
+    --v-selection-control-size: 20px;
     --v-input-control-height: calc(var(--v-vcs-item-height) - 16px);
   }
+  :deep(.v-input__control) {
+    height: calc(var(--v-vcs-item-height) - 8px);
+  }
   // remove ripple effect
   :deep(.v-selection-control__input::before) {
     background-color: transparent;
@@ -83,7 +87,7 @@
       const checkbox = ref();
       const errorTooltip = ref();
       const paddingProvided = usePadding(attrs);
-      const forwardSlots = useForwardSlots(slots, ['label']);
+      const forwardSlots = useForwardSlots(slots, ['label', 'message']);
       return {
         forwardSlots,
         paddingProvided,

package/src/components/form-inputs-controls/VcsCoordinate.vue

@@ -1,5 +1,12 @@
 <template>
-  <v-row no-gutters v-if="localValue">
+  <v-row
+    no-gutters
+    v-if="localValue"
+    class="vcs-coordinate"
+    :class="{
+      'py-1': !paddingProvided,
+    }"
+  >
     <slot name="prepend" v-bind="{ ...$props }" />
     <template v-for="(_, idx) in localValue">
       <v-col :key="`${prefixes[idx]}-coordinate`" v-if="!hideZ || idx < 2">
@@ -7,6 +14,7 @@
           :id="`${prefixes[idx]}-coordinate`"
           :hide-spin-buttons="true"
           type="number"
+          class="py-0"
           :min="getRangeFromExtent(idx, extent)?.[0]"
           :max="getRangeFromExtent(idx, extent)?.[1]"
           :step="steps[idx]"
@@ -33,6 +41,7 @@
   import { between } from '../style/composables.js';
   import { useProxiedComplexModel } from '../modelHelper.js';
   import { removeListenersFromAttrs } from '../attrsHelpers.js';
+  import { usePadding } from '../composables.js';
 
   /**
    *
@@ -114,11 +123,14 @@
         default: () => [[], [], []],
       },
     },
+    emits: ['update:modelValue'],
     setup(props, { attrs, emit }) {
       const localValue = useProxiedComplexModel(props, 'modelValue', emit);
       const noListenerAttrs = computed(() => removeListenersFromAttrs(attrs));
+      const paddingProvided = usePadding(attrs);
 
       return {
+        paddingProvided,
         localValue,
         noListenerAttrs,
         getRangeFromExtent,

package/src/components/form-inputs-controls/VcsCoordinate.vue.d.ts

@@ -32,11 +32,12 @@ declare const _default: import("vue").DefineComponent<{
         default: () => never[][];
     };
 }, {
+    paddingProvided: import("vue").ComputedRef<boolean>;
     localValue: import("vue").Ref<any>;
     noListenerAttrs: import("vue").ComputedRef<Record<string, unknown>>;
     getRangeFromExtent: typeof getRangeFromExtent;
     getRulesForAxis(idx: any): any[];
-}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
         type: ArrayConstructor;
         default: () => number[];
@@ -69,7 +70,9 @@ declare const _default: import("vue").DefineComponent<{
         type: ArrayConstructor;
         default: () => never[][];
     };
-}>>, {
+}>> & {
+    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+}, {
     modelValue: unknown[];
     decimals: unknown[];
     extent: unknown[];

package/src/components/form-inputs-controls/VcsDatePicker.vue

@@ -1,47 +1,45 @@
 <template>
-  <v-menu
-    v-model="menuOpen"
-    :close-on-content-click="false"
-    transition="scale-transition"
-    max-width="290px"
-    min-width="290px"
+  <VcsTextField
+    :prepend-icon="icon"
+    class="vcs-date-picker"
+    readonly
+    v-bind="$attrs"
+    v-model="formattedDate"
   >
-    <template #activator="{ props }">
-      <VcsTextField
-        :placeholder="formatDate(new Date().toISOString())"
-        :prepend-icon="icon"
-        readonly
-        hide-details
-        class="ma-0 py-1"
-        v-bind="props"
-        v-model="formattedDate"
-      />
-    </template>
-    <v-date-picker
-      v-model="date"
-      hide-header
-      @update:model-value="menuOpen = false"
-      color="primary"
+    <v-menu
+      activator="parent"
+      v-model="menuOpen"
+      :close-on-content-click="false"
+      transition="scale-transition"
+      max-width="290px"
+      min-width="290px"
     >
-      <template #actions>
-        <v-btn color="primary" @click="goToToday">
-          {{ $t('datePicker.today') }}
-        </v-btn>
-      </template>
-    </v-date-picker>
-  </v-menu>
+      <v-date-picker
+        v-model="localValue"
+        hide-header
+        @update:model-value="menuOpen = false"
+        color="primary"
+      >
+        <template #actions>
+          <v-btn color="primary" @click="goToToday">
+            {{ $t('datePicker.today') }}
+          </v-btn>
+        </template>
+      </v-date-picker>
+    </v-menu>
+  </VcsTextField>
 </template>
 <style lang="scss" scoped></style>
 <script>
-  import { computed, ref, watch, onBeforeMount } from 'vue';
+  import { computed, ref } from 'vue';
   import { VMenu, VDatePicker, VBtn } from 'vuetify/components';
   import { useI18n } from 'vue-i18n';
-  import { getLogger } from '@vcsuite/logger';
   import VcsTextField from './VcsTextField.vue';
+  import { useProxiedAtomicModel } from '../modelHelper.js';
 
   /**
-   * @description stylized wrapper around {@link https://v15.vuetifyjs.com/en/components/date-pickers/#month-pickers-in-dialog-and-menu}.
-   * @vue-prop {string} modelValue - value of the date picker in {@link https://tc39.es/ecma262/#sec-date-time-string-format | Date Time String Format}
+   * @description stylized wrapper around {@link https://vuetifyjs.com/en/components/date-pickers/#internationalization}.
+   * @vue-prop {Date} modelValue - value of the date picker as a Date (changes to the Date Object are not tracked, handled as atomic value)
    * @vue-prop {string} [icon] - specify optional prepend icon, defaults to mdi-calendar
    */
   export default {
@@ -65,27 +63,14 @@
     emits: ['update:modelValue'],
     setup(props, { emit }) {
       const i18n = useI18n();
-      const localValue = ref(props.modelValue);
+      const localValue = useProxiedAtomicModel(props, 'modelValue', emit);
       const menuOpen = ref(false);
 
-      const isValid = (date) => !Number.isNaN(date.getTime());
-      const setFromValue = () => {
-        if (isValid(props.modelValue)) {
-          localValue.value = props.modelValue;
-        } else if (localValue.value) {
-          getLogger('VcsDatePicker').error(
-            'Invalid date provided: ',
-            props.modelValue,
-          );
-        }
-      };
-      onBeforeMount(() => setFromValue());
-
       const formatDate = (date) => {
         if (date) {
           return new Intl.DateTimeFormat(i18n.locale.value, {
             dateStyle: 'short',
-          }).format(Date.parse(date));
+          }).format(date);
         }
         return '';
       };
@@ -93,27 +78,16 @@
         localValue.value = new Date();
         menuOpen.value = false;
       };
-      watch(
-        () => props.modelValue,
-        () => setFromValue(),
-      );
       const formattedDate = computed({
         get: () => {
           return formatDate(localValue.value);
         },
         set: () => {},
       });
-      const date = computed({
-        get: () => localValue.value,
-        set: (nv) => {
-          localValue.value = nv;
-          emit('update:modelValue', localValue.value);
-        },
-      });
 
       return {
         formattedDate,
-        date,
+        localValue,
         menuOpen,
         formatDate,
         goToToday,

package/src/components/form-inputs-controls/VcsDatePicker.vue.d.ts

@@ -9,69 +9,7 @@ declare const _default: import("vue").DefineComponent<{
     };
 }, {
     formattedDate: import("vue").WritableComputedRef<string>;
-    date: import("vue").WritableComputedRef<{
-        toString: () => string;
-        toDateString: () => string;
-        toTimeString: () => string;
-        toLocaleString: {
-            (): string;
-            (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): string;
-            (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions | undefined): string;
-        };
-        toLocaleDateString: {
-            (): string;
-            (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): string;
-            (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions | undefined): string;
-        };
-        toLocaleTimeString: {
-            (): string;
-            (locales?: string | string[] | undefined, options?: Intl.DateTimeFormatOptions | undefined): string;
-            (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions | undefined): string;
-        };
-        valueOf: () => number;
-        getTime: () => number;
-        getFullYear: () => number;
-        getUTCFullYear: () => number;
-        getMonth: () => number;
-        getUTCMonth: () => number;
-        getDate: () => number;
-        getUTCDate: () => number;
-        getDay: () => number;
-        getUTCDay: () => number;
-        getHours: () => number;
-        getUTCHours: () => number;
-        getMinutes: () => number;
-        getUTCMinutes: () => number;
-        getSeconds: () => number;
-        getUTCSeconds: () => number;
-        getMilliseconds: () => number;
-        getUTCMilliseconds: () => number;
-        getTimezoneOffset: () => number;
-        setTime: (time: number) => number;
-        setMilliseconds: (ms: number) => number;
-        setUTCMilliseconds: (ms: number) => number;
-        setSeconds: (sec: number, ms?: number | undefined) => number;
-        setUTCSeconds: (sec: number, ms?: number | undefined) => number;
-        setMinutes: (min: number, sec?: number | undefined, ms?: number | undefined) => number;
-        setUTCMinutes: (min: number, sec?: number | undefined, ms?: number | undefined) => number;
-        setHours: (hours: number, min?: number | undefined, sec?: number | undefined, ms?: number | undefined) => number;
-        setUTCHours: (hours: number, min?: number | undefined, sec?: number | undefined, ms?: number | undefined) => number;
-        setDate: (date: number) => number;
-        setUTCDate: (date: number) => number;
-        setMonth: (month: number, date?: number | undefined) => number;
-        setUTCMonth: (month: number, date?: number | undefined) => number;
-        setFullYear: (year: number, month?: number | undefined, date?: number | undefined) => number;
-        setUTCFullYear: (year: number, month?: number | undefined, date?: number | undefined) => number;
-        toUTCString: () => string;
-        toISOString: () => string;
-        toJSON: (key?: any) => string;
-        [Symbol.toPrimitive]: {
-            (hint: "default"): string;
-            (hint: "string"): string;
-            (hint: "number"): number;
-            (hint: string): string | number;
-        };
-    }>;
+    localValue: import("vue").Ref<any>;
     menuOpen: import("vue").Ref<boolean>;
     formatDate: (date: any) => string;
     goToToday: () => void;

package/src/components/form-inputs-controls/VcsFileInput.vue

@@ -4,24 +4,29 @@
     variant="outlined"
     clear-icon="$close"
     :hide-details="false"
+    color="primary vcs-file-input"
     class="primary--placeholder"
     :class="{
       'py-1': !paddingProvided,
     }"
     v-bind="$attrs"
   >
-    <template #message="{ message }">
+    <template v-for="slot of forwardSlots" #[slot]="scope">
+      <slot :name="slot" v-bind="scope ?? {}" />
+    </template>
+    <template #message="scope">
       <v-tooltip
         ref="errorTooltipRef"
         :activator="fileInputRef"
-        v-if="message"
-        :text="$st(message)"
+        v-if="scope?.message"
+        :text="$st(scope?.message)"
         content-class="bg-error"
         :location="tooltipPosition"
       />
+      <slot name="message" v-bind="scope ?? {}"></slot>
     </template>
-    <template #append-inner>
-      <slot name="append-inner"></slot>
+    <template #append-inner="scope">
+      <slot name="append-inner" v-bind="scope ?? {}"></slot>
       <v-tooltip
         :activator="fileInputRef"
         v-if="tooltip && !errorTooltipRef"
@@ -29,14 +34,6 @@
         :location="tooltipPosition"
       />
     </template>
-    <template
-      v-for="slot of Object.keys($slots).filter(
-        (name) => name !== 'append-inner',
-      )"
-      #[slot]="scope"
-    >
-      <slot :name="slot" v-bind="scope" />
-    </template>
   </v-file-input>
 </template>
 
@@ -44,19 +41,19 @@
   @import './vcsTextField.scss';
 
   // set text overflow for file input
-  :deep(.v-field__field) {
-    display: inline-block;
-    max-width: 100%;
+  :deep(.v-field__input) {
+    display: unset;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    line-height: calc(var(--v-vcs-item-height) - 9px);
   }
 </style>
 
 <script>
   import { ref } from 'vue';
   import { VFileInput, VTooltip } from 'vuetify/components';
-  import { usePadding } from '../composables.js';
+  import { useForwardSlots, usePadding } from '../composables.js';
 
   /**
    * @description extends API of {@link https://vuetifyjs.com/en/api/v-file-input v-text-field}.
@@ -84,13 +81,15 @@
         default: 'right',
       },
     },
-    setup(props, { attrs }) {
+    setup(props, { attrs, slots }) {
       const fileInputRef = ref();
       const errorTooltipRef = ref();
 
       const paddingProvided = usePadding(attrs);
+      const forwardSlots = useForwardSlots(slots, ['append-inner', 'message']);
 
       return {
+        forwardSlots,
         paddingProvided,
         fileInputRef,
         errorTooltipRef,

package/src/components/form-inputs-controls/VcsFileInput.vue.d.ts

@@ -8,6 +8,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
 }, {
+    forwardSlots: import("vue").ComputedRef<string[]>;
     paddingProvided: import("vue").ComputedRef<boolean>;
     fileInputRef: import("vue").Ref<any>;
     errorTooltipRef: import("vue").Ref<any>;

package/src/components/form-inputs-controls/VcsLabel.vue

@@ -5,7 +5,7 @@
     :class="{
       'vcs-label-required': required,
       'vcs-label-disabled': disabled,
-      'py-1': !paddingProvided,
+      'pa-1': !paddingProvided,
     }"
   >
     <slot />

package/src/components/form-inputs-controls/VcsRadio.vue

@@ -1,5 +1,12 @@
 <template>
-  <v-radio-group v-bind="{ ...$attrs }" ref="radioGroup">
+  <v-radio-group
+    ref="radioGroup"
+    class="vcs-radio"
+    :class="{
+      'py-1': !paddingProvided,
+    }"
+    v-bind="$attrs"
+  >
     <v-radio
       v-for="(item, idx) in items"
       :id="`${$.uid}-${idx}`"
@@ -8,6 +15,7 @@
       :disabled="$attrs.disabled ?? item.disabled ?? false"
       :color="item?.color ?? undefined"
       :error="!!errorTooltip"
+      class="pa-0"
       :class="{
         'flex-column': labelPosition !== 'right',
         'label-top': labelPosition === 'top',
@@ -44,7 +52,6 @@
   .v-input--density-compact :deep(.v-selection-control) {
     --v-selection-control-size: calc(var(--v-vcs-item-height) - 8px);
     --v-input-control-height: calc(var(--v-vcs-item-height) - 16px);
-    padding: 4px;
   }
   // remove ripple effect
   :deep(.v-selection-control__input::before) {
@@ -58,10 +65,15 @@
   :deep(.label-top > .v-selection-control__wrapper) {
     order: 2;
   }
+  :deep(.v-selection-control-group) {
+    row-gap: 8px;
+    column-gap: 8px;
+  }
 </style>
 <script>
   import { ref } from 'vue';
   import { VRadio, VRadioGroup, VTooltip } from 'vuetify/components';
+  import { usePadding } from '../composables.js';
 
   /**
    * @typedef {Object} VcsRadioItem
@@ -112,11 +124,13 @@
         default: 'right',
       },
     },
-    setup() {
+    setup(props, { attrs }) {
       const radioGroup = ref();
       const errorTooltip = ref();
+      const paddingProvided = usePadding(attrs);
 
       return {
+        paddingProvided,
         radioGroup,
         errorTooltip,
       };

package/src/components/form-inputs-controls/VcsRadio.vue.d.ts

@@ -20,6 +20,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
 }, {
+    paddingProvided: import("vue").ComputedRef<boolean>;
     radioGroup: import("vue").Ref<any>;
     errorTooltip: import("vue").Ref<any>;
 }, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{