@react-fabric/data 1.0.0-beta.8 → 1.0.1

package/src/tree/utils.ts

@@ -21,40 +21,44 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { compareValues, isString, matchString } from "@react-fabric/utilities";
-import { type InternalNode, type TreeNodeType } from "./types";
+import { compareValues, isArray, isString, matchString } from "@react-fabric/utilities";
+import type { InternalNode, TreeNodeType } from "./types";
 
-const sorter = (a: TreeNodeType, b: TreeNodeType) => {
+function defaultSorter<T extends KeyValue>(a: TreeNodeType<T>, b: TreeNodeType<T>) {
   if (!!a.leaf !== !!b.leaf) return a.leaf ? 1 : -1;
   return compareValues()(a.label, b.label);
-};
+}
 
-const getChildren = (list: InternalNode[] = []): InternalNode[] => {
+function getChildren<T extends KeyValue>(list: InternalNode<T>[] = []): InternalNode<T>[] {
   return list
-    .map<InternalNode[]>((item) => [item, ...getChildren(item.children)])
+    .map<InternalNode<T>[]>((item) => [item, ...getChildren(item.children)])
     .flat(99)
     .filter(Boolean);
-};
+}
 
-const getIntermediate = (list: AnyObject[] = []) => {
+function getIntermediate<T extends KeyValue>(list: InternalNode<T>[] = []) {
   const checks = list.map((item) => item.checked);
   const someOff = checks.includes(0);
   const someInt = checks.includes(2);
   const someOn = checks.includes(1);
 
   return (someOff && someOn) || someInt ? 2 : someOn ? 1 : 0;
-};
+}
 
 // convert node item to internal node used by the tree
