@adaptabletools/adaptable 23.0.0-canary.1 → 23.0.0-canary.2

package/index.css

@@ -6975,93 +6975,43 @@
   .ab-Datepicker-Overlay .rdp-focusable {
     cursor: pointer;
   }
-  .ab-Datepicker-Overlay {
-    @keyframes rdp-slide_in_left {
-      0% {
-        transform: translateX(-100%);
-      }
-      100% {
-        transform: translateX(0);
-      }
-    }
-    @keyframes rdp-slide_in_right {
-      0% {
-        transform: translateX(100%);
-      }
-      100% {
-        transform: translateX(0);
-      }
-    }
-    @keyframes rdp-slide_out_left {
-      0% {
-        transform: translateX(0);
-      }
-      100% {
-        transform: translateX(-100%);
-      }
-    }
-    @keyframes rdp-slide_out_right {
-      0% {
-        transform: translateX(0);
-      }
-      100% {
-        transform: translateX(100%);
-      }
-    }
-  }
+  .ab-Datepicker-Overlay {}
   .ab-Datepicker-Overlay .rdp-weeks_before_enter {
-    animation: rdp-slide_in_left var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-slide_in_left var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay .rdp-weeks_before_exit {
-    animation: rdp-slide_out_left var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-slide_out_left var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay .rdp-weeks_after_enter {
-    animation: rdp-slide_in_right var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-slide_in_right var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay .rdp-weeks_after_exit {
-    animation: rdp-slide_out_right var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-slide_out_right var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay .rdp-root[dir="rtl"] .rdp-weeks_after_enter {
-    animation: rdp-slide_in_left var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-slide_in_left var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay .rdp-root[dir="rtl"] .rdp-weeks_before_exit {
-    animation: rdp-slide_out_right var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-slide_out_right var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay .rdp-root[dir="rtl"] .rdp-weeks_before_enter {
-    animation: rdp-slide_in_right var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-slide_in_right var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay .rdp-root[dir="rtl"] .rdp-weeks_after_exit {
-    animation: rdp-slide_out_left var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
-  }
-  .ab-Datepicker-Overlay {
-    @keyframes rdp-fade_in {
-      from {
-        opacity: 0;
-      }
-      to {
-        opacity: 1;
-      }
-    }
-    @keyframes rdp-fade_out {
-      from {
-        opacity: 1;
-      }
-      to {
-        opacity: 0;
-      }
-    }
+    animation: ab-rdp-slide_out_left var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
+  .ab-Datepicker-Overlay {}
   .ab-Datepicker-Overlay .rdp-caption_after_enter {
-    animation: rdp-fade_in var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-fade_in var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay .rdp-caption_after_exit {
-    animation: rdp-fade_out var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-fade_out var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay .rdp-caption_before_enter {
-    animation: rdp-fade_in var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-fade_in var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay .rdp-caption_before_exit {
-    animation: rdp-fade_out var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
+    animation: ab-rdp-fade_out var(--rdp-animation_duration) var(--rdp-animation_timing) forwards;
   }
   .ab-Datepicker-Overlay {
     border: var(--ab-cmp-datepicker__border);
@@ -8701,3 +8651,51 @@
     }
   }
 }
+@keyframes ab-rdp-slide_in_left {
+  0% {
+    transform: translateX(-100%);
+  }
+  100% {
+    transform: translateX(0);
+  }
+}
+@keyframes ab-rdp-slide_in_right {
+  0% {
+    transform: translateX(100%);
+  }
+  100% {
+    transform: translateX(0);
+  }
+}
+@keyframes ab-rdp-slide_out_left {
+  0% {
+    transform: translateX(0);
+  }
+  100% {
+    transform: translateX(-100%);
+  }
+}
+@keyframes ab-rdp-slide_out_right {
+  0% {
+    transform: translateX(0);
+  }
+  100% {
+    transform: translateX(100%);
+  }
+}
+@keyframes ab-rdp-fade_in {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+@keyframes ab-rdp-fade_out {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "23.0.0-canary.1",
+  "version": "23.0.0-canary.2",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableState/LayoutState.d.ts

@@ -44,6 +44,10 @@ export interface LayoutState extends BaseState {
 /**
  * Base object for both Table and Pivot Layouts
  */
+/**
+ * How row groups are displayed in a Layout (maps to AG Grid `groupDisplayType`).
+ */
+export type RowGroupDisplayType = 'single' | 'multi' | 'groupRows';
 export interface LayoutBase extends AdaptableObject {
     /**
      * Name of the Layout as it appears in the Layout toolbar and tool panel
@@ -101,10 +105,7 @@ export interface LayoutBase extends AdaptableObject {
      * Position of the Grand Total Row in the Layout
      */
     GrandTotalRow?: 'top' | 'bottom' | 'pinnedTop' | 'pinnedBottom' | boolean;
-    /**
-     * Display Row Grouped Columns as 'single' or 'multi' column
-     */
-    RowGroupDisplayType?: 'single' | 'multi';
+    RowGroupDisplayType?: RowGroupDisplayType;
 }
 /**
  * Defines a Table-based Layout

package/src/AdaptableState/StyledColumnState.d.ts

@@ -1,6 +1,6 @@
 import { BaseState } from './BaseState';
 import { AdaptablePredicate, AdaptableBooleanQuery, AdaptableIcon } from '../types';
-import { CellBoxStyle, CellFontStyle } from './Common/AdaptableStyle';
+import { AdaptableStyle, CellBoxStyle, CellFontStyle } from './Common/AdaptableStyle';
 import { TypeHint } from './Common/Types';
 import { RowScope } from './Common/RowScope';
 import { AgSparklineOptions } from 'ag-charts-types';
@@ -367,23 +367,14 @@ export type SystemBadgeStylePredicateIds = SystemBadgeStylePredicateId[];
 export interface BadgeStylePredicate extends AdaptablePredicate {
     PredicateId: TypeHint<string, SystemBadgeStylePredicateId>;
 }
+/** Keys copied from legacy `BadgeStyleDefinition.Style` (`AdaptableStyle`) into `PillStyle`. */
+export declare const BADGE_PILL_STYLE_KEYS: readonly ["BackColor", "ForeColor", "BorderColor", "FontWeight", "FontStyle", "TextDecoration"];
 /**
- * Visual styling applied to a single Badge "pill" (subset of `AdaptableStyle`)
+ * Visual styling applied to a single Badge pill — an explicit subset of
+ * {@link AdaptableStyle}. Not used: `BorderRadius` ({@link BadgeShape}),
+ * `Alignment` / `FontSize` / `ClassName` (column-level or unsupported).
  */
-export interface BadgePillStyle {
-    /** Pill background colour. */
-    BackColor?: string;
-    /** Pill text/icon colour. */
-    ForeColor?: string;
-    /** Pill border colour (a subtle 1px border is drawn when set). */
-    BorderColor?: string;
-    /** Whether the pill text is bold. */
-    FontWeight?: 'Normal' | 'Bold';
-    /** Whether the pill text is italic. */
-    FontStyle?: 'Normal' | 'Italic';
-    /** Optional decoration (underline / line-through / overline). */
-    TextDecoration?: 'None' | 'Underline' | 'Overline' | 'LineThrough';
-}
+export type BadgePillStyle = Pick<AdaptableStyle, (typeof BADGE_PILL_STYLE_KEYS)[number]>;
 /**
  * Visual shape of a Badge; convenience shorthand that resolves to a border radius without having to pick a pixel value
  */

package/src/AdaptableState/StyledColumnState.js

@@ -1 +1,9 @@
-export {};
+/** Keys copied from legacy `BadgeStyleDefinition.Style` (`AdaptableStyle`) into `PillStyle`. */
+export const BADGE_PILL_STYLE_KEYS = [
+    'BackColor',
+    'ForeColor',
+    'BorderColor',
+    'FontWeight',
+    'FontStyle',
+    'TextDecoration',
+];

package/src/View/Layout/Wizard/sections/ColumnsSection.js

@@ -189,7 +189,7 @@ export const ColumnsSection = (props) => {
         if (layout.RowGroupDisplayType === 'single') {
             allColumns.unshift(generateAutoRowGroupSingleColumn());
         }
-        else {
+        else if (layout.RowGroupDisplayType === 'multi') {
             [...layout.RowGroupedColumns].reverse().forEach((col) => {
                 const groupCol = generateAutoRowGroupColumnForColumn(adaptable.api.columnApi.getColumnWithColumnId(col));
                 allColumns.unshift(groupCol);

package/src/View/Layout/Wizard/sections/RowGroupingSection.js

@@ -73,9 +73,13 @@ export const RowGroupingSection = (props) => {
                                     if (RowGroupDisplayType === 'single') {
                                         newLayout.TableColumns = (newLayout.TableColumns || []).filter((colId) => !adaptable.api.columnApi.isAutoRowGroupColumnForMulti(colId));
                                     }
-                                    else {
+                                    else if (RowGroupDisplayType === 'multi') {
                                         newLayout.TableColumns = (newLayout.TableColumns || []).filter((colId) => !adaptable.api.columnApi.isAutoRowGroupColumnForSingle(colId));
                                     }
+                                    else {
+                                        newLayout.TableColumns = (newLayout.TableColumns || []).filter((colId) => !adaptable.api.columnApi.isAutoRowGroupColumnForSingle(colId) &&
+                                            !adaptable.api.columnApi.isAutoRowGroupColumnForMulti(colId));
+                                    }
                                     onChange(newLayout);
-                                }, children: [_jsx(TypeRadio, { value: "single", text: "Single Column", description: "All Row Grouped Columns display in one hierarchical Column" }), _jsx(TypeRadio, { value: "multi", text: "Multiple Columns", description: "Each Row Grouped Column displays in its own, separate, Column" })] }) }) })] }), _jsxs(Tabs, { className: "twa:mt-2", children: [_jsx(Tabs.Tab, { children: "Row Grouped Columns" }), _jsx(Tabs.Tab, { children: rowGroupsText }), _jsx(Tabs.Content, { children: _jsx(ValueSelector, { showFilterInput: true, filter: columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => option.friendlyName ?? option.columnId, toListLabel: (option) => (_jsxs(Flex, { alignItems: "center", children: [option.friendlyName ?? option.columnId, _jsx(ColumnGroupTag, { column: option })] })), options: sortedGroupableColumns, value: layout.RowGroupedColumns ?? [], allowReorder: true, onChange: handleColumnsChange }) }), _jsx(Tabs.Content, { children: _jsx(RowGroupBehaviorSection, { layout: layout, onChange: onChange }) })] })] }));
+                                }, children: [_jsx(TypeRadio, { value: "single", text: "Single Column", description: "All Row Grouped Columns display in one hierarchical Column" }), _jsx(TypeRadio, { value: "multi", text: "Multiple Columns", description: "Each Row Grouped Column displays in its own, separate, Column" }), _jsx(TypeRadio, { value: "groupRows", text: "Full Width Group Rows", description: "Row groups display as full-width rows (no group column and no aggregations)" })] }) }) })] }), _jsxs(Tabs, { className: "twa:mt-2", children: [_jsx(Tabs.Tab, { children: "Row Grouped Columns" }), _jsx(Tabs.Tab, { children: rowGroupsText }), _jsx(Tabs.Content, { children: _jsx(ValueSelector, { showFilterInput: true, filter: columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => option.friendlyName ?? option.columnId, toListLabel: (option) => (_jsxs(Flex, { alignItems: "center", children: [option.friendlyName ?? option.columnId, _jsx(ColumnGroupTag, { column: option })] })), options: sortedGroupableColumns, value: layout.RowGroupedColumns ?? [], allowReorder: true, onChange: handleColumnsChange }) }), _jsx(Tabs.Content, { children: _jsx(RowGroupBehaviorSection, { layout: layout, onChange: onChange }) })] })] }));
 };

