@adaptabletools/adaptable 23.0.0-canary.0 → 23.0.0-canary.10

package/src/components/ui/tooltip.d.ts

@@ -1,6 +1,7 @@
-import { Tooltip as TooltipPrimitive } from "@base-ui/react/tooltip";
-declare function TooltipProvider({ delay, ...props }: TooltipPrimitive.Provider.Props): import("react").JSX.Element;
-declare function Tooltip({ ...props }: TooltipPrimitive.Root.Props): import("react").JSX.Element;
-declare function TooltipTrigger({ ...props }: TooltipPrimitive.Trigger.Props): import("react").JSX.Element;
-declare function TooltipContent({ className, side, sideOffset, align, alignOffset, children, ...props }: TooltipPrimitive.Popup.Props & Pick<TooltipPrimitive.Positioner.Props, "align" | "alignOffset" | "side" | "sideOffset">): import("react").JSX.Element;
+import * as React from 'react';
+import { Tooltip as TooltipPrimitive } from '@base-ui/react/tooltip';
+declare function TooltipProvider({ delay, ...props }: TooltipPrimitive.Provider.Props): React.JSX.Element;
+declare function Tooltip({ ...props }: TooltipPrimitive.Root.Props): React.JSX.Element;
+declare const TooltipTrigger: React.ForwardRefExoticComponent<Omit<TooltipPrimitive.Trigger.Props<unknown>, "ref"> & React.RefAttributes<HTMLButtonElement>>;
+declare function TooltipContent({ className, side, sideOffset, align, alignOffset, children, ...props }: TooltipPrimitive.Popup.Props & Pick<TooltipPrimitive.Positioner.Props, 'align' | 'alignOffset' | 'side' | 'sideOffset'>): React.JSX.Element;
 export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };

package/src/components/ui/tooltip.js

@@ -1,16 +1,17 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Tooltip as TooltipPrimitive } from "@base-ui/react/tooltip";
-import { cn, POPUP_Z_INDEX } from "~/lib/utils";
+import * as React from 'react';
+import { Tooltip as TooltipPrimitive } from '@base-ui/react/tooltip';
+import { cn, POPUP_Z_INDEX } from '../../lib/utils';
 function TooltipProvider({ delay = 0, ...props }) {
-    return (_jsx(TooltipPrimitive.Provider, { "data-slot": "tooltip-provider", delay: delay, ...props }));
+    return _jsx(TooltipPrimitive.Provider, { "data-slot": "tooltip-provider", delay: delay, ...props });
 }
 function Tooltip({ ...props }) {
     return _jsx(TooltipPrimitive.Root, { "data-slot": "tooltip", ...props });
 }
