@dative-gpi/foundation-shared-components 1.0.27 → 1.0.28-remove-deprecated2

package/components/FSClickable.vue

@@ -3,19 +3,19 @@
     v-if="$props.href"
     :href="$props.href"
     :style="style"
+    :class="$props.class"
     @mouseover="hover = true"
     @mouseleave="hover = false"
     @mousedown="active = true"
     @mouseup="active = false"
   >
     <FSCard
+      height="100%"
+      width="100%"
       :borderRadius="$props.borderRadius"
       :borderStyle="$props.borderStyle"
       :padding="$props.padding"
-      :height="$props.height"
-      :width="$props.width"
       :class="classes"
-      :style="style"
       v-bind="$attrs"
     >
       <template
@@ -40,23 +40,23 @@
       />
     </template>
   </a>
-  <router-link
+  <FSRouterLink
     v-else-if="$props.to"
     :style="style"
     :to="$props.to"
+    :class="$props.class"
     @mouseover="hover = true"
     @mouseleave="hover = false"
     @mousedown="active = true"
     @mouseup="active = false"
   >
     <FSCard
+      height="100%"
+      width="100%"
       :borderRadius="$props.borderRadius"
       :borderStyle="$props.borderStyle"
       :padding="$props.padding"
-      :height="$props.height"
-      :width="$props.width"
       :class="classes"
-      :style="style"
       v-bind="$attrs"
     >
       <template
@@ -80,11 +80,13 @@
         :color="loadColor"
       />
     </template>
-  </router-link>
+  </FSRouterLink>
   <button
     v-else
     :type="$props.type"
     :style="style"
+    :class="$props.class"
+    :disabled="$props.load || !$props.editable"
     @click.stop="onClick"
     @mouseover="hover = true"
     @mouseleave="hover = false"
@@ -92,13 +94,12 @@
     @mouseup="active = false"
   >
     <FSCard
+      height="100%"
+      width="100%"
       :borderRadius="$props.borderRadius"
       :borderStyle="$props.borderStyle"
       :padding="$props.padding"
-      :height="$props.height"
-      :width="$props.width"
       :class="classes"
-      :style="style"
       v-bind="$attrs"
     >
       <template
@@ -133,11 +134,13 @@ import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-compone
 import { useColors } from "@dative-gpi/foundation-shared-components/composables";
 import { sizeToVar } from "@dative-gpi/foundation-shared-components/utils";
 
