@dative-gpi/foundation-shared-components 1.1.23 → 1.1.24-unit-formatter

package/components/FSEditImageUI.vue

@@ -135,25 +135,36 @@
         />
       </FSRow>
     </FSRow>
-    <template
+    <FSClickable
       v-else
+      borderStyle="dashed"
+      variant="background"
+      :height="$props.height"
+      :width="$props.width"
+      @click="() => invisibleButtonRef.input.click()"
     >
-      <FSButtonFileMini
-        class="fs-edit-image-hidden-button"
-        ref="invisibleButtonRef"
-        accept=".jpg,.jpeg,.png"
-        :readFile="false"
-        @update:metadata="onUpload"
-      />
-      <FSCardPlaceholder
-        v-if="invisibleButtonRef"
-        :height="$props.height"
-        :width="$props.width"
-        icon="mdi-plus-box-outline"
-        :label="$tr('edit-image.add-image', 'Add an image.')"
-        @click="() => invisibleButtonRef!.input.click()"
-      />
-    </template>
+      <FSRow
+        align="center-center"
+        :wrap="false"
+      >
+        <FSIcon>
+          mdi-plus-box-outline
+        </FSIcon>
+        <FSText
+          font="text-body"
+          :lineClamp="2"
+        >
+          {{ $tr('edit-image.add-image', 'Add an image.') }}
+        </FSText>
+        <FSButtonFileMini
+          class="fs-edit-image-hidden-button"
+          ref="invisibleButtonRef"
+          accept=".jpg,.jpeg,.png"
+          :readFile="false"
+          @update:metadata="onUpload"
+        />
+      </FSRow>
+    </FSClickable>
   </FSCol>
 </template>
 
@@ -166,11 +177,10 @@ import { useFiles } from "@dative-gpi/foundation-shared-services/composables";
 
 import FSButtonRemoveMini from "./buttons/FSButtonRemoveMini.vue";
 import FSButtonFileMini from "./buttons/FSButtonFileMini.vue";
-import FSCardPlaceholder from "./FSCardPlaceholder.vue";
+import FSClickable from "./FSClickable.vue";
 import FSImageUI from "./FSImageUI.vue";
 import FSCard from "./FSCard.vue";
 import FSText from "./FSText.vue";
-import FSSpan from "./FSSpan.vue";
 import FSCol from "./FSCol.vue";
 import FSRow from "./FSRow.vue";
 
