@dative-gpi/foundation-shared-components 1.0.5 → 1.0.6

package/components/FSButton.vue

@@ -128,13 +128,11 @@
 </template>
 
 <script lang="ts">
-import type { PropType } from "vue";
-import { computed, defineComponent } from "vue";
-import type { RouteLocation } from "vue-router";
+import { computed, defineComponent, type PropType } from "vue";
+import { type RouteLocation } from "vue-router";
 
+import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { useColors, useSlots } from "@dative-gpi/foundation-shared-components/composables";
-import type { ColorBase} from "@dative-gpi/foundation-shared-components/models";
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
 import FSClickable from "./FSClickable.vue";
 import FSSpan from "./FSSpan.vue";

package/components/FSCard.vue

@@ -34,11 +34,9 @@
 </template>
 
 <script lang="ts">
-import type { PropType } from "vue";
-import { computed, defineComponent } from "vue";
+import { computed, defineComponent, type PropType } from "vue";
 
-import type { ColorBase} from "@dative-gpi/foundation-shared-components/models";
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { useColors } from "@dative-gpi/foundation-shared-components/composables";
 import { sizeToVar } from "@dative-gpi/foundation-shared-components/utils";
 
@@ -73,7 +71,7 @@ export default defineComponent({
       default: "8px"
     },
     variant: {
-      type: String as PropType<"background" | "standard" | "gradient">,
+      type: String as PropType<"background" | "standard" | "full" | "gradient">,
       required: false,
       default: "background"
     },
@@ -119,6 +117,17 @@ export default defineComponent({
 
     const style = computed((): { [key: string] : string | null | undefined } => {
       switch (props.variant) {
+        case "background": return {
+          "--fs-card-border-size"     : props.border ? "1px" : "0",
+          "--fs-card-border-style"    : props.borderStyle,
+          "--fs-card-border-radius"   : sizeToVar(props.borderRadius),
+          "--fs-card-padding"         : sizeToVar(props.padding),
+          "--fs-card-height"          : sizeToVar(props.height),
+          "--fs-card-width"           : sizeToVar(props.width),
+          "--fs-card-background-color": backgrounds.base,
+          "--fs-card-border-color"    : lights.dark,
+          "--fs-card-color"           : darks.base
+        }
         case "standard": return {
           "--fs-card-border-size"     : props.border ? "1px" : "0",
           "--fs-card-border-style"    : props.borderStyle,
@@ -130,16 +139,16 @@ export default defineComponent({
           "--fs-card-border-color"    : colors.value.lightContrast,
           "--fs-card-color"           : colors.value.lightContrast
         }
-        case "background": return {
+        case "full": return {
           "--fs-card-border-size"     : props.border ? "1px" : "0",
           "--fs-card-border-style"    : props.borderStyle,
           "--fs-card-border-radius"   : sizeToVar(props.borderRadius),
           "--fs-card-padding"         : sizeToVar(props.padding),
           "--fs-card-height"          : sizeToVar(props.height),
           "--fs-card-width"           : sizeToVar(props.width),
-          "--fs-card-background-color": backgrounds.base,
-          "--fs-card-border-color"    : lights.dark,
-          "--fs-card-color"           : darks.base
+          "--fs-card-background-color": colors.value.base,
+          "--fs-card-border-color"    : colors.value.base,
+          "--fs-card-color"           : colors.value.baseContrast
         }
         case "gradient": return {
           "--fs-card-border-size"     : props.border ? "1px" : "0",

package/components/FSColor.vue

@@ -1,8 +1,8 @@
 <template>
   <FSCard
+    :variant="$props.variant"
     :border="$props.border"
-    :class="classes"
-    :style="style"
+    :color="$props.color"
     v-bind="$attrs"
   >
     <slot
@@ -12,11 +12,9 @@
 </template>
 
 <script lang="ts">
-import type { PropType } from "vue";
-import { computed, defineComponent } from "vue";
+import { computed, defineComponent, type PropType } from "vue";
 
-import type { ColorBase} from "@dative-gpi/foundation-shared-components/models";
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+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";
@@ -27,15 +25,20 @@ export default defineComponent({
     FSCard
   },
   props: {
-    border: {
-      type: Boolean,
+    variant: {
+      type: String as PropType<"standard" | "full">,
       required: false,
-      default: true
+      default: "standard"
     },
     color: {
       type: String as PropType<ColorBase>,
       required: false,
       default: ColorEnum.Primary
+    },
+    border: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   setup(props) {
@@ -43,29 +46,8 @@ export default defineComponent({
 
     const colors = computed(() => getColors(props.color));
 
-    const style = computed((): { [key: string] : string | null | undefined } => {
-      return {
-        "--fs-color-background-color": colors.value.light,
-        "--fs-color-border-color"    : colors.value.lightContrast,
-        "--fs-color-color"           : colors.value.lightContrast,
-        "--fs-color-light"           : colors.value.light,
-        "--fs-color-base"            : colors.value.base,
-        "--fs-color-dark"            : colors.value.dark
-      };
-    });
-
-    const classes = computed((): string[] => {
-      const classNames = ["fs-color"];
-      if (props.border) {
-        classNames.push("fs-color-border");
-      }
-      return classNames;
-    });
-
     return {
-      classes,
-      colors,
-      style
+      colors
     };
   }
 });

package/components/fields/FSColorField.vue

@@ -112,7 +112,7 @@ export default defineComponent({
       default: null
     },
     modelValue: {
-      type: String,
+      type: String as PropType<string | null>,
       required: false,
       default: "#000000"
     },
@@ -164,9 +164,9 @@ export default defineComponent({
 
     const menu = ref(false);
 
-    const innerColor = ref(getColors(props.modelValue).base);
-    const innerOpacity = ref(getHexFromPercentage(props.opacityValue));
-    const fullColor = ref(innerColor.value + innerOpacity.value);
+    const innerColor = ref("#000000");
+    const innerOpacity = ref("00");
+    const fullColor = ref("#00000000");
 
     const style = computed((): { [key: string]: string | undefined } => {
       if (!props.editable) {
@@ -185,7 +185,6 @@ export default defineComponent({
       };
     });
 
-
     const onSubmit = (value: string) => {
       innerColor.value = value.substring(0, 7);
       innerOpacity.value = value.length === 9 ? value.substring(7, 9) : "FF";
@@ -195,14 +194,21 @@ export default defineComponent({
     };
 
     const reset = (): void => {
-      innerColor.value = getColors(props.modelValue)['base'];
-      innerOpacity.value = getHexFromPercentage(props.opacityValue);
-      fullColor.value = innerColor.value + innerOpacity.value;
+      if (props.modelValue) {
+        innerColor.value = getColors(props.modelValue)['base'];
+        innerOpacity.value = getHexFromPercentage(props.opacityValue);
+        fullColor.value = innerColor.value + innerOpacity.value;
+      }
+      else {
+        innerColor.value = "#000000";
+        innerOpacity.value = "00";
+        fullColor.value = "#00000000";
+      }
     };
 
     watch(() => props.modelValue, () => {
       reset();
-    });
+    }, { immediate: true });
 
     return {
       getPercentageFromHex,

package/composables/useColors.ts

@@ -56,11 +56,20 @@ export const useColors = () => {
         return color.lighten(color.value() / 50);
     }
 
-    const getColors = (color: ColorBase): ColorVariations => {
+    const parseColor = (color: ColorBase): Color => {
         const themed = (Object as any).values(ColorEnum).includes(color);
+        
+        try {
+            return themed ? new Color(theme.colors[color as ColorEnum]) : new Color(color);
+        }
+        catch {
+            return new Color("#000000");
+        }
+    }
 
-        const base = themed ? new Color(theme.colors[color as ColorEnum]) : new Color(color);
-
+    const getColors = (color: ColorBase): ColorVariations => {
+        const base = parseColor(color);
+        
         const light = getLight(base);
         const soft = getSoft(base);
         const dark = getDark(base);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.5",
-    "@dative-gpi/foundation-shared-services": "1.0.5"
+    "@dative-gpi/foundation-shared-domain": "1.0.6",
+    "@dative-gpi/foundation-shared-services": "1.0.6"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "23b56d709ccee80d14efeadd00136e6c5c7f52b8"
+  "gitHead": "b2bbdea22792b7454a5234d8a6b8bb43553f3202"
 }