@vuu-ui/vuu-utils 4.1.0 → 4.1.2

package/package.json

@@ -1,11 +1,10 @@
 {
-  "version": "4.1.0",
+  "version": "4.1.2",
   "author": "heswell",
   "main": "./src/index.js",
   "license": "Apache-2.0",
   "types": "types/index.d.ts",
   "scripts": {
-    "build:dev": "node ../../scripts/run-build.mjs",
     "build": "node ../../scripts/run-build-rslib.ts",
     "test": "vitest run",
     "type-defs": "node ../../scripts/build-type-defs.mjs"
@@ -15,14 +14,14 @@
   },
   "devDependencies": {
     "@dnd-kit/react": "^0.5.0",
-    "@vuu-ui/vuu-data-types": "4.1.0",
-    "@vuu-ui/vuu-table-types": "4.1.0",
-    "@vuu-ui/vuu-filter-types": "4.1.0",
-    "@vuu-ui/vuu-protocol-types": "4.1.0"
+    "@vuu-ui/vuu-data-types": "4.1.2",
+    "@vuu-ui/vuu-table-types": "4.1.2",
+    "@vuu-ui/vuu-filter-types": "4.1.2",
+    "@vuu-ui/vuu-protocol-types": "4.1.2"
   },
   "peerDependencies": {
     "@internationalized/date": "^3.0.0",
-    "@vuu-ui/vuu-filter-parser": "4.1.0",
+    "@vuu-ui/vuu-filter-parser": "4.1.2",
     "clsx": "^2.0.0",
     "react": "^19.2.3",
     "react-dom": "^19.2.3"

package/src/column-utils.js

@@ -526,6 +526,11 @@ const getGroupIcon = (columns, dataRow)=>{
         return getIcon?.(dataRow);
     }
 };
+const getGroupAdornment = (columns, dataRow)=>{
+    const { depth, isLeaf } = dataRow;
+    if (isLeaf || 0 === depth || depth > columns.length) return null;
+    return columns[depth - 1].getGroupAdornment?.(dataRow) ?? null;
+};
 const getGroupValue = (columns, dataRow)=>{
     const { depth, isLeaf } = dataRow;
     if (isLeaf || depth > columns.length) return null;
@@ -802,4 +807,4 @@ const columnByAriaIndex = (columns, ariaColIndex)=>{
     }
     throw Error(`no column with aria-colIndex ${ariaColIndex}`);
 };
-export { AggregationType, addColumnToSubscribedColumns, applyDefaultColumnConfig, applyGroupByToColumns, applyRuntimeColumnWidthsToConfig, applySortToColumns, applyWidthToColumns, assertAllColumnsAreIncludedInSubscription, buildColumnMap, checkConfirmationPending, columnByAriaIndex, dataAndColumnUnchanged, dataColumnAndKeyUnchanged, dataSourceRowToDataRowDto, existingSort, extractGroupColumn, findColumn, flattenColumnGroup, fromServerDataType, getAllCellsInColumn, getAriaColIndex, getAriaRowIndex, getCalculatedColumnDetails, getColumnLabel, getColumnName, getColumnStyle, getColumnsInViewport, getDefaultAlignment, getDefaultColumnType, getGroupIcon, getGroupValue, getPinStateFromElement, getRuntimeColumnWidth, getServerDataType, getTableHeadings, getTypeFormattingFromColumn, hasCustomRenderer, hasHeadings, hasValidationRules, isCalculatedColumn, isColumnTypeRenderer, isDataLoading, isDataValueEditable, isDateTimeDataType, isDateTimeDataValue, isGroupColumn, isJsonAttribute, isJsonColumn, isJsonGroup, isLookupRenderer, isMappedValueTypeRenderer, isNanoTimestampColumn, isNotHidden, isNumericColumn, isPinned, isResizing, isStringColumn, isTemporalColumn, isTextColumn, isTimeDataType, isTimeDataValue, isTimeDataValueWithMilliseconds, isTimestampColumn, isTypeDescriptor, isValidColumnAlignment, isValidPinLocation, isValueListRenderer, isVuuColumnDataType, mapSortCriteria, measurePinnedColumns, metadataKeys, moveColumnTo, projectUpdates, removeSort, replaceColumn, setAggregations, setCalculatedColumnExpression, setCalculatedColumnName, setCalculatedColumnType, sortPinnedColumns, subscribedOnly, toColumnDescriptor, toColumnName, toDataSourceColumns, updateColumn, updateColumnFormatting, updateColumnRenderProps, updateColumnType, visibleColumnAtIndex };
+export { AggregationType, addColumnToSubscribedColumns, applyDefaultColumnConfig, applyGroupByToColumns, applyRuntimeColumnWidthsToConfig, applySortToColumns, applyWidthToColumns, assertAllColumnsAreIncludedInSubscription, buildColumnMap, checkConfirmationPending, columnByAriaIndex, dataAndColumnUnchanged, dataColumnAndKeyUnchanged, dataSourceRowToDataRowDto, existingSort, extractGroupColumn, findColumn, flattenColumnGroup, fromServerDataType, getAllCellsInColumn, getAriaColIndex, getAriaRowIndex, getCalculatedColumnDetails, getColumnLabel, getColumnName, getColumnStyle, getColumnsInViewport, getDefaultAlignment, getDefaultColumnType, getGroupAdornment, getGroupIcon, getGroupValue, getPinStateFromElement, getRuntimeColumnWidth, getServerDataType, getTableHeadings, getTypeFormattingFromColumn, hasCustomRenderer, hasHeadings, hasValidationRules, isCalculatedColumn, isColumnTypeRenderer, isDataLoading, isDataValueEditable, isDateTimeDataType, isDateTimeDataValue, isGroupColumn, isJsonAttribute, isJsonColumn, isJsonGroup, isLookupRenderer, isMappedValueTypeRenderer, isNanoTimestampColumn, isNotHidden, isNumericColumn, isPinned, isResizing, isStringColumn, isTemporalColumn, isTextColumn, isTimeDataType, isTimeDataValue, isTimeDataValueWithMilliseconds, isTimestampColumn, isTypeDescriptor, isValidColumnAlignment, isValidPinLocation, isValueListRenderer, isVuuColumnDataType, mapSortCriteria, measurePinnedColumns, metadataKeys, moveColumnTo, projectUpdates, removeSort, replaceColumn, setAggregations, setCalculatedColumnExpression, setCalculatedColumnName, setCalculatedColumnType, sortPinnedColumns, subscribedOnly, toColumnDescriptor, toColumnName, toDataSourceColumns, updateColumn, updateColumnFormatting, updateColumnRenderProps, updateColumnType, visibleColumnAtIndex };

package/src/tree-utils.js

@@ -35,9 +35,9 @@ const addChildValues = (rows, treeSourceNodes, cols, iconProvider, index = {
         type: "string"
     });
     for(let i = 0; i < treeSourceNodes.length; i++, index.value += 1){
-        const { childNodes, icon, label, nodeData } = treeSourceNodes[i];
+        const { childNodes, icon, keySegment = treeSourceNodes[i].label, label, nodeData } = treeSourceNodes[i];
         const blanks = Array(depth - 1).fill("");
-        const fullKey = `${keyBase}|${label}`;
+        const fullKey = `${keyBase}|${keySegment}`;
         const row = [
             index.value,
             index.value,

package/types/column-utils.d.ts

@@ -2,7 +2,7 @@ import type { DataSourceRow, DataValueDescriptor, DataValueType, DataValueTypeSi
 import type { VuuAggType, VuuAggregation, VuuColumnDataType, VuuDataRowDto, VuuGroupBy, VuuSort } from "@vuu-ui/vuu-protocol-types";
 import { TableModel } from "@vuu-ui/vuu-table";
 import type { ColumnAlignment, ColumnDescriptor, ColumnLayout, ColumnTypeFormatting, ColumnTypeRendering, ColumnTypeWithValidationRules, DataRow, DataValueTypeDescriptor, DefaultColumnConfiguration, GroupColumnDescriptor, LookupRenderer, MappedValueTypeRenderer, PinLocation, RuntimeColumnDescriptor, TableCellRendererProps, TableConfig, TableHeadings, ValueListRenderer } from "@vuu-ui/vuu-table-types";
-import { type CSSProperties } from "react";
+import type { CSSProperties, ReactNode } from "react";
 /**
  * ColumnMap provides a lookup of the index position of a data item within a row
  * by column name.
@@ -170,6 +170,7 @@ export declare const getColumnsInViewport: (columns: RuntimeColumnDescriptor[],
 export declare const isNotHidden: (column: RuntimeColumnDescriptor) => boolean;
 export declare const visibleColumnAtIndex: (columns: RuntimeColumnDescriptor[], index: number) => RuntimeColumnDescriptor | undefined;
 export declare const getGroupIcon: (columns: RuntimeColumnDescriptor[], dataRow: DataRow) => string | undefined;
+export declare const getGroupAdornment: (columns: RuntimeColumnDescriptor[], dataRow: DataRow) => ReactNode;
 export declare const getGroupValue: (columns: RuntimeColumnDescriptor[], dataRow: DataRow) => string | null;
 export declare const getDefaultColumnType: (serverDataType?: VuuColumnDataType) => DataValueTypeSimple;
 export declare const updateColumnFormatting: <T extends ColumnDescriptor = ColumnDescriptor>(column: T, formatting: ColumnTypeFormatting) => T;

package/types/filters/filter-utils.d.ts

@@ -29,6 +29,7 @@ export declare const stripFilterFromColumns: (columns: RuntimeColumnDescriptor[]
     exportable?: boolean;
     exportFormatter?: (value: unknown, row: import("@vuu-ui/vuu-table-types").RowAccessor) => string;
     getIcon?: (row: import("@vuu-ui/vuu-table-types").DataRow) => string | undefined;
+    getGroupAdornment?: (row: import("@vuu-ui/vuu-table-types").DataRow) => import("react").ReactNode;
     groupable?: boolean;
     hidden?: boolean;
     locked?: Exclude<import("@vuu-ui/vuu-table-types").PinLocation, "left"> | false;

package/types/tree-types.d.ts

@@ -4,6 +4,11 @@ export interface TreeSourceNode<T = unknown> {
     icon?: string;
     header?: boolean;
     label: string;
+    /**
+     * Segment used to build the row key for this node, defaults to label.
+     * Allows a display label to differ from a stable key.
+     */
+    keySegment?: string;
     childNodes?: TreeSourceNode<T>[];
     /** node is rendered expanded initially */
     expanded?: boolean;