@dative-gpi/foundation-shared-components 0.0.11 → 0.0.13

package/components/{FSTagField.vue → fields/FSTagField.vue}

@@ -6,44 +6,15 @@
       :hideHeader="$props.hideHeader"
       :required="$props.required"
       :editable="$props.editable"
-      :error="messages.length > 0"
+      :rules="$props.rules"
+      :messages="messages"
+      :validateOn="validateOn"
+      :validationValue="$props.modelValue"
       @keydown.enter="onAdd"
+      @blur="blurred = true"
       v-model="innerValue"
       v-bind="$attrs"
     >
-      <template v-if="!$props.hideHeader" #label>
-        <slot name="label">
-          <FSRow :wrap="false">
-            <FSSpan
-              v-if="$props.label"
-              class="fs-tag-field-label"
-              font="text-overline"
-              :style="style"
-            >
-              {{ $props.label }}
-            </FSSpan>
-            <FSSpan
-              v-if="$props.label && $props.required"
-              class="fs-tag-field-label"
-              style="margin-left: -8px;"
-              font="text-overline"
-              :ellipsis="false"
-              :style="style"
-            >
-              *
-            </FSSpan>
-            <v-spacer style="min-width: 40px;" />
-            <FSSpan
-              v-if="messages.length > 0"
-              class="fs-tag-field-messages"
-              font="text-overline"
-              :style="style"
-            >
-              {{ messages.join(", ") }}
-            </FSSpan>
-          </FSRow>
-        </slot>
-      </template>
       <template #append-inner>
         <slot name="append-inner">
           <FSButton