-export const refactorTree = (
-  nodes: TreeNodeType[],
+export function refactorTree<T extends KeyValue>(
+  nodes: TreeNodeType<T>[],
+  {
+    sorter = defaultSorter<T>,
+    defaultExpanded = [],
+  }: { sorter?: false | ((a: TreeNodeType<T>, b: TreeNodeType<T>) => number); defaultExpanded?: string[] },
   options: { level: number; parent?: string } = { level: 0, parent: undefined },
-) => {
-  const list: InternalNode[] = [];
-
-  nodes.sort(sorter).forEach((node) => {
+) {
+  const list: InternalNode<T>[] = [];
+  if (sorter !== false) nodes = nodes.sort(sorter);
+  nodes.forEach((node) => {
     list.push({
-      open: false,
+      open: defaultExpanded.includes(node.id) && !!node.children?.length,
       level: options.level,
       parent: options.parent,
       checked: 0,
@@ -66,93 +70,106 @@ export const refactorTree = (
       leaf: !!node.leaf,
       children:
         node.children &&
-        refactorTree(node.children, {
-          level: options.level + 1,
-          parent: node.id,
-        }),
+        refactorTree<T>(
+          node.children,
+          { sorter, defaultExpanded },
+          {
+            level: options.level + 1,
+            parent: node.id,
+          },
+        ),
     });
   });
 
   return list;
-};
+}
 
-export const makeTreeMap = (nodes: InternalNode[], map = new Map()) => {
+export function makeTreeMap<T extends KeyValue>(nodes: InternalNode<T>[], map = new Map<string, InternalNode<T>>()) {
   nodes.forEach((node) => {
-    if (map.has(node.id))
-      throw new Error(
-        `Node with id [${node.id}] already exists, please make sure all ids are unique`,
-      );
+    if (map.has(node.id)) throw new Error(`Node with id [${node.id}] already exists, please make sure all ids are unique`);
     map.set(node.id, node);
-    node.children && makeTreeMap(node.children, map);
+    if (node.children) makeTreeMap<T>(node.children, map);
   });
   return map;
-};
+}
 
 // make flat list to be rendered by virtual list
-export const flattenTree = (
-  nodes: InternalNode[],
-  lines: Array<0 | 1 | 2 | 3> = [],
-) => {
-  const list: InternalNode[] = [];
+export function flattenTree<T extends KeyValue>(nodes: InternalNode<T>[], lines: Array<0 | 1 | 2 | 3> = []) {
+  const list: InternalNode<T>[] = [];
   const filtered = nodes.filter((node) => !node.filtered);
   filtered.forEach((node, idx) => {
     node.lines = [...lines, idx === filtered.length - 1 ? 2 : 3];
     list.push(node);
-    (node.open || node.childFiltered) &&
-      node.children &&
+    if ((node.open || node.childFiltered) && node.children)
       list.push(
         ...flattenTree(
           node.children.filter((child) => !child.filtered),
           [...lines, idx === filtered.length - 1 ? 0 : 1],
         ),
       );
+    if (node.open && node.children?.length === 0)
+      list.push({
+        empty: true,
+        leaf: true,
+        lines: [...lines, idx === filtered.length - 1 ? 0 : 1, 2],
+      } as InternalNode<T>);
   });
   return list;
-};
+}
 
-export const updateSelection = (
-  nodes: Map<string, InternalNode>,
-  id: string,
-  selected?: true,
-) => {
-  const node = nodes.get(id);
+function selectNode<T extends KeyValue>(nodes: Map<string, InternalNode<T>>, id?: string) {
+  const node = nodes.get(id ?? "");
   if (node) {
     // change selection
-    node.selected = selected;
+    node.selected = true;
     // update all parent childSelected flag
     let parent = node.parent;
     while (parent) {
       const parentNode = nodes.get(parent);
-      parentNode && (parentNode.childSelected = selected);
-      selected && parentNode && (parentNode.open = true);
+      if (parentNode) parentNode.childSelected = true;
+      // selected && parentNode && (parentNode.open = true);
       parent = parentNode?.parent;
     }
   }
-};
+}
 
-export const updateChecked = (list: Map<string, AnyObject>, id: string) => {
+export function updateSelection<T extends KeyValue>({
+  nodes,
+  multiple,
+  selected,
+}: {
+  nodes: Map<string, InternalNode<T>>;
+  multiple?: boolean;
+  selected?: string | string[];
+}) {
+  nodes.forEach((node) => {
+    node.selected = undefined;
+    node.childSelected = undefined;
+  });
+  if (multiple && isArray(selected)) selected?.forEach((id) => selectNode(nodes, id));
+  else selectNode(nodes, selected as string);
+}
+
+export function updateChecked<T extends KeyValue>(list: Map<string, InternalNode<T>>, id: string, checked?: 0 | 1 | 2) {
   const node = list.get(id);
   if (node) {
-    node.checked = node.checked === 1 ? 0 : 1;
+    node.checked = (checked ?? node.checked === 0) ? 1 : 0;
     // check all children
-    node.children &&
-      getChildren(node.children).forEach(
-        (child) => (child.checked = node.checked),
-      );
+    if (node.children) getChildren(node.children).forEach((child) => (child.checked = node.checked));
     let parent = node.parent;
     while (parent) {
       const parentNode = list.get(parent);
-      parentNode && (parentNode.checked = getIntermediate(parentNode.children));
+      if (parentNode) parentNode.checked = getIntermediate(parentNode.children);
       parent = parentNode?.parent;
     }
   }
-};
+}
 
-export const filterTree = (
-  nodes: Map<string, InternalNode>,
+export function filterTree<T extends KeyValue>(
+  nodes: Map<string, InternalNode<T>>,
   query?: string,
-  matcher?: AnyObject,
-) => {
+  matcher?: (data: T, query: string) => boolean,
+) {
   nodes.forEach((node) => {
     if (query) {
       if (node.parentFiltered) return;
@@ -166,11 +183,13 @@ export const filterTree = (
         let parent = node.parent;
         while (parent) {
           const parentNode = nodes.get(parent);
-          parentNode && (parentNode.filtered = false);
-          parentNode && (parentNode.childFiltered = true);
+          if (parentNode) {
+            parentNode.filtered = false;
+            parentNode.childFiltered = true;
+          }
           parent = parentNode?.parent;
         }
-        node.children &&
+        if (node.children)
           getChildren(node.children).forEach((child) => {
             child.parentFiltered = true;
             child.filtered = false;
@@ -182,4 +201,4 @@ export const filterTree = (
       node.parentFiltered = undefined;
     }
   });
-};
+}

package/src/utils/getColor.ts

@@ -0,0 +1,55 @@
+/**
+ * React Fabric
+ * @version 1.0.0
+ * @license MIT
+ * @copyright 2024 Adarsh Pastakia
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/* istanbul ignore file */
+
+import { isColor } from "@react-fabric/utilities";
+
+/**
+ * Resolves a color value to a CSS color string.
+ *
+ * If the input is a valid CSS color (e.g., `"#ff0000"`, `"rgb(255,0,0)"`), it is returned as-is.
+ * Otherwise, it is treated as a design token name and resolved to a CSS custom property
+ * (e.g., `"primary-500"` → `"var(--color-primary-500)"`).
+ *
+ * @param {ColorUnion} color - The color value to resolve. Accepts CSS color strings or design token names.
+ * @returns The resolved CSS color string, or `undefined` if color is falsy.
+ *
+ * @example
+ * ```ts
+ * getColor("primary-500");    // "var(--color-primary-500)"
+ * getColor("#ff0000");       // "#ff0000"
+ * getColor("red");           // "var(--color-red)"
+ * getColor(undefined);       // undefined
+ * ```
+ */
+export function getColor(color?: string) {
+  if (!color) return undefined;
+  if (color && isColor(color)) {
+    return color;
+  }
+  if (color.startsWith("--")) return `var(${color})`;
+  return `var(--color-${color})`;
+}