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

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

@@ -1,10 +1,10 @@
 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';
@@ -22,6 +22,9 @@ import { getCellBoxStyleSummaryItems, getCellFontStyleSummaryItems, StyledColumn
 import { Card } from '../../../components/Card';
 import { useAdaptable } from '../../AdaptableContext';
 import { StyledColumnBadgePreviewCard } from './StyledColumnWizardStyleSection/Components/StyledColumnBadgePreview';
+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' },
@@ -38,97 +41,106 @@ 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, index) => {
-        const items = [];
-        let rule = 'Always';
-        if (badge.Predicate) {
-            rule = api.predicateApi.predicateToString(badge.Predicate);
-        }
-        else if (badge.Expression) {
-            rule = badge.Expression.BooleanExpression;
-        }
-        items.push(`Badge ${index + 1}: ${rule}`);
-        items.push(`Shape: ${badge.Shape ?? 'Rounded'}`);
-        getBadgePillStyleSummaryItems(badge.PillStyle).forEach(({ label, value }) => {
-            items.push(`${label}: ${value}`);
-        });
-        if (badge.Icon) {
-            const iconName = 'name' in badge.Icon ? badge.Icon.name : 'Custom';
-            items.push(`Icon: ${iconName}`);
-        }
-        if (badge.IconOnly) {
-            items.push('Icon Only: Yes');
-        }
-        if (badge.Icon && badge.IconPosition) {
-            items.push(`Icon Position: ${badge.IconPosition}`);
-        }
-        if (typeof badge.IconGap === 'number') {
-            items.push(`Icon Gap: ${badge.IconGap}px`);
-        }
-        return items;
-    });
+    return badgeStyle.Badges.map((badge) => getBadgeDefinitionSummaryItems(badge, api).map(({ label, value }) => `${label}: ${value}`));
 };
 export const getStyledColumnBadgeDefinitionViewValues = (styledColumn, api) => {
     return getStyledColumnBadgeDefinitionViewValueGroups(styledColumn, api).flat();
@@ -161,40 +173,66 @@ export const getStyledColumnBadgeStyleViewValues = (styledColumn, api) => {
     return items;
 };
 export const renderBadgeDefinitionSummaryTags = (styledColumn, api) => {
-    const groups = getStyledColumnBadgeDefinitionViewValueGroups(styledColumn, api);
-    if (!groups.length) {
+    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: groups.map((items, index) => (_jsx(Flex, { alignItems: "center", className: "twa:flex-wrap twa:gap-2", children: items.map((item, itemIndex) => (_jsx(Tag, { children: item }, `${index}-${itemIndex}`))) }, index))) }));
+    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) => {
-    if (!api) {
-        const { api: adaptableApi } = useOnePageAdaptableWizardContext();
-        api = adaptableApi;
-    }
     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: {
@@ -203,17 +241,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) => {
@@ -260,13 +288,9 @@ export const StyledColumnBadgeStyleSection = (props) => {
                                     } }) })] })] }), _jsx(StyledColumnBadgePreviewCard, { data: data })] }));
 };
 export const renderBadgeStyleSummary = (styledColumn, api) => {
-    if (!api) {
-        const { api: adaptableApi } = useOnePageAdaptableWizardContext();
-        api = adaptableApi;
-    }
     const items = getStyledColumnBadgeStyleViewValues(styledColumn, api);
     if (!items.length) {
         return _jsx(Tag, { children: "No Style Defined" });
     }
-    return (_jsx(Flex, { alignItems: "center", className: "twa:flex-wrap twa:gap-2", children: items.map((item) => (_jsx(Tag, { children: item }, item))) }));
+    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;
 }

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

@@ -1,12 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-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 { NumberInput } from '../../../components/Input/NumberInput';
 import { SingleSelect } from '../../../components/NewSelect';
-import { Tag } from '../../../components/Tag';
+import { renderSummaryLabelValueTags } from '../../Wizard/SummaryColorTag';
 import { Toggle, ToggleGroup } from '../../../components/Toggle';
 const FORM_SIZES = ['200px', '1fr'];
 const FONT_SIZE_ITEMS = [
@@ -46,18 +45,13 @@ export const StyledColumnFontStyleEditor = (props) => {
             props.onChange(next);
         }
     };