-function TooltipTrigger({ ...props }) {
-    return _jsx(TooltipPrimitive.Trigger, { "data-slot": "tooltip-trigger", ...props });
-}
-function TooltipContent({ className, side = "top", sideOffset = 4, align = "center", alignOffset = 0, children, ...props }) {
-    return (_jsx(TooltipPrimitive.Portal, { children: _jsx(TooltipPrimitive.Positioner, { align: align, alignOffset: alignOffset, side: side, sideOffset: sideOffset, className: `twa:isolate ${POPUP_Z_INDEX}`, children: _jsxs(TooltipPrimitive.Popup, { "data-slot": "tooltip-content", className: cn("twa:z-50 twa:inline-flex twa:w-fit twa:max-w-xs twa:origin-(--transform-origin) twa:items-center twa:gap-1.5 twa:rounded-md twa:bg-foreground twa:px-3 twa:py-1.5 twa:text-xs twa:text-background twa:has-data-[slot=kbd]:pr-1.5 twa:data-[side=bottom]:slide-in-from-top-2 twa:data-[side=inline-end]:slide-in-from-left-2 twa:data-[side=inline-start]:slide-in-from-right-2 twa:data-[side=left]:slide-in-from-right-2 twa:data-[side=right]:slide-in-from-left-2 twa:data-[side=top]:slide-in-from-bottom-2 twa:**:data-[slot=kbd]:relative twa:**:data-[slot=kbd]:isolate twa:**:data-[slot=kbd]:z-50 twa:**:data-[slot=kbd]:rounded-sm twa:data-[state=delayed-open]:animate-in twa:data-[state=delayed-open]:fade-in-0 twa:data-[state=delayed-open]:zoom-in-95 twa:data-open:animate-in twa:data-open:fade-in-0 twa:data-open:zoom-in-95 twa:data-closed:animate-out twa:data-closed:fade-out-0 twa:data-closed:zoom-out-95", className), ...props, children: [children, _jsx(TooltipPrimitive.Arrow, { className: "twa:z-50 twa:size-2.5 twa:translate-y-[calc(-50%-2px)] twa:rotate-45 twa:rounded-[2px] twa:bg-foreground twa:fill-foreground twa:data-[side=bottom]:top-1 twa:data-[side=inline-end]:top-1/2! twa:data-[side=inline-end]:-left-1 twa:data-[side=inline-end]:-translate-y-1/2 twa:data-[side=inline-start]:top-1/2! twa:data-[side=inline-start]:-right-1 twa:data-[side=inline-start]:-translate-y-1/2 twa:data-[side=left]:top-1/2! twa:data-[side=left]:-right-1 twa:data-[side=left]:-translate-y-1/2 twa:data-[side=right]:top-1/2! twa:data-[side=right]:-left-1 twa:data-[side=right]:-translate-y-1/2 twa:data-[side=top]:-bottom-2.5" })] }) }) }));
+const TooltipTrigger = React.forwardRef(function TooltipTrigger({ ...props }, ref) {
+    return _jsx(TooltipPrimitive.Trigger, { "data-slot": "tooltip-trigger", ref: ref, ...props });
+});
+function TooltipContent({ className, side = 'top', sideOffset = 4, align = 'center', alignOffset = 0, children, ...props }) {
+    return (_jsx(TooltipPrimitive.Portal, { children: _jsx(TooltipPrimitive.Positioner, { align: align, alignOffset: alignOffset, side: side, sideOffset: sideOffset, className: `twa:isolate ${POPUP_Z_INDEX}`, children: _jsxs(TooltipPrimitive.Popup, { "data-slot": "tooltip-content", className: cn('twa:z-50 twa:inline-flex twa:w-fit twa:max-w-xs twa:origin-(--transform-origin) twa:items-center twa:gap-1.5 twa:rounded-md twa:bg-foreground twa:px-3 twa:py-1.5 twa:text-xs twa:text-background twa:has-data-[slot=kbd]:pr-1.5 twa:data-[side=bottom]:slide-in-from-top-2 twa:data-[side=inline-end]:slide-in-from-left-2 twa:data-[side=inline-start]:slide-in-from-right-2 twa:data-[side=left]:slide-in-from-right-2 twa:data-[side=right]:slide-in-from-left-2 twa:data-[side=top]:slide-in-from-bottom-2 twa:**:data-[slot=kbd]:relative twa:**:data-[slot=kbd]:isolate twa:**:data-[slot=kbd]:z-50 twa:**:data-[slot=kbd]:rounded-sm twa:data-[state=delayed-open]:animate-in twa:data-[state=delayed-open]:fade-in-0 twa:data-[state=delayed-open]:zoom-in-95 twa:data-open:animate-in twa:data-open:fade-in-0 twa:data-open:zoom-in-95 twa:data-closed:animate-out twa:data-closed:fade-out-0 twa:data-closed:zoom-out-95', className), ...props, children: [children, _jsx(TooltipPrimitive.Arrow, { className: "twa:z-50 twa:size-2.5 twa:translate-y-[calc(-50%-2px)] twa:rotate-45 twa:rounded-[2px] twa:bg-foreground twa:fill-foreground twa:data-[side=bottom]:top-1 twa:data-[side=inline-end]:top-1/2! twa:data-[side=inline-end]:-left-1 twa:data-[side=inline-end]:-translate-y-1/2 twa:data-[side=inline-start]:top-1/2! twa:data-[side=inline-start]:-right-1 twa:data-[side=inline-start]:-translate-y-1/2 twa:data-[side=left]:top-1/2! twa:data-[side=left]:-right-1 twa:data-[side=left]:-translate-y-1/2 twa:data-[side=right]:top-1/2! twa:data-[side=right]:-left-1 twa:data-[side=right]:-translate-y-1/2 twa:data-[side=top]:-bottom-2.5" })] }) }) }));
 }
 export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1780392679141 || Date.now(),
-    VERSION: "23.0.0-canary.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1782199086573 || Date.now(),
+    VERSION: "23.0.0-canary.10" || '--current-version--',
 };

package/src/layout-manager/src/LayoutManagerModel.d.ts

@@ -1,4 +1,4 @@
-import { ColumnSizingMap, LayoutRowSelection } from '../../AdaptableState/LayoutState';
+import { ColumnSizingMap, LayoutOpenChart, LayoutRowSelection, RowGroupDisplayType } from '../../AdaptableState/LayoutState';
 import { XOR } from '../../Utilities/Extensions/TypeExtensions';
 /**
  * Defines how a Column is sorted
@@ -17,7 +17,7 @@ export interface BaseLayoutModel {
     /**
      * @defaultValue 'single'
      */
