@adaptabletools/adaptable-cjs 20.1.7 → 20.2.0-canary.0

package/src/Api/Internal/ExpressionInternalApi.js

@@ -34,7 +34,7 @@ class ExpressionInternalApi extends ApiBase_1.ApiBase {
         }
         return !evaluateExpressionExternallyFn(context);
     }
-    evaluatePredicatesInAdaptableQL(module, object, predicates) {
+    shouldEvaluatePredicatesInAdaptableQL(module, object, predicates) {
         const evaluateExpressionExternallyFn = this.getExpressionOptions()?.evaluateAdaptableQLExternally;
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
@@ -54,37 +54,6 @@ class ExpressionInternalApi extends ApiBase_1.ApiBase {
         }
         return !evaluateExpressionExternallyFn(context);
     }
-    // Used later, when we extend to support inferring fields from data
-    // private getFieldsFromData<T extends Record<string, any>>(data: T): string[] {
-    //   if (!data) {
-    //     return [];
-    //   }
-    //   if (typeof data !== 'object' || Number.isNaN(data)) {
-    //     return [];
-    //   }
-    //   const keys: string[] = [];
-    //   for (const key in Object.keys(data)) {
-    //     const candidate = data[key];
-    //     if (
-    //       typeof candidate === 'number' ||
-    //       typeof candidate === 'string' ||
-    //       typeof candidate === 'boolean' ||
-    //       candidate instanceof Date
-    //     ) {
-    //       keys.push(key);
-    //       continue;
-    //     }
-    //     // no support for arrays
-    //     // for objects we go one level deep
-    //     if (typeof candidate === 'object' && candidate !== null && !Array.isArray(candidate)) {
-    //       const childKeys = this.getFieldsFromData(candidate);
-    //       for (const childKey of childKeys) {
-    //         keys.push(`${key}.${childKey}`);
-    //       }
-    //     }
-    //   }
-    //   return keys;
-    // }
     getFieldsFromOptions() {
         const fields = this.getExpressionOptions().fields;
         if (fields != null && typeof fields === 'function') {

package/src/Api/Internal/FormatColumnInternalApi.d.ts

@@ -1,6 +1,6 @@
+import { IRowNode } from 'ag-grid-enterprise';
 import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, ColumnScope, FormatColumn, StringFormatterOptions } from '../../types';
 import { ApiBase } from '../Implementation/ApiBase';
-import { IRowNode } from 'ag-grid-enterprise';
 export declare class FormatColumnInternalApi extends ApiBase {
     /**
      * Retrieves all Format Columns in Adaptable State with the `Style` property set
@@ -77,6 +77,7 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * @param scope Scope to check
      */
     getFormatColumnDefsForScope(scope: ColumnScope): AdaptablePredicateDef[];
+    formatColumnWithColumnGroupStateShouldRender(formatColumn: FormatColumn, column: AdaptableColumn): boolean;
     /**
      * Checks if format column is relevant for a given cell (intersection of given AdaptableColumn and RowNode)
      *

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -8,6 +8,33 @@ const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
+function getParentGroup(source) {
+    if (!source) {
+        return undefined;
+    }
+    let current = source;
+    while (current.getParent()) {
+        current = current.getParent();
+        if (!current) {
+            return undefined;
+        }
+        const currentProvidedColumnGroup = current.getProvidedColumnGroup();
+        // for columns that don't belong to groups or belong to a group that doesn't have full depth
+        // there are artificial parent groups created by ag-grid
+        // so for the current column group, lets grab the leaf columns
+        // and if the only leaf column is the source column, then we can continue
+        // and do another iteration where we go up one level
+        if (currentProvidedColumnGroup) {
+            const leafColumns = current.getLeafColumns();
+            if (leafColumns.length === 1 && leafColumns[0] === source) {
+                continue;
+            }
+            // otherwise, we have found the parent group corresponding to the source column
+            return currentProvidedColumnGroup;
+        }
+    }
+    return undefined;
+}
 class FormatColumnInternalApi extends ApiBase_1.ApiBase {
     /**
      * Retrieves all Format Columns in Adaptable State with the `Style` property set
@@ -149,6 +176,37 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             .predicateApi.internalApi.getFormatColumnPredicateDefs(scope)
             .filter((predicateDef) => this.getColumnScopeApi().isScopeInScope(scope, predicateDef.columnScope));
     }
+    formatColumnWithColumnGroupStateShouldRender(formatColumn, column) {
+        if (!formatColumn.ColumnGroupState) {
+            return true;
+        }
+        const agGridApi = this.getAdaptableApi().agGridApi;
+        const agGridColumn = agGridApi.isPivotMode()
+            ? agGridApi.getPivotResultColumns().find((col) => col.getColId() === column.columnId)
+            : agGridApi.getColumn(column.columnId);
+        if (!agGridColumn) {
+            return false;
+        }
+        const columnGroupParentForCurrentColumn = getParentGroup(agGridColumn);
+        if (!columnGroupParentForCurrentColumn) {
+            return false;
+        }
+        const columnGroupState = columnGroupParentForCurrentColumn.isExpanded()
+            ? 'Expanded'
+            : 'Collapsed';
+        const columnGroupLeafColumns = columnGroupParentForCurrentColumn.getLeafColumns();
+        const columnIsTopLevel = columnGroupParentForCurrentColumn.getLevel() === 0 &&
+            columnGroupLeafColumns.length === 1 &&
+            columnGroupLeafColumns[0] === agGridColumn;
+        if (columnIsTopLevel) {
+            // for top-level columns don't apply formatColumns that have an explicit ColumnGroupState defined
+            return false;
+        }
+        if (formatColumn.ColumnGroupState === 'Both') {
+            return true;
+        }
+        return formatColumn.ColumnGroupState === columnGroupState;
+    }
     /**
      * Checks if format column is relevant for a given cell (intersection of given AdaptableColumn and RowNode)
      *
@@ -179,6 +237,10 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
                 return false;
             }
         }
+        if (formatColumn.ColumnGroupState &&
+            !this.formatColumnWithColumnGroupStateShouldRender(formatColumn, column)) {
+            return false;
+        }
         if (!formatColumn.Rule) {
             return true;
         }

package/src/Api/LayoutApi.d.ts

@@ -29,15 +29,19 @@ export interface LayoutApi {
      */
     getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;
     /**
-     * Retrieves map with visible columns in current Layout
+     * Retrieves map with visible columns in current Table Layout
      */
     getCurrentVisibleColumnIdsMapForTableLayout(): {
         [key: string]: boolean;
     };
     /**
-     * Retrieves array of visible ColumnIds in current Layout
+     * Retrieves array of visible ColumnIds in current Table Layout
      */
     getCurrentVisibleColumnIdsForTableLayout(): string[];
+    /**
+     * Retrieves array of visible ColumnIds in current Pivot Layout
+     */
+    getCurrentVisibleColumnIdsForPivotLayout(): string[];
     /**
      * Retrieves array of visible ColumnIds in current Layout
      */

package/src/Api/QuickSearchApi.d.ts

@@ -17,6 +17,14 @@ export interface QuickSearchApi {
      * Clears Quick Search
      */
     clearQuickSearch(): void;
+    /**
+     * Goes to the next match for the current Quick Search text
+     */
+    gotoNextMatch(): void;
+    /**
+     * Goes to the previous match for the current Quick Search text
+     */
+    gotoPreviousMatch(): void;
     /**
      * Retrieves current Quick Search text
      */
@@ -25,6 +33,14 @@ export interface QuickSearchApi {
      *  Retrieves current Quick Search style
      */
     getQuickSearchStyle(): AdaptableStyle;
+    /**
+     * Retrieves the style for the text match in the Quick Search
+     */
+    getQuickSearchTextMatchStyle(): Omit<AdaptableStyle, 'ClassName'> | undefined;
+    /**
+     * Retrieves the style for the current text match in the Quick Search
+     */
+    getQuickSearchCurrentTextMatchStyle(): Omit<AdaptableStyle, 'ClassName'> | undefined;
     /**
      * Sets style for Quick Search; can be name of (a provided) css style
      * @param style the style to use

package/src/Redux/Store/AdaptableStore.js

@@ -506,10 +506,11 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case QuickSearchRedux.QUICK_SEARCH_RUN: {
                     let returnAction = next(action);
                     adaptable.api.gridApi.refreshAllCells(true);
+                    const actionTyped = action;
+                    const searchText = actionTyped.quickSearchText;
+                    adaptable.setAgGridFindSearchValue(searchText);
                     // if set then return a query on the text
                     if (adaptable.adaptableOptions.quickSearchOptions.filterGridAfterQuickSearch) {
-                        const actionTyped = action;
-                        const searchText = actionTyped.quickSearchText;
                         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(searchText)) {
                             adaptable.setAgGridQuickSearch(searchText);
                         }

package/src/Utilities/Constants/GeneralConstants.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LAYOUT_NEW_TABLE_TOOLTIP = exports.THEME_STYLE = exports.SYSTEM_EXPORT_DESTINATIONS = exports.CLIPBOARD_EXPORT_DESTINATION = exports.DOWNLOAD_EXPORT_DESTINATION = exports.SELECT_REPORT_FORMAT_STRING = exports.SELECT_REPORT_STRING = exports.SYSTEM_REPORT_FORMATS = exports.JSON_FORMAT_REPORT = exports.CSV_FORMAT_REPORT = exports.VISUAL_EXCEL_FORMAT_REPORT = exports.EXCEL_FORMAT_REPORT = exports.SYSTEM_REPORT_NAMES = exports.SELECTED_DATA_REPORT = exports.CURRENT_LAYOUT_REPORT = exports.ALL_DATA_REPORT = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.MENU_SEPARATOR = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.DEFAULT_DOUBLE_DISPLAY_VALUE = exports.DEFAULT_INTEGER_DISPLAY_VALUE = exports.DEFAULT_STRING_DISPLAY_VALUE = exports.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_GRAND_TOTAL_COLUMN = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_SELECTION_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.GROUP_PATH_SEPARATOR = exports.QUARTER_SECOND = exports.HALF_SECOND = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.READ_ONLY_STYLE = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE_ID = exports.ADAPTABLE = exports.ERROR_LAYOUT = exports.OS_THEME = exports.DARK_THEME = exports.LIGHT_THEME = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
 exports.OBSERVABLE_EXPRESSION_ROW_REMOVED = exports.OBSERVABLE_EXPRESSION_ROW_ADDED = exports.STANDALONE_MODULE_POPUPS = exports.LAYOUT_DELETE_TOOLTIP = exports.LAYOUT_CLONE_TOOLTIP = exports.LAYOUT_EDIT_TOOLTIP = exports.LAYOUT_SAVE_TOOLTIP = exports.LAYOUT_NEW_TABLE_OR_PIVOT_TOOLTIP = exports.LAYOUT_NEW_PIVOT_TOOLTIP = void 0;
+const normalizeLayoutModel_1 = require("../../layout-manager/src/normalizeLayoutModel");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
 exports.MISSING_COLUMN = ' [MISSING]';
 exports.LIGHT_THEME = 'light';
@@ -24,7 +25,7 @@ exports.EMPTY_ARRAY = [];
 exports.HALF_SECOND = 500;
 exports.QUARTER_SECOND = 250;
 exports.GROUP_PATH_SEPARATOR = '/';
-exports.AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
+exports.AG_GRID_GROUPED_COLUMN = normalizeLayoutModel_1.AUTO_GROUP_COLUMN_ID__SINGLE;
 exports.AG_GRID_SELECTION_COLUMN = 'ag-Grid-SelectionColumn';
 exports.AG_GRID_PIVOT_COLUMN = 'pivot_';
 exports.AG_GRID_PIVOT_GRAND_TOTAL_COLUMN = 'PivotRowTotal_pivot_';

package/src/View/Components/Forms/AdaptableFormControlTextClear.d.ts

@@ -6,5 +6,6 @@ export type AdaptableFormControlTextClearProps = {
     focusOnClear?: boolean;
     autoFocus?: boolean;
     inputStyle?: CSSProperties;
+    actionTools?: React.ReactNode;
 } & InputProps;
 export declare const AdaptableFormControlTextClear: React.ForwardRefExoticComponent<Omit<AdaptableFormControlTextClearProps, "ref"> & React.RefAttributes<HTMLInputElement>>;

package/src/View/Components/Forms/AdaptableFormControlTextClear.js

@@ -29,6 +29,7 @@ exports.AdaptableFormControlTextClear = React.forwardRef((props, ref) => {
                     ref.current = r;
                 }
             }, type: "text", placeholder: props.placeholder, value: props.value, onChange: (x) => props.OnTextChange(x.target.value) }),
+        props.actionTools,
         React.createElement(SimpleButton_1.default, { variant: "text", icon: "close", tooltip: closeButtonTooltip, px: 0, py: 0, marginRight: 1, onClick: () => {
                 props.OnTextChange('');
                 const input = inputRef.current;

package/src/View/Dashboard/Dashboard.js

@@ -15,16 +15,14 @@ const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
 const AdaptableViewFactory_1 = require("../AdaptableViewFactory");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const AdaptableIconComponent_1 = require("../Components/AdaptableIconComponent");
-const AdaptableFormControlTextClear_1 = require("../Components/Forms/AdaptableFormControlTextClear");
-const useQuickSearchDebounced_1 = require("../QuickSearch/useQuickSearchDebounced");
 const UIHelper_1 = tslib_1.__importDefault(require("../UIHelper"));
 const CustomDashboardButton_1 = require("./CustomDashboardButton");
 const CustomToolbar_1 = require("./CustomToolbar");
 const DashboardToolbarFactory_1 = require("./DashboardToolbarFactory");
 const PinnedDashboard_1 = require("./PinnedDashboard");
 const ModuleToolbarWrapper_1 = require("./ModuleToolbarWrapper");
+const QuickSearchInput_1 = require("../QuickSearch/QuickSearchInput");
 const DashboardComponent = (props) => {
-    const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)(props);
     const dashboardAccessLevel = props.api.entitlementApi.getEntitlementAccessLevelForModule('Dashboard');
     const renderTab = (tab) => {
         const visibleToolbarNames = tab.Toolbars.filter((vt) => vt);
@@ -93,7 +91,7 @@ const DashboardComponent = (props) => {
     };
     const renderQuickSearch = () => {
         return (React.createElement(rebass_1.Box, { ml: 2 },
-            React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", "aria-label": 'Quick Search', placeholder: props.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: "ab-DashboardToolbar__QuickSearch__text", value: searchText, OnTextChange: search, style: { width: 'auto' }, inputStyle: { width: '7rem' } })));
+            React.createElement(QuickSearchInput_1.QuickSearchInput, { width: '7rem' })));
     };
     let instanceName = props.api.internalApi.getToolbarTitle();
     let dashboardOptions = props.api.optionsApi.getDashboardOptions();

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

@@ -201,9 +201,9 @@ const AggregationsSection = (props) => {
                     React.createElement(FormLayout_1.FormRow, { label: 'Omit Aggregation from Header' },
                         React.createElement(CheckBox_1.CheckBox, { checked: layout.SuppressAggFuncInHeader, onChange: handleSuppressAggFuncInHeader })),
                     React.createElement(FormLayout_1.FormRow, { label: 'Grand Total Row' },
-                        React.createElement(Select_1.Select, { style: { width: 120 }, options: ['top', 'bottom'].map((position) => {
+                        React.createElement(Select_1.Select, { style: { width: 160 }, options: ['top', 'bottom', 'pinnedTop', 'pinnedBottom'].map((position) => {
                                 return {
-                                    label: StringExtensions_1.default.CapitaliseFirstLetter(position),
+                                    label: StringExtensions_1.default.CamelCaseToHumanText(position),
                                     value: position,
                                 };
                             }), placeholder: "Off", value: layout.GrandTotalRow, onChange: (value) => {

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

@@ -328,9 +328,9 @@ const PivotAggregationsSection = (props) => {
                     React.createElement(FormLayout_1.FormRow, { label: 'Omit Aggregation from Header' },
                         React.createElement(CheckBox_1.CheckBox, { checked: layout.SuppressAggFuncInHeader, onChange: handleSuppressAggFuncInHeader })),
                     React.createElement(FormLayout_1.FormRow, { label: 'Grand Total Row' },
-                        React.createElement(Select_1.Select, { style: { width: 120 }, options: ['top', 'bottom'].map((position) => {
+                        React.createElement(Select_1.Select, { style: { width: 160 }, options: ['top', 'bottom', 'pinnedTop', 'pinnedBottom'].map((position) => {
                                 return {
-                                    label: StringExtensions_1.default.CapitaliseFirstLetter(position),
+                                    label: StringExtensions_1.default.CamelCaseToHumanText(position),
                                     value: position,
                                 };
                             }), placeholder: "Off", value: layout.GrandTotalRow, onChange: (value) => {

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

@@ -12,6 +12,7 @@ const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/ArrayExtensions"));
 const LayoutHelpers_1 = require("../../../../Api/Implementation/LayoutHelpers");
+const RowGroupingSection_1 = require("./RowGroupingSection");
 const PivotRowGroupingSectionSummary = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
@@ -37,11 +38,15 @@ const PivotRowGroupingSection = (props) => {
             PivotGroupedColumns: columnIds,
         });
     };
+    const rowGroupsText = 'Row Group ' + adaptable.api.internalApi.getCorrectEnglishVariant('Behaviour');
     return (React.createElement(Tabs_1.Tabs, { style: { height: '100%' } },
         React.createElement(Tabs_1.Tabs.Tab, null, "Row Grouped Columns"),
+        React.createElement(Tabs_1.Tabs.Tab, null, rowGroupsText),
         React.createElement(Tabs_1.Tabs.Content, null,
             React.createElement(ValueSelector_1.ValueSelector, { showFilterInput: true, showSelectedOnlyPosition: "top", filter: Utilities_1.columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => option.friendlyName ?? option.columnId, options: sortedGroupableColumns, value: layout.PivotGroupedColumns ?? [], allowReorder: true, xSelectedLabel: () => {
                     return `Selected Columns:`;
-                }, onChange: handleColumnsChange }))));
+                }, onChange: handleColumnsChange })),
+        React.createElement(Tabs_1.Tabs.Content, null,
+            React.createElement(RowGroupingSection_1.RowGroupBehaviorSection, { layout: layout, onChange: onChange }))));
 };
 exports.PivotRowGroupingSection = PivotRowGroupingSection;

package/src/View/Layout/Wizard/sections/RowGroupingSection.d.ts

@@ -4,5 +4,9 @@ export declare const RowGroupingSectionSummary: React.FunctionComponent;
 interface RowGroupingSectionProps {
     onChange: (data: Layout) => void;
 }
+export declare const RowGroupBehaviorSection: (props: {
+    layout: Layout;
+    onChange: (data: Layout) => void;
+}) => React.JSX.Element;
 export declare const RowGroupingSection: React.FunctionComponent<RowGroupingSectionProps>;
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RowGroupingSection = exports.RowGroupingSectionSummary = void 0;
+exports.RowGroupingSection = exports.RowGroupBehaviorSection = exports.RowGroupingSectionSummary = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
@@ -28,6 +28,28 @@ const RowGroupingSectionSummary = () => {
     })) : (React.createElement(Tag_1.Tag, null, "No Row Grouping"))));
 };
 exports.RowGroupingSectionSummary = RowGroupingSectionSummary;
+const RowGroupBehaviorSection = (props) => {
+    const { layout, onChange } = props;
+    return (React.createElement(FormLayout_1.default, null,
+        React.createElement(Radio_1.RadioGroup, { orientation: "vertical", value: layout.RowGroupValues?.RowGroupDefaultBehavior ?? 'always-collapsed', onRadioChange: (RowGroupDefaultBehavior) => {
+                const newLayout = {
+                    ...layout,
+                    RowGroupValues: {
+                        RowGroupDefaultBehavior,
+                    },
+                };
+                if (newLayout.RowGroupValues.RowGroupDefaultBehavior === 'collapsed' ||
+                    newLayout.RowGroupValues.RowGroupDefaultBehavior === 'expanded') {
+                    newLayout.RowGroupValues.ExceptionGroupKeys = [];
+                }
+                onChange(newLayout);
+            } },
+            React.createElement(TypeRadio_1.TypeRadio, { value: "always-collapsed", text: "All Collapsed", description: "Always open Layout with all Grouped Rows collapsed" }),
+            React.createElement(TypeRadio_1.TypeRadio, { value: "always-expanded", text: "All Expanded", description: "Always open Layout with all Grouped Rows expanded" }),
+            React.createElement(TypeRadio_1.TypeRadio, { value: "expanded", text: "Mostly Expanded", description: "Layout opens with all Grouped rows expanded, other than those collapsed when Layout last displayed" }),
+            React.createElement(TypeRadio_1.TypeRadio, { value: "collapsed", text: "Mostly Collapsed", description: "Layout opens with all Grouped rows collapsed, other than those expanded when Layout last displayed" }))));
+};
+exports.RowGroupBehaviorSection = RowGroupBehaviorSection;
 const RowGroupingSection = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     if (adaptable.api.gridApi.isTreeDataGrid()) {
@@ -83,24 +105,6 @@ const RowGroupingSection = (props) => {
                         return `Selected Columns:`;
                     }, onChange: handleColumnsChange })),
             React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(FormLayout_1.default, null,
-                    React.createElement(Radio_1.RadioGroup, { orientation: "vertical", value: layout.RowGroupValues?.RowGroupDefaultBehavior ?? 'always-collapsed', onRadioChange: (RowGroupDefaultBehavior) => {
-                            let newLayout = {
-                                ...layout,
-                                RowGroupValues: {
-                                    RowGroupDefaultBehavior,
-                                },
-                            };
-                            if (newLayout.RowGroupValues.RowGroupDefaultBehavior === 'collapsed' ||
-                                newLayout.RowGroupValues.RowGroupDefaultBehavior === 'expanded') {
-                                newLayout.RowGroupValues.ExceptionGroupKeys =
-                                    [];
-                            }
-                            onChange(newLayout);
-                        } },
-                        React.createElement(TypeRadio_1.TypeRadio, { value: "always-collapsed", text: "All Collapsed", description: "Always open Layout with all Grouped Rows collapsed" }),
-                        React.createElement(TypeRadio_1.TypeRadio, { value: "always-expanded", text: "All Expanded", description: "Always open Layout with all Grouped Rows expanded" }),
-                        React.createElement(TypeRadio_1.TypeRadio, { value: "expanded", text: "Mostly Expanded", description: "Layout opens with all Grouped rows expanded, other than those collapsed when Layout last displayed" }),
-                        React.createElement(TypeRadio_1.TypeRadio, { value: "collapsed", text: "Mostly Collapsed", description: "Layout opens with all Grouped rows collapsed, other than those expanded when Layout last displayed" })))))));
+                React.createElement(exports.RowGroupBehaviorSection, { layout: layout, onChange: onChange })))));
 };
 exports.RowGroupingSection = RowGroupingSection;

package/src/View/QuickSearch/QuickSearchInput.js

@@ -8,6 +8,9 @@ const QuickSearchRedux = tslib_1.__importStar(require("../../Redux/ActionsReduce
 const AdaptableFormControlTextClear_1 = require("../Components/Forms/AdaptableFormControlTextClear");
 const useQuickSearchDebounced_1 = require("./useQuickSearchDebounced");
 const AdaptableContext_1 = require("../AdaptableContext");
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const join_1 = tslib_1.__importDefault(require("../../components/utils/join"));
+const rebass_1 = require("rebass");
 const QuickSearchInput = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const QuickSearchText = (0, react_redux_1.useSelector)((state) => state.QuickSearch.QuickSearchText);
@@ -17,6 +20,8 @@ const QuickSearchInput = (props) => {
         QuickSearchText,
         onRunQuickSearch,
     });
-    return (react_1.default.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: props.className, value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: props.width ?? '10rem' } }));
+    return (react_1.default.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { "aria-label": 'Quick Search', type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: (0, join_1.default)('ab-DashboardToolbar__QuickSearch__text', props.className), value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: props.width ?? '10rem' }, actionTools: react_1.default.createElement(rebass_1.Box, { display: "flex", flexDirection: "row", alignItems: "center", flex: 'none' },
+            react_1.default.createElement(SimpleButton_1.default, { "aria-label": 'Previous Match', icon: "arrow-up", px: 0, py: 0, mr: 1, disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoPreviousMatch() }),
+            react_1.default.createElement(SimpleButton_1.default, { "aria-label": 'Next Match', icon: "arrow-down", px: 0, py: 0, mr: 1, disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoNextMatch() })) }));
 };
 exports.QuickSearchInput = QuickSearchInput;

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -9,12 +9,12 @@ const QuickSearchRedux = tslib_1.__importStar(require("../../Redux/ActionsReduce
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
 const FormLayout_1 = tslib_1.__importStar(require("../../components/FormLayout"));
-const AdaptableFormControlTextClear_1 = require("../Components/Forms/AdaptableFormControlTextClear");
 const StyleComponent_1 = require("../Components/StyleComponent");
 const rebass_1 = require("rebass");
 const CheckBox_1 = require("../../components/CheckBox");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const useQuickSearchDebounced_1 = require("./useQuickSearchDebounced");
+const QuickSearchInput_1 = require("./QuickSearchInput");
 const QuickSearchPopupComponent = (props) => {
     const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)(props);
     const [state, setState] = (0, react_1.useState)({
@@ -32,9 +32,8 @@ const QuickSearchPopupComponent = (props) => {
     };
     return (React.createElement(PopupPanel_1.PopupPanel, { headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
         React.createElement(Panel_1.default, { header: props.moduleInfo.FriendlyName + ' Text', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginLeft: 2, marginRight: 2 },
-            ' ',
             React.createElement(FormLayout_1.default, null,
-                React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { "data-name": "quick-search-text", type: "text", marginLeft: 2, marginRight: 5, padding: 20, style: { height: '100%' }, placeholder: props.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, value: searchText, OnTextChange: search }))),
+                React.createElement(QuickSearchInput_1.QuickSearchInput, null))),
         React.createElement(Panel_1.default, { header: props.api.internalApi.getCorrectEnglishVariant('Behaviour'), style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginLeft: 2, marginRight: 2 },
             ' ',
             React.createElement(rebass_1.Flex, { flexDirection: "column" },

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -106,6 +106,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private listenerPivotChanged;
     private listenerCellSelectionChanged;
     private listenerSortChanged;
+    private listenerColumnGroupOpened;
     private layoutManager;
     private columnMinMaxValuesCache;
     renderReactRoot: RenderReactRootFn;
@@ -303,6 +304,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     isGridGroupingActive(): boolean;
     setAgGridQuickSearch(searchText: string): void;
     clearAgGridQuickSearch(): void;
+    setAgGridFindSearchValue(searchText: string): void;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     setRowGroupColumns(columnIds: string[]): void;
     getAllGridColumns(): Column<any>[];