@adaptabletools/adaptable 23.0.0-canary.0 → 23.0.0-canary.10

package/src/View/StatusBar/StatusBarPopup.js

@@ -8,6 +8,7 @@ import { getStatusPanelsSelector } from '../../Redux/ActionsReducers/StatusBarRe
 import { useAdaptable } from '../AdaptableContext';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
 import { ACCESS_LEVEL_READ_ONLY } from '../../Utilities/Constants/GeneralConstants';
+import { isRichStatusBarPanel } from './statusBarPanelHelpers';
 export const StatusBarPopup = (props) => {
     const statusPanels = useSelector(getStatusPanelsSelector);
     const adaptable = useAdaptable();
@@ -26,19 +27,50 @@ export const StatusBarPopup = (props) => {
             };
         });
         adaptable.api.statusBarApi.setStatusBarPanels(newStatusPanels);
-    }, [statusPanels]);
-    const availableItems = ALL_STATUS_SUB_PANELS.filter((panel) => {
+    }, [statusPanels, adaptable.api.statusBarApi]);
+    const availableItems = React.useMemo(() => ALL_STATUS_SUB_PANELS.filter((panel) => {
         const module = adaptable.ModuleService.getModuleById(panel);
         return module?.isModuleVisible();
     }).map((panel) => {
         const module = adaptable.ModuleService.getModuleById(panel);
         return { Id: panel, Title: module.moduleInfo.FriendlyName };
-    });
+    }), [adaptable]);
+    const unusedItemGroups = React.useMemo(() => {
+        const statusPanelIds = [];
+        const moduleShortcutIds = [];
+        availableItems.forEach((item) => {
+            const module = adaptable.ModuleService.getModuleById(item.Id);
+            if (isRichStatusBarPanel(module)) {
+                statusPanelIds.push(item.Id);
+            }
+            else {
+                moduleShortcutIds.push(item.Id);
+            }
+        });
+        // Roughly balance the two boxes by item count (~10 panels vs ~17 shortcuts)
+        // so the wider list gets the extra room and they feel more even.
+        return [
+            {
+                listId: 'UNUSED-PANELS',
+                title: 'Status Panels',
+                help: 'Fully featured actionable controls',
+                items: statusPanelIds,
+                flex: 40,
+            },
+            {
+                listId: 'UNUSED-SHORTCUTS',
+                title: 'Module Shortcuts',
+                help: 'Buttons to open Module Status Panel',
+                items: moduleShortcutIds,
+                flex: 60,
+            },
+        ];
+    }, [availableItems, adaptable]);
     const disabled = props.accessLevel === ACCESS_LEVEL_READ_ONLY;
-    return (_jsx(PopupPanel, { headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed(), children: statusPanels.length ? (_jsx(ModuleManager, { permittedActions: {
+    return (_jsx(PopupPanel, { headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed(), children: statusPanels.length ? (_jsx(ModuleManager, { dragScope: "status-bar", layout: "rows", permittedActions: {
                 createTab: false,
                 dragAndDropTab: false,
                 deleteTab: false,
                 editTabName: false,
-            }, onTabsChange: handleTabChange, disabled: disabled, tabs: tabs, availableItems: availableItems, tabsTitle: 'AdapTable Status Bar Panels', unusedPanelTitle: "Available Status Bar Components", dragItemText: "Drag into a Status Bar Panel below" })) : (_jsx(EmptyContent, { children: "To enable this feature add to Grid Options statusPanels the Adaptable Status Panel." })) }));
+            }, onTabsChange: handleTabChange, disabled: disabled, tabs: tabs, availableItems: availableItems, unusedItemGroups: unusedItemGroups, dragItemText: "Drag items from either panel above into a Status Bar Panel below", tabsTitle: "AdapTable Status Bar Panels" })) : (_jsx(EmptyContent, { children: "To enable this feature add to Grid Options statusPanels the Adaptable Status Panel." })) }));
 };

package/src/View/StatusBar/statusBarPanelHelpers.d.ts

@@ -0,0 +1,2 @@
+import { IModule } from '../../Strategy/Interface/IModule';
+export declare const isRichStatusBarPanel: (module: IModule | undefined) => boolean;

package/src/View/StatusBar/statusBarPanelHelpers.js

@@ -0,0 +1,7 @@
+export const isRichStatusBarPanel = (module) => {
+    if (!module) {
+        return false;
+    }
+    const statusBarPanelProps = module.getViewProperties?.()?.getStatusBarPanelProps?.() ?? {};
+    return Boolean(statusBarPanelProps.view || statusBarPanelProps.content || statusBarPanelProps.popover);
+};

