@adaptabletools/adaptable 23.0.0-canary.6 → 23.0.0-canary.8

package/src/agGrid/cellRenderers/RangeBarRenderer.js

@@ -1,5 +1,6 @@
 import Helper from '../../Utilities/Helpers/Helper';
 import clamp from '../../Utilities/utils/clamp';
+import { buildBarChartCellTextLabels, hasBarChartCellTextConfigured, mountBarChartCellText, } from '../../Utilities/Helpers/barChartCellText';
 import { shouldRenderStyledColumnOnRow } from './shouldRenderStyledColumnOnRow';
 const SVG_NS = 'http://www.w3.org/2000/svg';
 const DEFAULT_TRACK_HEIGHT = 4;
@@ -96,8 +97,9 @@ export const getRangeBarRendererForColumn = (styledColumn, abColumn, api) => {
                 this.eGui.append(params.formatValue?.(rawCellValue) ?? String(rawCellValue));
                 return;
             }
-            const referenceValue = rangeStyle.Reference != undefined
-                ? resolveBoundValue(rangeStyle.Reference, abColumn, params.node, api)
+            const referenceProperties = rangeStyle.Reference;
+            const referenceValue = referenceProperties?.Value != undefined
+                ? resolveBoundValue(referenceProperties.Value, abColumn, params.node, api)
                 : undefined;
             // Markers - resolve user overrides against per-marker defaults.
             const valueMarker = normaliseMarker(rangeStyle.Marker, {
@@ -105,21 +107,24 @@ export const getRangeBarRendererForColumn = (styledColumn, abColumn, api) => {
                 Color: DEFAULT_VALUE_MARKER_COLOR,
                 Size: DEFAULT_VALUE_MARKER_SIZE,
             });
-            const referenceMarker = normaliseMarker(rangeStyle.ReferenceMarker, {
+            const referenceMarker = normaliseMarker(referenceProperties?.Marker, {
                 Shape: 'Line',
                 Color: DEFAULT_REFERENCE_MARKER_COLOR,
                 Size: DEFAULT_LINE_MARKER_THICKNESS,
             });
             // Out-of-range handling
-            const outOfRangeMode = rangeStyle.OutOfRangeMode ?? 'Clamp';
+            const outOfRangeProperties = rangeStyle.OutOfRange;
+            const outOfRangeMode = outOfRangeProperties?.Mode ?? 'Clamp';
+            const outOfRangeColor = outOfRangeProperties?.Color;
             const isOutOfRange = numericValue < min || numericValue > max;
             const hideValueMarker = isOutOfRange && outOfRangeMode === 'Hide';
             // Layout
             const isVertical = rangeStyle.Orientation === 'Vertical';
-            const trackThickness = rangeStyle.TrackHeight ?? DEFAULT_TRACK_HEIGHT;
+            const trackProperties = rangeStyle.Track;
+            const trackThickness = trackProperties?.Height ?? DEFAULT_TRACK_HEIGHT;
             const bandThickness = Math.max(trackThickness + 6, DEFAULT_BAND_HEIGHT);
-            const hasCellText = rangeStyle.CellText && rangeStyle.CellText.length > 0;
-            const isTextMerged = rangeStyle.CellTextPosition === 'Merged';
+            const cellTextProperties = rangeStyle.CellTextProperties;
+            const hasCellText = hasBarChartCellTextConfigured(cellTextProperties);
             // Map a 0..1 fraction onto the long-axis viewBox (0..100). Vertical
             // orientation inverts so that lower values appear at the bottom of
             // the cell, matching user expectation.
@@ -132,7 +137,7 @@ export const getRangeBarRendererForColumn = (styledColumn, abColumn, api) => {
             this.eGui.style.alignItems = isVertical ? 'center' : 'stretch';
             this.eGui.style.justifyContent = 'center';
             this.eGui.style.position = 'relative';
-            this.eGui.style.height = hasCellText && !isTextMerged ? '80%' : '100%';
+            this.eGui.style.height = '100%';
             const svg = document.createElementNS(SVG_NS, 'svg');
             svg.setAttribute('class', 'ab-RangeBar__svg');
             svg.setAttribute('preserveAspectRatio', 'none');
@@ -191,11 +196,11 @@ export const getRangeBarRendererForColumn = (styledColumn, abColumn, api) => {
             const trackCrossOffset = (bandThickness - trackThickness) / 2;
             const track = document.createElementNS(SVG_NS, 'rect');
             setRectAxes(track, 0, 100, trackCrossOffset, trackThickness);
-            track.setAttribute('fill', rangeStyle.TrackColor ?? DEFAULT_TRACK_COLOR);
+            track.setAttribute('fill', trackProperties?.Color ?? DEFAULT_TRACK_COLOR);
             track.setAttribute('class', 'ab-RangeBar__track');
             // Slight transparency by default so the track doesn't drown out the
-            // band colours; honour explicit user TrackColor as-is.
-            if (rangeStyle.TrackColor == undefined) {
+            // band colours; honour explicit user Track.Color as-is.
+            if (trackProperties?.Color == undefined) {
                 // With no bands the cell background is often plain — the same muted
                 // foreground at 0.35 opacity can disappear (only the accent marker reads).
                 // Bands provide contrast underneath, so keep the subtle blend there.
@@ -224,8 +229,8 @@ export const getRangeBarRendererForColumn = (styledColumn, abColumn, api) => {
                     valueFraction = toFraction(numericValue, min, max);
                 }
                 const valueCoord = valueAxisCoord(valueFraction);
-                const effectiveMarker = isOutOfRange && outOfRangeMode === 'Clamp' && rangeStyle.OutOfRangeColor
-                    ? { ...valueMarker, Color: rangeStyle.OutOfRangeColor }
+                const effectiveMarker = isOutOfRange && outOfRangeMode === 'Clamp' && outOfRangeColor
+                    ? { ...valueMarker, Color: outOfRangeColor }
                     : valueMarker;
                 const markerEl = createMarkerElement(effectiveMarker, valueCoord, bandThickness, isVertical);
                 if (markerEl) {
@@ -233,40 +238,38 @@ export const getRangeBarRendererForColumn = (styledColumn, abColumn, api) => {
                     svg.appendChild(markerEl);
                 }
             }
-            this.eGui.appendChild(svg);
+            // Wrap the SVG in a positioned container so a `Merged` text row sits
+            // centred on the *bar*, not on the cell — see BulletChartRenderer for
+            // the same fix and Percent Bar for the matching behaviour via its
+            // `barEl`.
+            const svgContainer = document.createElement('div');
+            svgContainer.style.position = 'relative';
+            svgContainer.style.display = 'flex';
+            svgContainer.style.alignItems = 'center';
+            svgContainer.style.justifyContent = 'center';
+            if (isVertical) {
+                svgContainer.style.flex = '1 1 auto';
+                svgContainer.style.minHeight = '0';
+            }
+            else {
+                svgContainer.style.flex = '0 0 auto';
+            }
+            svgContainer.appendChild(svg);
+            this.eGui.appendChild(svgContainer);
             if (hasCellText) {
-                const textEl = document.createElement('div');
-                textEl.className = 'ab-RangeBar__text';
-                textEl.style.lineHeight = '1.2';
-                const parts = [];
-                if (rangeStyle.CellText.includes('CellValue')) {
-                    parts.push(params.formatValue?.(numericValue) ?? String(numericValue));
-                }
-                if (rangeStyle.CellText.includes('PercentageValue')) {
-                    const pct = clamp((numericValue - min) / (max - min), 0, 1) * 100;
-                    parts.push(`${pct.toFixed(0)}%`);
-                }
-                textEl.innerText = parts.join(' ');
-                switch (rangeStyle.CellTextPosition) {
-                    case 'Above':
-                        this.eGui.prepend(textEl);
-                        break;
-                    case 'Merged':
-                        textEl.style.position = 'absolute';
-                        textEl.style.top = '50%';
-                        textEl.style.transform = 'translateY(-50%)';
-                        textEl.style.left = '0';
-                        textEl.style.right = '0';
-                        textEl.style.paddingLeft = '5px';
-                        textEl.style.paddingRight = '5px';
-                        textEl.style.pointerEvents = 'none';
-                        this.eGui.appendChild(textEl);
-                        break;
-                    case 'Below':
-                    default:
-                        this.eGui.appendChild(textEl);
-                        break;
-                }
+                const pct = clamp((numericValue - min) / (max - min), 0, 1) * 100;
+                // See PercentBarRenderer: `params.formatValue` on a column without a
+                // `valueFormatter` returns the raw value (a number here), so coerce
+                // to string before it flows into the helpers.
+                const formattedCellValue = String(params.formatValue?.(numericValue) ?? numericValue);
+                const labels = buildBarChartCellTextLabels(cellTextProperties, formattedCellValue, `${pct.toFixed(0)}%`);
+                mountBarChartCellText({
+                    wrapperEl: this.eGui,
+                    mergedOverlayEl: svgContainer,
+                    textClassName: 'ab-RangeBar__text',
+                    cellTextProperties,
+                    labels,
+                });
             }
         }
         getGui() {

package/src/components/AdaptableFormComponent/AdaptableFormComponent.js

@@ -276,7 +276,7 @@ export function AdaptableFormComponent({ formDef, data, onChange, onButtonClick,
         if (!field.helpText && !error) {
             return control;
         }
-        return (_jsxs(Box, { children: [control, field.helpText && !error ? (_jsx(Box, { id: helpId, className: "ab-Form_help twa:text-xs twa:opacity-70 twa:mt-1", children: field.helpText })) : null, error ? (_jsx(Box, { id: errorId, role: "alert", "aria-live": "polite", className: "ab-Form_error twa:text-xs twa:mt-1", style: { color: 'var(--ab-color-error, #c00)' }, children: error })) : null] }));
+        return (_jsxs(Box, { children: [control, field.helpText && !error ? (_jsx(Box, { id: helpId, className: "ab-Form_help twa:text-xs twa:opacity-70 twa:mt-1", children: field.helpText })) : null, error ? (_jsx(Box, { id: errorId, role: "alert", "aria-live": "polite", className: "ab-Form_error twa:text-xs twa:mt-1", style: { color: 'var(--ab-color-destructive, #c00)' }, children: error })) : null] }));
     };
     // by default we have 2 columns: label & input
     const columns = formDef.config?.columns ?? [1, 2];

package/src/components/Card/index.js

@@ -1,10 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { twMerge } from '../../twMerge';
-import clsx from 'clsx';
+import { cn } from '../../lib/utils';
 import { Box } from '../Flex';
 export function Card(props) {
     const { shadow = true, children, className, style, gap = 2 } = props;
-    return (_jsx(Box, { className: clsx('twa:bg-background twa:text-foreground', 'ab-Card', 'twa:text-3', 'twa:rounded-standard twa:p-2', 'twa:flex twa:flex-col', {
+    return (_jsx(Box, { className: cn('twa:bg-background twa:text-foreground', 'ab-Card', 'twa:text-3', 'twa:rounded-standard twa:p-2', 'twa:flex twa:flex-col', {
             'twa:shadow-sm': shadow,
             'twa:gap-0': gap === 0,
             'twa:gap-1': gap === 1,
@@ -16,7 +15,7 @@ export function Card(props) {
 }
 const CardTitle = (props) => {
     const { children, className, gap = 2, border = true } = props;
-    return (_jsx("div", { className: twMerge(clsx('ab-Card__title', {
+    return (_jsx("div", { className: cn('ab-Card__title', {
             'twa:flex twa:flex-row': true,
             'twa:items-center': true,
             'twa:text-4 twa:px-2': true,
@@ -28,11 +27,11 @@ const CardTitle = (props) => {
             'twa:gap-3': gap === 3,
             'twa:gap-4': gap === 4,
             'twa:gap-8': gap === 8,
-        }, className)), children: children }));
+        }, className), children: children }));
 };
 const CardBody = (props) => {
     const { children, gap, className } = props;
-    return (_jsx("div", { className: clsx('ab-Card__body', 'twa:overflow-auto twa:min-h-0', 'twa:flex-1 twa:flex twa:flex-col', {
+    return (_jsx("div", { className: cn('ab-Card__body', 'twa:overflow-auto twa:min-h-0', 'twa:flex-1 twa:flex twa:flex-col', {
             'twa:gap-0': gap === 0,
             'twa:gap-1': gap === 1,
             'twa:gap-2': gap === 2,

package/src/components/CheckBox/index.js

@@ -2,7 +2,6 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useRef, useState } from 'react';
 import { Box, Flex } from '../Flex';
-import clsx from 'clsx';
 import { cn } from '../../lib/utils';
 import { targetPeer } from '../twUtils';
 const Square = (props) => {
@@ -44,10 +43,10 @@ const CheckBox = ({ children, checked, onChange, value, name, disabled, readOnly
     React.useEffect(() => {
         checkboxRef.current.indeterminate = indeterminate;
     }, [indeterminate]);
-    let input = (_jsx("input", { className: clsx(`ab-CheckBox-input twa:peer twa:align-middle twa:opacity-0`, {
+    let input = (_jsx("input", { className: cn(`ab-CheckBox-input twa:peer twa:align-middle twa:opacity-0`, {
             'twa:cursor-pointer': !readOnly && !disabled,
         }), ref: checkboxRef, disabled: disabled, readOnly: readOnly, checked: !!computedChecked, tabIndex: tabIndex, type: "checkbox", name: name, value: value, onChange: onInputChange }));
-    return (_jsxs(Box, { ...props, className: clsx('twa:my-2', 'ab-CheckBox', `ab-CheckBox--${type}`, `ab-CheckBox--variant-${variant}`, disabled ? 'ab-CheckBox--disabled' : '', readOnly ? 'ab-CheckBox--readonly' : '', props.className), style: props.style, as: as, children: [before, beforeGap, input, _jsx(Square, { type: type, className: checkSquareClassName }), afterGap, after] }));
+    return (_jsxs(Box, { ...props, className: cn('twa:my-2', 'ab-CheckBox', `ab-CheckBox--${type}`, `ab-CheckBox--variant-${variant}`, disabled ? 'ab-CheckBox--disabled' : '', readOnly ? 'ab-CheckBox--readonly' : '', props.className), style: props.style, as: as, children: [before, beforeGap, input, _jsx(Square, { type: type, className: checkSquareClassName }), afterGap, after] }));
 };
 export const CheckBoxGroup = (props) => {
     const { orientation, ...flexProps } = props;

package/src/components/CodeBlock/index.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { cn } from '../../lib/utils';
 import { Box } from '../Flex';
-import clsx from 'clsx';
 export const baseClassName = 'ab-CodeBlock';
 export const CodeBlock = (props) => {
-    return (_jsx(Box, { as: "code", ...props, className: clsx('twa:p-1 twa:rounded-standard twa:bg-primary twa:text-primary-foreground', baseClassName, props.className) }));
+    return (_jsx(Box, { as: "code", ...props, className: cn('twa:p-1 twa:rounded-standard twa:bg-primary twa:text-primary-foreground', baseClassName, props.className) }));
 };

package/src/components/ColorPicker/ColorPicker.d.ts

@@ -5,6 +5,7 @@ import { BoxProps } from '../Flex';
 export type ColorPickerProps = Omit<HTMLProps<HTMLInputElement>, 'onChange'> & {
     api: AdaptableApi;
     onChange: (color: string) => void;
+    className?: string;
     value: string;
     includeAlpha?: boolean;
 } & Omit<BoxProps, 'onChange'>;

package/src/components/ColorPicker/ColorPicker.js

@@ -2,15 +2,15 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useCallback, useEffect } from 'react';
 import debounce from '../../Utilities/utils/debounce';
+import { cn } from '../../lib/utils';
 import Input from '../Input';
 import { getVariableColor } from '../../Utilities/Helpers/StyleHelper';
 import tinycolor from 'tinycolor2';
 import { Box, Flex } from '../Flex';
 import { twMerge } from '../../twMerge';
-import clsx from 'clsx';
 export const ColorPicker = React.forwardRef((props, ref) => {
     const ColorPalette = props.api.userInterfaceApi.getColorPalette();
-    let { api, value, includeAlpha = true, ...restProps } = props;
+    let { value, includeAlpha = true, className, ...restProps } = props;
     // Create a debounced version of onChange
     // we need this because moving the mouse A LOT in the custom color picker can break the React rendering
     const debouncedOnChange = useCallback(debounce((color) => {
@@ -36,17 +36,19 @@ export const ColorPicker = React.forwardRef((props, ref) => {
         return [tinycolor(color).setAlpha(0).toRgbString(), tinycolor(color).setAlpha(1).toRgbString()];
     }, [value]);
     const rangeBackround = `linear-gradient(90deg, ${preparedAlphaColor[0]} 0%, ${preparedAlphaColor[1]} 100%)`;
-    const alpha = tinycolor(value).getAlpha();
-    return (_jsxs(Flex, { className: clsx('ColorPicker twa:items-center twa:gap-2', {
+    const alpha = tinycolor(getVariableColor(value)).getAlpha();
+    return (_jsxs(Flex, { className: cn('ColorPicker twa:items-center twa:gap-2', {
             'twa:opacity-30': props.disabled,
-        }, props.className), children: [_jsx(Input, { ...restProps, as: undefined, disabled: props.disabled, className: twMerge('twa:w-[70px] twa:p-0', restProps.className), onChange: (event) => {
+        }, className), children: [_jsx(Input, { ...restProps, as: undefined, disabled: props.disabled, className: twMerge('ab-ColorPicker-swatch'), onChange: (event) => {
                     /**
                      * The value is not in the map when the color is not in the palette.
                      */
                     const color = optionsMap[event.target.value] ?? event.target.value;
                     debouncedOnChange(color);
                 }, value: preparedValue, ref: ref, type: "color", list: "ABcolorChoices", title: props.title }), ABcolorChoices, includeAlpha && (_jsxs(Flex, { alignItems: "center", className: "twa:gap-1", children: [_jsx(Box, { children: "Opacity" }), _jsx(Flex, { alignItems: "center", className: "twa:min-h-input", children: _jsx(Input, { disabled: props.disabled, className: "ab-ColorPicker-range", style: { background: rangeBackround }, value: alpha, onChange: (event) => {
-                                const color = tinycolor(value).setAlpha(event.target.value).toRgbString();
+                                const color = tinycolor(getVariableColor(value))
+                                    .setAlpha(event.target.value)
+                                    .toRgbString();
                                 debouncedOnChange(color);
                             }, min: 0, max: 1, step: 0.01, type: "range" }) })] }))] }));
 });

package/src/components/ColorPicker/OptionalColorPicker.d.ts

@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { AdaptableApi } from '../../Api/AdaptableApi';
+export type OptionalColorPickerProps = {
+    api: AdaptableApi;
+    value: string | undefined;
+    onChange: (color: string | undefined) => void;
+    defaultColor?: string;
+    disabled?: boolean;
+    includeAlpha?: boolean;
+    className?: string;
+};
+export declare const OptionalColorPicker: React.FC<OptionalColorPickerProps>;

package/src/components/ColorPicker/OptionalColorPicker.js

@@ -0,0 +1,26 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useRef } from 'react';
+import { Box, Flex } from '../Flex';
+import SimpleButton from '../SimpleButton';
+import { twMerge } from '../../twMerge';
+import { ColorPicker } from './ColorPicker';
+const DEFAULT_COLOR = '#000000';
+export const OptionalColorPicker = (props) => {
+    const { api, value, onChange, defaultColor = DEFAULT_COLOR, disabled = false, includeAlpha = true, className, } = props;
+    const pickerRef = useRef(null);
+    const pendingOpenRef = useRef(false);
+    useEffect(() => {
+        if (pendingOpenRef.current && value && pickerRef.current) {
+            pendingOpenRef.current = false;
+            pickerRef.current.click();
+        }
+    }, [value]);
+    const handleActivate = () => {
+        pendingOpenRef.current = true;
+        onChange(defaultColor);
+    };
+    if (!value) {
+        return (_jsxs(Flex, { alignItems: "center", className: twMerge('OptionalColorPicker twa:gap-1', className), children: [_jsx("button", { type: "button", disabled: disabled, className: "ab-OptionalColorPicker-empty", onClick: handleActivate, "aria-label": "Set colour", title: "Click to set colour" }), _jsx(Box, { className: "twa:text-2 twa:text-muted-foreground", children: "None" })] }));
+    }
+    return (_jsxs(Flex, { alignItems: "center", className: twMerge('OptionalColorPicker twa:gap-1', className), children: [_jsx(ColorPicker, { ref: pickerRef, api: api, value: value, disabled: disabled, includeAlpha: includeAlpha, onChange: onChange }), _jsx(SimpleButton, { icon: "close", variant: "text", disabled: disabled, tooltip: "Clear colour", onClick: () => onChange(undefined) })] }));
+};

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

@@ -1 +1,2 @@
 export * from './ColorPicker';
+export * from './OptionalColorPicker';

package/src/components/ColorPicker/index.js

@@ -1 +1,2 @@
 export * from './ColorPicker';
+export * from './OptionalColorPicker';

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

@@ -77,6 +77,7 @@ export type ComboboxCommonProps<T extends ComboboxItemType> = {
      */
     renderSearchInputTrailing?: React.ReactNode | (() => React.ReactNode);
     renderCheckboxIndicator?: boolean | null | ComboboxPrimitive.ItemIndicator.Props['render'];
+    showTrigger?: boolean;
 };
 export type AdaptableComboboxProps<T extends ComboboxItemType> = ComboboxCommonProps<T> & ComboboxDataProps<T>;
 export declare function valueToItem<T extends ComboboxItemType>(stringValue: T['value'] | undefined | null, lookup: Map<any, T>): T | undefined;

package/src/components/Combobox/index.js

@@ -5,7 +5,6 @@ import { cn } from '../../lib/utils';
 import { ChevronDownIcon, Loader2Icon, PlusIcon } from 'lucide-react';
 import { useMemo } from 'react';
 import { InputGroupAddon, InputGroupButton } from '../ui/input-group';
-import clsx from 'clsx';
 import { getItemTextLabel, toStringValue, toStringValues, valueToItem, valueToItems, } from './comboboxUtils';
 import { VirtualizedList } from './VirtualizedList';
 import { CheckBox } from '../CheckBox';
@@ -180,15 +179,15 @@ function useCreatable(props, allItems, itemByValue) {
         if (props.isCreatable && itemsToCreate.length > 0) {
             savingCreatableItem = true;
             itemsAllNumeric = allItems.every((item) => !item.creatable ? typeof item.value === 'number' : true);
+            newCreatedItems = itemsToCreate.map((item) => ({
+                ...item,
+                creatable: true,
+                created: true,
+                // if all other items are numeric, and the value for the created item is a valid number, then convert the value to a number
+                // we'll also have to correctly call onValueChange with the new value
+                value: itemsAllNumeric && !Number.isNaN(Number(item.value)) ? Number(item.value) : item.value,
+            }));
             setAlreadySavedCreatableItems((current) => {
-                newCreatedItems = itemsToCreate.map((item) => ({
-                    ...item,
-                    creatable: true,
-                    created: true,
-                    // if all other items are numeric, and the value for the created item is a valid number, then convert the value to a number
-                    // we'll also have to correctly call onValueChange with the new value
-                    value: itemsAllNumeric && !Number.isNaN(Number(item.value)) ? Number(item.value) : item.value,
-                }));
                 const mergedItems = [...current, ...newCreatedItems];
                 const seenValues = new Set();
                 return mergedItems.filter((item) => {
@@ -356,7 +355,7 @@ const SingleCombobox_MenuListSearchable = (props) => {
                 'twa:flex twa:w-full twa:cursor-default twa:items-center twa:justify-between twa:gap-1.5 twa:rounded-input twa:border twa:border-input twa:bg-transparent twa:py-2 twa:pr-2 twa:pl-2.5 twa:text-sm twa:whitespace-nowrap twa:shadow-xs twa:transition-[color,box-shadow] twa:outline-none twa:select-none twa:focus:border-ring twa:focus:ring-3 twa:focus:ring-ring/50 twa:disabled:cursor-not-allowed twa:disabled:opacity-50 twa:data-placeholder:text-muted-foreground twa:h-9', triggerClassName), disabled: isDisabled, onFocus: handleFocus, onBlur: handleBlur, children: _jsx(ComboboxValue, { placeholder: _jsx("span", { children: props.placeholder }), children: (value) => {
                         return (_jsxs(React.Fragment, { children: [_jsx("span", { className: "twa:flex twa:flex-1 twa:truncate twa:text-left", "data-slot": "combobox-value", children: _jsx(ComboboxValue, { placeholder: _jsx("span", { children: props.placeholder }) }) }), _jsx("input", { type: "hidden", "data-slot": "combobox-value-input", readOnly: true, value: value ? getItemTextLabel(value) : '' }), props.isLoading && (_jsx(Loader2Icon, { className: "twa:size-4 twa:text-muted-foreground twa:animate-spin" })), value && showClear ? (_jsx(ComboboxClear, { disabled: isDisabled, onMouseDown: (e) => {
                                         e.preventBaseUIHandler();
-                                    } })) : (_jsx(InputGroupButton, { size: "icon-xs", variant: "ghost", className: 'twa:min-h-auto!', children: _jsx(ChevronDownIcon, { className: "twa:pointer-events-none twa:size-4 twa:shrink-0 twa:text-muted-foreground" }) }))] }));
+                                    } })) : props.showTrigger !== false ? (_jsx(InputGroupButton, { size: "icon-xs", variant: "ghost", className: 'twa:min-h-auto!', children: _jsx(ChevronDownIcon, { className: "twa:pointer-events-none twa:size-4 twa:shrink-0 twa:text-muted-foreground" }) })) : null] }));
                     } }) }), _jsxs(ComboboxContent, { anchor: anchor, style: getContentStyle({ maxLabelLength }), resizable: props.resizable, contentRef: contentRefCallback, className: props.contentClassName, children: [_jsx(ComboboxInput, { className: searchInputClassName, placeholder: props.placeholder, showClear: false, showTrigger: false, disabled: isDisabled, ref: searchInputRef, onFocus: handleFocus, onBlur: handleBlur }), _jsx(AdaptableComboboxList, { renderItemLabel: props.renderItemLabel, searchable: props.searchable, emptyText: emptyText, groups: props.groups, virtualized: !!props.virtualized, showItemTooltip: !!props.showItemTooltip, open: props.open, isLoading: props.isLoading })] })] }));
 };
 const SingleCombobox_SimpleSearchable = (props) => {
@@ -367,7 +366,7 @@ const SingleCombobox_SimpleSearchable = (props) => {
     const searchable = props.searchable === false ? false : 'inline';
     const isDisabled = props.disabled;
     const { allItems, itemByValue, maxLabelLength, inputValue, onInputValueChange, onValueChange, value, } = useGetAllItems(props);
-    return (_jsxs(AdaptableCombobox_Root, { ...props, value: value, itemByValue: itemByValue, inputValue: inputValue, onInputValueChange: onInputValueChange, onValueChange: onValueChange, allItems: allItems, children: [_jsx(ComboboxInput, { className: className, groupRef: anchor, placeholder: props.placeholder, showClear: showClear, showTrigger: true, isLoading: props.isLoading, disabled: isDisabled, readOnly: searchable === false, "aria-label": props.ariaLabel || props['aria-label'], "data-name": props['data-name'], onFocus: props.onFocus, onBlur: props.onBlur }), _jsx(ComboboxContent, { anchor: anchor, style: getContentStyle({ maxLabelLength }), resizable: props.resizable, children: _jsx(AdaptableComboboxList, { searchable: props.searchable, renderItemLabel: props.renderItemLabel, emptyText: emptyText, groups: props.groups, virtualized: !!props.virtualized, showItemTooltip: !!props.showItemTooltip, open: props.open, isLoading: props.isLoading }) })] }));
+    return (_jsxs(AdaptableCombobox_Root, { ...props, value: value, itemByValue: itemByValue, inputValue: inputValue, onInputValueChange: onInputValueChange, onValueChange: onValueChange, allItems: allItems, children: [_jsx(ComboboxInput, { className: className, groupRef: anchor, placeholder: props.placeholder, showClear: showClear, showTrigger: props.showTrigger !== false, isLoading: props.isLoading, disabled: isDisabled, readOnly: searchable === false, "aria-label": props.ariaLabel || props['aria-label'], "data-name": props['data-name'], onFocus: props.onFocus, onBlur: props.onBlur }), _jsx(ComboboxContent, { anchor: anchor, style: getContentStyle({ maxLabelLength }), resizable: props.resizable, children: _jsx(AdaptableComboboxList, { searchable: props.searchable, renderItemLabel: props.renderItemLabel, emptyText: emptyText, groups: props.groups, virtualized: !!props.virtualized, showItemTooltip: !!props.showItemTooltip, open: props.open, isLoading: props.isLoading }) })] }));
 };
 const MultiCombobox_SimpleSearchable = (props) => {
     const anchor = useComboboxAnchor();
@@ -400,13 +399,13 @@ const MultiCombobox_SimpleSearchable = (props) => {
                     if (!menuOpen) {
                         onOpenChange(true);
                     }
-                }, ref: anchor, className: clsx('twa:relative', props.className), children: _jsx(ComboboxValue, { children: (selectedItems) => {
+                }, ref: anchor, className: cn('twa:relative', props.className), children: _jsx(ComboboxValue, { children: (selectedItems) => {
                         const shouldKeepTrigger = props.searchable === false && selectedItems.length > 0;
                         return (_jsxs(React.Fragment, { children: [props.renderInputValues ? (props.renderInputValues(selectedItems)) : (_jsx(MultiComboboxChips, { selectedItems: selectedItems, showClear: showClear })), props.renderInput !== false ? (_jsxs(_Fragment, { children: [_jsx(ComboboxChipsInput, { placeholder: selectedItems.length > 0 ? '' : props.placeholder, readOnly: props.searchable === false, onFocus: props.onFocus, onBlur: props.onBlur, className: props.searchable === false && selectedItems.length > 0
                                                 ? 'twa:absolute! twa:inset-0 twa:min-h-auto! twa:max-h-auto!' // so we fill the parent container and on click we can open the combobox as usual
-                                                : 'twa:flex-1' }), props.searchable === false && selectedItems.length > 0 ? (_jsx("div", { className: "twa:flex-1" })) : null, _jsx("div", { "data-slot": "input-group", role: "group", className: "twa:group/input-group twa:z-10", children: _jsxs(InputGroupAddon, { align: "inline-end", className: "twa:p-0 px twa:gap-0.5", children: [props.isLoading && (_jsx(Loader2Icon, { className: "twa:size-4 twa:text-muted-foreground twa:animate-spin" })), _jsx(InputGroupButton, { size: "icon-xs", variant: "ghost", render: _jsx(ComboboxTrigger, { className: "twa:min-h-auto!" }), "data-slot": "combobox-toggle", className: clsx(`twa:data-pressed:bg-transparent`, shouldKeepTrigger
+                                                : 'twa:flex-1' }), props.searchable === false && selectedItems.length > 0 ? (_jsx("div", { className: "twa:flex-1" })) : null, _jsx("div", { "data-slot": "input-group", role: "group", className: "twa:group/input-group twa:z-10", children: _jsxs(InputGroupAddon, { align: "inline-end", className: "twa:p-0 px twa:gap-0.5", children: [props.isLoading && (_jsx(Loader2Icon, { className: "twa:size-4 twa:text-muted-foreground twa:animate-spin" })), props.showTrigger !== false ? (_jsx(InputGroupButton, { size: "icon-xs", variant: "ghost", render: _jsx(ComboboxTrigger, { className: "twa:min-h-auto!" }), "data-slot": "combobox-toggle", className: cn(`twa:data-pressed:bg-transparent`, shouldKeepTrigger
                                                             ? ''
-                                                            : 'twa:group-has-data-[slot=combobox-clear]/input-group:hidden'), disabled: isDisabled }), showClear && _jsx(ComboboxClear, { disabled: isDisabled })] }) })] })) : null] }));
+                                                            : 'twa:group-has-data-[slot=combobox-clear]/input-group:hidden'), disabled: isDisabled })) : null, showClear && _jsx(ComboboxClear, { disabled: isDisabled })] }) })] })) : null] }));
                     } }) }), _jsx(ComboboxContent, { anchor: anchor, style: getContentStyle({ maxLabelLength }), resizable: props.resizable, children: _jsx(AdaptableComboboxList, { searchable: props.searchable, emptyText: emptyText, renderItemLabel: props.renderItemLabel, showSelectAllCheckbox: props.showSelectAllCheckbox, renderCheckboxIndicator: props.renderCheckboxIndicator ?? true, onCheckAllChange: onCheckAllChange, totalCount: allItems.length, groups: props.groups, virtualized: !!props.virtualized, showItemTooltip: !!props.showItemTooltip, open: props.open, isLoading: props.isLoading }) })] }));
 };
 const MultiComboboxChips = (props) => {
@@ -492,15 +491,15 @@ const MultiCombobox_MenuListSearchable = (props) => {
                     hasFocusRef.current = false;
                     props.onBlur?.();
                 }
-            }, className: clsx('twa:relative', props.className, _props?.className), children: _jsx(ComboboxValue, { children: (selectedItems) => {
-                    return (_jsxs(React.Fragment, { children: [props.renderInputValues ? (props.renderInputValues(selectedItems)) : (_jsx(MultiComboboxChips, { selectedItems: selectedItems, showClear: showClear })), props.renderInput !== false ? (_jsx(_Fragment, { children: _jsx(ComboboxChipsInput, { ref: chipsInputRef, placeholder: selectedItems.length > 0 ? '' : props.placeholder, readOnly: true, value: '', className: 'twa:flex-1' }) })) : (_jsx("div", { className: "twa:flex-1" })), _jsx("div", { "data-slot": "input-group", role: "group", className: "twa:group/input-group", children: _jsxs(InputGroupAddon, { align: "inline-end", className: "twa:p-0 px", children: [props.isLoading && (_jsx(Loader2Icon, { className: "twa:size-4 twa:text-muted-foreground twa:animate-spin" })), _jsx(InputGroupButton, { size: "icon-xs", variant: "ghost", render: _jsx(ComboboxTrigger, { className: "twa:min-h-auto!", ref: chevronRef, "data-slot": "combobox-toggle", 
+            }, className: cn('twa:relative', props.className, _props?.className), children: _jsx(ComboboxValue, { children: (selectedItems) => {
+                    return (_jsxs(React.Fragment, { children: [props.renderInputValues ? (props.renderInputValues(selectedItems)) : (_jsx(MultiComboboxChips, { selectedItems: selectedItems, showClear: showClear })), props.renderInput !== false ? (_jsx(_Fragment, { children: _jsx(ComboboxChipsInput, { ref: chipsInputRef, placeholder: selectedItems.length > 0 ? '' : props.placeholder, readOnly: true, value: '', className: 'twa:flex-1' }) })) : (_jsx("div", { className: "twa:flex-1" })), _jsx("div", { "data-slot": "input-group", role: "group", className: "twa:group/input-group", children: _jsxs(InputGroupAddon, { align: "inline-end", className: "twa:p-0 px", children: [props.isLoading && (_jsx(Loader2Icon, { className: "twa:size-4 twa:text-muted-foreground twa:animate-spin" })), props.showTrigger !== false ? (_jsx(InputGroupButton, { size: "icon-xs", variant: "ghost", render: _jsx(ComboboxTrigger, { className: "twa:min-h-auto!", ref: chevronRef, "data-slot": "combobox-toggle", 
                                                 // we already have the role="combobox" on the parent
                                                 // so we want to avoid the same role twice in the component,
                                                 // hence we use the role="widget" here.
-                                                role: "widget" }), "data-slot": "combobox-toggle", className: clsx(`twa:data-pressed:bg-transparent`, 'twa:group-has-data-[slot=combobox-clear]/input-group:hidden'), disabled: isDisabled }), showClear && _jsx(ComboboxClear, { disabled: isDisabled })] }) })] }));
+                                                role: "widget" }), "data-slot": "combobox-toggle", className: cn(`twa:data-pressed:bg-transparent`, 'twa:group-has-data-[slot=combobox-clear]/input-group:hidden'), disabled: isDisabled })) : null, showClear && _jsx(ComboboxClear, { disabled: isDisabled })] }) })] }));
                 } }) }));
     };
-    return (_jsxs(AdaptableCombobox_Root, { ...props, value: value, multiple: true, allItems: allItems, itemByValue: itemByValue, inputValue: inputValue, onInputValueChange: onInputValueChange, onValueChange: onValueChange, onOpenChange: onOpenChange, children: [props.renderInput === false ? (_jsx(ComboboxTrigger, { nativeButton: false, render: renderChips })) : (renderChips(undefined)), _jsxs(ComboboxContent, { anchor: anchor, style: getContentStyle({ maxLabelLength }), resizable: props.resizable, contentRef: contentRefCallback, children: [_jsx(ComboboxInput, { placeholder: 'Filter...', showClear: false, ref: searchInputRef, showTrigger: false, disabled: isDisabled, onFocus: handleFocus, onBlur: handleBlur, role: "searchbox", className: 'twa:min-h-input', children: typeof props.renderSearchInputTrailing === 'function'
+    return (_jsxs(AdaptableCombobox_Root, { ...props, value: value, multiple: true, allItems: allItems, itemByValue: itemByValue, inputValue: inputValue, onInputValueChange: onInputValueChange, onValueChange: onValueChange, onOpenChange: onOpenChange, children: [props.renderInput === false ? (_jsx(ComboboxTrigger, { nativeButton: false, render: renderChips, icon: props.showTrigger !== false ? undefined : null })) : (renderChips(undefined)), _jsxs(ComboboxContent, { anchor: anchor, style: getContentStyle({ maxLabelLength }), resizable: props.resizable, contentRef: contentRefCallback, children: [_jsx(ComboboxInput, { placeholder: 'Filter...', showClear: false, ref: searchInputRef, showTrigger: false, disabled: isDisabled, onFocus: handleFocus, onBlur: handleBlur, role: "searchbox", className: 'twa:min-h-input', children: typeof props.renderSearchInputTrailing === 'function'
                             ? props.renderSearchInputTrailing()
                             : undefined }), _jsx(AdaptableComboboxList, { renderItemLabel: props.renderItemLabel, emptyText: emptyText, searchable: props.searchable, showSelectAllCheckbox: props.showSelectAllCheckbox, selectAllCheckboxValue: props.selectAllCheckboxValue, renderCheckboxIndicator: props.renderCheckboxIndicator ?? true, onCheckAllChange: onCheckAllChange, totalCount: allItems.length, groups: props.groups, virtualized: !!props.virtualized, showItemTooltip: !!props.showItemTooltip, open: props.open, isLoading: props.isLoading })] })] }));
 };
@@ -535,6 +534,8 @@ export const GridFilterCombobox = (props) => {
         virtualized: true,
         resizable: true,
         showClear: false,
+        // don't show a chevron icon in the grid filter combobox
+        showTrigger: false,
         renderInputValues: (items) => {
             let children = items.map((item) => getItemTextLabel(item)).join(', ');
             if (items.length === 0) {

package/src/components/Dashboard/DashboardManager.js

@@ -2,8 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { ModuleManager } from '../DragAndDropContext/ModuleManager';
 const DashboardManager = ({ tabs, onTabsChange, availableToolbars, api, disabled, }) => {
-    const moduleService = api.internalApi.getModuleService();
-    const moduleInfo = moduleService.getModuleInfoByModule('Dashboard');
     const moduleTabs = tabs.map((tab) => {
         return {
             Name: tab.Name,
@@ -16,7 +14,7 @@ const DashboardManager = ({ tabs, onTabsChange, availableToolbars, api, disabled
             Toolbars: tab.Items,
         }));
         onTabsChange(dashboardTabs);
-    }, []);
-    return (_jsx(ModuleManager, { availableItems: availableToolbars, disabled: disabled, onTabsChange: handleTabsChange, tabs: moduleTabs, tabsTitle: moduleInfo.FriendlyName + ' Tabs', unusedPanelTitle: 'Available Toolbars', dragItemText: "Drag into a Tab below" }));
+    }, [onTabsChange]);
+    return (_jsx(ModuleManager, { dragScope: "dashboard-tabs", layout: "rows", availableItems: availableToolbars, disabled: disabled, onTabsChange: handleTabsChange, tabs: moduleTabs }));
 };
 export default DashboardManager;

package/src/components/Dialog/index.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
+import { cn } from '../../lib/utils';
 import { useRef, useEffect } from 'react';
 import contains from '../utils/contains';
 import captureTabNavigation from '../utils/captureTabNavigation';
@@ -9,7 +10,6 @@ import useAutoFocus from '../utils/useAutoFocus';
 import { Icon } from '../icons';
 import { WindowModal } from '../WindowModal';
 import { Box } from '../Flex';
-import clsx from 'clsx';
 import { targetOwn } from '../twUtils';
 const baseClassName = 'ab-Dialog';
 export const Dialog = React.forwardRef((props, dialogRef) => {
@@ -95,7 +95,7 @@ export const Dialog = React.forwardRef((props, dialogRef) => {
     if (!isOpen) {
         return null;
     }
-    const closeButton = showCloseButton ? (_jsx(Box, { title: "Close dialog", onClick: () => setIsOpen(false), className: clsx(`${baseClassName}__close-button twa:p-1`, 'twa:text-accentlight', 'twa:text-shadow-[0_1px_0_#fff]', `twa:text-3 twa:cursor-pointer twa:leading-none twa:font-bold`, 'twa:absolute twa:top-[6px] twa:right-[6px]'), children: _jsx(Icon, { size: 20, name: "close" }) })) : null;
+    const closeButton = showCloseButton ? (_jsx(Box, { title: "Close dialog", onClick: () => setIsOpen(false), className: cn(`${baseClassName}__close-button twa:p-1`, 'twa:text-accentlight', 'twa:text-shadow-[0_1px_0_#fff]', `twa:text-3 twa:cursor-pointer twa:leading-none twa:font-bold`, 'twa:absolute twa:top-[6px] twa:right-[6px]'), children: _jsx(Icon, { size: 20, name: "close" }) })) : null;
     const setPreventDismissFlag = (e) => {
         if (dismissOnClickOutside) {
             e.nativeEvent.preventDialogDismiss = true;
@@ -106,8 +106,8 @@ export const Dialog = React.forwardRef((props, dialogRef) => {
             if (boxProps && boxProps.onClick) {
                 boxProps.onClick(e);
             }
-        }, onKeyDown: onKeyDown, className: clsx('twa:relative', 'twa:bg-background', 'twa:text-foreground', 'twa:fill-foreground', 'twa:rounded-standard', 'twa:flex twa:flex-col', targetOwn.focusOutline, targetOwn.focusWithinOutline, baseClassName, modal ? `${baseClassName}--modal` : `${baseClassName}--not-modal`, className), ref: boxRef, children: [children, closeButton] }));
-    const content = fixed ? (_jsx("div", { onClick: setPreventDismissFlag, className: clsx(`${baseClassName}-fixed-wrapper`, 'twa:fixed twa:inset-0', 'twa:m-auto', 'twa:flex twa:items-center twa:justify-center'), children: box })) : (box);
+        }, onKeyDown: onKeyDown, className: cn('twa:relative', 'twa:bg-background', 'twa:text-foreground', 'twa:fill-foreground', 'twa:rounded-standard', 'twa:flex twa:flex-col', targetOwn.focusOutline, targetOwn.focusWithinOutline, baseClassName, modal ? `${baseClassName}--modal` : `${baseClassName}--not-modal`, className), ref: boxRef, children: [children, closeButton] }));
+    const content = fixed ? (_jsx("div", { onClick: setPreventDismissFlag, className: cn(`${baseClassName}-fixed-wrapper`, 'twa:fixed twa:inset-0', 'twa:m-auto', 'twa:flex twa:items-center twa:justify-center'), children: box })) : (box);
     if (windowModal) {
         return _jsx(WindowModal, { ...windowModalProps, children: content });
     }

package/src/components/DragAndDropContext/DragAndDropContext.d.ts

@@ -1,7 +1,12 @@
 import * as React from 'react';
 import { ModuleManagerProps } from './ModuleManager';
 import { ModuleDraggableItem } from './types';
+export declare const DEFAULT_UNUSED_LIST_ID = "UNUSED";
 export declare const DragAndDropContext: React.Context<{
     availableItems: ModuleDraggableItem[];
     permittedActions: ModuleManagerProps["permittedActions"];
+    /** Prefixes drag list / item ids so multiple ModuleManagers on one page do not interfere. */
+    dragScope: string;
+    /** Drag-list ids for unused / available item pools (accept-drop sources for toolbar lists). */
+    unusedListIds: string[];
 }>;

package/src/components/DragAndDropContext/DragAndDropContext.js

@@ -1,4 +1,5 @@
 import * as React from 'react';
+export const DEFAULT_UNUSED_LIST_ID = 'UNUSED';
 export const DragAndDropContext = React.createContext({
     availableItems: [],
     permittedActions: {
@@ -7,4 +8,6 @@ export const DragAndDropContext = React.createContext({
         dragAndDropTab: true,
         deleteTab: true,
     },
+    dragScope: 'default',
+    unusedListIds: [DEFAULT_UNUSED_LIST_ID],
 });

package/src/components/DragAndDropContext/ModuleManager.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { BaseModuleTab, ModuleDraggableItem } from './types';
+import { BaseModuleTab, ModuleDraggableItem, UnusedItemGroup } from './types';
 export interface ModuleManagerProps {
     availableItems: ModuleDraggableItem[];
     filterOutSelectedItems?: boolean;
@@ -7,8 +7,12 @@ export interface ModuleManagerProps {
     disabled: boolean;
     onTabsChange: (tabs: BaseModuleTab[]) => void;
     tabs: BaseModuleTab[];
-    unusedPanelTitle: string;
-    dragItemText: string;
+    unusedPanelTitle?: string;
+    dragItemText?: string;
+    /** When set, renders multiple available-item pools instead of a single unused panel. */
+    unusedItemGroups?: UnusedItemGroup[];
+    /** Layout for `unusedItemGroups` when more than one group is provided. */
+    unusedItemGroupsLayout?: 'column' | 'row';
     tabsTitle?: string;
     permittedActions?: {
         createTab?: boolean;
@@ -16,5 +20,13 @@ export interface ModuleManagerProps {
         dragAndDropTab?: boolean;
         deleteTab?: boolean;
     };
+    /**
+     * `strip`: single horizontal drop row (e.g. pinned toolbars).
+     * `rows`: named tabs stacked vertically, each with a horizontal toolbar strip.
+     * `tabs`: multi-column tab editor (default, e.g. status bar).
+     */
+    layout?: 'tabs' | 'strip' | 'rows';
+    /** Unique per ModuleManager instance when more than one appears on the same screen. */
+    dragScope?: string;
 }
 export declare const ModuleManager: React.FunctionComponent<ModuleManagerProps>;