package/src/View/renderWithAdaptableContext.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Provider } from 'react-redux';
 import AdaptableContext from './AdaptableContext';
 import { WithAdaptableComputedCSSVars } from './AdaptableComputedCSSVarsContext';
-import { TooltipProvider } from "../components/ui/tooltip";
+import { TooltipProvider } from '../components/ui/tooltip';
 export const renderWithAdaptableContext = (children, adaptable) => {
     return (_jsx(TooltipProvider, { delay: 300, children: _jsx(Provider, { store: adaptable.adaptableStore.TheStore, children: _jsx(WithAdaptableComputedCSSVars, { children: _jsx(AdaptableContext.Provider, { value: adaptable, children: children }) }) }) }));
 };

package/src/agGrid/AdaptableAgGrid.js

@@ -96,6 +96,7 @@ import { FlashingCellService } from '../Utilities/Services/FlashingCellService';
 import { AgGridExportAdapter } from './AgGridExportAdapter';
 import { checkForDuplicateColumns, getLayoutRowGroupValuesExceptionGroupKeys, isPivotLayout, layoutModelToLayoutState, layoutStateToLayoutModel, normalizeLayout, } from '../Api/Implementation/LayoutHelpers';
 import { LayoutManager } from '../layout-manager/src';
+import { rowGroupDisplayTypeToGridOption } from '../layout-manager/src/rowGroupDisplayType';
 import { isPivotLayoutModel } from '../layout-manager/src/isPivotLayoutModel';
 import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, HIDDEN_COLUMN_TYPE, hiddenColDefConfig, PIVOT_AGGREGATION_TOTAL_COLUMN_TYPE, PIVOT_ANY_TOTAL_COLUMN_TYPE, PIVOT_COLUMN_TOTAL_COLUMN_TYPE, PIVOT_GRAND_TOTAL_COLUMN_TYPE, } from '../AdaptableState/Common/AdaptableColumn';
 import { agGridDataTypeDefinitions } from './agGridDataTypeDefinitions';
