@vcmap/ui 6.0.0-rc.1 → 6.0.0-rc.10

package/src/components/flight/VcsFlightAnchorsComponent.vue

@@ -1,5 +1,6 @@
 <template>
   <VcsFormSection
+    class="vcs-flight-anchors-component"
     :heading="title"
     :expandable="expandable"
     start-open
@@ -7,13 +8,14 @@
   >
     <v-container class="py-0 px-0">
       <v-sheet v-if="items.length < 1" class="ma-2 pl-2">
-        {{ $t('components.flight.noAnchor') }}
-        <VcsButton
-          :icon="addAnchorAction.icon"
-          :tooltip="addAnchorAction.title"
-          @click.stop="addAnchorAction.callback()"
-          class="d-flex justify-center"
-        />
+        <p>{{ $t('components.flight.noAnchor') }}</p>
+        <div class="d-flex justify-center">
+          <VcsButton
+            :icon="addAnchorAction.icon"
+            :tooltip="addAnchorAction.title"
+            @click.stop="addAnchorAction.callback()"
+          />
+        </div>
       </v-sheet>
       <VcsList
         v-else
@@ -22,32 +24,35 @@
         :show-title="false"
         @item-moved="move"
       >
-        <!-- eslint-disable-next-line -->
-        <template #item.append-title="{ item, index }">
-          <VcsTextField
-            v-if="showDuration(index)"
-            v-model.number="item.duration"
-            :hide-spin-buttons="true"
-            type="number"
-            unit="s"
-            step="1"
-            :decimals="2"
-            :rules="[durationRule]"
-            no-padding
-            class="ml-auto"
-            style="width: 50px"
-          />
+        <template #item.title="{ item, index }">
+          <div class="d-flex align-center">
+            <span>{{ $st(item.title) }}</span>
+            <v-spacer />
+            <div class="duration-input">
+              <VcsTextField
+                v-if="showDuration(index)"
+                v-model.number="item.duration"
+                :hide-spin-buttons="true"
+                type="number"
+                unit="s"
+                step="1"
+                :decimals="2"
+                :rules="[durationRule]"
+                no-padding
+                class="ml-auto"
+              />
+            </div>
+          </div>
         </template>
-        <!-- eslint-disable-next-line -->
-        <template #item.intermediate="{ item, index }">
-          <VcsButton
-            :key="`item-intermediate-${index}`"
-            :icon="addAnchorAction.icon"
-            :tooltip="addAnchorAction.title"
-            @click.stop="addAnchorAction.callback(index + 1)"
-            class="d-flex justify-center z-index-99"
-            height="0"
-          />
+        <template #item.intermediate="{ index }">
+          <div class="d-flex justify-center h-0">
+            <VcsButton
+              :icon="addAnchorAction.icon"
+              :tooltip="addAnchorAction.title"
+              @click.stop="addAnchorAction.callback(index + 1)"
+              class="z-index-99 mx-auto add-in-button"
+            />
+          </div>
         </template>
       </VcsList>
     </v-container>
@@ -55,7 +60,7 @@
 </template>
 <script>
   import { computed, inject, onMounted, onUnmounted, ref } from 'vue';
-  import { VContainer, VSheet } from 'vuetify/components';
+  import { VContainer, VSheet, VSpacer } from 'vuetify/components';
   import {
     anchorFromViewpoint,
     anchorToViewpoint,
@@ -63,7 +68,7 @@
   } from '@vcmap/core';
   import { Cartesian3 } from '@vcmap-cesium/engine';
   import { createToggleAction } from '../../actions/actionHelper.js';
-  import VcsFormSection from '../form-inputs-controls/VcsFormSection.vue';
+  import VcsFormSection from '../section/VcsFormSection.vue';
   import VcsList from '../lists/VcsList.vue';
   import VcsTextField from '../form-inputs-controls/VcsTextField.vue';
   import VcsButton from '../buttons/VcsButton.vue';
@@ -197,7 +202,8 @@
   }
 
   export function durationRule(value) {
-    if (Number.isFinite(value) && value > 0) {
+    const v = Number.parseFloat(value);
+    if (Number.isFinite(v) && v > 0) {
       return true;
     }
     return 'components.flight.invalidDuration';
@@ -217,6 +223,7 @@
       VcsTextField,
       VContainer,
       VSheet,
+      VSpacer,
       VcsFormSection,
       VcsList,
     },
@@ -242,6 +249,14 @@
         flightInstance.propertyChanged.addEventListener((prop) => {
           if (prop === 'loop') {
             loop.value = flightInstance.loop;
+            // update last anchor's duration
+            const lastAnchor = flightInstance.anchors.get(
+              flightInstance.anchors.size - 1,
+            );
+            lastAnchor.duration = calculateDuration(
+              lastAnchor,
+              flightInstance.anchors.get(0),
+            );
           }
         });
 
@@ -328,7 +343,20 @@
   };
 </script>
 <style scoped lang="scss">