-    RowGroupDisplayType?: 'single' | 'multi';
+    RowGroupDisplayType?: RowGroupDisplayType;
     /**
      * Those are not actually used by the LayoutManager,
      * but we need to keep them here so we can give the layout
@@ -53,6 +53,10 @@ export interface BaseLayoutModel {
     Ignore_AdaptableVersion?: string;
     Ignore_Uuid?: string;
     Ignore_Metadata?: any;
+    /**
+     * AG Grid charts to open when this layout is selected (not used by LayoutManager)
+     */
+    Ignore_OpenCharts?: LayoutOpenChart[];
     /**
      * The Layout Name
      */

package/src/layout-manager/src/index.js

@@ -2,6 +2,7 @@ import { debounce, DeepMap } from '@infinite-table/infinite-react';
 import { isPivotLayoutModel } from './isPivotLayoutModel';
 import { LMEmitter } from './LMEmitter';
 import { AUTO_GROUP_COLUMN_ID__MULTI_PREFIX, AUTO_GROUP_COLUMN_ID__SINGLE, normalizeLayoutModel, normalizePivotLayoutModel, normalizeTableLayoutModel, } from './normalizeLayoutModel';
+import { gridOptionToRowGroupDisplayType, rowGroupDisplayTypeToGridOption, } from './rowGroupDisplayType';
 import { getChanges, isLayoutEqual } from './isLayoutEqual';
 import { simplifyLayoutModel, simplifyPivotLayoutModel, simplifyTableLayoutModel, } from './simplifyLayoutModel';
 import { sortColumnIdsByOrder } from './sortColumnIdsByOrder';
@@ -9,7 +10,6 @@ import { destructurePivotColumnId } from './destructurePivotColumnId';
 import { isPivotAggTotalColumn } from './isPivotAggTotalColumn';
 import { isPivotGrandTotal } from './isPivotGrandTotal';
 import { isPivotColumnTotal } from './isPivotColumnTotal';
-import { isParameterizedAggFuncName } from '../../Aggregation/ParameterizedAggregationRegistry';
 import { getMarker } from '../../devTools';
 export const PIVOT_ANY_TOTAL_COL_TYPE = 'pivotAnyTotal';
 export const PIVOT_GRAND_TOTAL_COL_TYPE = 'pivotGrandTotal';
@@ -490,9 +490,13 @@ export class LayoutManager extends LMEmitter {
             // if it's different from the initial default column width
             else if (colState.width && initialWidth != colState.width) {
                 const colSizing = { ...ColumnSizing[colId] };
-                delete colSizing.Flex;
-                colSizing.Width = colState.width;
-                ColumnSizing[colId] = colSizing;
+                // Flex columns often report a computed width without flex in column state —
+                // keep explicit Flex sizing from the layout instead of replacing it with pixels.
+                if (colSizing.Flex == null) {
+                    delete colSizing.Flex;
+                    colSizing.Width = colState.width;
+                    ColumnSizing[colId] = colSizing;
+                }
             }
             if (colState.hide) {
                 acc[colId] = false;
@@ -522,24 +526,18 @@ export class LayoutManager extends LMEmitter {
             });
         }
         if (gridState.aggregation) {
-            TableAggregationColumns = gridState.aggregation.aggregationModel
-                .map((agg) => {
+            TableAggregationColumns = gridState.aggregation.aggregationModel.map((agg) => {
                 const prevAggForColumn = prevAggColumnsMap?.[agg.colId];
                 if (prevAggForColumn && prevAggForColumn.AggFunc.aggFunc === agg.aggFunc) {
                     return prevAggForColumn;
                 }
-                // Parameterized aggs require layout metadata (e.g. weight column); ignore incomplete picks.
-                if (isParameterizedAggFuncName(agg.aggFunc)) {
-                    return prevAggForColumn ?? null;
-                }
                 return {
                     ColumnId: agg.colId,
                     AggFunc: {
                         aggFunc: agg.aggFunc,
                     },
                 };
-            })
-                .filter(Boolean);
+            });
         }
         // if there's a current layout set
         // we want to only return the AG Grid columns that are also in the current layout
