@dative-gpi/foundation-shared-components 1.0.56 → 1.0.58-groupings

package/components/FSCol.vue

@@ -26,6 +26,11 @@ export default defineComponent({
       required: false,
       default: "fill"
     },
+    maxWidth: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: null
+    },
     padding: {
       type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
       required: false,
@@ -49,11 +54,12 @@ export default defineComponent({
   },
   setup(props) {
     const style = computed((): StyleValue => ({
-      "--fs-col-overflow": props.overflow,
-      "--fs-col-padding" : sizeToVar(props.padding),
-      "--fs-col-gap"     : sizeToVar(props.gap),
-      "--fs-col-width"   : sizeToVar(props.width),
-      "--fs-col-height"  : sizeToVar(props.height)
+      "--fs-col-overflow"   : props.overflow,
+      "--fs-col-padding"    : sizeToVar(props.padding),
+      "--fs-col-gap"        : sizeToVar(props.gap),
+      "--fs-col-width"      : sizeToVar(props.width),
+      "--fs-col-max-width"  : props.maxWidth ? sizeToVar(props.maxWidth) : "100%",
+      "--fs-col-height"     : sizeToVar(props.height),
     }));
 
     const classes = computed((): string[] => {

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
-          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,12 +37,13 @@
               @click="() => $emit('click:cancelButton', false)"
             />
             <FSButton
+              v-if="$props.showSubmitButton"
               type="submit"
               :prependIcon="$props.submitButtonPrependIcon"
               :appendIcon="$props.submitButtonAppendIcon"
               :variant="$props.submitButtonVariant"
               :color="$props.submitButtonColor"
-              :editable="$props.editable"
+              :disabled="$props.disabled"
               :label="submitLabel"
               :load="$props.load"
             />
@@ -60,16 +59,13 @@
       gap="24px"
     >
       <FSFadeOut
-        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,
@@ -213,42 +214,54 @@ export default defineComponent({
       required: false,
       default: false
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
-  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 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,
+      onValidate,
       ColorEnum,
       maxHeight,
-      formRef,
-      valid,
-      onValidate,
-      onSubmit
+      onSubmit,
+      formRef
     };
   }
 });

package/components/FSDialogMenu.vue

@@ -5,9 +5,8 @@
     v-bind="$attrs"
   >
     <FSCard
-      width="calc(100vw - 48px)"
-      padding="8px"
-      gap="24px"
+      :padding="$props.padding"
+      :gap="$props.gap"
       :color="$props.color"
       :class="classes"
     >
@@ -38,11 +37,21 @@ export default defineComponent({
     FSCard
   },
   props: {
-    cardClasses: {
+    classes: {
       type: [Array, String] as PropType<string[] | string | null>,
       required: false,
       default: null
     },
+    padding: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: "8px"
+    },
+    gap: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: "24px"
+    },
     modelValue: {
       type: Boolean,
       required: false,
@@ -60,12 +69,12 @@ export default defineComponent({
 
     const classes = computed((): string[] => {
       const classNames = ["fs-dialog-menu"];
-      if (props.cardClasses) {
-        if (Array.isArray(props.cardClasses)) {
-          classNames.push(...props.cardClasses);
+      if (props.classes) {
+        if (Array.isArray(props.classes)) {
+          classNames.push(...props.classes);
         }
         else {
-          classNames.push(props.cardClasses);
+          classNames.push(props.classes);
         }
       }
       return classNames;

package/components/FSDialogMultiFormBody.vue

@@ -1,60 +1,68 @@
 <template>
-  <FSWindow
-    width="100%"
-    :modelValue="currentStep - 1"
+  <FSCol
+    gap="24px"
   >
-    <FSForm
-      v-for="(step, index) in $props.steps"
-      :variant="$props.variant"
-      :key="index"
-      @submit="onSubmit"
-      v-model="valid"
+    <FSPagination
+      width="calc(100% - 16px)"
+      :pages="$props.steps"
+      :modelValue="currentStep - 1"
+    />
+    <FSWindow
+      width="100%"
+      :modelValue="currentStep - 1"
     >
-      <FSCol
-        gap="24px"
+      <FSForm
+        v-for="(step, index) in $props.steps"
+        :variant="$props.variant"
+        :key="index"
+        @submit="onSubmit"
+        v-model="valid"
       >
-        <FSFadeOut
-          padding="0 8px 0 0"
-          :maxHeight="maxHeight"
+        <FSCol
+          gap="24px"
         >
-          <slot
-            :name="`step-${step}`"
-          />
-        </FSFadeOut>
-        <FSRow
-          padding="0 16px 0 0"
-        >
-          <slot
-            name="left-footer"
-          />
-          <FSRow
-            class="fs-dialog-actions"
-            align="top-right"
-            :wrap="false"
+          <FSFadeOut
+            :maxHeight="maxHeight"
           >
-            <FSButton
-              :prependIcon="$props.cancelButtonPrependIcon"
-              :appendIcon="$props.cancelButtonAppendIcon"
-              :variant="$props.cancelButtonVariant"
-              :color="$props.cancelButtonColor"
-              :label="previousButtonLabel"
-              @click="onPrevious()"
+            <slot
+              :name="`step-${step}`"
             />
-            <FSButton
-              type="submit"
-              :prependIcon="$props.submitButtonPrependIcon"
-              :appendIcon="$props.submitButtonAppendIcon"
-              :color="$props.submitButtonColor"
-              :variant="nextButtonVariant"
-              :editable="$props.editable"
-              :label="nextButtonLabel"
-              :load="$props.load"
+          </FSFadeOut>
+          <FSRow>
+            <slot
+              name="left-footer"
             />
+            <FSRow
+              class="fs-dialog-actions"
+              align="top-right"
+              :wrap="false"
+            >
+              <FSButton
+                v-if="$props.showCancelButton || currentStep > 1"
+                :prependIcon="$props.cancelButtonPrependIcon"
+                :appendIcon="$props.cancelButtonAppendIcon"
+                :variant="$props.cancelButtonVariant"
+                :color="$props.cancelButtonColor"
+                :label="previousButtonLabel"
+                @click="onPrevious()"
+              />
+              <FSButton
+                v-if="$props.showSubmitButton || currentStep < $props.steps"
+                type="submit"
+                :prependIcon="$props.submitButtonPrependIcon"
+                :appendIcon="$props.submitButtonAppendIcon"
+                :color="$props.submitButtonColor"
+                :variant="nextButtonVariant"
+                :disabled="$props.disabled"
+                :label="nextButtonLabel"
+                :load="$props.load"
+              />
+            </FSRow>
           </FSRow>
-        </FSRow>
-      </FSCol>
-    </FSForm>
-  </FSWindow>
+        </FSCol>
+      </FSForm>
+    </FSWindow>
+  </FSCol>
 </template>
 
 <script lang="ts">
@@ -64,17 +72,21 @@ import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { useBreakpoints } from "@dative-gpi/foundation-shared-components/composables";
 
+import FSPagination from "./FSPagination.vue";
 import FSFadeOut from "./FSFadeOut.vue";
 import FSButton from "./FSButton.vue";
 import FSForm from "./FSForm.vue";
+import FSCol from "./FSCol.vue";
 import FSRow from "./FSRow.vue";
 
 export default defineComponent({
   name: "FSDialogMultiFormBody",
   components: {
+    FSPagination,
     FSFadeOut,
     FSButton,
     FSForm,
+    FSCol,
     FSRow
   },
   props: {
@@ -97,6 +109,11 @@ export default defineComponent({
       type: Number,
       required: true
     },
+    showCancelButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     cancelButtonPrependIcon: {
       type: String as PropType<string | null>,
       required: false,
@@ -122,6 +139,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,
@@ -152,10 +174,10 @@ export default defineComponent({
       required: false,
       default: false
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["click:cancelButton", "click:submitButton"],
@@ -170,21 +192,22 @@ export default defineComponent({
     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
+        + (props.steps > 1 ? 24 + 4 : 0)                             // Pagination
         + (isMobileSized.value ? 36 : 40) + 24;                      // Footer
-      return `calc(100vh - 40px - ${other}px)`;
+      return `calc(100vh - 42px - ${other}px)`;
     });
 
     const previousButtonLabel = computed(() => {
       return currentStep.value == 1
-        ? props.cancelButtonLabel ?? $tr("ui.button.cancel", "Cancel")
-        : $tr("ui.button.back", "Back");
+        ? props.cancelButtonLabel ?? $tr("ui.common.cancel", "Cancel")
+        : $tr("ui.common.back", "Back");
     });
 
     const nextButtonLabel = computed(() => {
       return currentStep.value == props.steps
-        ? props.submitButtonLabel ?? $tr("ui.button.validate", "Validate")
-        : $tr("ui.button.next", "Next");
+        ? props.submitButtonLabel ?? $tr("ui.common.validate", "Validate")
+        : $tr("ui.common.next", "Next");
     });
 
     const nextButtonVariant = computed(() => {