+  :deep(.v-list-item) {
+    padding: 0 8px 0 16px;
+  }
+  :deep(.v-list) {
+    overflow: visible;
+  }
+  .duration-input {
+    width: 60px;
+  }
   .z-index-99 {
-    z-index: 99;
+    z-index: 99 !important;
+  }
+  .add-in-button {
+    min-height: 0 !important;
+    margin-top: -8px;
   }
 </style>

package/src/components/flight/VcsFlightComponent.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-sheet>
+  <v-sheet class="vcs-flight-component">
     <VcsFormSection
       :heading="heading"
       :expandable="expandable"
@@ -18,24 +18,23 @@
       <v-container class="py-0 px-1">
         <v-row no-gutters v-if="!hideName">
           <v-col cols="6">
-            <VcsLabel html-for="name" dense required>
+            <VcsLabel :html-for="`${cid}-name`" required>
               {{ $t('components.flight.name') }}
             </VcsLabel>
           </v-col>
           <v-col>
-            <VcsTextField id="name" dense clearable v-model="name" />
+            <VcsTextField :id="`${cid}-name`" clearable v-model="name" />
           </v-col>
         </v-row>
         <v-row no-gutters v-if="!hideTitle">
           <v-col cols="6">
-            <VcsLabel html-for="title" dense>
+            <VcsLabel :html-for="`${cid}-title`">
               {{ $t('components.flight.title') }}
             </VcsLabel>
           </v-col>
           <v-col>
             <VcsTextField
-              id="title"
-              dense
+              :id="`${cid}-title`"
               clearable
               :placeholder="$t('components.flight.titlePlaceholder')"
               v-model="title"
@@ -44,17 +43,16 @@
         </v-row>
         <v-row no-gutters v-if="!hideInterpolation">
           <v-col cols="6">
-            <VcsLabel html-for="interpolation" dense>
+            <VcsLabel :html-for="`${cid}-interpolation`">
               {{ $t('components.flight.interpolation') }}
             </VcsLabel>
           </v-col>
           <v-col>
             <VcsSelect
-              id="title"
-              dense
+              :id="`${cid}-interpolation`"
               :items="[
-                { value: 'spline', text: 'components.flight.spline' },
-                { value: 'linear', text: 'components.flight.linear' },
+                { value: 'spline', title: 'components.flight.spline' },
+                { value: 'linear', title: 'components.flight.linear' },
               ]"
               v-model="interpolation"
             />
@@ -62,18 +60,17 @@
         </v-row>
         <v-row no-gutters v-if="!hideDuration">
           <v-col cols="6">
-            <VcsLabel html-for="duration" dense>
+            <VcsLabel :html-for="`${cid}-duration`">
               {{ $t('components.flight.duration') }}
             </VcsLabel>
           </v-col>
           <v-col>
             <VcsTextField
-              id="duration"
-              v-model.number="duration"
+              :id="`${cid}-duration`"
+              v-model="duration"
               :hide-spin-buttons="true"
               type="number"
               unit="s"
-              step="1"
               :decimals="2"
               :disabled="disablePlayer"
               :rules="[durationRule]"
@@ -82,12 +79,7 @@
         </v-row>
         <v-row no-gutters v-if="!hideLoop">
           <v-col cols="6">
-            <VcsCheckbox
-              id="animate"
-              label="components.flight.loop"
-              dense
-              v-model="loop"
-            />
+            <VcsCheckbox label="components.flight.loop" v-model="loop" />
           </v-col>
         </v-row>
       </v-container>
@@ -106,7 +98,7 @@
   import { computed, onUnmounted, ref, inject } from 'vue';
   import { VSheet, VContainer, VRow, VCol, VDivider } from 'vuetify/components';
   import { getSplineAndTimesForInstance } from '@vcmap/core';
-  import VcsFormSection from '../form-inputs-controls/VcsFormSection.vue';
+  import VcsFormSection from '../section/VcsFormSection.vue';
   import VcsLabel from '../form-inputs-controls/VcsLabel.vue';
   import VcsTextField from '../form-inputs-controls/VcsTextField.vue';
   import VcsSelect from '../form-inputs-controls/VcsSelect.vue';