@@ -73,14 +44,14 @@
 import { computed, defineComponent, PropType, ref } from "vue";
 
 import { ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { useColors } from "@dative-gpi/foundation-shared-components/composables";
+import { useColors, useRules } from "@dative-gpi/foundation-shared-components/composables";
 
 import FSTextField from "./FSTextField.vue";
-import FSTagGroup from "./FSTagGroup.vue";
-import FSButton from "./FSButton.vue";
-import FSSpan from "./FSSpan.vue";
-import FSCol from "./FSCol.vue";
-import FSRow from "./FSRow.vue";
+import FSTagGroup from "../FSTagGroup.vue";
+import FSButton from "../FSButton.vue";
+import FSSpan from "../FSSpan.vue";
+import FSCol from "../FSCol.vue";
+import FSRow from "../FSRow.vue";
 
 export default defineComponent({
   name: "FSTagField",
@@ -141,10 +112,12 @@ export default defineComponent({
   },
   emits: ["update:modelValue"],
   setup(props, { emit }) {
+    const {validateOn, blurred, getMessages} = useRules();
+    const { getColors } = useColors();
 
-    const errors = useColors().getColors(ColorEnum.Error);
-    const lights = useColors().getColors(ColorEnum.Light);
-    const darks = useColors().getColors(ColorEnum.Dark);
+    const errors = getColors(ColorEnum.Error);
+    const lights = getColors(ColorEnum.Light);
+    const darks = getColors(ColorEnum.Dark);
 
     const innerValue = ref("");
 
@@ -160,16 +133,7 @@ export default defineComponent({
       };
     });
 
-    const messages = computed((): string[] => {
-      const messages = [];
-      for (const rule of props.rules) {
-        const message = rule(props.modelValue);
-        if (typeof(message) === "string") {
-          messages.push(message);
-        }
-      }
-      return messages;
-    });
+    const messages = computed((): string[] => getMessages(props.modelValue, props.rules));
 
     const onAdd = (): void => {
       if (!props.editable) {
@@ -197,7 +161,9 @@ export default defineComponent({
     return {
       ColorEnum,
       innerValue,
+      validateOn,
       messages,
+      blurred,
       style,
       onAdd,
       onRemove

package/components/{FSTextArea.vue → fields/FSTextArea.vue}

@@ -36,17 +36,19 @@
     <v-textarea
       clearIcon="mdi-close"
       variant="outlined"
-      hide-details
       :style="style"
       :class="classes"
       :rows="$props.rows"
-      :rules="$props.rules"
+      :hideDetails="true"
       :noResize="!$props.resize"
       :autoGrow="$props.autoGrow"
       :readonly="!$props.editable"
-      :clearable="$props.editable"
+      :clearable="$props.editable && !!$props.modelValue"
+      :rules="$props.rules"
+      :validateOn="validateOn"
       :modelValue="$props.modelValue"
       @update:modelValue="(value) => $emit('update:modelValue', value)"
+      @blur="blurred = true"
       v-bind="$attrs"
     >
       <template v-for="(_, name) in $slots" v-slot:[name]="slotData">
@@ -69,12 +71,12 @@
 <script lang="ts">
 import { computed, defineComponent, PropType } from "vue";
 
-import { useColors, useBreakpoints } from "@dative-gpi/foundation-shared-components/composables";
+import { useColors, useBreakpoints, useRules } from "@dative-gpi/foundation-shared-components/composables";
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
-import FSSpan from "./FSSpan.vue";
-import FSCol from "./FSCol.vue";
-import FSRow from "./FSRow.vue";
+import FSSpan from "../FSSpan.vue";
+import FSCol from "../FSCol.vue";
+import FSRow from "../FSRow.vue";
 
 export default defineComponent({
   name: "FSTextArea",
@@ -83,7 +85,6 @@ export default defineComponent({
     FSCol,
     FSRow
   },
-  inheritAttrs: false,
   props: {
     label: {
       type: String,
@@ -100,11 +101,6 @@ export default defineComponent({
       required: false,
       default: null
     },
-    required: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
     rows: {
       type: Number,
       required: false,
@@ -125,11 +121,21 @@ export default defineComponent({
       required: false,
       default: false
     },
+    required: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     rules: {
       type: Array as PropType<Function[]>,
       required: false,
       default: () => []
     },
+    messages: {
+      type: Array as PropType<string[]>,
+      required: false,
+      default: null
+    },
     editable: {
       type: Boolean,
       required: false,
@@ -138,11 +144,13 @@ export default defineComponent({
   },
   emits: ["update:modelValue"],
   setup(props) {
+    const { validateOn, blurred, getMessages } = useRules();
     const { isMobileSized } = useBreakpoints();
+    const { getColors } = useColors();
 
-    const errors = useColors().getColors(ColorEnum.Error);
-    const lights = useColors().getColors(ColorEnum.Light);
-    const darks = useColors().getColors(ColorEnum.Dark);
+    const errors = getColors(ColorEnum.Error);
+    const lights = getColors(ColorEnum.Light);
+    const darks = getColors(ColorEnum.Dark);
 
     const style = computed((): {[code: string]: string} & Partial<CSSStyleDeclaration> => {
       let height: string | undefined = undefined;
@@ -180,17 +188,6 @@ export default defineComponent({
       };
     });
 
-    const messages = computed(() => {
-      const messages = [];
-      for (const rule of props.rules) {
-        const message = rule(props.modelValue);
-        if (typeof(message) === "string") {
-          messages.push(message);
-        }
-      }
-      return messages;
-    });
-
     const classes = computed((): string[] => {
       const classNames = ["fs-text-area"];
       if (props.autoGrow) {
@@ -199,8 +196,12 @@ export default defineComponent({
       return classNames;
     });
 
+    const messages = computed((): string[] => props.messages ?? getMessages(props.modelValue, props.rules));
+
     return {
+      validateOn,
       messages,
+      blurred,
       style,
       classes
     };

package/components/{FSTextField.vue → fields/FSTextField.vue}

@@ -35,14 +35,16 @@
       class="fs-text-field"
       clearIcon="mdi-close"
       variant="outlined"
-      hide-details
       :style="style"
       :type="$props.type"
-      :rules="$props.rules"
+      :hideDetails="true"
       :readonly="!$props.editable"
-      :clearable="$props.editable"
+      :clearable="$props.editable && !!$props.modelValue"
+      :rules="$props.rules"
+      :validateOn="validateOn"
       :modelValue="$props.modelValue"
       @update:modelValue="(value) => $emit('update:modelValue', value)"
+      @blur="blurred = true"
       v-bind="$attrs"
     >
       <template v-for="(_, name) in slots" v-slot:[name]="slotData">
@@ -65,12 +67,12 @@
 <script lang="ts">
 import { computed, defineComponent, PropType } from "vue";
 
-import { useColors, useSlots } from "@dative-gpi/foundation-shared-components/composables";
+import { useColors, useRules, useSlots } from "@dative-gpi/foundation-shared-components/composables";
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
-import FSSpan from "./FSSpan.vue";
-import FSCol from "./FSCol.vue";
-import FSRow from "./FSRow.vue";
+import FSSpan from "../FSSpan.vue";
+import FSCol from "../FSCol.vue";
+import FSRow from "../FSRow.vue";
 
 export default defineComponent({
   name: "FSTextField",
@@ -79,7 +81,6 @@ export default defineComponent({
     FSCol,
     FSRow
   },
-  inheritAttrs: false,
   props: {
     label: {
       type: String,
@@ -116,6 +117,11 @@ export default defineComponent({
       required: false,
       default: () => []
     },
+    messages: {
+      type: Array as PropType<string[]>,
+      required: false,
+      default: null
+    },
     editable: {
       type: Boolean,
       required: false,
@@ -124,13 +130,16 @@ export default defineComponent({
   },
   emits: ["update:modelValue"],
   setup(props) {
+    const { validateOn, blurred, getMessages } = useRules();
+    const { getColors } = useColors();
     const { slots } = useSlots();
+
     delete slots.label;
     delete slots.description;
 
-    const errors = useColors().getColors(ColorEnum.Error);
-    const lights = useColors().getColors(ColorEnum.Light);
-    const darks = useColors().getColors(ColorEnum.Dark);
+    const errors = getColors(ColorEnum.Error);
+    const lights = getColors(ColorEnum.Light);
+    const darks = getColors(ColorEnum.Dark);
 
     const style = computed((): {[code: string]: string} & Partial<CSSStyleDeclaration> => {
       if (!props.editable) {
@@ -151,19 +160,12 @@ export default defineComponent({
       };
     });
 
-    const messages = computed((): string[] => {
-      const messages = [];
-      for (const rule of props.rules) {
-        const message = rule(props.modelValue ?? "");
-        if (typeof(message) === "string") {
-          messages.push(message);
-        }
-      }
-      return messages;
-    });
+    const messages = computed((): string[] => props.messages ?? getMessages(props.modelValue, props.rules));
 
     return {
+      validateOn,
       messages,
+      blurred,
       slots,
       style
     };

package/components/fields/FSTimeField.vue

@@ -0,0 +1,104 @@
+<template>
+  <FSNumberField
+    class="fs-time-field"
+    :editable="$props.editable"
+    :modelValue="innerTime"
+    @update:modelValue="onSubmitValue"
+    v-bind="$attrs"
+  >
+    <template #append> 
+      <FSSelectField
+        class="fs-time-field-select"
+        :editable="$props.editable"
+        :hideHeader="true"
+        :clearable="false"
+        :items="timeScale"
+        :modelValue="selectedUnit.id"
+        @update:modelValue="onSubmitTimeScale"
+      />
+    </template>
+  </FSNumberField>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, ref } from "vue";
+
+import { getTimeScaleIndex, timeScale } from "@dative-gpi/foundation-shared-components/utils";
+import { useColors } from "@dative-gpi/foundation-shared-components/composables";
+import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+
+import FSNumberField from "./FSNumberField.vue";
+import FSSelectField from "./FSSelectField.vue";
+
+export default defineComponent({
+  name: "FSTimeField",
+  components: {
+    FSNumberField,
+    FSSelectField
+  },
+  props: {
+    modelValue: {
+      type: Number,
+      required: false,
+      default: null
+    },
+    editable: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
+  },
+  emits: ["update:modelValue"],
+  setup(props, { emit }) {
+    const innerTime = ref(props.modelValue);
+    const selectedUnit = ref(timeScale[0]);
+
+    if (getTimeScaleIndex(props.modelValue) !== 0) {
+      selectedUnit.value = timeScale[getTimeScaleIndex(props.modelValue)];
+      innerTime.value = props.modelValue / selectedUnit.value.id;
+    }
+
+    const errors = useColors().getColors(ColorEnum.Error);
+    const lights = useColors().getColors(ColorEnum.Light);
+    const darks = useColors().getColors(ColorEnum.Dark);
+
+    const style = computed((): {[code: string]: string} & Partial<CSSStyleDeclaration> => {
+      if (!props.editable) {
+        return {
+          "--fs-time-field-cursor"             : "default",
+          "--fs-time-field-border-color"       : lights.base,
+          "--fs-time-field-color"              : lights.dark,
+          "--fs-time-field-active-border-color": lights.base
+        };
+      }
+      return {
+        "--fs-time-field-cursor"             : "text",
+        "--fs-time-field-border-color"       : lights.dark,
+        "--fs-time-field-color"              : darks.base,
+        "--fs-time-field-active-border-color": darks.dark,
+        "--fs-time-field-error-color"        : errors.base,
+        "--fs-time-field-error-border-color" : errors.base
+      };
+    });
+
+    const onSubmitValue = (value: number): void => {
+      innerTime.value = value;
+      emit("update:modelValue", innerTime.value * selectedUnit.value.id);
+    };
+
+    const onSubmitTimeScale = (value: number): void => {
+      selectedUnit.value = timeScale.find((item) => item.id === value);
+      emit("update:modelValue", innerTime.value * selectedUnit.value.id);
+    };
+
+    return {
+      style,
+      innerTime,
+      selectedUnit,
+      timeScale,
+      onSubmitValue,
+      onSubmitTimeScale,
+    };
+  }
+});
+</script>