package/src/View/StyledColumn/Wizard/BadgePillStyleEditor.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
-import { BadgePillStyle } from '../../../AdaptableState/StyledColumnState';
+import { BadgePillStyle } from '../../../AdaptableState/StyledColumns/BadgeStyle';
 export interface BadgePillStyleEditorProps {
     api: AdaptableApi;
     /** Current pill style (may be undefined / partial). */
@@ -11,6 +11,8 @@ export interface BadgePillStyleEditorProps {
      */
     onChange: (next: BadgePillStyle | undefined) => void;
     disabled?: boolean;
+    /** When true, omit outer border — for use inside a wizard Card body. */
+    embedded?: boolean;
 }
 /**
  * Compact editor for the cut-down {@link BadgePillStyle}.
@@ -22,5 +24,10 @@ export interface BadgePillStyleEditorProps {
  * - **No** `FontSize` — pills inherit cell font sizing.
  */
 export declare const BadgePillStyleEditor: React.FunctionComponent<BadgePillStyleEditorProps>;
+/** Descriptive pill properties for summary panels (`Label: value` strings). */
+export declare const getBadgePillStyleSummaryItems: (pill: BadgePillStyle | undefined) => {
+    label: string;
+    value: string;
+}[];
 /** Compact summary tags for a {@link BadgePillStyle}; used by wizard summaries. */
 export declare const renderBadgePillStyleSummaryTags: (pill: BadgePillStyle | undefined) => React.JSX.Element | null;

package/src/View/StyledColumn/Wizard/BadgePillStyleEditor.js

@@ -1,10 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { CheckBox } from '../../../components/CheckBox';
-import { ColorPicker } from '../../../components/ColorPicker';
+import { OptionalColorPicker } from '../../../components/ColorPicker';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { Box, Flex } from '../../../components/Flex';
 import { Toggle, ToggleGroup } from '../../../components/Toggle';
-import { Tag } from '../../../components/Tag';
+import { renderSummaryLabelValueTags } from '../../Wizard/SummaryColorTag';
 const LABEL_COLUMN = { name: 'label', style: { textAlign: 'start' } };
 const CHILD_COLUMN = { name: 'children' };
 /**
@@ -35,30 +34,43 @@ export const BadgePillStyleEditor = (props) => {
         }
     };
     const disabledClass = disabled ? 'twa:opacity-50 twa:pointer-events-none' : '';
-    return (_jsx(Box, { className: "twa:mt-2 twa:rounded-standard twa:border twa:border-border twa:overflow-hidden twa:shadow-sm", children: _jsx(Box, { className: "twa:p-3", children: _jsxs(FormLayout, { columns: [LABEL_COLUMN, CHILD_COLUMN], sizes: ['7.5rem', '1fr'], gridColumnGap: "0.75rem", children: [_jsx(FormRow, { label: "Background", children: _jsxs(Flex, { alignItems: "center", className: "twa:gap-2", children: [_jsx(CheckBox, { disabled: disabled, checked: !!pill.BackColor, onChange: (checked) => update({ BackColor: checked ? pill.BackColor ?? '#cccccc' : undefined }), children: "Set" }), _jsx(ColorPicker, { disabled: disabled || !pill.BackColor, api: props.api, value: pill.BackColor || '#cccccc', onChange: (c) => update({ BackColor: c }) })] }) }), _jsx(FormRow, { label: "Text", children: _jsxs(Flex, { alignItems: "center", className: "twa:gap-2", children: [_jsx(CheckBox, { disabled: disabled, checked: !!pill.ForeColor, onChange: (checked) => update({ ForeColor: checked ? pill.ForeColor ?? '#000000' : undefined }), children: "Set" }), _jsx(ColorPicker, { disabled: disabled || !pill.ForeColor, api: props.api, value: pill.ForeColor || '#000000', onChange: (c) => update({ ForeColor: c }) })] }) }), _jsx(FormRow, { label: "Border", children: _jsxs(Flex, { alignItems: "center", className: "twa:gap-2", children: [_jsx(CheckBox, { disabled: disabled, checked: !!pill.BorderColor, onChange: (checked) => update({ BorderColor: checked ? pill.BorderColor ?? '#000000' : undefined }), children: "Set" }), _jsx(ColorPicker, { disabled: disabled || !pill.BorderColor, api: props.api, value: pill.BorderColor || '#000000', onChange: (c) => update({ BorderColor: c }) })] }) }), _jsx(FormRow, { label: "Font", children: _jsx(Box, { className: disabledClass, children: _jsxs(Flex, { alignItems: "center", className: "twa:gap-2 twa:flex-wrap", children: [_jsxs(ToggleGroup, { children: [_jsx(Toggle, { pressed: pill.FontStyle === 'Italic', onPressedChange: (pressed) => update({ FontStyle: pressed ? 'Italic' : undefined }), icon: "italic" }), _jsx(Toggle, { pressed: pill.FontWeight === 'Bold', onPressedChange: (pressed) => update({ FontWeight: pressed ? 'Bold' : undefined }), icon: "bold" })] }), _jsxs(ToggleGroup, { children: [_jsx(Toggle, { pressed: pill.TextDecoration === 'Underline', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'Underline' : undefined }), icon: "underline" }), _jsx(Toggle, { pressed: pill.TextDecoration === 'LineThrough', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'LineThrough' : undefined }), icon: "strikethrough" }), _jsx(Toggle, { pressed: pill.TextDecoration === 'Overline', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'Overline' : undefined }), icon: "overline" })] })] }) }) })] }) }) }));
+    const form = (_jsxs(FormLayout, { columns: [LABEL_COLUMN, CHILD_COLUMN], sizes: ['7.5rem', '1fr'], gridColumnGap: "0.75rem", children: [_jsx(FormRow, { label: "Background", children: _jsx(OptionalColorPicker, { disabled: disabled, api: props.api, value: pill.BackColor, defaultColor: "#cccccc", onChange: (c) => update({ BackColor: c }) }) }), _jsx(FormRow, { label: "Text", children: _jsx(OptionalColorPicker, { disabled: disabled, api: props.api, value: pill.ForeColor, defaultColor: "#000000", onChange: (c) => update({ ForeColor: c }) }) }), _jsx(FormRow, { label: "Border", children: _jsx(OptionalColorPicker, { disabled: disabled, api: props.api, value: pill.BorderColor, defaultColor: "#000000", onChange: (c) => update({ BorderColor: c }) }) }), _jsx(FormRow, { label: "Font", children: _jsx(Box, { className: disabledClass, children: _jsxs(Flex, { alignItems: "center", className: "twa:gap-2 twa:flex-wrap", children: [_jsxs(Flex, { alignItems: "center", className: "twa:gap-2", children: [_jsx(Toggle, { standalone: true, pressed: pill.FontStyle === 'Italic', onPressedChange: (pressed) => update({ FontStyle: pressed ? 'Italic' : undefined }), icon: "italic" }), _jsx(Toggle, { standalone: true, pressed: pill.FontWeight === 'Bold', onPressedChange: (pressed) => update({ FontWeight: pressed ? 'Bold' : undefined }), icon: "bold" })] }), _jsxs(ToggleGroup, { children: [_jsx(Toggle, { pressed: pill.TextDecoration === 'Underline', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'Underline' : undefined }), icon: "underline" }), _jsx(Toggle, { pressed: pill.TextDecoration === 'LineThrough', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'LineThrough' : undefined }), icon: "strikethrough" }), _jsx(Toggle, { pressed: pill.TextDecoration === 'Overline', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'Overline' : undefined }), icon: "overline" })] })] }) }) })] }));
+    if (props.embedded) {
+        return form;
+    }
+    return (_jsx(Box, { className: "twa:mt-2 twa:rounded-standard twa:border twa:border-border twa:overflow-hidden twa:shadow-sm", children: _jsx(Box, { className: "twa:p-3", children: form }) }));
 };
-/** Compact summary tags for a {@link BadgePillStyle}; used by wizard summaries. */
-export const renderBadgePillStyleSummaryTags = (pill) => {
-    if (!pill)
-        return null;
-    const tags = [];
+/** Descriptive pill properties for summary panels (`Label: value` strings). */
+export const getBadgePillStyleSummaryItems = (pill) => {
+    if (!pill) {
+        return [];
+    }
+    const items = [];
     if (pill.BackColor) {
-        tags.push(_jsxs(Tag, { children: ["Bg ", pill.BackColor] }, "bg"));
+        items.push({ label: 'Back Colour', value: pill.BackColor });
     }
     if (pill.ForeColor) {
-        tags.push(_jsxs(Tag, { children: ["Text ", pill.ForeColor] }, "fg"));
+        items.push({ label: 'Fore Colour', value: pill.ForeColor });
     }
     if (pill.BorderColor) {
-        tags.push(_jsxs(Tag, { children: ["Border ", pill.BorderColor] }, "bc"));
+        items.push({ label: 'Border Colour', value: pill.BorderColor });
+    }
+    if (pill.FontWeight === 'Bold') {
+        items.push({ label: 'Font Weight', value: 'Bold' });
+    }
+    if (pill.FontStyle === 'Italic') {
+        items.push({ label: 'Font Style', value: 'Italic' });
     }
-    if (pill.FontWeight === 'Bold')
-        tags.push(_jsx(Tag, { children: "Bold" }, "b"));
-    if (pill.FontStyle === 'Italic')
-        tags.push(_jsx(Tag, { children: "Italic" }, "i"));
     if (pill.TextDecoration && pill.TextDecoration !== 'None') {
-        tags.push(_jsx(Tag, { children: pill.TextDecoration }, "td"));
+        items.push({ label: 'Text Decoration', value: pill.TextDecoration });
     }
-    if (tags.length === 0)
+    return items;
+};
+/** Compact summary tags for a {@link BadgePillStyle}; used by wizard summaries. */
+export const renderBadgePillStyleSummaryTags = (pill) => {
+    const items = getBadgePillStyleSummaryItems(pill);
+    if (!items.length) {
         return null;
-    return (_jsx(Flex, { alignItems: "center", className: "twa:gap-1 twa:flex-wrap", children: tags }));
+    }
+    return renderSummaryLabelValueTags(items);
 };

package/src/View/StyledColumn/Wizard/StyledColumnBadgeSection.d.ts

@@ -1,6 +1,14 @@
 import * as React from 'react';
 import { StyledColumn } from '../../../types';
-export declare const renderBadgeSummary: (styledColumn: StyledColumn) => React.JSX.Element;
+import { AdaptableApi } from '../../../Api/AdaptableApi';
+export declare const getStyledColumnBadgeDefinitionViewValueGroups: (styledColumn: StyledColumn, api: AdaptableApi) => string[][];
+export declare const getStyledColumnBadgeDefinitionViewValues: (styledColumn: StyledColumn, api: AdaptableApi) => string[];
+export declare const getStyledColumnBadgeStyleViewValues: (styledColumn: StyledColumn, api?: AdaptableApi) => string[];
+export declare const renderBadgeDefinitionSummaryTags: (styledColumn: StyledColumn, api: AdaptableApi) => React.JSX.Element;
+export declare const StyledColumnBadgeDefinitionsView: React.FunctionComponent<React.PropsWithChildren<{
+    data: StyledColumn;
+}>>;
+export declare const renderBadgeSummary: (styledColumn: StyledColumn, api: AdaptableApi) => React.JSX.Element;
 export interface StyledColumnBadgeSectionProps {
     onChange: (data: StyledColumn) => void;
 }
@@ -9,4 +17,4 @@ export interface StyledColumnBadgeStyleSectionProps {
     onChange: (data: StyledColumn) => void;
 }
 export declare const StyledColumnBadgeStyleSection: React.FunctionComponent<StyledColumnBadgeStyleSectionProps>;
-export declare const renderBadgeStyleSummary: (styledColumn: StyledColumn) => React.JSX.Element;
+export declare const renderBadgeStyleSummary: (styledColumn: StyledColumn, api: AdaptableApi) => React.JSX.Element;

package/src/View/StyledColumn/Wizard/StyledColumnBadgeSection.js

@@ -1,15 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import DropdownButton from '../../../components/DropdownButton';
 import ErrorBox from '../../../components/ErrorBox';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
-import HelpBlock from '../../../components/HelpBlock';
 import SimpleButton from '../../../components/SimpleButton';
+import { ButtonNew } from '../../Components/Buttons/ButtonNew';
 import { Tag } from '../../../components/Tag';
+import { renderSummaryLabelValueTags, renderSummaryStringTags, } from '../../Wizard/SummaryColorTag';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
 import { AdaptableIconSelector } from '../../Components/AdaptableIconSelector';
 import { PredicateEditor } from '../../Components/PredicateEditor/PredicateEditor';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
-import { StyledColumnBadgePreview } from './StyledColumnWizardStyleSection/Components/StyledColumnBadgePreview';
 import { Badge } from '../../Components/Badge';
 import { AdaptableIconComponent } from '../../Components/AdaptableIconComponent';
 import { DEFAULT_INTEGER_DISPLAY_VALUE, DEFAULT_STRING_DISPLAY_VALUE, } from '../../../Utilities/Constants/GeneralConstants';
@@ -18,9 +17,13 @@ import { Flex, Box } from '../../../components/Flex';
 import Radio, { RadioGroup } from '../../../components/Radio';
 import { NumberInput } from '../../../components/Input/NumberInput';
 import { Toggle, ToggleGroup } from '../../../components/Toggle';
-import { BadgePillStyleEditor } from './BadgePillStyleEditor';
-import { renderCellStyleSummaryTags, StyledColumnCellStyleEditor, } from './StyledColumnSliceStyleEditors';
+import { BadgePillStyleEditor, getBadgePillStyleSummaryItems } from './BadgePillStyleEditor';
+import { getCellBoxStyleSummaryItems, getCellFontStyleSummaryItems, StyledColumnCellStyleEditor, } from './StyledColumnSliceStyleEditors';
 import { Card } from '../../../components/Card';
+import { useAdaptable } from '../../AdaptableContext';
+import { CollapsibleWizardCard, CollapsibleWizardValueSummary, getWizardAccordionSectionClassName, useWizardCardAccordion, } from '../../Wizard/CollapsibleWizardCard';
+import { SingleSelect } from '../../../components/NewSelect';
+import { cn } from '../../../lib/utils';
 const BADGE_STYLE_FORM_SIZES = ['200px', '1fr'];
 const SHAPE_CHOICES = [
     { value: 'Pill', label: 'Pill' },
@@ -37,83 +40,198 @@ const OVERFLOW_CHOICES = [
     { value: 'Wrap', label: 'Wrap', hint: 'Wrap onto subsequent lines' },
     { value: 'Scroll', label: 'Scroll', hint: 'Single line; cell scrolls horizontally' },
 ];
-const BadgeEditor = (props) => {
+const badgeCardId = (index) => `badge-${index}`;
+const getBadgePreviewValue = (dataType) => dataType === 'number' || dataType === 'numberArray'
+    ? `${DEFAULT_INTEGER_DISPLAY_VALUE}`
+    : DEFAULT_STRING_DISPLAY_VALUE;
+const getBadgeDefinitionSummaryItems = (badge, api) => {
+    const items = [];
+    let rule = 'Always';
+    if (badge.Predicate) {
+        rule = api.predicateApi.predicateToString(badge.Predicate);
+    }
+    else if (badge.Expression) {
+        rule = badge.Expression.BooleanExpression;
+    }
+    items.push({ label: 'Rule', value: rule });
+    items.push({ label: 'Shape', value: badge.Shape ?? 'Rounded' });
+    items.push(...getBadgePillStyleSummaryItems(badge.PillStyle));
+    const iconProps = badge.IconProperties;
+    if (iconProps?.Icon) {
+        items.push({
+            label: 'Icon',
+            value: 'name' in iconProps.Icon ? iconProps.Icon.name : 'Custom',
+            icon: iconProps.Icon,
+        });
+    }
+    if (iconProps?.IconOnly) {
+        items.push({ label: 'Icon Only', value: 'Yes' });
+    }
+    if (iconProps?.Icon && iconProps.Position) {
+        items.push({ label: 'Icon Position', value: iconProps.Position });
+    }
+    if (typeof iconProps?.Gap === 'number') {
+        items.push({ label: 'Icon Gap', value: `${iconProps.Gap}px` });
+    }
+    return items;
+};
+const BadgePreview = ({ badge, density, previewValue }) => (_jsx(Badge, { pillStyle: badge.PillStyle, icon: badge.IconProperties?.Icon, iconPosition: badge.IconProperties?.Position, shape: badge.Shape, density: density, iconGap: badge.IconProperties?.Gap, children: badge.IconProperties?.IconOnly ? '' : previewValue }));
+const BadgeCardSummary = ({ badge, api }) => (_jsx(CollapsibleWizardValueSummary, { value: renderSummaryLabelValueTags(getBadgeDefinitionSummaryItems(badge, api)) }));
+const BadgeEditorForm = (props) => {
     const { api } = useOnePageAdaptableWizardContext();
-    const { badge, columnId, onChange, density, index } = props;
+    const { badge, columnId, onChange } = props;
     const predicateDefs = api.styledColumnApi.internalApi.getBadgePredicateDefsForColumn(columnId);
-    const dataType = api.columnApi.getColumnDataTypeForColumnId(columnId);
-    const previewValue = dataType === 'number' || dataType == 'numberArray'
-        ? DEFAULT_INTEGER_DISPLAY_VALUE
-        : DEFAULT_STRING_DISPLAY_VALUE;
     const currentShape = badge.Shape ?? 'Rounded';
-    return (_jsxs(Box, { className: "ab-Badge-Definition-Editor twa:mb-3 twa:rounded-standard twa:border twa:border-border twa:overflow-hidden twa:shadow-sm", children: [_jsxs(Flex, { alignItems: "center", className: "ab-Badge-Definition-Editor__header twa:px-3 twa:py-2 twa:border-b twa:border-border twa:gap-2", children: [_jsx(Box, { className: "twa:flex-1 twa:font-medium twa:text-3", children: `Badge ${index + 1}` }), _jsx(SimpleButton, { icon: "delete", variant: "text", tooltip: "Delete badge", onClick: props.onDelete })] }), _jsx(Box, { className: "twa:p-3", children: _jsxs(FormLayout, { children: [_jsx(FormRow, { label: "Preview", children: _jsx(Badge, { pillStyle: badge.PillStyle, icon: badge.Icon, iconPosition: badge.IconPosition, shape: badge.Shape, density: density, iconGap: badge.IconGap, children: badge.IconOnly ? '' : previewValue }) }), _jsx(FormRow, { label: "Shape", children: _jsx(Box, { className: "twa:ml-2", children: _jsx(RadioGroup, { orientation: "horizontal", name: `ab-badge-shape-${columnId}`, value: currentShape, onRadioChange: (value) => onChange({ ...badge, Shape: value }), className: "twa:gap-3", children: SHAPE_CHOICES.map((choice) => (_jsx(Radio, { value: choice.value, children: choice.label }, choice.value))) }) }) }), _jsx(FormRow, { label: "Style", children: _jsx(BadgePillStyleEditor, { api: api, value: badge.PillStyle, onChange: (next) => {
-                                    if (next) {
-                                        onChange({ ...badge, PillStyle: next });
-                                    }
-                                    else {
-                                        const cleaned = { ...badge };
-                                        delete cleaned.PillStyle;
-                                        onChange(cleaned);
-                                    }
-                                } }) }), _jsx(FormRow, { label: 'Rule', children: columnId ? (_jsxs(_Fragment, { children: [_jsx(HelpBlock, { className: "twa:text-2 twa:mb-1 twa:mt-2", children: "Create (optional) Rule for when the Badge is displayed; if no Rule provided Badge will always display (unless overriden by another Rule)" }), _jsx(PredicateEditor, { columnId: columnId, predicate: badge.Predicate, predicateDefs: predicateDefs, placeholder: "No Predicate Selected", onChange: (predicate) => {
-                                            onChange({
-                                                ...badge,
-                                                Predicate: predicate,
-                                            });
-                                        }, onClear: () => onChange({
-                                            ...badge,
-                                            Predicate: undefined,
-                                        }) })] })) : (_jsx(ErrorBox, { children: "Select a column first" })) }), _jsxs(FormRow, { label: "Icon", children: [_jsx(HelpBlock, { className: "twa:text-2 twa:mb-1 twa:mt-2", children: "Select (optional) Icon (and Icon position) to display in the Badge" }), ' ', !badge.Icon || 'name' in badge.Icon ? (_jsx(AdaptableIconSelector, { value: badge?.Icon && 'name' in badge?.Icon ? badge.Icon.name : undefined, onChange: (iconName) => {
-                                        if (iconName) {
-                                            onChange({
-                                                ...badge,
-                                                Icon: {
-                                                    name: iconName,
-                                                },
-                                            });
-                                        }
-                                        else {
-                                            onChange({
-                                                ...badge,
-                                                Icon: undefined,
-                                            });
-                                        }
-                                    } })) : (_jsx(AdaptableIconComponent, { icon: badge.Icon }))] }), badge.Icon && (_jsx(FormRow, { label: "Icon Position", children: _jsx(DropdownButton, { columns: ['label'], items: [
-                                    {
-                                        label: 'Start',
-                                        onClick: () => onChange({ ...badge, IconPosition: 'Start' }),
-                                    },
-                                    {
-                                        label: 'End',
-                                        onClick: () => onChange({ ...badge, IconPosition: 'End' }),
-                                    },
-                                ], children: badge.IconPosition ?? 'Start' }) })), badge.Icon && (_jsx(FormRow, { label: "Show Icon Only", children: _jsx(CheckBox, { checked: badge.IconOnly, onClick: () => onChange({ ...badge, IconOnly: !badge.IconOnly }) }) })), badge.Icon && !badge.IconOnly && (_jsx(FormRow, { label: "Icon Gap", children: _jsxs(Flex, { alignItems: "center", className: "twa:ml-2 twa:gap-2", children: [_jsx(NumberInput, { value: badge.IconGap ?? '', placeholder: "auto", step: 1, min: 0, style: { width: 70 }, onChange: (value) => {
-                                            onChange({
-                                                ...badge,
-                                                IconGap: typeof value === 'number' && value >= 0 ? value : undefined,
-                                            });
-                                        } }), _jsx(Box, { className: "twa:text-xs twa:opacity-70", children: "px between icon and text \u2014 leave blank to follow Density" })] }) }))] }) })] }));
+    const iconProps = badge.IconProperties;
+    const hasIcon = Boolean(iconProps?.Icon);
+    const updateIconProperties = (patch) => {
+        const next = {
+            ...(iconProps ?? { Icon: undefined }),
+            ...patch,
+        };
+        if (!next.Icon) {
+            const cleaned = { ...badge };
+            delete cleaned.IconProperties;
+            onChange(cleaned);
+            return;
+        }
+        onChange({ ...badge, IconProperties: next });
+    };
+    return (_jsxs(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-2", children: [_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Shape" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Define shape of the corners for this badge" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(RadioGroup, { orientation: "horizontal", name: `ab-badge-shape-${columnId}`, value: currentShape, onRadioChange: (value) => onChange({ ...badge, Shape: value }), className: "twa:gap-3", children: SHAPE_CHOICES.map((choice) => (_jsx(Radio, { value: choice.value, children: choice.label }, choice.value))) }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Style" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Colours and font styling for the badge pill" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(BadgePillStyleEditor, { embedded: true, api: api, value: badge.PillStyle, onChange: (next) => {
+                                if (next) {
+                                    onChange({ ...badge, PillStyle: next });
+                                }
+                                else {
+                                    const cleaned = { ...badge };
+                                    delete cleaned.PillStyle;
+                                    onChange(cleaned);
+                                }
+                            } }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Rule" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Optional rule for when this badge is displayed \u2014 leave empty for Badge to always show" })] }), _jsx(Card.Body, { className: "twa:p-1", children: columnId ? (_jsx(PredicateEditor, { columnId: columnId, predicate: badge.Predicate, predicateDefs: predicateDefs, placeholder: "No Predicate Selected", onChange: (predicate) => {
+                                onChange({
+                                    ...badge,
+                                    Predicate: predicate,
+                                });
+                            }, onClear: () => onChange({
+                                ...badge,
+                                Predicate: undefined,
+                            }) })) : (_jsx(ErrorBox, { children: "Select a column first" })) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Icon" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Optional icon inside the badge \u2014 position and spacing apply once an icon is selected" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsxs(FormLayout, { children: [_jsx(FormRow, { label: "Icon", children: !iconProps?.Icon || 'name' in iconProps.Icon ? (_jsx(AdaptableIconSelector, { value: iconProps?.Icon && 'name' in iconProps.Icon ? iconProps.Icon.name : undefined, onChange: (iconName) => {
+                                            if (iconName) {
+                                                updateIconProperties({
+                                                    Icon: { name: iconName },
+                                                });
+                                            }
+                                            else {
+                                                const cleaned = { ...badge };
+                                                delete cleaned.IconProperties;
+                                                onChange(cleaned);
+                                            }
+                                        } })) : (_jsx(AdaptableIconComponent, { icon: iconProps.Icon })) }), _jsx(FormRow, { label: "Icon Position", children: _jsx(Box, { className: "twa:max-w-[160px]", children: _jsx(SingleSelect, { disabled: !hasIcon, className: "twa:w-full", value: iconProps?.Position ?? 'Start', onValueChange: (v) => updateIconProperties({ Position: v }), items: [
+                                                { value: 'Start', label: 'Start' },
+                                                { value: 'End', label: 'End' },
+                                            ] }) }) }), _jsx(FormRow, { label: "Show Icon Only", children: _jsx(CheckBox, { disabled: !hasIcon, checked: iconProps?.IconOnly, onClick: () => updateIconProperties({ IconOnly: !iconProps?.IconOnly }) }) }), _jsx(FormRow, { label: "Icon Gap", children: _jsxs(Flex, { alignItems: "center", className: "twa:gap-2", children: [_jsx(NumberInput, { disabled: !hasIcon || iconProps?.IconOnly, value: iconProps?.Gap ?? '', placeholder: "auto", step: 1, min: 0, style: { width: 70 }, onChange: (value) => {
+                                                    updateIconProperties({
+                                                        Gap: typeof value === 'number' && value >= 0 ? value : undefined,
+                                                    });
+                                                } }), _jsx(Box, { className: "twa:text-xs twa:opacity-70", children: "px between icon and text \u2014 leave blank to follow Density" })] }) })] }) })] })] }));
+};
+export const getStyledColumnBadgeDefinitionViewValueGroups = (styledColumn, api) => {
+    const badgeStyle = styledColumn.BadgeStyle;
+    if (!badgeStyle?.Badges?.length) {
+        return [];
+    }
+    return badgeStyle.Badges.map((badge) => getBadgeDefinitionSummaryItems(badge, api).map(({ label, value }) => `${label}: ${value}`));
 };
