@adaptabletools/adaptable-cjs 23.0.0-canary.1 → 23.0.0-canary.3

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

@@ -5,6 +5,7 @@ exports.normalizeTableLayoutModel = normalizeTableLayoutModel;
 exports.normalizePivotLayoutModel = normalizePivotLayoutModel;
 exports.normalizeLayoutModel = normalizeLayoutModel;
 const isPivotLayoutModel_1 = require("./isPivotLayoutModel");
+const rowGroupDisplayType_1 = require("./rowGroupDisplayType");
 exports.AUTO_GROUP_COLUMN_ID__SINGLE = 'ag-Grid-AutoColumn';
 exports.AUTO_GROUP_COLUMN_ID__MULTI_PREFIX = 'ag-Grid-AutoColumn-';
 function normalizeTableLayoutModel(layout, options) {
@@ -66,7 +67,10 @@ function normalizeTableLayoutModel(layout, options) {
             displayType = displayType || 'single';
             layout.RowGroupDisplayType = displayType;
         }
-        if (displayType === 'single') {
+        if (displayType === 'groupRows') {
+            layout.TableColumns = layout.TableColumns.filter((colId) => !(0, rowGroupDisplayType_1.isRowGroupAutoColumnId)(colId));
+        }
+        else if (displayType === 'single') {
             if (!ColumnOrderSet.has(exports.AUTO_GROUP_COLUMN_ID__SINGLE)) {
                 layout.TableColumns = [exports.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,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rowGroupDisplayTypeToGridOption = rowGroupDisplayTypeToGridOption;
+exports.gridOptionToRowGroupDisplayType = gridOptionToRowGroupDisplayType;
+exports.isRowGroupAutoColumnId = isRowGroupAutoColumnId;
+const normalizeLayoutModel_1 = require("./normalizeLayoutModel");
+function rowGroupDisplayTypeToGridOption(displayType) {
+    switch (displayType ?? 'single') {
+        case 'multi':
+            return 'multipleColumns';
+        case 'groupRows':
+            return 'groupRows';
+        case 'single':
+        default:
+            return 'singleColumn';
+    }
+}
+function gridOptionToRowGroupDisplayType(groupDisplayType) {
+    if (groupDisplayType === 'multipleColumns') {
+        return 'multi';
+    }
+    if (groupDisplayType === 'groupRows') {
+        return 'groupRows';
+    }
+    return 'single';
+}
+function isRowGroupAutoColumnId(colId) {
+    return colId === normalizeLayoutModel_1.AUTO_GROUP_COLUMN_ID__SINGLE || colId.startsWith(normalizeLayoutModel_1.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

@@ -1,10 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.POPUP_Z_INDEX = void 0;
+exports.getFocusableElements = exports.POPUP_Z_INDEX = void 0;
 exports.cn = cn;
+exports.captureTab = captureTab;
 const clsx_1 = require("clsx");
 const twMerge_1 = require("../twMerge");
 function cn(...inputs) {
     return (0, twMerge_1.twMerge)((0, clsx_1.clsx)(inputs));
 }
 exports.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(',');
+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);
+    });
+};
+exports.getFocusableElements = getFocusableElements;
+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 = (0, exports.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();
+    }
+}

package/src/metamodel/adaptable.metamodel.d.ts

@@ -1138,11 +1138,6 @@ export declare const ADAPTABLE_METAMODEL: {
     };
     BadgePillStyle: {
         k: string;
-        p: {
-            n: string;
-            k: string;
-            o: boolean;
-        }[];
     };
     BadgeShape: {
         k: string;
@@ -3552,25 +3547,6 @@ export declare const ADAPTABLE_METAMODEL: {
     LayoutArray: {
         k: string;
     };
-    LayoutBase: {
-        k: string;
-        p: ({
-            n: string;
-            k: string;
-            o: boolean;
-            r?: undefined;
-        } | {
-            n: string;
-            k: string;
-            o: boolean;
-            r: string;
-        } | {
-            n: string;
-            k: string;
-            o?: undefined;
-            r?: undefined;
-        })[];
-    };
     LayoutChangedAction: {
         k: string;
     };
@@ -4343,12 +4319,17 @@ export declare const ADAPTABLE_METAMODEL: {
     };
     ReportScheduleRanInfo: {
         k: string;
-        p: {
+        p: ({
+            n: string;
+            k: string;
+            o?: undefined;
+            r?: undefined;
+        } | {
             n: string;
             k: string;
             o: boolean;
             r: string;
-        }[];
+        })[];
     };
     ResolveContextDataContext: {
         k: string;