@react-fabric/data 1.0.0-beta.5 → 1.0.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-fabric/data",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
   "description": "RUF: Data package",
   "author": "Adarsh Pastakia <adarshpastakia@outlook.com>",
   "license": "MIT",
@@ -33,9 +33,10 @@
     "watch": "npm-run-all -p watch:rollup watch:dts"
   },
   "dependencies": {
-    "@react-fabric/core": "^1.0.0-beta.5",
-    "@react-fabric/form": "^1.0.0-beta.5",
-    "@react-fabric/utilities": "^1.0.0-beta.5",
+    "@react-fabric/core": "^1.0.0-beta.7",
+    "@react-fabric/date": "^1.0.0-beta.7",
+    "@react-fabric/form": "^1.0.0-beta.7",
+    "@react-fabric/utilities": "^1.0.0-beta.7",
     "@tanstack/react-virtual": "^3.8.6",
     "classnames": "^2.5.1",
     "color": "^4.2.3",
@@ -51,5 +52,5 @@
     "node": ">=18.12.0",
     "npm": ">=8.19.0"
   },
-  "gitHead": "7d4a7ed1ea9890652826bef58d01c31280d761c8"
+  "gitHead": "8e6efedbbb02660c0b64140aff00e633b891bb85"
 }

package/src/checklist/CheckList.tsx

@@ -22,12 +22,14 @@
  */
 
 import { Badge, CoreIcons, EmptyContent, Icon } from "@react-fabric/core";