-export const renderBadgeSummary = (styledColumn) => {
-    return _jsx(StyledColumnBadgePreview, { data: styledColumn });
+export const getStyledColumnBadgeDefinitionViewValues = (styledColumn, api) => {
+    return getStyledColumnBadgeDefinitionViewValueGroups(styledColumn, api).flat();
+};
+const isBadgeArrayColumn = (styledColumn, api) => {
+    if (!api || !styledColumn.ColumnId) {
+        return false;
+    }
+    const dataType = api.columnApi.getColumnDataTypeForColumnId(styledColumn.ColumnId);
+    return dataType === 'numberArray' || dataType === 'textArray';
+};
+export const getStyledColumnBadgeStyleViewValues = (styledColumn, api) => {
+    const badgeStyle = styledColumn.BadgeStyle;
+    if (!badgeStyle) {
+        return [];
+    }
+    const items = [`Density: ${badgeStyle.Density ?? 'Normal'}`];
+    if (isBadgeArrayColumn(styledColumn, api)) {
+        if (typeof badgeStyle.Spacing === 'number') {
+            items.push(`Spacing: ${badgeStyle.Spacing}px`);
+        }
+        items.push(`Overflow: ${badgeStyle.OverflowMode ?? 'Truncate'}`);
+    }
+    getCellFontStyleSummaryItems(badgeStyle.Font).forEach(({ label, value }) => {
+        items.push(`${label}: ${value}`);
+    });
+    getCellBoxStyleSummaryItems(badgeStyle.Cell).forEach(({ label, value }) => {
+        items.push(`${label}: ${value}`);
+    });
+    return items;
+};
+export const renderBadgeDefinitionSummaryTags = (styledColumn, api) => {
+    const badges = styledColumn.BadgeStyle?.Badges;
+    if (!badges?.length) {
+        return _jsx(Tag, { children: "No Badges Defined" });
+    }
+    return (_jsx(Flex, { flexDirection: "column", className: "twa:gap-2", children: badges.map((badge, index) => (_jsxs(Flex, { alignItems: "center", className: "twa:flex-wrap twa:gap-2", children: [_jsxs(Tag, { className: "twa:shrink-0", children: ["Badge ", index + 1] }), renderSummaryLabelValueTags(getBadgeDefinitionSummaryItems(badge, api))] }, index))) }));
+};
+export const StyledColumnBadgeDefinitionsView = ({ data }) => {
+    const { api } = useAdaptable();
+    return renderBadgeDefinitionSummaryTags(data, api);
+};
+export const renderBadgeSummary = (styledColumn, api) => {
+    return renderBadgeDefinitionSummaryTags(styledColumn, api);
 };
 export const StyledColumnBadgeSection = (props) => {
-    const { data } = useOnePageAdaptableWizardContext();
+    const { data, api } = useOnePageAdaptableWizardContext();
     const badgeStyle = data?.BadgeStyle ?? {};
     const badges = badgeStyle.Badges ?? [];
     const currentDensity = badgeStyle.Density ?? 'Normal';
-    return (_jsxs(Box, { children: [_jsx(Flex, { className: "twa:justify-end", children: _jsx(SimpleButton, { icon: "plus", onClick: () => {
-                        props.onChange({
-                            ...data,
-                            BadgeStyle: {
-                                ...badgeStyle,
-                                Badges: [...badges, ObjectFactory.CreateDefaultStyledColumnBadge()],
-                            },
-                        });
-                    }, children: "Add Badge" }) }), _jsx(Flex, { flexDirection: "column", className: "twa:p-2", children: badges.map((badge, index) => {
-                    const handleEditBadge = (badge) => {
+    const dataType = data.ColumnId
+        ? api.columnApi.getColumnDataTypeForColumnId(data.ColumnId)
+        : 'text';
+    const previewValue = getBadgePreviewValue(dataType);
+    const { bindCard, hasExpandedCard, expandedFillsSpace, expandedId, setExpandedId } = useWizardCardAccordion(null);
+    const handleAddBadge = () => {
+        const newIndex = badges.length;
+        props.onChange({
+            ...data,
+            BadgeStyle: {
+                ...badgeStyle,
+                Badges: [...badges, ObjectFactory.CreateDefaultStyledColumnBadge()],
+            },
+        });
+        setExpandedId(badgeCardId(newIndex));
+    };
+    const handleDeleteBadge = (index) => {
+        const cardId = badgeCardId(index);
+        const newBadges = [...badges];
+        newBadges.splice(index, 1);
+        props.onChange({
+            ...data,
+            BadgeStyle: {
+                ...badgeStyle,
+                Badges: newBadges,
+            },
+        });
+        if (expandedId === cardId) {
+            setExpandedId(null);
+            return;
+        }
+        if (expandedId?.startsWith('badge-')) {
+            const expandedIndex = Number(expandedId.replace('badge-', ''));
+            if (!Number.isNaN(expandedIndex) && expandedIndex > index) {
+                setExpandedId(badgeCardId(expandedIndex - 1));
+            }
+        }
+    };
+    return (_jsxs(Box, { className: cn(getWizardAccordionSectionClassName(hasExpandedCard, expandedFillsSpace), 'twa:p-2'), children: [_jsx(Flex, { className: "twa:justify-end twa:mb-2 twa:shrink-0", children: _jsx(ButtonNew, { onClick: handleAddBadge, children: "Add Badge" }) }), _jsx(Flex, { flexDirection: "column", className: "twa:gap-3 twa:min-h-0", children: badges.map((badge, index) => {
+                    const handleEditBadge = (nextBadge) => {
                         const newBadges = [...badges];
-                        newBadges[index] = badge;
+                        newBadges[index] = nextBadge;
                         props.onChange({
                             ...data,
                             BadgeStyle: {
@@ -122,17 +240,7 @@ export const StyledColumnBadgeSection = (props) => {
                             },
                         });
                     };
-                    return (_jsx(BadgeEditor, { index: index, badge: badge, density: currentDensity, columnId: data.ColumnId, onChange: handleEditBadge, onDelete: () => {
-                            const newBadges = [...badges];
-                            newBadges.splice(index, 1);
-                            props.onChange({
-                                ...data,
-                                BadgeStyle: {
-                                    ...badgeStyle,
-                                    Badges: newBadges,
-                                },
-                            });
-                        } }, index));
+                    return (_jsx(CollapsibleWizardCard, { ...bindCard(badgeCardId(index)), surface: "panel", "data-name": `styled-column-badge-${index}`, title: `Badge ${index + 1}`, collapsedHelp: false, headerVisual: _jsx(BadgePreview, { badge: badge, density: currentDensity, previewValue: previewValue }), headerActions: _jsx(SimpleButton, { icon: "delete", variant: "text", tooltip: "Delete badge", onClick: () => handleDeleteBadge(index) }), summary: _jsx(BadgeCardSummary, { badge: badge, api: api }), bodyClassName: "twa:!pt-0 twa:overflow-y-auto", children: _jsx(BadgeEditorForm, { badge: badge, columnId: data.ColumnId, onChange: handleEditBadge }) }, badgeCardId(index)));
                 }) })] }));
 };
 export const StyledColumnBadgeStyleSection = (props) => {
@@ -178,15 +286,10 @@ export const StyledColumnBadgeStyleSection = (props) => {
                                         }
                                     } }) })] })] })] }));
 };