@@ -178,12 +188,11 @@ export default defineComponent({
   name: "FSEditImageUI",
   components: {
     FSButtonRemoveMini,
-    FSCardPlaceholder,
     FSButtonFileMini,
+    FSClickable,
     FSImageUI,
     FSCard,
     FSText,
-    FSSpan,
     FSCol,
     FSRow
   },

package/components/FSGridMosaic.vue

@@ -40,7 +40,6 @@ import { useBreakpoints } from "@dative-gpi/foundation-shared-components/composa
 import type { FSGridMosaic } from "@dative-gpi/foundation-shared-components/models";
 
 import FSGrid from "./FSGrid.vue";
-import FSText from "./FSText.vue";
 import FSCol from "./FSCol.vue";
 import FSRow from "./FSRow.vue";
 
@@ -48,7 +47,6 @@ export default defineComponent({
   name: "FSGridMosaic",
   components: {
     FSGrid,
-    FSText,
     FSCol,
     FSRow
   },

package/components/FSIconCard.vue

@@ -30,14 +30,12 @@ import { sizeToVar } from "../utils";
 
 import FSCard from "./FSCard.vue";
 import FSIcon from "./FSIcon.vue";
-import FSRow from "./FSRow.vue";
 
 export default defineComponent({
   name: "FSIconCard",
   components: {
     FSCard,
-    FSIcon,
-    FSRow
+    FSIcon
   },
   props: {
     size: {

package/components/FSIconCheck.vue

@@ -28,18 +28,10 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: true
-    },
-    variant: {
-      type: String as () => "fill" | "outline",
-      required: false,
-      default: "outline"
     }
   },
   setup(props) {
     const icon = computed((): string => {
-      if (props.variant === "fill") {
-        return props.value ? "mdi-check-circle" : "mdi-close-circle";
-      }
       return props.value ? "mdi-check-circle-outline" : "mdi-close-circle-outline";
     });
 

package/components/FSImageCard.vue

@@ -1,5 +1,5 @@
 <template>
-  <FSCard
+  <FSClickable
     class="fs-image-card"
     :height="height"
     :width="width"
@@ -22,20 +22,20 @@
         </FSSpan>
       </FSRow>
     </FSRow>
-  </FSCard>
+  </FSClickable>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent, type PropType, type StyleValue } from "vue";
 
-import FSCard from "./FSCard.vue";
+import FSClickable from "./FSClickable.vue";
 import FSSpan from "./FSSpan.vue";
 import FSRow from "./FSRow.vue";
 
 export default defineComponent({
   name: "FSImageCard",
   components: {
-    FSCard,
+    FSClickable,
     FSSpan,
     FSRow
   },

package/components/FSInstantPicker.vue

@@ -89,7 +89,6 @@ import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { computeTicks, TimePrecision } from '@dative-gpi/foundation-shared-components/utils';
 
 import FSCol from '@dative-gpi/foundation-shared-components/components/FSCol.vue';
-import FSRow from '@dative-gpi/foundation-shared-components/components/FSRow.vue';
 import FSSpan from '@dative-gpi/foundation-shared-components/components/FSSpan.vue';
 import FSText from '@dative-gpi/foundation-shared-components/components/FSText.vue';
 import FSSlider from '@dative-gpi/foundation-shared-components/components/FSSlider.vue';
@@ -101,7 +100,6 @@ export default defineComponent({
   name: "FSInstantPicker",
   components: {
     FSCol,
-    FSRow,
     FSSpan,
     FSText,
     FSSlider,

package/components/FSLink.vue

@@ -1,7 +1,19 @@
 <template>
+  <a
+    v-if="$props.href"
+    :href="$props.href"
+    :class="classes"
+    :style="style"
+  >
+    <slot>
+      <FSSpan>
+        {{ $props.label }}
+      </FSSpan>
+    </slot>
+  </a>
   <FSRouterLink
+    v-else-if="$props.to"
     :to="$props.to"
-    :href="$props.href"
     :class="classes"
     :style="style"
     v-bind="$attrs"

package/components/FSOptionItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <FSCard
+  <FSClickable
     :disabled="$props.disabled"
     :height="['32px', '28px']"
     :padding="$props.padding"
@@ -47,7 +47,7 @@
         </FSIcon>
       </slot>
     </FSRow>
-  </FSCard>
+  </FSClickable>
 </template>
 
 <script lang="ts">
@@ -56,7 +56,7 @@ import { computed, defineComponent, type PropType } from "vue";
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { useColors } from "@dative-gpi/foundation-shared-components/composables";
 
-import FSCard from "./FSCard.vue";
+import FSClickable from "./FSClickable.vue";
 import FSSpan from "./FSSpan.vue";
 import FSIcon from "./FSIcon.vue";
 import FSRow from "./FSRow.vue";
@@ -64,7 +64,7 @@ import FSRow from "./FSRow.vue";
 export default defineComponent({
   name: "FSOptionItem",
   components: {
-    FSCard,
+    FSClickable,
     FSSpan,
     FSIcon,
     FSRow

package/components/FSOptionsMenu.vue

@@ -41,13 +41,12 @@
             :scrollOutside="false"
             maxHeight="80dvh"
           >
-            <FSCard
+            <FSClickable
               v-for="(item, index) in $props.items"
               width="100%"
               padding="8px"
               height="40px"
               :key="index"
-              :color="ColorEnum.Light"
               :border="false"
               @click="onClickItem(item)"
             >
@@ -69,7 +68,7 @@
                   </FSText>
                 </FSRow>
               </slot>
-            </FSCard>
+            </FSClickable>
           </FSFadeOut>
         </FSCol>
       </slot>
@@ -82,7 +81,7 @@ import { defineComponent, ref, type PropType } from "vue";
 
 import { useColors } from "@dative-gpi/foundation-shared-components/composables";
 
-import { CardVariants, ColorEnum, type ColorBase } from '@dative-gpi/foundation-shared-components/models';
+import { ColorEnum, type ColorBase } from '@dative-gpi/foundation-shared-components/models';
 
 import FSRow from '@dative-gpi/foundation-shared-components/components/FSRow.vue';
 import FSCol from '@dative-gpi/foundation-shared-components/components/FSCol.vue';
@@ -91,6 +90,7 @@ import FSMenu from '@dative-gpi/foundation-shared-components/components/FSMenu.v
 import FSCard from '@dative-gpi/foundation-shared-components/components/FSCard.vue';
 import FSText from '@dative-gpi/foundation-shared-components/components/FSText.vue';
 import FSButton from '@dative-gpi/foundation-shared-components/components/FSButton.vue';
+import FSClickable from '@dative-gpi/foundation-shared-components/components/FSClickable.vue';
 
 export default defineComponent({
   name: "FSInformationsMenu",
@@ -101,7 +101,8 @@ export default defineComponent({
     FSText,
     FSButton,
     FSCol,
-    FSIcon
+    FSIcon,
+    FSClickable
   },
   props: {
     items: {
@@ -157,7 +158,6 @@ export default defineComponent({
       ColorEnum,
       modelValue,
       lightColors,
-      CardVariants,
       onClickItem
     };
   }

package/components/FSPlayButtons.vue

@@ -3,7 +3,7 @@
     width="hug"
     gap="4px"
   >
-    <FSCard
+    <FSClickable
       variant="full"
       :color="ColorEnum.Light"
       borderRadius="50%"
@@ -14,8 +14,8 @@
         size="18px"
         icon="mdi-skip-backward"
       />
-    </FSCard>
-    <FSCard
+    </FSClickable>
+    <FSClickable
       variant="full"
       :color="ColorEnum.Light"
       borderRadius="50%"
@@ -26,8 +26,8 @@
         size="18px"
         :icon="$props.modelValue ? 'mdi-pause' : 'mdi-play'"
       />
-    </FSCard>
-    <FSCard
+    </FSClickable>
+    <FSClickable
       variant="full"
       :color="ColorEnum.Light"
       borderRadius="50%"
@@ -38,7 +38,7 @@
         size="18px"
         icon="mdi-skip-forward"
       />
-    </FSCard>
+    </FSClickable>
   </FSRow>
 </template>
 
@@ -48,15 +48,13 @@ import { defineComponent } from "vue";
 import { ColorEnum } from '@dative-gpi/foundation-shared-components/models';
 
 import FSIcon from '@dative-gpi/foundation-shared-components/components/FSIcon.vue';
-import FSCard from '@dative-gpi/foundation-shared-components/components/FSCard.vue';
-import FSRow from '@dative-gpi/foundation-shared-components/components/FSRow.vue';
+import FSClickable from '@dative-gpi/foundation-shared-components/components/FSClickable.vue';
 
 export default defineComponent({
   name: "FSPlayButtons",
   components: {
-    FSCard,
-    FSIcon,
-    FSRow
+    FSClickable,
+    FSIcon
   },
   props: {
     modelValue: {

package/components/FSProgressBar.vue

@@ -4,62 +4,21 @@
     :style="style"
   >
     <div
-      class="fs-progress-bar-wrapper"
+      class="fs-progress-bar-gradient"
     >
-      <div
-        class="fs-progress-bar-track"
-      >
-        <div
-          v-if="$props.cursor && isValueInRange"
-          class="fs-progress-bar-cursor"
-        >
-          <FSText
-            v-if="$props.showValue"
-            class="fs-progress-bar-cursor-label"
-            font="text-overline"
-            :ellipsis="false"
-          >
-            {{ displayValue }}
-          </FSText>
-        </div>
-        <div
-          v-if="!$props.cursor"
-          class="fs-progress-bar-fill"
-        ></div>
-      </div>
-      <div
-        v-if="positionedLabels.length"
-        class="fs-progress-bar-labels"
-      >
-        <div
-          v-for="label in positionedLabels"
-          :key="label.value"
-          class="fs-progress-bar-label"
-          :class="{
-            'fs-progress-bar-label--start': label.percent === 0,
-            'fs-progress-bar-label--end': label.percent === 100
-          }"
-          :style="{ left: `${label.percent}%` }"
-        >
-          <FSText
-            font="text-overline"
-          >
-            {{ label.display }}
-          </FSText>
-        </div>
-      </div>
+      <div></div>
     </div>
     <FSText
-      v-if="$props.showValue && !$props.cursor"
+      v-if="$props.showValue"
       font="text-button"
     >
-      {{ displayValue }}
+      {{ fixedRate }}%
     </FSText>
   </FSRow>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, type PropType, type StyleValue } from "vue";
+import { computed, defineComponent, type StyleValue } from "vue";
 
 import { useColors } from '@dative-gpi/foundation-shared-components/composables';
 
@@ -91,31 +50,6 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: true
-    },
-    valueFormat: {
-      type: String as PropType<"percentage" | "raw">,
-      required: false,
-      default: "percentage"
-    },
-    min: {
-      type: Number,
-      required: false,
-      default: 0
-    },
-    max: {
-      type: Number,
-      required: false,
-      default: 1
-    },
-    labels: {
-      type: Array as PropType<Array<{ value: number; text?: string }>>,
-      required: false,
-      default: () => []
-    },
-    cursor: {
-      type: Boolean,
-      required: false,
-      default: false
     }
   },
   setup(props) {
@@ -124,85 +58,37 @@ export default defineComponent({
     const lightColors = getColors(ColorEnum.Light);
     const successColors = getColors(ColorEnum.Success);
     const errorColors = getColors(ColorEnum.Error);
-
-    const isValid = computed(() => props.max > props.min);
-
-    const range = computed(() => props.max - props.min);
-
-    const clampedValue = computed(() => {
-      if (!isValid.value) { 
-        return props.min; 
-      }
-      return Math.min(Math.max(props.modelValue, props.min), props.max);
-    });
-
-    const valuePercent = computed(() => {
-      if (!isValid.value) { 
-        return 0; 
-      }
-      return ((clampedValue.value - props.min) / range.value) * 100;
-    });
-
-    const isValueInRange = computed(() => {
-      return props.modelValue >= props.min && props.modelValue <= props.max;
-    });
-
-    const zeroPercent = computed(() => {
-      if (!isValid.value) { return 0; }
-      const zero = Math.min(Math.max(0, props.min), props.max);
-      return ((zero - props.min) / range.value) * 100;
+ 
+    const fixedRate = computed(() => {
+      return (props.modelValue * 100).toFixed(0);
     });
 
-    const fillLeft = computed(() => Math.min(zeroPercent.value, valuePercent.value));
-
-    const fillWidth = computed(() => Math.abs(valuePercent.value - zeroPercent.value));
-
-    const gradientStartStop = computed(() => {
-      if (fillWidth.value === 0) { return "0%"; }
-      return `${-(fillLeft.value / fillWidth.value) * 100}%`;
+    const relativeWidth = computed(() => {
+      return props.modelValue ? 100 / props.modelValue : 0;
     });
-
-    const gradientEndStop = computed(() => {
-      if (fillWidth.value === 0) { return "100%"; }
-      return `${((100 - fillLeft.value) / fillWidth.value) * 100}%`;
+    
+    const startColor = computed(() => {
+      return props.startColor ?? errorColors.base;
     });
 
-    const positionedLabels = computed(() => {
-      return props.labels.map(label => {
-        const percent = isValid.value
-          ? ((label.value - props.min) / range.value) * 100
-          : 0;
-
-        return {
-          value: label.value,
-          display: label.text ?? label.value,
-          percent: Math.min(Math.max(percent, 0), 100)
-        };
-      });
+    const endColor = computed(() => {
+      return props.endColor ?? successColors.base;
     });
 
-    const displayValue = computed(() => {
-      if (props.valueFormat === "raw") { return props.modelValue.toFixed(2); }
-      return `${Math.round(valuePercent.value)}%`;
+    const style = computed((): StyleValue => {
+      return {
+        '--progress-bar-background-color': lightColors.dark,
+        '--progress-bar-gradient-start-color': startColor.value,
+        '--progress-bar-gradient-end-color': endColor.value,
+        '--progress-bar-gradient-width': `min(100%, ${fixedRate.value}%)`,
+        '--progress-bar-total-relative-width': `${relativeWidth.value}%`
+      };
     });
 
-    const style = computed((): StyleValue => ({
-      "--progress-bar-background": lightColors.dark,
-      "--progress-bar-gradient-start": props.startColor ?? errorColors.base,
-      "--progress-bar-gradient-start-stop": gradientStartStop.value,
-      "--progress-bar-gradient-end": props.endColor ?? successColors.base,
-      "--progress-bar-gradient-end-stop": gradientEndStop.value,
-      "--progress-bar-fill-left": `${fillLeft.value}%`,
-      "--progress-bar-fill-width": `${fillWidth.value}%`,
-      "--progress-bar-cursor-position": `${valuePercent.value}%`
-    }));
-
     return {
-      positionedLabels,
-      isValueInRange,
-      displayValue,
-      style
-    };
-  }
+      style,
+      fixedRate
+    }
+  },
 });
-</script>
+</script>

package/components/FSRangePicker.vue

@@ -89,7 +89,6 @@ import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { computeTicks, TimePrecision } from '@dative-gpi/foundation-shared-components/utils';
 
 import FSCol from '@dative-gpi/foundation-shared-components/components/FSCol.vue';
-import FSRow from '@dative-gpi/foundation-shared-components/components/FSRow.vue';
 import FSSpan from '@dative-gpi/foundation-shared-components/components/FSSpan.vue';
 import FSText from '@dative-gpi/foundation-shared-components/components/FSText.vue';
 import FSPlayButtons from '@dative-gpi/foundation-shared-components/components/FSPlayButtons.vue';
@@ -101,7 +100,6 @@ export default defineComponent({
   name: "FSRangePicker",
   components: {
     FSCol,
-    FSRow,
     FSSpan,
     FSText,
     FSTermField,