@@ -552,7 +550,7 @@ export class LayoutManager extends LMEmitter {
                 if (groupDisplayType === 'singleColumn') {
                     colsInLayout.add(AUTO_GROUP_COLUMN_ID__SINGLE);
                 }
-                else {
+                else if (groupDisplayType === 'multipleColumns') {
                     this.currentLayout.RowGroupedColumns.forEach((colId) => {
                         colsInLayout.add(`${AUTO_GROUP_COLUMN_ID__MULTI_PREFIX}${colId}`);
                     });
@@ -760,7 +758,7 @@ export class LayoutManager extends LMEmitter {
             ColumnGroupValues,
             GrandTotalRow: this.gridApi.getGridOption('grandTotalRow'),
             SuppressAggFuncInHeader: this.gridApi.getGridOption('suppressAggFuncInHeader'),
-            RowGroupDisplayType: this.gridApi.getGridOption('groupDisplayType') === 'multipleColumns' ? 'multi' : 'single',
+            RowGroupDisplayType: gridOptionToRowGroupDisplayType(this.gridApi.getGridOption('groupDisplayType')),
             RowSelection: this.getRowSelectionFromGrid(),
         });
         return layout;
@@ -1314,7 +1312,7 @@ export class LayoutManager extends LMEmitter {
             // this.gridApi.applyColumnState(state);
             const hasGroupedColumns = layout.RowGroupedColumns && layout.RowGroupedColumns.length;
             if (hasGroupedColumns) {
-                const displayTypeFromLayout = layout.RowGroupDisplayType === 'multi' ? 'multipleColumns' : 'singleColumn';
+                const displayTypeFromLayout = rowGroupDisplayTypeToGridOption(layout.RowGroupDisplayType);
                 const groupDisplayType = this.gridApi.getGridOption('groupDisplayType');
                 if (groupDisplayType !== displayTypeFromLayout) {
                     this.gridApi.setGridOption('groupDisplayType', displayTypeFromLayout);
@@ -1677,7 +1675,7 @@ export class LayoutManager extends LMEmitter {
             this.applyPivotTotals(layout);
             const hasGroupedColumns = layout.PivotGroupedColumns && !!layout.PivotGroupedColumns.length;
             if (hasGroupedColumns) {
-                const displayTypeFromLayout = layout.RowGroupDisplayType === 'multi' ? 'multipleColumns' : 'singleColumn';
+                const displayTypeFromLayout = rowGroupDisplayTypeToGridOption(layout.RowGroupDisplayType);
                 const groupDisplayType = this.gridApi.getGridOption('groupDisplayType');
                 if (groupDisplayType !== displayTypeFromLayout) {
                     this.gridApi.setGridOption('groupDisplayType', displayTypeFromLayout);

package/src/layout-manager/src/isLayoutEqual.js

@@ -1,4 +1,4 @@
-import isDeepEqual from '../../Utilities/utils/isEqual';
+import { isEqual as isDeepEqual } from '../../Utilities/Extensions/ObjectExtensions';
 import { debug as debugFactory } from '@infinite-table/infinite-react';
 import { isPivotLayoutModel } from './isPivotLayoutModel';
 import { normalizePivotLayoutModel, normalizeTableLayoutModel } from './normalizeLayoutModel';

package/src/layout-manager/src/normalizeLayoutModel.js

@@ -1,4 +1,5 @@
 import { isPivotLayoutModel } from './isPivotLayoutModel';
+import { isRowGroupAutoColumnId } from './rowGroupDisplayType';
 export const AUTO_GROUP_COLUMN_ID__SINGLE = 'ag-Grid-AutoColumn';
 export const AUTO_GROUP_COLUMN_ID__MULTI_PREFIX = 'ag-Grid-AutoColumn-';
 export function normalizeTableLayoutModel(layout, options) {
@@ -60,7 +61,10 @@ export function normalizeTableLayoutModel(layout, options) {
             displayType = displayType || 'single';
             layout.RowGroupDisplayType = displayType;
         }
-        if (displayType === 'single') {
+        if (displayType === 'groupRows') {
+            layout.TableColumns = layout.TableColumns.filter((colId) => !isRowGroupAutoColumnId(colId));
+        }
+        else if (displayType === 'single') {
             if (!ColumnOrderSet.has(AUTO_GROUP_COLUMN_ID__SINGLE)) {
                 layout.TableColumns = [AUTO_GROUP_COLUMN_ID__SINGLE, ...layout.TableColumns];
             }

package/src/layout-manager/src/rowGroupDisplayType.d.ts

@@ -0,0 +1,6 @@
+import { GridOptions } from 'ag-grid-enterprise';
+import { RowGroupDisplayType } from '../../AdaptableState/LayoutState';
+export type { RowGroupDisplayType };
+export declare function rowGroupDisplayTypeToGridOption(displayType: RowGroupDisplayType | undefined): GridOptions['groupDisplayType'];
+export declare function gridOptionToRowGroupDisplayType(groupDisplayType: GridOptions['groupDisplayType'] | undefined): RowGroupDisplayType;
+export declare function isRowGroupAutoColumnId(colId: string): boolean;

package/src/layout-manager/src/rowGroupDisplayType.js

@@ -0,0 +1,24 @@
+import { AUTO_GROUP_COLUMN_ID__MULTI_PREFIX, AUTO_GROUP_COLUMN_ID__SINGLE, } from './normalizeLayoutModel';
+export function rowGroupDisplayTypeToGridOption(displayType) {
+    switch (displayType ?? 'single') {
+        case 'multi':
+            return 'multipleColumns';
+        case 'groupRows':
+            return 'groupRows';
+        case 'single':
+        default:
+            return 'singleColumn';
+    }
+}
+export function gridOptionToRowGroupDisplayType(groupDisplayType) {
+    if (groupDisplayType === 'multipleColumns') {
+        return 'multi';
+    }
+    if (groupDisplayType === 'groupRows') {
+        return 'groupRows';
+    }
+    return 'single';
+}
+export function isRowGroupAutoColumnId(colId) {
+    return colId === AUTO_GROUP_COLUMN_ID__SINGLE || colId.startsWith(AUTO_GROUP_COLUMN_ID__MULTI_PREFIX);
+}

package/src/lib/utils.d.ts

@@ -1,3 +1,23 @@
 import { type ClassValue } from 'clsx';
 export declare function cn(...inputs: ClassValue[]): string;
 export declare const POPUP_Z_INDEX = "twa:z-[9999999]";
+export declare const getFocusableElements: (root: HTMLElement) => HTMLElement[];
+type CaptureTabEvent = Pick<KeyboardEvent, 'key' | 'shiftKey' | 'preventDefault'>;
+type CaptureTabTarget = HTMLElement | null | {
+    current: HTMLElement | null;
+};
+/**
+ * Traps Tab / Shift+Tab navigation within `node` so focus cycles between the
+ * first and last focusable elements instead of escaping the container.
+ *
+ * Only acts when the currently focused element is within `node` — popups that
+ * portal elsewhere (selects, datepickers) keep managing their own navigation.
+ *
+ * `node` may be an element directly or a React ref to one.
+ *
+ * Can be called directly (`captureTab(node, event)`) or curried by omitting the
+ * event (`captureTab(node)`) to get a handler that only expects the event.
+ */
+export declare function captureTab(node: CaptureTabTarget): (event: CaptureTabEvent) => void;
+export declare function captureTab(node: CaptureTabTarget, event: CaptureTabEvent): void;
+export {};

package/src/lib/utils.js

@@ -4,3 +4,48 @@ export function cn(...inputs) {
     return twMerge(clsx(inputs));
 }
 export const POPUP_Z_INDEX = 'twa:z-[9999999]';
+const FOCUSABLE_SELECTOR = [
+    'a[href]',
+    'button:not([disabled])',
+    'input:not([disabled])',
+    'select:not([disabled])',
+    'textarea:not([disabled])',
+    '[tabindex]:not([tabindex="-1"])',
+].join(',');
+export const getFocusableElements = (root) => {
+    return Array.from(root.querySelectorAll(FOCUSABLE_SELECTOR)).filter((el) => {
+        if (el.hasAttribute('disabled') || el.getAttribute('aria-hidden') === 'true') {
+            return false;
+        }
+        // ignore elements that aren't actually rendered (e.g. display:none)
+        return !!(el.offsetWidth || el.offsetHeight || el.getClientRects().length);
+    });
+};
+export function captureTab(node, event) {
+    if (event === undefined) {
+        return (deferredEvent) => captureTab(node, deferredEvent);
+    }
+    if (event.key !== 'Tab')
+        return;
+    const root = node instanceof HTMLElement ? node : (node?.current ?? null);
+    if (!root)
+        return;
+    const active = document.activeElement;
+    if (!active || !root.contains(active))
+        return;
+    const focusable = getFocusableElements(root);
+    if (focusable.length === 0)
+        return;
+    const first = focusable[0];
+    const last = focusable[focusable.length - 1];
+    if (event.shiftKey) {
+        if (active === first) {
+            event.preventDefault();
+            last.focus();
+        }
+    }
+    else if (active === last) {
+        event.preventDefault();
+        first.focus();
+    }
+}