-    const onForeColorChecked = (checked) => {
-        if (checked) {
-            update({ ForeColor: font.ForeColor ?? '#000000' });
-        }
-        else {
-            update({ ForeColor: undefined });
-        }
+    const onForeColorChange = (color) => {
+        update({ ForeColor: color });
     };
     const onAlignmentChange = (alignment) => {
         update({ Alignment: alignment });
     };
-    return (_jsx(Box, { children: _jsxs(FormLayout, { className: "twa:ml-2", sizes: [...FORM_SIZES], children: [_jsx(FormRow, { label: "Text Colour:", children: _jsxs(Flex, { alignItems: "center", className: "twa:ml-2 twa:gap-2", children: [_jsx(CheckBox, { disabled: disabled, checked: !!font.ForeColor, onChange: (checked) => onForeColorChecked(checked), children: "Set" }), _jsx(ColorPicker, { disabled: disabled || !font.ForeColor, api: props.api, value: font.ForeColor || '#000000', onChange: (c) => update({ ForeColor: c }) })] }) }), _jsx(FormRow, { label: "Font:", children: _jsx(Box, { className: disabledClass, children: _jsxs(Flex, { alignItems: "center", className: "twa:ml-2 twa:gap-2 twa:flex-wrap", children: [_jsxs(ToggleGroup, { children: [_jsx(Toggle, { pressed: font.FontStyle === 'Italic', onPressedChange: (pressed) => update({ FontStyle: pressed ? 'Italic' : undefined }), icon: "italic" }), _jsx(Toggle, { pressed: font.FontWeight === 'Bold', onPressedChange: (pressed) => update({ FontWeight: pressed ? 'Bold' : undefined }), icon: "bold" })] }), _jsxs(ToggleGroup, { children: [_jsx(Toggle, { pressed: font.TextDecoration === 'Underline', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'Underline' : undefined }), icon: "underline" }), _jsx(Toggle, { pressed: font.TextDecoration === 'LineThrough', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'LineThrough' : undefined }), icon: "strikethrough" }), _jsx(Toggle, { pressed: font.TextDecoration === 'Overline', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'Overline' : undefined }), icon: "overline" })] }), _jsx(Box, { className: "twa:w-32", children: _jsx(SingleSelect, { placeholder: "Default size", items: FONT_SIZE_ITEMS, value: font.FontSize ?? '', onValueChange: (value) => update({
+    return (_jsx(Box, { children: _jsxs(FormLayout, { className: "twa:ml-2", sizes: [...FORM_SIZES], children: [_jsx(FormRow, { label: "Text Colour:", children: _jsx(OptionalColorPicker, { className: "twa:ml-2", disabled: disabled, api: props.api, value: font.ForeColor, defaultColor: "#000000", onChange: onForeColorChange }) }), _jsx(FormRow, { label: "Font:", children: _jsx(Box, { className: disabledClass, children: _jsxs(Flex, { alignItems: "center", className: "twa:ml-2 twa:gap-2 twa:flex-wrap", children: [_jsxs(Flex, { alignItems: "center", className: "twa:gap-2", children: [_jsx(Toggle, { standalone: true, pressed: font.FontStyle === 'Italic', onPressedChange: (pressed) => update({ FontStyle: pressed ? 'Italic' : undefined }), icon: "italic" }), _jsx(Toggle, { standalone: true, pressed: font.FontWeight === 'Bold', onPressedChange: (pressed) => update({ FontWeight: pressed ? 'Bold' : undefined }), icon: "bold" })] }), _jsxs(ToggleGroup, { children: [_jsx(Toggle, { pressed: font.TextDecoration === 'Underline', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'Underline' : undefined }), icon: "underline" }), _jsx(Toggle, { pressed: font.TextDecoration === 'LineThrough', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'LineThrough' : undefined }), icon: "strikethrough" }), _jsx(Toggle, { pressed: font.TextDecoration === 'Overline', onPressedChange: (pressed) => update({ TextDecoration: pressed ? 'Overline' : undefined }), icon: "overline" })] }), _jsx(Box, { className: "twa:w-32", children: _jsx(SingleSelect, { placeholder: "Default size", items: FONT_SIZE_ITEMS, value: font.FontSize ?? '', onValueChange: (value) => update({
                                             FontSize: (value || undefined),
                                         }) }) })] }) }) }), !hideAlignment && (_jsx(FormRow, { label: "Alignment:", children: _jsx(Box, { className: disabledClass, children: _jsx(Flex, { alignItems: "center", className: "twa:ml-2 twa:gap-2", children: _jsxs(ToggleGroup, { children: [_jsx(Toggle, { icon: "align-left", pressed: font.Alignment === 'Left', onPressedChange: (pressed) => onAlignmentChange(pressed ? 'Left' : undefined) }), _jsx(Toggle, { icon: "align-center", pressed: font.Alignment === 'Center', onPressedChange: (pressed) => onAlignmentChange(pressed ? 'Center' : undefined) }), _jsx(Toggle, { icon: "align-right", pressed: font.Alignment === 'Right', onPressedChange: (pressed) => onAlignmentChange(pressed ? 'Right' : undefined) })] }) }) }) }))] }) }));
 };
@@ -88,7 +82,7 @@ export const StyledColumnCellStyleEditor = (props) => {
             props.onChange(next);
         }
     };
-    return (_jsx(Box, { children: _jsxs(FormLayout, { className: "twa:ml-2", sizes: [...FORM_SIZES], children: [_jsx(FormRow, { label: "Background:", children: _jsxs(Flex, { alignItems: "center", className: "twa:ml-2 twa:gap-2", children: [_jsx(CheckBox, { disabled: disabled, checked: !!cell.BackColor, onChange: (checked) => update({ BackColor: checked ? cell.BackColor ?? '#ffffff' : undefined }), children: "Set" }), _jsx(ColorPicker, { disabled: disabled || !cell.BackColor, api: props.api, value: cell.BackColor || '#ffffff', onChange: (c) => update({ BackColor: c }) })] }) }), _jsx(FormRow, { label: "Border colour:", children: _jsxs(Flex, { alignItems: "center", className: "twa:ml-2 twa:gap-2", children: [_jsx(CheckBox, { disabled: disabled, checked: !!cell.BorderColor, onChange: (checked) => update({ BorderColor: checked ? cell.BorderColor ?? '#000000' : undefined }), children: "Set" }), _jsx(ColorPicker, { disabled: disabled || !cell.BorderColor, api: props.api, value: cell.BorderColor || '#000000', onChange: (c) => update({ BorderColor: c }) })] }) }), _jsx(FormRow, { label: "Border radius:", children: _jsxs(Flex, { alignItems: "center", className: "twa:ml-2 twa:gap-2", children: [_jsx(NumberInput, { disabled: disabled, className: "twa:w-20", value: cell.BorderRadius, min: 0, max: 64, step: 1, onChange: (v) => update({ BorderRadius: v === undefined || isNaN(Number(v)) ? undefined : v }) }), _jsx(Box, { className: "twa:text-xs twa:opacity-70", children: "px" })] }) })] }) }));
+    return (_jsx(Box, { children: _jsxs(FormLayout, { className: "twa:ml-2", sizes: [...FORM_SIZES], children: [_jsx(FormRow, { label: "Background:", children: _jsx(OptionalColorPicker, { className: "twa:ml-2", disabled: disabled, api: props.api, value: cell.BackColor, defaultColor: "#ffffff", onChange: (c) => update({ BackColor: c }) }) }), _jsx(FormRow, { label: "Border colour:", children: _jsx(OptionalColorPicker, { className: "twa:ml-2", disabled: disabled, api: props.api, value: cell.BorderColor, defaultColor: "#000000", onChange: (c) => update({ BorderColor: c }) }) }), _jsx(FormRow, { label: "Border radius:", children: _jsxs(Flex, { alignItems: "center", className: "twa:ml-2 twa:gap-2", children: [_jsx(NumberInput, { disabled: disabled, className: "twa:w-20", value: cell.BorderRadius, min: 0, max: 64, step: 1, onChange: (v) => update({ BorderRadius: v === undefined || isNaN(Number(v)) ? undefined : v }) }), _jsx(Box, { className: "twa:text-xs twa:opacity-70", children: "px" })] }) })] }) }));
 };
 /**
  * Descriptive font properties for summary panels (`Label: value` strings).
@@ -126,7 +120,7 @@ export const renderFontStyleSummaryTags = (font) => {
     if (!items.length) {
         return null;
     }
-    return (_jsx(Flex, { alignItems: "center", className: "twa:gap-1 twa:flex-wrap", children: items.map(({ label, value }) => (_jsx(Tag, { children: `${label}: ${value}` }, label))) }));
+    return renderSummaryLabelValueTags(items);
 };
 /**
  * Descriptive cell box properties for summary panels (`Label: value` strings).
@@ -155,5 +149,5 @@ export const renderCellStyleSummaryTags = (cell) => {
     if (!items.length) {
         return null;
     }
-    return (_jsx(Flex, { alignItems: "center", className: "twa:gap-1 twa:flex-wrap", children: items.map(({ label, value }) => (_jsx(Tag, { children: `${label}: ${value}` }, label))) }));
+    return renderSummaryLabelValueTags(items);
 };

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

@@ -4,6 +4,7 @@ import { SingleSelect } from '../../../components/NewSelect';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { Tag } from '../../../components/Tag';
+import { renderSummaryStringTags } from '../../Wizard/SummaryColorTag';
 import AdaptableInput from '../../Components/AdaptableInput';
 import { ColorPicker } from '../../../components/ColorPicker';
 import { CheckBox } from '../../../components/CheckBox';
@@ -95,7 +96,7 @@ export const renderSparklineSummary = (data) => {
     const items = buildStyledColumnSparklineStyleSummaryStrings(sparkline, {
         includeEmptyFeatures: true,
     });
-    return (_jsx(Flex, { alignItems: "center", className: "twa:flex-wrap twa:gap-2", children: items.map((item) => (_jsx(Tag, { children: item }, item))) }));
+    return renderSummaryStringTags(items);
 };
 /**
  * Validation for the Sparkline Settings wizard step.

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

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export type StyledColumnTypeThumbnailKey = 'gradient' | 'percent' | 'sparkline' | 'badge' | 'bullet' | 'rating' | 'rangeBar' | 'icon';
+export declare const StyledColumnTypeThumbnail: React.FunctionComponent<{
+    type: StyledColumnTypeThumbnailKey;
+}>;

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

@@ -0,0 +1,50 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box } from '../../../components/Flex';
+import { Badge } from '../../Components/Badge';
+import { RatingPreview } from './StyledColumnWizardStyleSection/Components/StyledColumnRatingPreview';
+import { WIZARD_TYPE_SELECTION_PREVIEW_FRAME_CLASS } from '../../Wizard/WizardTypeSelection';
+const THUMBNAIL_FRAME_CLASS = WIZARD_TYPE_SELECTION_PREVIEW_FRAME_CLASS;
+const THUMBNAIL_SVG_CLASS = 'twa:block twa:h-[22px] twa:w-full';
+const DEFAULT_BAR = 'var(--ab-color-accent, #07c)';
+const DEFAULT_TRACK = 'color-mix(in srgb, var(--ab-color-foreground) 30%, transparent)';
+const DEFAULT_MARKER = 'var(--ab-color-foreground, #333)';
+const flagEmoji = (countryCodeAlpha2) => {
+    const cc = countryCodeAlpha2.toUpperCase();
+    if (cc.length !== 2) {
+        return cc;
+    }
+    const regionalIndicatorBase = 0x1f1a5;
+    return String.fromCodePoint(regionalIndicatorBase + cc.charCodeAt(0), regionalIndicatorBase + cc.charCodeAt(1));
+};
+const BadgeThumbnail = () => (_jsx(Box, { className: `${THUMBNAIL_FRAME_CLASS} twa:justify-start`, children: _jsxs("div", { className: "ab-Badge__wrapper ab-Badge__wrapper--truncate", style: { gap: 4 }, children: [_jsx(Badge, { pillStyle: { BackColor: '#e8f5e9', ForeColor: '#2e7d32' }, shape: "Pill", density: "Compact", children: "Buy" }), _jsx(Badge, { pillStyle: { BackColor: '#ffebee', ForeColor: '#c62828' }, shape: "Pill", density: "Compact", children: "Sell" })] }) }));
+const IconThumbnail = () => (_jsx(Box, { className: THUMBNAIL_FRAME_CLASS, style: { gap: 10 }, children: ['US', 'GB', 'FR'].map((code) => (_jsx("span", { className: "ab-IconStyle__glyph", style: {
+            fontSize: 18,
+            lineHeight: 1,
+            display: 'inline-flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+        }, children: flagEmoji(code) }, code))) }));
+const RatingThumbnail = () => (_jsx(Box, { className: THUMBNAIL_FRAME_CLASS, children: _jsx(RatingPreview, { rating: { Max: 5, AllowHalf: true }, value: 3.5 }) }));
+const GradientThumbnail = () => (_jsx(Box, { className: `${THUMBNAIL_FRAME_CLASS} twa:gap-1 twa:px-1`, children: [
+        { label: '42', background: '#63be7b' },
+        { label: '68', background: '#ffeb84' },
+        { label: '91', background: '#f8696b' },
+    ].map((cell) => (_jsx(Box, { className: "twa:flex-1 twa:rounded-sm twa:px-1 twa:py-0.5 twa:text-center twa:text-2 twa:leading-tight", style: { background: cell.background, color: '#1a1a1a' }, children: cell.label }, cell.label))) }));
+const PercentBarThumbnail = () => (_jsx(Box, { className: THUMBNAIL_FRAME_CLASS, children: _jsx(Box, { className: "twa:relative twa:h-[6px] twa:w-full twa:rounded-sm", style: { background: DEFAULT_TRACK }, children: _jsx(Box, { className: "twa:absolute twa:top-0 twa:h-full twa:rounded-sm", style: { left: '8%', width: '62%', background: DEFAULT_BAR } }) }) }));
+const BulletThumbnail = () => (_jsx(Box, { className: THUMBNAIL_FRAME_CLASS, children: _jsxs("svg", { className: THUMBNAIL_SVG_CLASS, viewBox: "0 0 100 22", preserveAspectRatio: "none", "aria-hidden": true, children: [_jsx("rect", { x: "0", y: "2", width: "33", height: "18", fill: "#f8696b", opacity: "0.45" }), _jsx("rect", { x: "33", y: "2", width: "34", height: "18", fill: "#ffeb84", opacity: "0.45" }), _jsx("rect", { x: "67", y: "2", width: "33", height: "18", fill: "#63be7b", opacity: "0.45" }), _jsx("rect", { x: "4", y: "7", width: "52", height: "8", rx: "1", fill: DEFAULT_BAR }), _jsx("line", { x1: "78", y1: "3", x2: "78", y2: "19", stroke: DEFAULT_MARKER, strokeWidth: "2.5", vectorEffect: "non-scaling-stroke" })] }) }));
+const RangeBarThumbnail = () => (_jsx(Box, { className: THUMBNAIL_FRAME_CLASS, children: _jsxs("svg", { className: THUMBNAIL_SVG_CLASS, viewBox: "0 0 100 22", preserveAspectRatio: "none", "aria-hidden": true, children: [_jsx("rect", { x: "0", y: "0", width: "100", height: "22", fill: "transparent" }), _jsx("rect", { x: "2", y: "8", width: "96", height: "6", rx: "1", fill: DEFAULT_TRACK }), _jsx("line", { x1: "38", y1: "4", x2: "38", y2: "18", stroke: DEFAULT_MARKER, strokeWidth: "2", vectorEffect: "non-scaling-stroke" }), _jsx("polygon", { points: "72,4 82,11 72,18", fill: DEFAULT_BAR })] }) }));
+const SparklineThumbnail = () => (_jsx(Box, { className: THUMBNAIL_FRAME_CLASS, children: _jsxs("svg", { className: THUMBNAIL_SVG_CLASS, viewBox: "0 0 100 22", preserveAspectRatio: "none", "aria-hidden": true, children: [_jsx("polyline", { points: "0,16 12,12 24,14 36,8 48,10 60,4 72,7 84,3 100,6", fill: "none", stroke: DEFAULT_BAR, strokeWidth: "1.75", vectorEffect: "non-scaling-stroke" }), _jsx("polygon", { points: "0,22 0,16 12,12 24,14 36,8 48,10 60,4 72,7 84,3 100,6 100,22", fill: DEFAULT_BAR, opacity: "0.15" })] }) }));
+const THUMBNAIL_BY_TYPE = {
+    badge: BadgeThumbnail,
+    icon: IconThumbnail,
+    rating: RatingThumbnail,
+    gradient: GradientThumbnail,
+    percent: PercentBarThumbnail,
+    bullet: BulletThumbnail,
+    rangeBar: RangeBarThumbnail,
+    sparkline: SparklineThumbnail,
+};
+export const StyledColumnTypeThumbnail = ({ type }) => {
+    const Thumbnail = THUMBNAIL_BY_TYPE[type];
+    return (_jsx(Box, { "aria-hidden": true, className: "twa:w-full", children: _jsx(Thumbnail, {}) }));
+};

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

@@ -4,4 +4,6 @@ import { StyledColumn } from '../../../AdaptableState/StyledColumnState';
 export interface StyledColumnWizardProps extends AdaptableOnePageWizardProps<StyledColumn> {
     isNew: boolean;
 }
+/** First wizard step to open when editing an existing Styled Column (column menu, settings list, etc.). */
+export declare const getStyledColumnEditDefaultSectionName: (styledColumn: StyledColumn) => string;
 export declare const StyledColumnWizard: (props: StyledColumnWizardProps) => React.JSX.Element;

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

@@ -53,10 +53,33 @@ const computeDefaultStyledColumnName = (sc) => {
     }
     return `${typeKey}-${sc.ColumnId || 'column'}`;
 };
+/** First wizard step to open when editing an existing Styled Column (column menu, settings list, etc.). */
+export const getStyledColumnEditDefaultSectionName = (styledColumn) => {
+    if (styledColumn.BadgeStyle) {
+        return 'Badges';
+    }
+    if (styledColumn.GradientStyle || styledColumn.PercentBarStyle) {
+        return 'Ranges';
+    }
+    if (styledColumn.BulletChartStyle) {
+        return 'Ranges';
+    }
+    if (styledColumn.RangeBarStyle) {
+        return 'Style';
+    }
+    if (styledColumn.IconStyle) {
+        return 'Mappings';
+    }
+    return 'Style';
+};
 export const StyledColumnWizard = (props) => {
     const data = props.data ?? props.popupParams?.value;
     const popupDefaultCurrentSectionName = props?.popupParams?.config?.defaultCurrentSectionName ?? undefined;
-    const defaultCurrentSectionName = props.defaultCurrentSectionName ?? popupDefaultCurrentSectionName;
+    const hasExistingData = Boolean(data);
+    const isEdit = hasExistingData && props.popupParams?.action !== 'New';
+    const defaultCurrentSectionName = props.defaultCurrentSectionName ??
+        popupDefaultCurrentSectionName ??
+        (isEdit ? getStyledColumnEditDefaultSectionName(data) : undefined);
     const allStyledColumns = useSelector((state) => state.StyledColumn?.StyledColumns ?? []);
     const [styledColumn, setStyledColumn] = useState(() => {
         if (data) {
@@ -111,7 +134,7 @@ export const StyledColumnWizard = (props) => {
     }
     else if (styledColumn.GradientStyle || styledColumn.PercentBarStyle) {
         specificSteps.push({
-            details: 'Define the Cell Ranges or a Column Comparison',
+            details: 'Select type of Cell Range and configure contents',
             renderSummary: renderStyledColumnRangesSummary,
             render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(StyledColumnWizardRangesSection, { onChange: setStyledColumn }) })),
             title: 'Ranges',
@@ -269,9 +292,7 @@ export const StyledColumnWizard = (props) => {
                 isValid: isValidStyledColumnScope,
                 renderSummary: renderStyledColumnScopeSummary,
                 details: 'Select the Column and Rows where Style should render',
-                render: () => {
-                    return (_jsx(Box, { className: "twa:p-2 twa:h-full", children: _jsx(StyledColumnWizardScopeSection, { isNew: props.isNew, onChange: setStyledColumn }) }));
-                },
+                render: () => (_jsx(StyledColumnWizardScopeSection, { isNew: props.isNew, onChange: setStyledColumn })),
                 title: 'Scope',
             },
             ...specificSteps,