-export const renderBadgeStyleSummary = (styledColumn) => {
-    const badgeStyle = styledColumn?.BadgeStyle;
-    if (!badgeStyle) {
-        return _jsx(Tag, { children: "\u2014" });
+export const renderBadgeStyleSummary = (styledColumn, api) => {
+    const items = getStyledColumnBadgeStyleViewValues(styledColumn, api);
+    if (!items.length) {
+        return _jsx(Tag, { children: "No Style Defined" });
     }
-    const density = badgeStyle.Density ?? 'Normal';
-    const spacing = typeof badgeStyle.Spacing === 'number' ? badgeStyle.Spacing : null;
-    const overflow = badgeStyle.OverflowMode ?? 'Truncate';
-    const alignment = badgeStyle.Font?.Alignment;
-    const cellTags = renderCellStyleSummaryTags(badgeStyle.Cell);
-    return (_jsxs(Flex, { alignItems: "center", className: "twa:flex-wrap twa:gap-2", children: [_jsxs(Box, { children: ["Density: ", _jsx(Tag, { children: density })] }), spacing != null && (_jsxs(Box, { children: ["Spacing: ", _jsxs(Tag, { children: [spacing, "px"] })] })), _jsxs(Box, { children: ["Overflow: ", _jsx(Tag, { children: overflow })] }), alignment && (_jsxs(Box, { children: ["Align: ", _jsx(Tag, { children: alignment })] })), cellTags && _jsxs(Box, { children: ["Cell: ", cellTags] })] }));
+    return renderSummaryStringTags(items);
 };

package/src/View/StyledColumn/Wizard/StyledColumnSliceStyleEditors.d.ts

@@ -13,9 +13,7 @@ export interface StyledColumnFontStyleEditorProps {
     disabled?: boolean;
     /**
      * When true, the Alignment row is omitted entirely. Used by Styled Columns
-     * that own horizontal alignment elsewhere (e.g. Percent Bar's "Auto / Left /
-     * Center / Right" controls drive `CellTextAlignment`, so showing a second
-     * Alignment row inside the font editor is confusing).
+     * that own horizontal alignment elsewhere (e.g. Badge row layout).
      */
     hideAlignment?: boolean;
 }
@@ -39,10 +37,24 @@ export interface StyledColumnCellStyleEditorProps {
  * key is unset) which the host wizard merges back into its `*Style` patch.
  */
 export declare const StyledColumnCellStyleEditor: React.FunctionComponent<StyledColumnCellStyleEditorProps>;
+/**
+ * Descriptive font properties for summary panels (`Label: value` strings).
+ */
+export declare const getCellFontStyleSummaryItems: (font: CellFontStyle | undefined) => {
+    label: string;
+    value: string;
+}[];
 /**
  * Compact summary tags for the Font slice; used by wizard summary panels.
  */
 export declare const renderFontStyleSummaryTags: (font: CellFontStyle | undefined) => React.JSX.Element | null;
+/**
+ * Descriptive cell box properties for summary panels (`Label: value` strings).
+ */
+export declare const getCellBoxStyleSummaryItems: (cell: CellBoxStyle | undefined) => {
+    label: string;
+    value: string;
+}[];
 /**
  * Compact summary tags for the Cell slice; used by wizard summary panels.
  */