@dative-gpi/foundation-shared-components 0.0.34 → 0.0.36

package/components/FSText.vue

@@ -47,7 +47,7 @@ export default defineComponent({
     variant: {
       type: String as PropType<"base" | "light" | "dark">,
       required: false,
-      default: "dark"
+      default: "base"
     }
   },
   setup(props) {

package/components/lists/FSDataTableUI.vue

@@ -662,20 +662,23 @@ export default defineComponent({
       const activeFilters: { key: string, filter: FSDataTableFilter }[] = Object.keys(filters.value).reduce((acc, key) => {
         return acc.concat(filters.value[key].filter((filter) => filter.hidden).map((filter) => ({ key, filter })));
       }, []);
-      return props.items.filter((item) => {
-        if (props.selectedOnly && !innerValue.value.includes(item[props.itemValue])) {
-          return false;
-        }
-        if (innerSearch.value) {
-          if (!JSON.stringify(item).toLowerCase().includes(innerSearch.value.toString().toLowerCase())) {
+      if (props.items && props.items.length) {
+        return props.items.filter((item) => {
+          if (props.selectedOnly && !innerValue.value.includes(item[props.itemValue])) {
             return false;
           }
-        }
-        if (activeFilters.some(af => af.filter.filter(af.filter.value, item[af.key], item))) {
-          return false;
-        }
-        return true;
-      });
+          if (innerSearch.value) {
+            if (!JSON.stringify(item).toLowerCase().includes(innerSearch.value.toString().toLowerCase())) {
+              return false;
+            }
+          }
+          if (activeFilters.some(af => af.filter.filter(af.filter.value, item[af.key], item))) {
+            return false;
+          }
+          return true;
+        });
+      }
+      return [];
     });
 
     const headersSlots = computed((): FSDataTableColumn[] => {
@@ -811,19 +814,21 @@ export default defineComponent({
           }));
         }
         else {
-          const mapToInnerValue = header.innerValue ? header.innerValue : (i: any) => i;
-          const itemValues = props.items.flatMap((item) => Array.isArray(item[key]) && item[key].length == 0 ? undefined : item[key]).map(mapToInnerValue);
-          const distinctValues = [...new Set(itemValues)];
-
-          value = distinctValues.map((dv): FSDataTableFilter => ({
-            hidden: currentFilters?.find((cf) => cf.value == (dv || null))?.hidden ?? false,
-            text: dv?.toString() ?? "—",
-            value: dv || null,
-            filter: header.methodFilter ?? ((_, property) => {
-              property = [property].flat().map(mapToInnerValue);
-              return Array.isArray(property) ? property.includes(dv) || (!dv && property.length == 0) : (!dv && !property) || dv == property;
-            })
-          }));
+          if (props.items && props.items.length) {
+            const mapToInnerValue = header.innerValue ? header.innerValue : (i: any) => i;
+            const itemValues = props.items.flatMap((item) => Array.isArray(item[key]) && item[key].length == 0 ? undefined : item[key]).map(mapToInnerValue);
+            const distinctValues = [...new Set(itemValues)];
+
+            value = distinctValues.map((dv): FSDataTableFilter => ({
+              hidden: currentFilters?.find((cf) => cf.value == (dv || null))?.hidden ?? false,
+              text: dv?.toString() ?? "—",
+              value: dv || null,
+              filter: header.methodFilter ?? ((_, property) => {
+                property = [property].flat().map(mapToInnerValue);
+                return Array.isArray(property) ? property.includes(dv) || (!dv && property.length == 0) : (!dv && !property) || dv == property;
+              })
+            }));
+          }
         }
         filterDictionary[key] = value.sort((v1, v2) => {
           return v1.text.localeCompare(v2.text, undefined, { numeric: true });

package/composables/useColors.ts

@@ -24,7 +24,7 @@ export const useColors = () => {
     };
 
     const soften = (base: Color): Color => {
-        return base.value(Math.min(base.value() + 10, 90));
+        return base.value(Math.min(base.value() + 10, 100));
     };
 
     const darken = (base: Color): Color => {
@@ -50,7 +50,7 @@ export const useColors = () => {
     const getContrasts = (color: ColorBase): ColorVariations => {
         const themed = (Object as any).values(ColorEnum).includes(color);
 
-        const base = themed ? new Color(theme.colors[color as ColorEnum]) : new Color(color);
+        let base = themed ? new Color(theme.colors[color as ColorEnum]) : new Color(color);
 
         if (isGrayScale(base)) {
             switch (color) {
@@ -60,15 +60,15 @@ export const useColors = () => {
                     return getColors(ColorEnum.Light);
                 default:
                     if (base.value() > 50) {
-                        base.value(Math.max(base.value() - 65, 0));
+                        base = base.value(Math.max(base.value() - 65, 0));
                     }
                     else {
-                        base.value(Math.min(base.value() + 65, 100));
+                        base = base.value(Math.min(base.value() + 65, 100));
                     }
                     break;
             }
         }
-        return getColors(color);
+        return getColors(base.hex());
     };
 
     const getGradients = (colors: ColorBase | ColorBase[]): ColorVariations => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "0.0.34",
+  "version": "0.0.36",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "0.0.34",
-    "@dative-gpi/foundation-shared-services": "0.0.34",
+    "@dative-gpi/foundation-shared-domain": "0.0.36",
+    "@dative-gpi/foundation-shared-services": "0.0.36",
     "@fontsource/montserrat": "^5.0.16",
     "@lexical/clipboard": "^0.12.5",
     "@lexical/history": "^0.12.5",
@@ -32,5 +32,5 @@
     "sass": "^1.69.5",
     "sass-loader": "^13.3.2"
   },
-  "gitHead": "62ed70daab463e19ca77268ebce9fb4ff8d87b9f"
+  "gitHead": "6480f8ebb0980b81c6eaf46112647148d808afc3"
 }