@@ -461,8 +462,7 @@ export class AdaptableAgGrid {
             if (isPivotLayoutModel(layoutModel)) {
                 gridOptions.pivotDefaultExpanded = layoutModel.PivotExpandLevel;
             }
-            gridOptions.groupDisplayType =
-                layoutModel.RowGroupDisplayType === 'multi' ? 'multipleColumns' : 'singleColumn';
+            gridOptions.groupDisplayType = rowGroupDisplayTypeToGridOption(layoutModel.RowGroupDisplayType);
             // fixes issue #3053
             gridOptions.suppressAggFuncInHeader = !!layoutModel.SuppressAggFuncInHeader;
             if (!isPivotLayoutModel(layoutModel) &&

package/src/components/Combobox/index.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { Combobox, ComboboxChip, ComboboxChips, ComboboxChipsInput, ComboboxClear, ComboboxCollection, ComboboxContent, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxLabel, ComboboxList, ComboboxPrimitive, ComboboxSeparator, ComboboxTrigger, ComboboxValue, useComboboxAnchor, RESIZABLE_VIRTUALIZED_LIST_CLASS, } from "../ui/combobox";
+import { Combobox, ComboboxChip, ComboboxChips, ComboboxChipsInput, ComboboxClear, ComboboxCollection, ComboboxContent, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxLabel, ComboboxList, ComboboxPrimitive, ComboboxSeparator, ComboboxTrigger, ComboboxValue, useComboboxAnchor, RESIZABLE_VIRTUALIZED_LIST_CLASS, } from '../ui/combobox';
 import { cn } from '../../lib/utils';
 import { ChevronDownIcon, Loader2Icon, PlusIcon } from 'lucide-react';
 import { useMemo } from 'react';

package/src/components/Datepicker/index.js

@@ -9,10 +9,10 @@ import { useDatepickerContext } from './DatepickerContext';
 import { AdaptableDateInlineInput } from '../../View/Components/AdaptableInput/AdaptableDateInlineInput';
 import { isValid, addYears, endOfYear, startOfYear, addDays, addBusinessDays, } from 'date-fns';
 import { Flex } from '../Flex';
-import { cn } from "../../lib/utils";
-import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
-import { Calendar } from "../ui/calendar";
-import { InputGroup, InputGroupAddon } from "../ui/input-group";
+import { cn } from '../../lib/utils';
+import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
+import { Calendar } from '../ui/calendar';
+import { InputGroup, InputGroupAddon } from '../ui/input-group';
 import { SingleSelect } from '../NewSelect';
 import { targetOwn } from '../twUtils';
 // ── Caption dropdown components (month/year) ──────────────────────────

package/src/components/NewDropdownButton/index.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger, } from "../ui/dropdown-menu";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger, } from '../ui/dropdown-menu';
 import { NewTooltip } from '../NewTooltip';
 import { cn } from '../../lib/utils';
 import { ChevronDownIcon } from 'lucide-react';