+import FSRouterLink from "./FSRouterLink.vue";
 import FSCard from "./FSCard.vue";
 
 export default defineComponent({
   name: "FSClickable",
   components: {
+    FSRouterLink,
     FSCard
   },
   props: {
@@ -156,8 +159,13 @@ export default defineComponent({
       required: false,
       default: "0"
     },
+    class: {
+      type: [String, Array] as PropType<string | string[] | null>,
+      required: false,
+      default: null
+    },
     to: {
-      type: [String, Object] as PropType<string | RouteLocation | null>,
+      type: Object as PropType<RouteLocation | null>,
       required: false,
       default: null
     },

package/components/FSClock.vue

@@ -30,7 +30,7 @@
       v-if="$props.slider"
     >
       <FSSlider
-        :label="$tr('ui.clock.hours', 'Hours')"
+        :label="$tr('ui.common.hours', 'Hours')"
         :readonly="!$props.editable"
         :color="$props.color"
         :step="1"
@@ -39,7 +39,7 @@
         v-model="innerHours"
       />
       <FSSlider
-        :label="$tr('ui.clock.minutes', 'Minutes')"
+        :label="$tr('ui.common.minutes', 'Minutes')"
         :readonly="!$props.editable"
         :color="$props.color"
         :step="1"
@@ -54,9 +54,9 @@
 <script lang="ts">
 import { computed, defineComponent, type PropType, ref, type StyleValue, watch } from "vue";
 
+import { useBreakpoints, useColors } from "@dative-gpi/foundation-shared-components/composables";
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { useAppTimeZone } from "@dative-gpi/foundation-shared-services/composables";
-import { useColors } from "@dative-gpi/foundation-shared-components/composables";
+import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
 
 import FSSlider from "./FSSlider.vue";
 import FSCol from "./FSCol.vue";
@@ -98,7 +98,8 @@ export default defineComponent({
   },
   emits: ["update:modelValue"],
   setup(props, { emit }) {
-    const { epochToLongDateFormat } = useAppTimeZone();
+    const { epochToLongDateFormat } = useDateFormat();
+    const { isMobileSized } = useBreakpoints();
     const { getColors } = useColors();
 
     const colors = computed(() => getColors(props.color));
@@ -116,7 +117,11 @@ export default defineComponent({
           "--fs-clock-field-background-color"   : backgrounds.base,
           "--fs-clock-field-border-color"       : lights.base,
           "--fs-clock-field-color"              : lights.dark,
-          "--fs-clock-field-active-border-color": lights.base
+          "--fs-clock-field-active-border-color": lights.base,
+          "--fs-font-font-size"                 : isMobileSized.value ? "12px" : "14px",
+          "--fs-font-line-height"               : isMobileSized.value ? "16px" : "20px",
+          "--fs-font-letter-spacing"            : isMobileSized.value ? "-0.36px" : "-0.42px",
+          "--fs-base-field-input-height"        : isMobileSized.value ? "34px" : "38px"
         };
       }
       return {
@@ -124,7 +129,11 @@ export default defineComponent({
         "--fs-clock-field-background-color"   : colors.value.light,
         "--fs-clock-field-border-color"       : colors.value.base,
         "--fs-clock-field-color"              : darks.base,
-        "--fs-clock-field-active-border-color": colors.value.dark
+        "--fs-clock-field-active-border-color": colors.value.dark,
+        "--fs-font-font-size"                 : isMobileSized.value ? "12px" : "14px",
+        "--fs-font-line-height"               : isMobileSized.value ? "16px" : "20px",
+        "--fs-font-letter-spacing"            : isMobileSized.value ? "-0.36px" : "-0.42px",
+        "--fs-base-field-input-height"        : isMobileSized.value ? "34px" : "38px"
       };
     });
 

package/components/FSColorIcon.vue

@@ -3,15 +3,15 @@
     class="fs-color-icon"
     :color="$props.color"
     :border="false"
-    :height="size"
-    :width="size"
+    :height="actualSize"
+    :width="actualSize"
   >
     <FSRow
       align="center-center"
     >
       <FSIcon
         :color="$props.color"
-        :size="$props.size"
+        :size="iconSize"
       >
         <slot />
       </FSIcon>
@@ -25,6 +25,8 @@ import { computed, defineComponent, type PropType } from "vue";
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { useBreakpoints } from "@dative-gpi/foundation-shared-components/composables";
 
+import { sizeToVar } from "../utils";
+
 import FSColor from "./FSColor.vue";
 import FSIcon from "./FSIcon.vue";
 import FSRow from "./FSRow.vue";
@@ -46,12 +48,17 @@ export default defineComponent({
       type: String as PropType<ColorBase>,
       required: false,
       default: ColorEnum.Dark
+    },
+    padding: {
+      type: [String, Number] as PropType<string | number>,
+      required: false,
+      default: "8px"
     }
   },
   setup(props) {
     const { isMobileSized } = useBreakpoints();
 
-    const size = computed((): string[] | number[] | string | number | null => {
+    const actualSize = computed((): string[] | number[] | string | number | null => {
       switch(props.size) {
         case "s": return isMobileSized.value ? "18px" : "20px";
         case "m": return isMobileSized.value ? "20px" : "26px";
@@ -60,8 +67,19 @@ export default defineComponent({
       }
     });
 
+    const iconSize = computed((): string => {
+      switch(props.size) {
+        case "s": 
+        case "m": 
+        case "l":
+          return props.size;
+        default: return `calc(${sizeToVar(props.size)} - ${sizeToVar(props.padding)})`;
+      }
+    });
+
     return {
-      size
+      actualSize,
+      iconSize
     };
   }
 });

package/components/FSDialog.vue

@@ -4,6 +4,7 @@
     :class="classes"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"
+    :width="$props.width"
     v-bind="$attrs"
   >
     <slot>
@@ -67,7 +68,7 @@ export default defineComponent({
       default: false
     }
   },
-  emits: ["update:modelValue"],
+  emits: ["click", "update:modelValue"],
   setup() {
     const { isExtraSmall } = useBreakpoints();
 

package/components/FSDialogContent.vue

@@ -1,6 +1,6 @@
 <template>
   <FSCard
-    padding="24px 8px 24px 24px"
+    :padding="['24px', '16px', '16px 12px']"
     gap="24px"
     :class="$props.cardClasses"
     :color="$props.color"
@@ -9,9 +9,7 @@
     <template
       #header
     >
-      <FSCol
-        padding="0 16px 0 0"
-      >
+      <FSCol>
         <FSRow
           align="center-left"
           :wrap="false"
@@ -21,13 +19,16 @@
           >
             {{ $props.title }}
           </FSText>
-          <v-spacer />
-          <FSButton
-            icon="mdi-close"
-            variant="icon"
-            :color="ColorEnum.Dark"
-            @click="$emit('update:modelValue', false)"
-          />
+          <FSRow
+            align="center-right"
+          >
+            <FSButton
+              icon="mdi-close"
+              variant="icon"
+              :color="ColorEnum.Dark"
+              @click="$emit('update:modelValue', false)"
+            />
+          </FSRow>
         </FSRow>
         <FSText
           v-if="$props.subtitle"

package/components/FSDialogForm.vue

@@ -11,12 +11,14 @@
       #body
     >
       <FSDialogFormBody 
+        ref="bodyRef"
         v-bind="$attrs"
         :subtitle="$props.subtitle"
         :validation="$props.validation"
         @click:cancelButton="$emit('update:modelValue', false)"
         @click:submitButton="$emit('click:submitButton')"
         @click:validateButton="onValidate"
+        @update:isValidForm="isValidForm = $event"
       >
         <template
           v-for="(_, name) in $slots"
@@ -33,8 +35,8 @@
 </template>
 
 <script lang="ts">
-import type { PropType} from "vue";
-import { defineComponent } from "vue";
+import type { PropType } from "vue";
+import { defineComponent, ref } from "vue";
 
 import FSDialogFormBody from "./FSDialogFormBody.vue";
 import FSDialog from "./FSDialog.vue";
@@ -74,6 +76,8 @@ export default defineComponent({
   },
   emits: ["update:modelValue", "click:validateButton", "click:submitButton"],
   setup(props, { emit }) {
+    const bodyRef = ref<typeof FSDialogFormBody | null>(null);
+    const isValidForm = ref(false);
 
     const onClose = () => {
       if (props.validation) {
@@ -87,8 +91,24 @@ export default defineComponent({
       emit("update:modelValue", false);
     };
 
+    const resetFormValidation = () => {
+      if (bodyRef.value) {
+        bodyRef.value.resetFormValidation();
+      }
+    };
+
+    const validateForm = async () => {
+      if (bodyRef.value) {
+        return await bodyRef.value.validateForm();
+      }
+    };
+
     return {
+      resetFormValidation,
+      validateForm,
+      isValidForm,
       onValidate,
+      bodyRef,
       onClose
     };
   }

package/components/FSDialogFormBody.vue

@@ -6,22 +6,19 @@
       ref="formRef"
       :variant="$props.variant"
       @submit="onSubmit"
-      v-model="valid"
+      v-model="isValidForm"
     >
       <FSCol
         gap="24px"
       >
         <FSFadeOut
-          :height="height"
-          padding="0 8px 0 0"
+          :maxHeight="maxHeight"
         >
           <slot
             name="body"
           />
         </FSFadeOut>
-        <FSRow
-          padding="0 16px 0 0"
-        >
+        <FSRow>
           <slot
             name="left-footer"
           />
@@ -31,6 +28,7 @@
             :wrap="false"
           >
             <FSButton
+              v-if="$props.showCancelButton"
               :prependIcon="$props.cancelButtonPrependIcon"
               :appendIcon="$props.cancelButtonAppendIcon"
               :variant="$props.cancelButtonVariant"
@@ -39,6 +37,7 @@
               @click="() => $emit('click:cancelButton', false)"
             />
             <FSButton
+              v-if="$props.showSubmitButton"
               type="submit"
               :prependIcon="$props.submitButtonPrependIcon"
               :appendIcon="$props.submitButtonAppendIcon"
@@ -60,16 +59,13 @@
       gap="24px"
     >
       <FSFadeOut
-        :height="height"
-        padding="0 8px 0 0"
+        :maxHeight="maxHeight"
       >
         <slot
           name="validation"
         />
       </FSFadeOut>
-      <FSRow
-        padding="0 16px 0 0"
-      >
+      <FSRow>
         <slot
           name="left-footer"
         />
@@ -93,7 +89,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, type PropType, ref } from "vue";
+import { computed, defineComponent, type PropType, ref, watch } from "vue";
 
 import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
@@ -118,16 +114,16 @@ export default defineComponent({
       required: false,
       default: "submit"
     },
-    modelValue: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
     subtitle: {
       type: String as PropType<string | null>,
       required: false,
       default: null
     },
+    showCancelButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     cancelButtonPrependIcon: {
       type: String as PropType<string | null>,
       required: false,
@@ -153,6 +149,11 @@ export default defineComponent({
       required: false,
       default: ColorEnum.Light
     },
+    showSubmitButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     submitButtonPrependIcon: {
       type: String as PropType<string | null>,
       required: false,
@@ -219,36 +220,48 @@ export default defineComponent({
       default: true
     }
   },
-  emits: ["click:cancelButton", "click:submitButton", "click:validateButton"],
+  emits: ["click:cancelButton", "click:submitButton", "click:validateButton", "update:isValidForm"],
   setup(props, { emit }) {
     const { isMobileSized } = useBreakpoints();
     const { $tr } = useTranslationsProvider();
 
-    const formRef = ref<HTMLElement | null>(null);
-    const valid = ref(false);
+    const formRef = ref<typeof FSForm | null>(null);
+    const isValidForm = ref(null);
 
-    const height = computed(() => {
+    const maxHeight = computed(() => {
       const other = 24 + 24                                          // Paddings
         + (isMobileSized.value ? 24 : 32) + 24                       // Title
-        + (props.subtitle ? (isMobileSized.value ? 14 : 16) + 8 : 0) // Subtitle
+        + (props.subtitle ? (isMobileSized.value ? 16 : 20) + 8 : 0) // Subtitle
         + (isMobileSized.value ? 36 : 40) + 24;                      // Footer
-      return `calc(100vh - 40px - ${other}px)`;
+      return `calc(100vh - 42px - ${other}px)`;
     });
 
     const cancelLabel = computed(() => {
-      return props.cancelButtonLabel ?? $tr("ui.button.cancel", "Cancel");
+      return props.cancelButtonLabel ?? $tr("ui.common.cancel", "Cancel");
     });
 
     const submitLabel = computed(() => {
-      return props.submitButtonLabel ??  $tr("ui.button.submit", "Submit");
+      return props.submitButtonLabel ??  $tr("ui.common.submit", "Submit");
     });
 
     const validateLabel = computed(() => {
-      return props.validateButtonLabel ??  $tr("ui.button.validate", "Done");
+      return props.validateButtonLabel ??  $tr("ui.common.validate", "Validate");
     });
 
+    const resetFormValidation = () => {
+      if (formRef.value) {
+        formRef.value.resetValidation();
+      }
+    };
+
+    const validateForm =  async () => {
+      if (formRef.value) {
+        return await formRef.value.validate();
+      }
+    };
+
     const onSubmit = () => {
-      if (valid.value) {
+      if (isValidForm.value) {
         emit("click:submitButton");
       }
     };
@@ -256,17 +269,23 @@ export default defineComponent({
     const onValidate = () => {
       emit("click:validateButton");
     };
+    
+    watch(() => isValidForm.value, () => {
+      emit("update:isValidForm", isValidForm.value);
+    }, { immediate: true });
 
     return {
+      resetFormValidation,
       validateLabel,
+      validateForm,
+      isValidForm,
       cancelLabel,
       submitLabel,
-      ColorEnum,
-      formRef,
-      height,
-      valid,
       onValidate,
-      onSubmit
+      ColorEnum,
+      maxHeight,
+      onSubmit,
+      formRef
     };
   }
 });