@@ -120,6 +112,7 @@
     getProvidedFlightInstance,
     setupFlightAnchorEditingListener,
   } from './composables.js';
+  import { useComponentId } from '../composables.js';
 
   /**
    * @param {import("@vcmap/core").FlightInstance} instance
@@ -128,7 +121,7 @@
   function getFlightDuration(instance) {
     if (instance.isValid()) {
       const { times } = getSplineAndTimesForInstance(instance);
-      return times.at(-1);
+      return Math.round(times.at(-1) * 100) / 100;
     }
     return 0;
   }
@@ -208,6 +201,7 @@
     setup() {
       const app = inject('vcsApp');
       const flightInstance = getProvidedFlightInstance();
+      const loop = ref(flightInstance.loop);
       const flightDuration = ref(getFlightDuration(flightInstance));
       const disablePlayer = ref(!(flightDuration.value > 0));
       const flightDurationListener = [
@@ -231,6 +225,8 @@
         editingListener();
       });
 
+      const cid = useComponentId();
+
       return {
         name: flightInstance.name,
         title: computed({
@@ -258,12 +254,9 @@
             return flightDuration.value;
           },
           set(value) {
-            if (
-              Number.isFinite(value) &&
-              value > 0 &&
-              flightDuration.value > 0
-            ) {
-              const factor = value / flightDuration.value;
+            const v = parseFloat(value);
+            if (Number.isFinite(v) && v > 0 && flightDuration.value > 0) {
+              const factor = v / flightDuration.value;
               [...flightInstance.anchors].forEach((anchor) => {
                 anchor.duration *= factor;
               });
@@ -273,13 +266,15 @@
         durationRule,
         loop: computed({
           get() {
-            return flightInstance?.loop;
+            return loop.value;
           },
           set(value) {
+            loop.value = !!value;
             flightInstance.loop = !!value;
           },
         }),
         disablePlayer,
+        cid,
       };
     },
   };

package/src/components/flight/VcsFlightComponent.vue.d.ts

@@ -47,6 +47,7 @@ declare const _default: import("vue").DefineComponent<{
     durationRule: typeof durationRule;
     loop: import("vue").WritableComputedRef<boolean>;
     disablePlayer: import("vue").Ref<boolean>;
+    cid: string;
 }, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     heading: {
         type: StringConstructor;

package/src/components/flight/VcsFlightEditor.vue

@@ -1,5 +1,6 @@
 <template>
   <AbstractConfigEditor
+    class="vcs-flight-editor"
     @submit="apply"
     @cancel="cancel"
     @reset="reset"

package/src/components/flight/VcsFlightPlayer.vue

@@ -1,11 +1,11 @@
 <template>
-  <v-container class="py-0 px-1">
-    <VcsLabel>{{ $t('flight.player') }}</VcsLabel>
+  <v-container class="py-0 px-1 vcs-flight-player">
+    <VcsLabel html-for="player">{{ $t('flight.player') }}</VcsLabel>
     <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,24 +93,37 @@
         flightInstance,
       );
 
-      const playerChangedListener = app.flights.playerChanged.addEventListener(
-        (player) => {
-          if (player?.flightInstanceName === flightInstance.name) {
-            isCurrentPlayer.value = true;
-            flightInstancePlayer = player;
-            clock.value = player.clock;
-          } else {
-            isCurrentPlayer.value = false;
-            flightInstancePlayer = undefined;
-            clock.value = getDefaultClock();
-          }
-        },
-      );
+      let clockChangedListener = () => {};
+      let playerChangedListener = () => {};
+
+      function syncPlayer(player) {
+        if (player?.flightInstanceName === flightInstance.name) {
+          isCurrentPlayer.value = true;
+          flightInstancePlayer = player;
+          syncClocks(clock, player.clock);
+          clockChangedListener = player.clock.changed.addEventListener(
+            (changed) => {
+              syncClocks(clock, changed);
+            },
+          );
+        } else {
+          isCurrentPlayer.value = false;
+          flightInstancePlayer = undefined;
+          clock.value = getDefaultClock();
+        }
+      }
 
       onMounted(async () => {
         flightInstancePlayer =
           await app.flights.setPlayerForFlight(flightInstance);
-        clock.value = flightInstancePlayer.clock;
+        syncPlayer(flightInstancePlayer);
+        syncClocks(clock, flightInstancePlayer.clock);
+        playerChangedListener = app.flights.playerChanged.addEventListener(
+          (player) => {
+            clockChangedListener();
+            syncPlayer(player);
+          },
+        );
       });
 
       onUnmounted(() => {
@@ -114,6 +141,7 @@
           return `${mins}:${secs < 10 ? 0 : ''}${secs}`;
         },
         setTime(seconds) {
+          clock.value.currentTime = seconds;
           flightInstancePlayer?.goToTime(seconds);
         },
       };

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

@@ -5,37 +5,51 @@
     false-icon="$vcsCheckbox"
     indeterminate-icon="$vcsCheckboxIndeterminate"
     :hide-details="false"
+    class="vcs-checkbox"
     :class="{
       'py-1': !paddingProvided,
     }"
     v-bind="$attrs"
   >
-    <template #label>
-      <slot name="label" />
-      <template v-if="!$slots.label">{{ $st($attrs.label) }}</template>
+    <template #label="scope" v-if="label || $slots.label">
+      <span class="pl-1">
+        <slot name="label" v-bind="scope ?? {}">{{ $st(label) }}</slot>
+      </span>
     </template>
-    <template #message="{ message }">
+    <template v-for="slot of forwardSlots" #[slot]="scope">
+      <slot :name="slot" v-bind="scope ?? {}" />
+    </template>
+    <template #message="scope">
       <v-tooltip
         ref="errorTooltip"
         :activator="checkbox"
-        v-if="message"
-        :text="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"
       :activator="checkbox"
       :location="tooltipPosition"
-      :text="tooltip"
+      :text="$st(tooltip)"
     ></v-tooltip>
   </v-checkbox>
 </template>
 <style lang="scss" scoped>
+  :deep(.v-icon--size-default) {
+    font-size: calc(var(--v-vcs-font-size) * (1.2 + 0.1 / 3));
+  }
   .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);
+    --v-selection-control-size: calc(
+      var(--v-vcs-font-size) * (1.2 + 0.1 / 3) + 4
+    );
+    --v-input-control-height: calc(var(--v-vcs-font-size) + 3px);
+  }
+  :deep(.v-input__control) {
+    height: calc(var(--v-vcs-font-size) * 2 - 2px);
   }
   // remove ripple effect
   :deep(.v-selection-control__input::before) {
@@ -49,14 +63,14 @@
 <script>
   import { ref } from 'vue';
   import { VCheckbox, VTooltip } from 'vuetify/components';
-  import { usePadding } from '../composables.js';
+  import { getForwardSlots, usePadding } from '../composables.js';
 
   /**
    * @description Stylized wrapper around {@link https://vuetifyjs.com/en/api/v-checkbox/ |vuetify checkbox}.
    * Provides VTooltip to show error messages
    * @vue-prop {string} [tooltip] - A message to be displayed when there is no error.
    * @vue-prop {('bottom' | 'left' | 'top' | 'right')}  [tooltipPosition='right'] - Position of the error tooltip, see {@link https://vuetifyjs.com/en/api/v-tooltip/#props-location | vuetify tooltip}.
-   * @vue-prop {string} label - Label to be displayed, will be translated.
+   * @vue-prop {string} [label] - Label to be displayed, will be translated.
    * @vue-data {slot} [#label] - slot to pass html for Checkbox label. Overrides label passed as prop.
    */
   export default {
@@ -75,13 +89,18 @@
         type: String,
         default: 'right',
       },
+      label: {
+        type: String,
+        default: undefined,
+      },
     },
-    setup(props, { attrs }) {
+    setup(props, { attrs, slots }) {
       const checkbox = ref();
       const errorTooltip = ref();
       const paddingProvided = usePadding(attrs);
-
+      const forwardSlots = getForwardSlots(slots, ['label', 'message']);
       return {
+        forwardSlots,
         paddingProvided,
         checkbox,
         errorTooltip,

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

@@ -7,7 +7,12 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    label: {
+        type: StringConstructor;
+        default: undefined;
+    };
 }, {
+    forwardSlots: string[];
     paddingProvided: import("vue").ComputedRef<boolean>;
     checkbox: import("vue").Ref<any>;
     errorTooltip: import("vue").Ref<any>;
@@ -20,7 +25,12 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    label: {
+        type: StringConstructor;
+        default: undefined;
+    };
 }>>, {
+    label: string;
     tooltip: string;
     tooltipPosition: string;
 }, {}>;