package/src/components/NewSelect/index.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectSeparator, SelectTrigger, SelectValue, } from "../ui/select";
-import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip";
+import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectSeparator, SelectTrigger, SelectValue, } from '../ui/select';
+import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip';
 import { cn } from '../../lib/utils';
 import React from 'react';
 const getItemTitle = (label, value) => {

package/src/components/NewTooltip/index.js

@@ -1,5 +1,5 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Tooltip, TooltipTrigger, TooltipContent } from "../ui/tooltip";
+import { Tooltip, TooltipTrigger, TooltipContent } from '../ui/tooltip';
 export function NewTooltip({ label, children, side, align }) {
     if (!label) {
         return _jsx(_Fragment, { children: children });

package/src/components/ui/button.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Button as ButtonPrimitive } from '@base-ui/react/button';
 import { cva } from 'class-variance-authority';
-import { cn } from "../../lib/utils";
+import { cn } from '../../lib/utils';
 const buttonVariants = cva('twa:group/button twa:inline-flex twa:shrink-0 twa:items-center twa:justify-center twa:rounded-button twa:border twa:border-transparent twa:bg-clip-padding twa:text-sm twa:font-medium twa:whitespace-nowrap twa:transition-all twa:outline-none twa:select-none twa:focus-visible:border-ring twa:focus-visible:ring-3 twa:focus-visible:ring-ring/50 twa:active:translate-y-px twa:disabled:pointer-events-none twa:disabled:opacity-50 twa:aria-invalid:border-destructive twa:aria-invalid:ring-3 twa:aria-invalid:ring-destructive/20 twa:dark:aria-invalid:border-destructive/50 twa:dark:aria-invalid:ring-destructive/40 twa:[&_svg]:pointer-events-none twa:[&_svg]:shrink-0 twa:[&_svg:not([class*=size-])]:size-4', {
     variants: {
         variant: {

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { DayPicker } from 'react-day-picker';
-import { Button } from "./button";
+import { Button } from './button';
 declare function Calendar({ className, classNames, showOutsideDays, captionLayout, buttonVariant, locale, formatters, components, ...props }: React.ComponentProps<typeof DayPicker> & {
     buttonVariant?: React.ComponentProps<typeof Button>['variant'];
 }): React.JSX.Element;

package/src/components/ui/calendar.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { DayPicker, getDefaultClassNames, useDayPicker, } from 'react-day-picker';
-import { cn } from "../../lib/utils";
-import { Button, buttonVariants } from "./button";
+import { cn } from '../../lib/utils';
+import { Button, buttonVariants } from './button';
 import { ChevronLeftIcon, ChevronRightIcon, ChevronDownIcon } from 'lucide-react';
 const CalendarRoot = ({ className, rootRef, ...props }) => {
     return _jsx("div", { "data-slot": "calendar", ref: rootRef, className: cn(className), ...props });

package/src/components/ui/combobox.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { Combobox as ComboboxPrimitive } from '@base-ui/react';
-import { cn, POPUP_Z_INDEX } from "../../lib/utils";
-import { Button } from "./button";
-import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput, } from "./input-group";
+import { cn, POPUP_Z_INDEX } from '../../lib/utils';
+import { Button } from './button';
+import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput, } from './input-group';
 import { CheckIcon, ChevronDownIcon, XIcon, Loader2Icon } from 'lucide-react';
 import { CheckBox } from '../CheckBox';
 const useFilteredItems = ComboboxPrimitive.useFilteredItems;

package/src/components/ui/dropdown-menu.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Menu as MenuPrimitive } from '@base-ui/react/menu';
-import { cn, POPUP_Z_INDEX } from "../../lib/utils";
+import { cn, POPUP_Z_INDEX } from '../../lib/utils';
 import { ChevronRightIcon, CheckIcon } from 'lucide-react';
 function DropdownMenu({ ...props }) {
     return _jsx(MenuPrimitive.Root, { "data-slot": "dropdown-menu", ...props });

package/src/components/ui/input-group.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { type VariantProps } from 'class-variance-authority';
-import { Button } from "./button";
+import { Button } from './button';
 declare function InputGroup({ className, ...props }: React.ComponentProps<'div'>): React.JSX.Element;
 declare const inputGroupAddonVariants: (props?: {
     align?: "inline-end" | "inline-start" | "block-end" | "block-start";

package/src/components/ui/input-group.js

@@ -1,10 +1,10 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { cva } from 'class-variance-authority';
-import { cn } from "../../lib/utils";
-import { Button } from "./button";
-import { Input } from "./input";
-import { Textarea } from "./textarea";
+import { cn } from '../../lib/utils';
+import { Button } from './button';
+import { Input } from './input';
+import { Textarea } from './textarea';
 function InputGroup({ className, ...props }) {
     return (_jsx("div", { "data-slot": "input-group", role: "group", className: cn('twa:group/input-group twa:relative twa:flex twa:h-input twa:w-full twa:min-w-0 twa:items-center twa:rounded-input twa:border twa:border-input twa:shadow-xs twa:transition-[color,box-shadow] twa:outline-none twa:in-data-[slot=combobox-content]:focus-within:border-inherit twa:in-data-[slot=combobox-content]:focus-within:ring-0 twa:has-[[data-slot=input-group-control]:focus-visible]:border-ring twa:has-[[data-slot=input-group-control]:focus-visible]:ring-3 twa:has-[[data-slot=input-group-control]:focus-visible]:ring-ring/50 twa:has-[[data-slot][aria-invalid=true]]:border-destructive twa:has-[[data-slot][aria-invalid=true]]:ring-3 twa:has-[[data-slot][aria-invalid=true]]:ring-destructive/20 twa:has-[>[data-align=block-end]]:h-auto twa:has-[>[data-align=block-end]]:flex-col twa:has-[>[data-align=block-start]]:h-auto twa:has-[>[data-align=block-start]]:flex-col twa:has-[>textarea]:h-auto twa:dark:bg-input/30 twa:dark:has-[[data-slot][aria-invalid=true]]:ring-destructive/40 twa:has-[>[data-align=block-end]]:[&>input]:pt-3 twa:has-[>[data-align=block-start]]:[&>input]:pb-3 twa:has-[>[data-align=inline-end]]:[&>input]:pr-1.5 twa:has-[>[data-align=inline-start]]:[&>input]:pl-1.5', className), ...props }));
 }

package/src/components/ui/input.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Input as InputPrimitive } from "@base-ui/react/input";
-import { cn } from "../../lib/utils";
+import { cn } from '../../lib/utils';
 function Input({ className, type, ...props }) {
     return (_jsx(InputPrimitive, { type: type, "data-slot": "input", className: cn("twa:h-9 twa:w-full twa:min-w-0 twa:rounded-md twa:border twa:border-input twa:bg-transparent twa:px-2.5 twa:py-1 twa:text-base twa:shadow-xs twa:transition-[color,box-shadow] twa:outline-none twa:file:inline-flex twa:file:h-7 twa:file:border-0 twa:file:bg-transparent twa:file:text-sm twa:file:font-medium twa:file:text-foreground twa:placeholder:text-muted-foreground twa:focus-visible:border-ring twa:focus-visible:ring-3 twa:focus-visible:ring-ring/50 twa:disabled:pointer-events-none twa:disabled:cursor-not-allowed twa:disabled:opacity-50 twa:aria-invalid:border-destructive twa:aria-invalid:ring-3 twa:aria-invalid:ring-destructive/20 twa:md:text-sm twa:dark:bg-input/30 twa:dark:aria-invalid:border-destructive/50 twa:dark:aria-invalid:ring-destructive/40", className), ...props }));
 }

package/src/components/ui/popover.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Popover as PopoverPrimitive } from "@base-ui/react/popover";
-import { cn, POPUP_Z_INDEX } from "../../lib/utils";
+import { cn, POPUP_Z_INDEX } from '../../lib/utils';
 function Popover({ ...props }) {
     return _jsx(PopoverPrimitive.Root, { "data-slot": "popover", ...props });
 }

package/src/components/ui/select.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Select as SelectPrimitive } from '@base-ui/react/select';
-import { cn, POPUP_Z_INDEX } from "../../lib/utils";
+import { cn, POPUP_Z_INDEX } from '../../lib/utils';
 import { ChevronDownIcon, CheckIcon, ChevronUpIcon } from 'lucide-react';
 const Select = SelectPrimitive.Root;
 function SelectGroup({ className, ...props }) {

package/src/components/ui/textarea.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { cn } from "../../lib/utils";
+import { cn } from '../../lib/utils';
 function Textarea({ className, ...props }) {
     return (_jsx("textarea", { "data-slot": "textarea", className: cn("twa:flex twa:field-sizing-content twa:min-h-16 twa:w-full twa:rounded-md twa:border twa:border-input twa:bg-transparent twa:px-2.5 twa:py-2 twa:text-base twa:shadow-xs twa:transition-[color,box-shadow] twa:outline-none twa:placeholder:text-muted-foreground twa:focus-visible:border-ring twa:focus-visible:ring-3 twa:focus-visible:ring-ring/50 twa:disabled:cursor-not-allowed twa:disabled:opacity-50 twa:aria-invalid:border-destructive twa:aria-invalid:ring-3 twa:aria-invalid:ring-destructive/20 twa:md:text-sm twa:dark:bg-input/30 twa:dark:aria-invalid:border-destructive/50 twa:dark:aria-invalid:ring-destructive/40", className), ...props }));
 }

package/src/components/ui/tooltip.js

@@ -1,6 +1,6 @@
 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 { cn, POPUP_Z_INDEX } from '../../lib/utils';
 function TooltipProvider({ delay = 0, ...props }) {
     return (_jsx(TooltipPrimitive.Provider, { "data-slot": "tooltip-provider", delay: delay, ...props }));
 }

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: 1780401790580 || Date.now(),
-    VERSION: "23.0.0-canary.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1780405578983 || Date.now(),
+    VERSION: "23.0.0-canary.2" || '--current-version--',
 };

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

@@ -1,4 +1,4 @@
-import { ColumnSizingMap, LayoutRowSelection } from '../../AdaptableState/LayoutState';
+import { ColumnSizingMap, 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

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';
@@ -552,7 +553,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 +761,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 +1315,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 +1678,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/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);
+}