@adaptabletools/adaptable 23.0.0-canary.3 → 23.0.0-canary.4

package/src/components/AdaptableFormComponent/AdaptableFormComponent.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 { flattenAdaptableFormFields, isAdaptableFormFieldDisabled, isAdaptableFormFieldGroup, isAdaptableFormFieldGroupHidden, isAdaptableFormFieldHidden, validateAdaptableForm, } from '../../AdaptableState/Common/AdaptableForm';
+import { flattenAdaptableFormFields, isAdaptableFormFieldDisabled, isAdaptableFormFieldGroup, isAdaptableFormFieldGroupHidden, isAdaptableFormFieldHidden, resolveSelectPlaceholder, resolveSelectValueAfterClear, validateAdaptableForm, } from '../../AdaptableState/Common/AdaptableForm';
 import FormLayout, { FormRow } from '../FormLayout';
 import Input from '../Input';
 import { AdaptableButtonView, } from '../../View/Components/AdaptableButton';
@@ -204,10 +204,12 @@ export function AdaptableFormComponent({ formDef, data, onChange, onButtonClick,
                 break;
             }
             case 'select': {
-                const items = resolveOptions(field).map((item) => ({
+                const optionItems = resolveOptions(field);
+                const items = optionItems.map((item) => ({
                     value: item.value,
                     label: item.label,
                 }));
+                const selectPlaceholder = resolveSelectPlaceholder(field, optionItems);
                 // The underlying SingleCombobox / MultiCombobox manage their own
                 // popup-based focus; we wrap them in a labelled `role="group"` so
                 // assistive tech announces "<label> group" when focus enters and
@@ -225,10 +227,10 @@ export function AdaptableFormComponent({ formDef, data, onChange, onButtonClick,
                     // anything else (e.g. legacy string defaults) to [] so the
                     // underlying combobox never receives a non-array value.
                     const selected = Array.isArray(value) ? value : [];
-                    control = (_jsx(Box, { ...groupProps, children: _jsx(MultiCombobox, { items: items, onValueChange: (newValues) => setFieldValue(field.name, newValues), value: selected, disabled: isDisabled, placeholder: field.placeholder }) }));
+                    control = (_jsx(Box, { ...groupProps, children: _jsx(MultiCombobox, { items: items, onValueChange: (newValues) => setFieldValue(field.name, newValues), value: selected, disabled: isDisabled, placeholder: selectPlaceholder }) }));
                 }
                 else {
-                    control = (_jsx(Box, { ...groupProps, children: _jsx(SingleCombobox, { items: items, onValueChange: (newValue) => setFieldValue(field.name, newValue), value: value, disabled: isDisabled, placeholder: field.placeholder }) }));
+                    control = (_jsx(Box, { ...groupProps, children: _jsx(SingleCombobox, { items: items, onValueChange: (newValue) => setFieldValue(field.name, resolveSelectValueAfterClear(field, newValue)), value: value, disabled: isDisabled, placeholder: selectPlaceholder }) }));
                 }
                 break;
             }
@@ -354,10 +356,13 @@ export function AdaptableFormComponent({ formDef, data, onChange, onButtonClick,
         }
         return items
             .filter((field) => !isAdaptableFormFieldHidden(field, data, context))
-            .map((field) => {
+            .map((field, index) => {
             const useFor = field.fieldType !== 'radio' && field.fieldType !== 'textOutput';
             const requiredMarker = field.required ? (_jsx("span", { className: "ab-Form_required-marker", "aria-hidden": "true", children: ' *' })) : null;
-            return (_jsxs(Flex, { flexDirection: "row", alignItems: "center", style: { columnGap: 'var(--ab-base-space)' }, children: [field.label ? (useFor ? (_jsxs("label", { id: fieldLabelId(field), htmlFor: fieldDomId(field), className: "ab-FormLayout--inline_field-label", title: field.tooltip, children: [field.label, requiredMarker] })) : (_jsxs(Box, { id: fieldLabelId(field), className: "ab-FormLayout--inline_field-label", title: field.tooltip, children: [field.label, requiredMarker] }))) : null, renderField(field)] }, field.name));
+            return (_jsxs(Flex, { flexDirection: "row", alignItems: "center", style: {
+                    columnGap: 'var(--ab-base-space)',
+                    marginLeft: index > 0 ? 'var(--ab-base-space)' : undefined,
+                }, children: [field.label ? (useFor ? (_jsxs("label", { id: fieldLabelId(field), htmlFor: fieldDomId(field), className: "ab-FormLayout--inline_field-label", title: field.tooltip, children: [field.label, requiredMarker] })) : (_jsxs(Box, { id: fieldLabelId(field), className: "ab-FormLayout--inline_field-label", title: field.tooltip, children: [field.label, requiredMarker] }))) : null, renderField(field)] }, field.name));
         });
     };
     const renderRowsEntry = (entry, index) => {

package/src/components/Combobox/VirtualizedList.js

@@ -36,16 +36,16 @@ export function VirtualizedList({ open, virtualizerRef, showItemTooltip, renderC
                     return null;
                 }
                 const isUncreatedCreatable = item.creatable && !item.created;
-                const textLabel = showItemTooltip ? getItemTextLabel(item) : undefined;
-                const tooltipText = textLabel != null
+                const itemText = getItemTextLabel(item);
+                const tooltipText = showItemTooltip && itemText != null
                     ? isUncreatedCreatable
-                        ? `Create "${textLabel}"`
-                        : textLabel
+                        ? `Create "${itemText}"`
+                        : itemText
                     : undefined;
                 const label = isUncreatedCreatable ? `Create "${item.label}"` : item.label;
                 const itemLabel = renderItemLabel ? (renderItemLabel(label, item)) : (_jsx("span", { className: "twa:min-w-0 twa:flex-1 twa:truncate", children: label }));
                 const itemContent = isUncreatedCreatable ? (_jsxs(_Fragment, { children: [_jsx(PlusIcon, {}), itemLabel] })) : (itemLabel);
-                const itemElement = (_jsx(ComboboxItem, { index: virtualItem.index, "data-index": virtualItem.index, ref: virtualizer.measureElement, value: item, renderCheckboxIndicator: renderCheckboxIndicator, "aria-setsize": filteredItems.length, "aria-posinset": virtualItem.index + 1, style: {
+                const itemElement = (_jsx(ComboboxItem, { index: virtualItem.index, "data-index": virtualItem.index, ref: virtualizer.measureElement, value: item, renderCheckboxIndicator: renderCheckboxIndicator, "aria-setsize": filteredItems.length, "aria-posinset": virtualItem.index + 1, "aria-label": itemText ?? undefined, style: {
                         position: 'absolute',
                         left: `var(--ab-base-space)`,
                         right: `var(--ab-base-space)`,

package/src/components/Combobox/comboboxUtils.d.ts

@@ -9,7 +9,9 @@ export type ComboboxItemType = {
     value: any;
     disabled?: boolean;
 };
-export declare function getItemTextLabel<T extends ComboboxItemType>(item: T): string;
+export declare function getItemTextLabel<T extends ComboboxItemType>(item: T & {
+    tooltip?: string;
+}): string;
 export type ComboboxGroupType<T extends ComboboxItemType> = {
     label: React.ReactNode;
     items: T[];
@@ -45,6 +47,7 @@ export type ComboboxCommonProps<T extends ComboboxItemType> = {
     renderItemLabel?: (defaultLabel: React.ReactNode, item: T) => React.ReactNode;
     multiple?: boolean;
     showClear?: boolean;
+    clearOnEscape?: boolean;
     searchable?: boolean | 'inline' | 'menulist';
     /**
      * Custom filter function, or `null` to disable built-in filtering

package/src/components/Combobox/comboboxUtils.js

@@ -5,6 +5,8 @@ export function getItemTextLabel(item) {
         return item.label;
     if (typeof item.label === 'number')
         return String(item.label);
+    if (typeof item.tooltip === 'string')
+        return String(item.tooltip);
     return String(item.value);
 }
 export function valueToItem(stringValue, lookup) {

package/src/components/Combobox/index.d.ts

@@ -35,4 +35,5 @@ export declare const MultiCombobox: <T extends ComboboxItemType>(props: MultiCom
 export type GridFilterComboboxProps<T extends ComboboxItemType> = Omit<MultiComboboxProps<T>, 'showSelectAllCheckbox' | 'searchable' | 'renderInput' | 'renderInputValues'> & {
     showSelectedCount?: boolean;
 };
+export declare const GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME: string;
 export declare const GridFilterCombobox: <T extends ComboboxItemType>(props: GridFilterComboboxProps<T>) => React.JSX.Element;

package/src/components/Combobox/index.js

@@ -31,9 +31,13 @@ const AdaptableComboboxList = (props) => {
         const label = isUncreatedCreatable ? `Create "${item.label}"` : item.label;
         const itemLabel = props.renderItemLabel ? props.renderItemLabel(label, item) : label;
         const itemContent = isUncreatedCreatable ? (_jsxs(_Fragment, { children: [_jsx(PlusIcon, {}), " ", itemLabel] })) : (itemLabel);
-        const textLabel = props.showItemTooltip ? getItemTextLabel(item) : undefined;
-        const tooltipText = textLabel != null ? (isUncreatedCreatable ? `Create "${textLabel}"` : textLabel) : undefined;
-        const itemElement = (_jsx(ComboboxItem, { value: item, className: 'ab-Combobox-Row', disabled: item.disabled, renderCheckboxIndicator: props.renderCheckboxIndicator, children: itemContent }, item.value));
+        const itemText = getItemTextLabel(item);
+        const tooltipText = props.showItemTooltip && itemText != null
+            ? isUncreatedCreatable
+                ? `Create "${itemText}"`
+                : itemText
+            : undefined;
+        const itemElement = (_jsx(ComboboxItem, { value: item, "aria-label": itemText ?? undefined, className: 'ab-Combobox-Row', disabled: item.disabled, renderCheckboxIndicator: props.renderCheckboxIndicator, children: itemContent }, item.value));
         if (tooltipText != null) {
             return (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { render: itemElement, children: itemContent }), _jsx(TooltipContent, { side: "right", children: tooltipText })] }, item.value));
         }
@@ -88,9 +92,15 @@ const AdaptableCombobox_Root = (props) => {
     const internalDefaultValue = props.multiple
         ? valueToItems(props.defaultValue, itemByValue)
         : valueToItem(props.defaultValue, itemByValue);
-    const handleValueChange = (next) => {
+    const handleValueChange = (next, eventDetails) => {
         if (!props.onValueChange)
             return;
+        // base-ui clears the selected value when Escape is pressed
+        // we only want to allow this if the clearOnEscape prop is true
+        if (eventDetails?.reason === 'escape-key' && !props.clearOnEscape) {
+            eventDetails.cancel?.();
+            return;
+        }
         if (Array.isArray(next)) {
             props.onValueChange(toStringValues(next), next);
         }
@@ -98,6 +108,15 @@ const AdaptableCombobox_Root = (props) => {
             props.onValueChange(toStringValue(next), next);
         }
     };
+    const handleInputValueChange = (next, eventDetails) => {
+        // base-ui blanks the input text (and then the selected value) when Escape is pressed
+        // we only want to allow this if the clearOnEscape prop is true
+        if (eventDetails?.reason === 'escape-key' && !props.clearOnEscape) {
+            eventDetails.cancel?.();
+            return;
+        }
+        props.onInputValueChange?.(next);
+    };
     let comboboxItems = props.groups ?? props.items;
     if (props.isCreatable && allItems[allItems.length - 1]?.creatable) {
         // let's detect all "creatable" items and add them to the combobox items
@@ -113,7 +132,7 @@ const AdaptableCombobox_Root = (props) => {
         }
         comboboxItems = [...comboboxItems, ...creatableItems];
     }
-    return (_jsx(Combobox, { ...props, items: comboboxItems, isItemEqualToValue: isItemEqualToValue, itemToStringLabel: getItemTextLabel, value: internalValue, defaultValue: internalDefaultValue, onValueChange: handleValueChange, "aria-label": props.ariaLabel || props['aria-label'], "data-name": props['data-name'], disabled: props.disabled, open: props.open, onOpenChange: props.onOpenChange, multiple: props.multiple, filter: props.filter, autoHighlight: true, children: props.children }));
+    return (_jsx(Combobox, { ...props, items: comboboxItems, isItemEqualToValue: isItemEqualToValue, itemToStringLabel: getItemTextLabel, value: internalValue, defaultValue: internalDefaultValue, onValueChange: handleValueChange, onInputValueChange: handleInputValueChange, "aria-label": props.ariaLabel || props['aria-label'], "data-name": props['data-name'], disabled: props.disabled, open: props.open, onOpenChange: props.onOpenChange, multiple: props.multiple, filter: props.filter, autoHighlight: true, children: props.children }));
 };
 const useGetAllItems = (props) => {
     const allItems = props.groups
@@ -495,6 +514,16 @@ export const MultiCombobox = (props) => {
     const showItemTooltip = props.showItemTooltip ?? !!props.virtualized;
     return searchable === 'menulist' ? (_jsx(MultiCombobox_MenuListSearchable, { renderInput: false, ...props, multiple: true, open: open, onOpenChange: onOpenChange, searchable: searchable, showItemTooltip: showItemTooltip })) : (_jsx(MultiCombobox_SimpleSearchable, { ...props, open: open, multiple: true, onOpenChange: onOpenChange, searchable: searchable, showItemTooltip: showItemTooltip }));
 };
+export const GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME = cn(
+// remove the border/shadow and position it properly
+// to adjust for outline on the input
+'twa:[.ab-FloatingFilter_&]:border-none twa:[.ab-FloatingFilter_&]:inset-y-0.5 twa:[.ab-FloatingFilter_&]:inset-x-0 twa:[.ab-FloatingFilter_&]:absolute twa:[.ab-FloatingFilter_&]:shadow-none twa:[.ab-FloatingFilter_&]:min-h-auto!', 
+// more adjustments for very compact ag grid themes
+'twa:[.ab-FloatingFilter_&]:[line-height:1]', 'twa:[.ab-FloatingFilter_[data-slot=combobox-trigger]]:py-0', 
+// also for very compact ag grid themes
+// make the floating-filter combobox a size container so the toggle can
+// shrink purely via CSS when the control is small in height (see ColumnFilter/base.css)
+'twa:[.ab-FloatingFilter_&]:[container-type:size]');
 export const GridFilterCombobox = (props) => {
     const { showSelectedCount = false, placeholder = 'Select...', ...comboboxProps } = props;
     const sharedProps = {
@@ -514,16 +543,7 @@ export const GridFilterCombobox = (props) => {
             return (_jsx(_Fragment, { children: _jsxs("div", { className: "twa:text-ellipsis twa:overflow-hidden twa:whitespace-nowrap twa:flex-1000", "data-slot": "combobox-selected-values", children: [showSelectedCount && items.length > 0 && (_jsxs("span", { "data-name": "multiple-values-count", className: "twa:mr-0.5", children: ["(", items.length, ")"] })), children] }) }));
         },
     };
-    const className = cn(
-    // remove the border/shadow and position it properly
-    // to adjust for outline on the input
-    'twa:[.ab-FloatingFilter_&]:border-none twa:[.ab-FloatingFilter_&]:inset-y-0.5 twa:[.ab-FloatingFilter_&]:inset-x-0 twa:[.ab-FloatingFilter_&]:absolute twa:[.ab-FloatingFilter_&]:shadow-none twa:[.ab-FloatingFilter_&]:min-h-auto!', 
-    // more adjustments for very compact ag grid themes
-    'twa:[.ab-FloatingFilter_&]:[line-height:1]', 'twa:[.ab-FloatingFilter_[data-slot=combobox-trigger]]:py-0', 
-    // also for very compact ag grid themes
-    // make the floating-filter combobox a size container so the toggle can
-    // shrink purely via CSS when the control is small in height (see ColumnFilter/base.css)
-    'twa:[.ab-FloatingFilter_&]:[container-type:size]', comboboxProps.className);
+    const className = cn(GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME, comboboxProps.className);
     const mergedProps = {
         ...sharedProps,
         ...comboboxProps,

package/src/components/Tree/TreeDropdown/index.js

@@ -3,7 +3,7 @@ import { useCallback, useMemo, useState } from 'react';
 import clsx from 'clsx';
 import { ChevronRightIcon, ChevronDownIcon, ChevronsDownUpIcon, ChevronsUpDownIcon, } from 'lucide-react';
 import { TreeExpandState, TreeSelectionState } from '../../InfiniteTable';
-import { MultiCombobox } from '../../Combobox';
+import { GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME, MultiCombobox, } from '../../Combobox';
 import { ComboboxChip } from '../../ui/combobox';
 import { toDisplayValueDefault, toDisplayValueFromOptionTree } from '../treeUtils';
 import { cn } from '../../../lib/utils';
@@ -516,10 +516,6 @@ export function GridFilterTreeDropdown(props) {
         }
         return (_jsxs("div", { className: "twa:text-ellipsis twa:overflow-hidden twa:whitespace-nowrap twa:flex-1000", "data-slot": "combobox-selected-values", children: [showSelectedCount && selectedLeafPaths.length > 0 && (_jsxs("span", { "data-name": "multiple-values-count", className: "twa:mr-0.5", children: ["(", selectedLeafPaths.length, ")"] })), children] }));
     }, [placeholder, showSelectedCount]);
-    const mergedClassName = cn(
-    // Match the restyling GridFilterCombobox uses: remove the field border,
-    // flatten the shadow and absolutely position so the component fits the
-    // grid's floating-filter input box.
-    'twa:[.ab-FloatingFilter_&]:border-none twa:[.ab-FloatingFilter_&]:inset-y-0.5 twa:[.ab-FloatingFilter_&]:inset-x-0 twa:[.ab-FloatingFilter_&]:absolute twa:[.ab-FloatingFilter_&]:shadow-none twa:[.ab-FloatingFilter_&]:min-h-auto!', className);
+    const mergedClassName = cn(GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME, className);
     return (_jsx(TreeDropdown, { ...rest, placeholder: placeholder, className: mergedClassName, showClear: rest.showClear ?? false, resizable: rest.resizable ?? true, renderSelectedValues: renderSelectedValues }));
 }

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: 1780656122892 || Date.now(),
-    VERSION: "23.0.0-canary.3" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1780948198125 || Date.now(),
+    VERSION: "23.0.0-canary.4" || '--current-version--',
 };

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

@@ -1,4 +1,4 @@
-import { ColumnSizingMap, LayoutRowSelection, RowGroupDisplayType } from '../../AdaptableState/LayoutState';
+import { ColumnSizingMap, LayoutOpenChart, LayoutRowSelection, RowGroupDisplayType } from '../../AdaptableState/LayoutState';
 import { XOR } from '../../Utilities/Extensions/TypeExtensions';
 /**
  * Defines how a Column is sorted
@@ -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/metamodel/adaptable.metamodel.d.ts

@@ -1113,9 +1113,6 @@ export declare const ADAPTABLE_METAMODEL: {
             o: boolean;
         }[];
     };
-    ApplyFilterAction: {
-        k: string;
-    };
     AutoGenerateTagsForLayoutsContext: {
         k: string;
         p: {
@@ -2965,20 +2962,6 @@ export declare const ADAPTABLE_METAMODEL: {
             r?: undefined;
         })[];
     };
-    FilterActionOnDataChange: {
-        k: string;
-        p: ({
-            n: string;
-            k: string;
-            r: string;
-            o?: undefined;
-        } | {
-            n: string;
-            k: string;
-            o: boolean;
-            r?: undefined;
-        })[];
-    };
     FilterApi: {
         k: string;
         p: ({