-import { type BadgeType } from "@react-fabric/core/dist/types/types";
+import {
+  type BadgeType,
+  type TestProps,
+} from "@react-fabric/core/dist/types/types";
 import { isString } from "@react-fabric/utilities";
 import {
   Fragment,
   isValidElement,
-  memo,
   useEffect,
   useMemo,
   useState,
@@ -47,7 +49,7 @@ export interface CheckListItem extends KeyValue {
   isDisabled?: boolean;
 }
 
-export interface CheckListProps extends SelectableProps {
+export interface CheckListProps extends SelectableProps, TestProps {
   /**
    * list items
    */
@@ -73,84 +75,79 @@ const CheckItem: FC<
     selected?: number;
     allowNegative?: boolean;
   }
-> = memo(
-  ({
-    id,
-    allowNegative,
-    selected,
-    icon,
-    label,
-    isDisabled,
-    onClick,
-    badge,
-  }: Omit<CheckListItem, "selected"> & {
-    selected?: number;
-    allowNegative?: boolean;
-  }) => {
-    return (
-      <div
-        role="none"
-        className="ax-checkList__item"
-        data-disabled={isDisabled}
-        onClick={() => onClick(id, false)}
-        onContextMenu={(e) => [
-          allowNegative && onClick(id, true),
-          e.preventDefault(),
-        ]}
-      >
-        {!allowNegative && (
+> = ({
+  id,
+  allowNegative,
+  selected,
+  icon,
+  label,
+  isDisabled,
+  onClick,
+  badge,
+  ...aria
+}: Omit<CheckListItem, "selected"> & {
+  selected?: number;
+  allowNegative?: boolean;
+}) => {
+  return (
+    <div
+      role="none"
+      className="ax-checkList__item"
+      data-disabled={isDisabled}
+      onClick={() => onClick(id, false)}
+      onContextMenu={(e) => [
+        allowNegative && onClick(id, true),
+        e.preventDefault(),
+      ]}
+      {...aria}
+    >
+      {!allowNegative && (
+        <Icon
+          data-type="checkbox"
+          className="ax-checkList__checkbox"
+          data-selected={selected === 1}
+          icon={selected ? CoreIcons.checkboxInt : CoreIcons.checkboxOff}
+        />
+      )}
+      {allowNegative && (
+        <Fragment>
           <Icon
-            data-type="checkbox"
+            data-type="multiple"
             className="ax-checkList__checkbox"
-            data-selected={selected === 1}
-            icon={selected ? CoreIcons.checkboxInt : CoreIcons.checkboxOff}
+            icon={
+              selected === 1
+                ? CoreIcons.expand
+                : selected === -1
+                  ? CoreIcons.collapse
+                  : CoreIcons.checkboxOff
+            }
+            data-selected={selected}
           />
-        )}
-        {allowNegative && (
-          <Fragment>
+          <div className="ax-checkList__checkbox">
+            <Icon
+              data-type="positive"
+              onClick={(e) => [(onClick(id, false), e.stopPropagation())]}
+              icon={selected === 1 ? CoreIcons.expandActive : CoreIcons.expand}
+              data-selected={selected === 1}
+            />
             <Icon
-              data-type="multiple"
-              className="ax-checkList__checkbox"
+              data-type="negative"
+              onClick={(e) => [(onClick(id, true), e.stopPropagation())]}
               icon={
-                selected === 1
-                  ? CoreIcons.expand
-                  : selected === -1
-                    ? CoreIcons.collapse
-                    : CoreIcons.checkboxOff
+                selected === -1 ? CoreIcons.collapseActive : CoreIcons.collapse
               }
-              data-selected={selected}
+              data-selected={selected === -1}
             />
-            <div className="ax-checkList__checkbox">
-              <Icon
-                data-type="positive"
-                onClick={(e) => [(onClick(id, false), e.stopPropagation())]}
-                icon={
-                  selected === 1 ? CoreIcons.expandActive : CoreIcons.expand
-                }
-                data-selected={selected === 1}
-              />
-              <Icon
-                data-type="negative"
-                onClick={(e) => [(onClick(id, true), e.stopPropagation())]}
-                icon={
-                  selected === -1
-                    ? CoreIcons.collapseActive
-                    : CoreIcons.collapse
-                }
-                data-selected={selected === -1}
-              />
-            </div>
-          </Fragment>
-        )}
-        {isValidElement(icon) && icon}
-        {isString(icon) && <Icon icon={icon} />}
-        <label>{label}</label>
-        <Badge {...badge} />
-      </div>
-    );
-  },
-);
-CheckItem.displayName = "CheckItem";
+          </div>
+        </Fragment>
+      )}
+      {isValidElement(icon) && icon}
+      {isString(icon) && <Icon icon={icon} />}
+      <label>{label}</label>
+      <Badge {...badge} />
+    </div>
+  );
+};
 
 export const CheckList: FC<CheckListProps> = ({
   items = [],
@@ -158,12 +155,19 @@ export const CheckList: FC<CheckListProps> = ({
   allowNegative,
   emptyMessage,
   sortItems = true,
-  ...props
+  selected,
+  nonselected,
+  onChange,
+  onClick,
+  ...aria
 }: CheckListProps) => {
   const { t } = useTranslation("data");
   const { selection, toggleSelection } = useSelectableList({
     items,
-    ...props,
+    selected,
+    nonselected,
+    onChange,
+    onClick,
   });
   const [showMore, setShowMore] = useState(false);
 
@@ -186,7 +190,7 @@ export const CheckList: FC<CheckListProps> = ({
   }, [items, selection, maxCount, showMore, sortItems]);
 
   return (
-    <div className="ax-checkList">
+    <div {...aria}>
       {listItems.map((item, index) => (
         <CheckItem
           {...item}

package/src/histogram/Histogram.tsx

@@ -31,6 +31,7 @@ import {
 import {
   type ColorType,
   type PaletteType,
+  type TestProps,
 } from "@react-fabric/core/dist/types/types";
 import { compareValues, Format } from "@react-fabric/utilities";
 import classNames from "classnames";
@@ -49,7 +50,7 @@ interface HistogramItem {
   disabled?: boolean;
 }
 
-export interface HistogramProps {
+export interface HistogramProps extends TestProps {
   /**
    * histogram items list
    */
@@ -88,6 +89,7 @@ export const Histogram = ({
   emptyTitle,
   emptyMessage,
   onClick,
+  ...aria
 }: HistogramProps) => {
   const { t } = useTranslation("data");
   const maxTotal = useMemo(() => {
@@ -104,6 +106,7 @@ export const Histogram = ({
   return (
     <div
       className={classes.histogram}
+      {...aria}
       style={
         {
           "--color": `var(--${color})`,
@@ -127,6 +130,7 @@ export const Histogram = ({
             classes.histoLabel,
             (item.count === 0 || item.disabled) && "pointer-events-none",
           )}
+          data-testid={item.id}
           onClick={(e) => [onClick?.(item.id), e.stopPropagation()]}
         >
           <div

package/src/index.ts

@@ -28,7 +28,7 @@ export { Histogram } from "./histogram/Histogram";
 export { JsonViewer } from "./json/JsonViewer";
 export { Pagination } from "./pagination/Pagination";
 export { Table } from "./table/Table";
-export { type TableRef } from "./table/types";
+export { type TableColumn, type TableRef } from "./table/types";
 export { TreePanel } from "./tree/TreePanel";
 export { type TreeNodeType as TreeNode } from "./tree/types";
 export { VirtualGallery, type VirtualGalleryRef } from "./virtual/Gallery";

package/src/table/AddColumn.tsx

@@ -22,13 +22,13 @@
  */
 
 import { CoreIcons, Dropdown, Icon, Menu, MenuItem } from "@react-fabric/core";
-import { type ColumnType } from "./types";
+import { type TableColumn } from "./types";
 
 export const AddColumn = ({
   columns,
   onClick,
 }: {
-  columns: ColumnType[];
+  columns: TableColumn[];
   onClick: (id: string) => void;
 }) => {
   return (

package/src/table/BodyCell.tsx

@@ -21,6 +21,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+import { DateDisplay } from "@react-fabric/date";
+import { Format, getByPath, isTrue } from "@react-fabric/utilities";
 import classNames from "classnames";
 import { useMemo } from "react";
 import { useTableContext } from "./Context";
@@ -28,15 +30,17 @@ import {
   COL_DEFAULT_WIDTH,
   COL_MAX_WIDTH,
   COL_MIN_WIDTH,
-  type ColumnType,
+  type TableColumn,
 } from "./types";
 
 export const BodyCell = ({
   column,
   item,
+  index,
 }: {
-  column: ColumnType;
+  column: TableColumn;
   item: KeyValue;
+  index: number;
 }) => {
   const { widths } = useTableContext();
 
@@ -45,6 +49,29 @@ export const BodyCell = ({
     [widths, column],
   );
 
+  const content = useMemo(() => {
+    const value = getByPath(item, column.id.toString());
+    if (column.renderer != null) {
+      return column.renderer(item[column.id], item, index);
+    }
+    if (column.dataType === "boolean") {
+      const map = column.valueMap ?? { true: "Yes", false: "no" };
+      return map[`${isTrue(value) ? "true" : "false"}`];
+    }
+    if (column.valueMap != null) {
+      if (column.dataType === "string" && value in column.valueMap) {
+        return column.valueMap[value];
+      }
+    }
+    if (column.dataType === "date") {
+      return <DateDisplay date={value} format={column.format} />;
+    }
+    if (column.dataType === "number") {
+      return Format.number(value, column.format);
+    }
+    return value ?? "";
+  }, [item, column]);
+
   return (
     <div
       className="overflow-hidden bg-inherit start-0"
@@ -61,7 +88,7 @@ export const BodyCell = ({
           column.align === "end" && "text-end",
         )}
       >
-        {column.renderer?.(item[column.id], item) ?? item[column.id]}
+        {content}
       </div>
     </div>
   );

package/src/table/BodyRow.tsx

@@ -0,0 +1,142 @@
+/*
+ * React Fabric
+ * @version: 1.0.0
+ *
+ *
+ * The MIT License (MIT)
+ * Copyright (c) 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.
+ */
+
+import classNames from "classnames";
+import { BodyCell } from "./BodyCell";
+import { CheckboxCell } from "./CheckboxCell";
+import { type TableColumn } from "./types";
+import { CoreIcons, Icon } from "@react-fabric/core";
+
+export const BodyRow = ({
+  rowKey,
+  index,
+  data,
+  keyProperty,
+  measureElement,
+  state,
+  hideableColumns,
+  wrapperStart,
+  wrapperEnd,
+  onRowClick,
+  checkableRows,
+  checked,
+  toggleChecked,
+  canExpand,
+  expanded,
+  toggleExpand,
+  expandRow,
+}: {
+  rowKey: Key;
+  index: number;
+  data: KeyValue;
+  keyProperty?: Key;
+  measureElement: AnyObject;
+  state: KeyValue<TableColumn[]>;
+  hideableColumns?: boolean;
+  wrapperStart: string;
+  wrapperEnd: string;
+  checkableRows?: boolean;
+  checked: 0 | 1;
+  onRowClick?: AnyObject;
+  canExpand?: AnyObject;
+  expandRow?: AnyObject;
+  expanded: boolean;
+  toggleExpand: (key: Key) => void;
+  toggleChecked: (key: Key) => void;
+}) => {
+  return (
+    <div
+      ref={measureElement}
+      data-index={index}
+      className={index % 2 ? "bg-even" : "bg-odd"}
+    >
+      <div
+        role="none"
+        data-row={index}
+        className={classNames(
+          "flex flex-nowrap datatable-row data-[hilight]:outline-1 -outline-offset-1 outline-primary-500",
+          onRowClick && "hover:bg-primary-50 active:bg-primary-100",
+        )}
+        onClick={() =>
+          checkableRows && keyProperty && !onRowClick
+            ? toggleChecked(data[keyProperty])
+            : onRowClick?.(data)
+        }
+      >
+        <div className={wrapperStart}>
+          {!!canExpand && (
+            <div
+              className={classNames(
+                "group font-medium w-6 flex flex-nowrap text-start items-center",
+                !canExpand(data) && "pointer-events-none opacity-35",
+              )}
+            >
+              <Icon
+                className="p-1 text-tint-700 hover:text-primary-600"
+                icon={expanded ? CoreIcons.collapse : CoreIcons.expand}
+                onClick={(e) => [
+                  keyProperty && toggleExpand(data[keyProperty]),
+                  e.stopPropagation(),
+                ]}
+              />
+            </div>
+          )}
+          {checkableRows && keyProperty && (
+            <CheckboxCell
+              onClick={() => toggleChecked(data[keyProperty])}
+              state={checked}
+            />
+          )}
+          {state.start?.map((col, ids) => (
+            <BodyCell
+              key={`${String(rowKey)}:${ids}`}
+              column={col}
+              item={data}
+              index={ids}
+            />
+          ))}
+        </div>
+        {state.cols?.map((col, idc) => (
+          <BodyCell
+            key={`${String(rowKey)}:${idc}`}
+            column={col}
+            item={data}
+            index={idc}
+          />
+        ))}
+        <div className={wrapperEnd}>
+          {state.end?.map((col, ide) => (
+            <BodyCell
+              key={`${String(rowKey)}:${ide}`}
+              column={col}
+              item={data}
+              index={ide}
+            />
+          ))}
+          {hideableColumns && <div className="w-6" />}
+        </div>
+      </div>
+      {expanded && expandRow(data)}
+    </div>
+  );
+};

package/src/table/EmptyCell.tsx

@@ -27,7 +27,7 @@ import {
   COL_DEFAULT_WIDTH,
   COL_MAX_WIDTH,
   COL_MIN_WIDTH,
-  type ColumnType,
+  type TableColumn,
 } from "./types";
 
 export const EmptyCell = ({
@@ -35,7 +35,7 @@ export const EmptyCell = ({
   width: _width,
   maxWidth,
   minWidth,
-}: ColumnType) => {
+}: TableColumn) => {
   const { widths } = useTableContext();
 
   const width = useMemo(

package/src/table/HeaderCell.tsx

@@ -35,7 +35,7 @@ import {
   COL_DEFAULT_WIDTH,
   COL_MAX_WIDTH,
   COL_MIN_WIDTH,
-  type ColumnType,
+  type TableColumn,
   type TableProps,
 } from "./types";
 
@@ -48,6 +48,7 @@ export const HeaderCell = ({
   rtlFlip,
   actions,
   locked,
+  tooltip,
   sortable,
   resizable,
   width: _width,
@@ -55,7 +56,7 @@ export const HeaderCell = ({
   minWidth,
   sort,
   onSort,
-}: ColumnType & Pick<TableProps, "sort" | "onSort">) => {
+}: TableColumn & Pick<TableProps, "sort" | "onSort">) => {
   const { startResize, widths } = useTableContext();
 
   const width = useMemo(
@@ -102,7 +103,7 @@ export const HeaderCell = ({
         maxWidth: maxWidth ?? COL_MAX_WIDTH,
       }}
     >
-      <Tooltip content={label} disabled={!label}>
+      <Tooltip content={tooltip ?? label} disabled={!(tooltip ?? label)}>
         <div className="flex-initial px-2 py-1 text-sm truncate sticky start-0">
           {icon && (
             <Icon icon={icon} bg={iconBg} color={iconColor} rtlFlip={rtlFlip} />