@adaptabletools/adaptable 23.0.0-canary.7 → 23.0.0-canary.9

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

@@ -9,7 +9,6 @@ import { RangesComponent } from '../../Components/RangesComponent';
 import { ColumnSelector } from '../../Components/Selectors/ColumnSelector';
 import { getGraySwatchColor } from '../../UIHelper';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
-import ArrayExtensions from '../../../Utilities/Extensions/ArrayExtensions';
 import AdaptableInput from '../../Components/AdaptableInput';
 import { Box, Flex } from '../../../components/Flex';
 import { BulletRangesSummaryPreview } from './StyledColumnWizardStyleSection/Components/BulletRangesSummaryPreview';
@@ -18,10 +17,9 @@ import { SingleSelect } from '../../../components/NewSelect';
 import { getCellFontStyleSummaryItems, StyledColumnFontStyleEditor, } from './StyledColumnSliceStyleEditors';
 import { Card } from '../../../components/Card';
 import { renderSummaryStringTags } from '../../Wizard/SummaryColorTag';
+import { formatBarStyleCellTextLayoutSummary, getActiveBarStyleCellTextTokens, hasBarStyleCellTextConfigured, patchBarStyleCellTextPlacement, resolveBarStyleCellTextLayout, toggleBarStyleCellTextToken, } from '../../../Utilities/Helpers/StyledColumns/BarStylesHelper';
+import { BarStyleCellTextLayoutEditor } from './StyledColumnWizardStyleSection/Components/BarStyleCellTextLayoutEditor';
 const BULLET_STYLE_FORM_SIZES = ['200px', '1fr'];
-// ---------------------------------------------------------------------------
-// Summary helpers
-// ---------------------------------------------------------------------------
 const getTargetSummary = (target) => {
     if (target == undefined) {
         return null;
@@ -53,12 +51,8 @@ const formatBulletOriginLabel = (origin) => {
     }
     return origin;
 };
-const formatBulletCellTextSummary = (cellText) => cellText
-    ?.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value'))
-    .join(' + ') ?? '';
-const formatBulletToolTipSummary = (toolTipText) => toolTipText
-    ?.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value'))
-    .join(' + ') ?? '';
+const formatBulletCellTextSummary = (cellText) => cellText?.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value')).join(' + ') ?? '';
+const formatBulletToolTipSummary = (toolTipText) => toolTipText?.map((t) => (t === 'CellValue' ? 'Cell Value' : 'Percent Value')).join(' + ') ?? '';
 export const getStyledColumnBulletRangesViewValues = (data) => {
     const bullet = data.BulletChartStyle;
     if (!bullet) {
@@ -73,11 +67,12 @@ export const getStyledColumnBulletRangesViewValues = (data) => {
 };
 const buildStyledColumnBulletStyleSummaryStrings = (bullet, options) => {
     const items = [];
-    const targetSummary = getTargetSummary(bullet.Target);
+    const targetProperties = bullet.TargetProperties;
+    const targetSummary = getTargetSummary(targetProperties?.Target);
     if (targetSummary) {
         items.push(`Target: ${targetSummary}`);
     }
-    const marker = bullet.TargetMarker;
+    const marker = targetProperties?.Marker;
     if (marker?.Shape && marker.Shape !== 'Line') {
         items.push(`Target Marker Shape: ${marker.Shape}`);
     }
@@ -90,19 +85,24 @@ const buildStyledColumnBulletStyleSummaryStrings = (bullet, options) => {
     if (bullet.Orientation === 'Vertical') {
         items.push('Orientation: Vertical');
     }
-    if (bullet.BarColor) {
-        items.push(`Bar Colour: ${bullet.BarColor}`);
+    const barProperties = bullet.Bar;
+    if (barProperties?.Color) {
+        items.push(`Bar Colour: ${barProperties.Color}`);
     }
-    if (bullet.BarHeight != null) {
-        items.push(`${bullet.Orientation === 'Vertical' ? 'Bar Width' : 'Bar Height'}: ${bullet.BarHeight}px`);
+    if (barProperties?.Height != null) {
+        items.push(`${bullet.Orientation === 'Vertical' ? 'Bar Width' : 'Bar Height'}: ${barProperties.Height}px`);
     }
     items.push(`Origin: ${formatBulletOriginLabel(bullet.Origin)}`);
     if (bullet.BackColor) {
         items.push(`Back Colour: ${bullet.BackColor}`);
     }
-    if (bullet.CellText?.length) {
-        items.push(`Cell Text: ${formatBulletCellTextSummary(bullet.CellText)}`);
-        items.push(`Cell Text Position: ${bullet.CellTextPosition ?? 'Below'}`);
+    if (hasBarStyleCellTextConfigured(bullet.CellTextProperties)) {
+        const tokens = getActiveBarStyleCellTextTokens(bullet.CellTextProperties);
+        items.push(`Cell Text: ${formatBulletCellTextSummary(tokens)}`);
+        const layoutSummary = formatBarStyleCellTextLayoutSummary(resolveBarStyleCellTextLayout(bullet.CellTextProperties));
+        if (layoutSummary) {
+            items.push(`Placement: ${layoutSummary}`);
+        }
     }
     else if (options.includeEmptyCellText) {
         items.push('Cell Text: None');
@@ -260,59 +260,70 @@ export const StyledColumnWizardBulletSection = (props) => {
         });
     }, [data, bullet]);
     // -- Target ----------------------------------------------------------------
-    const currentMode = getSimpleTargetMode(bullet.Target);
+    const currentMode = getSimpleTargetMode(bullet.TargetProperties?.Target);
+    const updateTargetProperties = (patch) => {
+        const merged = {
+            ...bullet.TargetProperties,
+            ...patch,
+        };
+        // Strip the wrapper when nothing meaningful is left.
+        const isEmpty = merged.Target == undefined && merged.Marker == undefined;
+        update({ TargetProperties: isEmpty ? undefined : merged });
+    };
+    const setTarget = (target) => updateTargetProperties({ Target: target });
     const handleTargetModeChange = (mode) => {
         if (mode === 'None') {
-            const next = { ...bullet };
-            delete next.Target;
-            props.onChange({ ...data, BulletChartStyle: next });
+            setTarget(undefined);
             return;
         }
         if (mode === 'Col-Avg' || mode === 'Col-Median') {
-            update({ Target: mode });
+            setTarget(mode);
             return;
         }
         if (mode === 'Number') {
-            update({ Target: minMaxRangeValues?.max ?? 0 });
+            setTarget(minMaxRangeValues?.max ?? 0);
             return;
         }
         if (mode === 'Column') {
             // Use the first available numeric column (excluding the styled column itself)
-            const candidate = api.columnApi
-                .getNumericColumns()
-                .find((c) => c.columnId !== data.ColumnId);
-            update({ Target: candidate?.columnId ?? '' });
+            const candidate = api.columnApi.getNumericColumns().find((c) => c.columnId !== data.ColumnId);
+            setTarget(candidate?.columnId ?? '');
             return;
         }
     };
     const handleNumericTargetChange = (value) => {
-        if (value == undefined || isNaN(value)) {
-            update({ Target: 0 });
-        }
-        else {
-            update({ Target: value });
-        }
+        setTarget(value == undefined || isNaN(value) ? 0 : value);
     };
     const handleColumnTargetChange = (columnId) => {
-        update({ Target: columnId });
+        setTarget(columnId);
+    };
+    // -- Bar -------------------------------------------------------------------
+    const updateBar = (patch) => {
+        const merged = {
+            ...bullet.Bar,
+            ...patch,
+        };
+        const isEmpty = merged.Color == undefined && merged.Height == undefined;
+        update({ Bar: isEmpty ? undefined : merged });
     };
     // -- Marker ----------------------------------------------------------------
     const updateMarker = (patch) => {
-        update({
-            TargetMarker: {
+        updateTargetProperties({
+            Marker: {
                 Shape: 'Line',
-                ...bullet.TargetMarker,
+                ...bullet.TargetProperties?.Marker,
                 ...patch,
             },
         });
     };
     // -- Cell text -------------------------------------------------------------
-    const toggleCellText = (token, checked) => {
-        const current = bullet.CellText ?? [];
-        const next = checked
-            ? Array.from(new Set([...current, token]))
-            : current.filter((t) => t !== token);
-        update({ CellText: next });
+    const toggleCellText = (token, show) => {
+        update(toggleBarStyleCellTextToken(bullet.CellTextProperties, token, show));
+    };
+    const onCellTextPlacementChange = (token, patch) => {
+        update({
+            CellTextProperties: patchBarStyleCellTextPlacement(bullet.CellTextProperties, token, patch),
+        });
     };
     const toggleToolTipText = (token, checked) => {
         const current = bullet.ToolTipText ?? [];
@@ -321,9 +332,6 @@ export const StyledColumnWizardBulletSection = (props) => {
             : current.filter((t) => t !== token);
         update({ ToolTipText: next });
     };
-    const handleCellTextPositionChange = (pos) => {
-        update({ CellTextPosition: pos });
-    };
     // -------------------------------------------------------------------------
     // Render
     // -------------------------------------------------------------------------
@@ -336,22 +344,29 @@ export const StyledColumnWizardBulletSection = (props) => {
     if (variant === 'ranges') {
         return (_jsx(Box, { children: _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Ranges" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Define qualitative bands for the bullet scale" })] }), _jsx(Card.Body, { children: _jsx(RangesComponent, { disabled: disabled, minMaxRangeValues: minMaxRangeValues, api: api, scope: scope, ranges: bullet.CellRanges, rangeValueType: bullet.RangeValueType, onRangeValueTypeChange: onRangeValueTypeChange, columnComparison: bullet.ColumnComparison, updateRanges: onUpdateRanges, updateColumnComparison: onUpdateColumnComparison, hideColumnComparison: true }) })] }) }));
     }
-    const numericTargetValue = typeof bullet.Target === 'number'
-        ? bullet.Target
-        : typeof bullet.Target?.Value === 'number'
-            ? bullet.Target.Value
+    const primaryTarget = Array.isArray(bullet.TargetProperties?.Target)
+        ? bullet.TargetProperties?.Target?.[0]
+        : bullet.TargetProperties?.Target;
+    const numericTargetValue = typeof primaryTarget === 'number'
+        ? primaryTarget
+        : typeof primaryTarget?.Value === 'number'
+            ? primaryTarget.Value
             : undefined;
-    const columnTargetValue = typeof bullet.Target === 'string' && bullet.Target !== 'Col-Avg' && bullet.Target !== 'Col-Median'
-        ? bullet.Target
-        : typeof bullet.Target?.Value === 'string'
-            ? bullet.Target.Value
+    const columnTargetValue = typeof primaryTarget === 'string' &&
+        primaryTarget !== 'Col-Avg' &&
+        primaryTarget !== 'Col-Median'
+        ? primaryTarget
+        : typeof primaryTarget?.Value === 'string'
+            ? primaryTarget.Value
             : undefined;
+    const markerCfg = bullet.TargetProperties?.Marker;
     const marker = {
-        Shape: bullet.TargetMarker?.Shape ?? 'Line',
-        Color: bullet.TargetMarker?.Color ?? '',
-        Size: bullet.TargetMarker?.Size ?? (bullet.TargetMarker?.Shape === 'Line' ? 2 : 8),
+        Shape: markerCfg?.Shape ?? 'Line',
+        Color: markerCfg?.Color ?? '',
+        Size: markerCfg?.Size ?? (markerCfg?.Shape === 'Line' ? 2 : 8),
     };
-    const cellTextDisabled = ArrayExtensions.IsNullOrEmpty(bullet.CellText) || disabled;
+    const cellTextProperties = bullet.CellTextProperties;
+    const cellTextDisabled = !hasBarStyleCellTextConfigured(cellTextProperties) || disabled;
     return (_jsxs(Box, { children: [_jsxs(Card, { shadow: false, className: "twa:mb-3", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Target" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Select a target value for the bullet scale" })] }), _jsx(Card.Body, { children: _jsxs(FormLayout, { sizes: [...BULLET_STYLE_FORM_SIZES], children: [_jsx(FormRow, { label: "Target:", children: _jsx(Box, { className: "twa:max-w-[180px]", children: _jsx(SingleSelect, { className: "twa:w-full", value: currentMode, onValueChange: (v) => handleTargetModeChange(v), items: [
                                                 { value: 'None', label: 'None' },
                                                 { value: 'Number', label: 'Fixed Number' },
@@ -361,9 +376,9 @@ export const StyledColumnWizardBulletSection = (props) => {
                                             ] }) }) }), currentMode === 'Number' && (_jsx(FormRow, { label: "Target Value:", children: _jsx(Box, { className: "twa:max-w-[160px]", children: _jsx(AdaptableInput, { type: "number", value: numericTargetValue ?? '', onChange: (e) => handleNumericTargetChange(e.target.value === '' ? undefined : Number(e.target.value)) }) }) })), currentMode === 'Column' && (_jsx(FormRow, { label: "Target Column:", children: _jsx(Box, { className: "twa:max-w-[220px]", children: _jsx(ColumnSelector, { type: "number", value: columnTargetValue ?? '', onChange: handleColumnTargetChange, filterColumn: (c) => c.columnId !== data.ColumnId, placeholder: "Select numeric column" }) }) })), currentMode !== 'None' && (_jsxs(_Fragment, { children: [_jsx(FormRow, { label: "Marker Shape:", children: _jsx(Box, { className: "twa:max-w-[160px]", children: _jsx(SingleSelect, { className: "twa:w-full", value: marker.Shape, onValueChange: (s) => updateMarker({ Shape: s }), items: MARKER_SHAPES.map((s) => ({ value: s.value, label: s.label })) }) }) }), _jsx(FormRow, { label: "Marker Colour:", children: _jsx(ColorPicker, { disabled: disabled, api: api, value: marker.Color || undefined, onChange: (c) => updateMarker({ Color: c }) }) }), _jsx(FormRow, { label: "Marker Size:", children: _jsx(Box, { className: "twa:max-w-[100px]", children: _jsx(AdaptableInput, { type: "number", min: 1, value: marker.Size, onChange: (e) => updateMarker({ Size: Number(e.target.value) }) }) }) })] }))] }) })] }), _jsxs(Card, { shadow: false, className: "twa:mb-3", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Bar" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Set the bar orientation and height" })] }), _jsx(Card.Body, { children: _jsxs(FormLayout, { sizes: [...BULLET_STYLE_FORM_SIZES], children: [_jsx(FormRow, { label: "Orientation:", children: _jsx(Box, { className: "twa:max-w-[160px]", children: _jsx(SingleSelect, { className: "twa:w-full", value: bullet.Orientation ?? 'Horizontal', onValueChange: (v) => update({ Orientation: v }), items: [
                                                 { value: 'Horizontal', label: 'Horizontal' },
                                                 { value: 'Vertical', label: 'Vertical' },
-                                            ] }) }) }), bullet.Orientation === 'Vertical' && (_jsx(FormRow, { label: "", children: _jsxs(Box, { className: "twa:text-xs twa:text-neutral-500", children: ["Tip: vertical bullet charts need a tall row height to be readable (we recommend at least 60px). Set ", _jsx("code", { children: "rowHeight" }), " on ", _jsx("code", { children: " gridOptions " }), " or use", ' ', _jsx("code", { children: "getRowHeight" }), "."] }) })), _jsx(FormRow, { label: "Bar Colour:", children: _jsx(ColorPicker, { disabled: disabled, api: api, value: bullet.BarColor, onChange: (c) => update({ BarColor: c }) }) }), _jsx(FormRow, { label: bullet.Orientation === 'Vertical' ? 'Bar Width (px):' : 'Bar Height (px):', children: _jsx(Box, { className: "twa:max-w-[100px]", children: _jsx(AdaptableInput, { type: "number", min: 1, value: bullet.BarHeight ?? '', onChange: (e) => update({
-                                                BarHeight: e.target.value === '' ? undefined : Number(e.target.value),
-                                            }), placeholder: "8" }) }) }), _jsx(FormRow, { label: "Origin:", children: _jsx(Box, { className: "twa:max-w-[160px]", children: _jsx(SingleSelect, { className: "twa:w-full", value: typeof bullet.Origin === 'number' ? 'Number' : (bullet.Origin ?? 'Auto'), onValueChange: (v) => {
+                                            ] }) }) }), bullet.Orientation === 'Vertical' && (_jsx(FormRow, { label: "", children: _jsxs(Box, { className: "twa:text-xs twa:text-neutral-500", children: ["Tip: vertical bullet charts need a tall row height to be readable (we recommend at least 60px). Set ", _jsx("code", { children: "rowHeight" }), " on ", _jsx("code", { children: " gridOptions " }), " or use", ' ', _jsx("code", { children: "getRowHeight" }), "."] }) })), _jsx(FormRow, { label: "Bar Colour:", children: _jsx(ColorPicker, { disabled: disabled, api: api, value: bullet.Bar?.Color, onChange: (c) => updateBar({ Color: c }) }) }), _jsx(FormRow, { label: bullet.Orientation === 'Vertical' ? 'Bar Width (px):' : 'Bar Height (px):', children: _jsx(Box, { className: "twa:max-w-[100px]", children: _jsx(AdaptableInput, { type: "number", min: 1, value: bullet.Bar?.Height ?? '', onChange: (e) => updateBar({
+                                                Height: e.target.value === '' ? undefined : Number(e.target.value),
+                                            }), placeholder: "8" }) }) }), _jsx(FormRow, { label: "Origin:", children: _jsx(Box, { className: "twa:max-w-[160px]", children: _jsx(SingleSelect, { className: "twa:w-full", value: typeof bullet.Origin === 'number' ? 'Number' : bullet.Origin ?? 'Auto', onValueChange: (v) => {
                                                 if (v === 'Auto' || v === 'Zero') {
                                                     update({ Origin: v });
                                                 }
@@ -373,11 +388,7 @@ export const StyledColumnWizardBulletSection = (props) => {
                                             }, items: [
                                                 { value: 'Auto', label: 'Auto' },
                                                 { value: 'Zero', label: 'Zero' },
-                                            ] }) }) })] }) })] }), _jsxs(Card, { shadow: false, className: "twa:mb-3", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Cell Text" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Choose whether to display text in the cell (and if so, then position and font))" })] }), _jsxs(Card.Body, { children: [_jsxs(FormLayout, { sizes: [...BULLET_STYLE_FORM_SIZES], children: [_jsxs(FormRow, { label: "Cell Display:", children: [_jsx(CheckBox, { disabled: disabled, checked: bullet.CellText?.includes('CellValue'), onChange: (checked) => toggleCellText('CellValue', checked), children: "Cell Value" }), ' ', _jsx(CheckBox, { disabled: disabled, className: "twa:ml-3", checked: bullet.CellText?.includes('PercentageValue'), onChange: (checked) => toggleCellText('PercentageValue', checked), children: "Percent Value" })] }), _jsx(FormRow, { label: "Cell Display Position:", children: _jsx(Box, { className: "twa:max-w-[160px]", children: _jsx(SingleSelect, { className: "twa:w-full", disabled: cellTextDisabled, value: bullet.CellTextPosition ?? 'Below', onValueChange: (v) => handleCellTextPositionChange(v), items: [
-                                                    { value: 'Above', label: 'Above Bar' },
-                                                    { value: 'Below', label: 'Below Bar' },
-                                                    { value: 'Merged', label: 'Merged' },
-                                                ] }) }) })] }), _jsx(Box, { className: `twa:mt-3 twa:pt-3 twa:border-t twa:border-foreground/15 ${cellTextDisabled ? 'twa:opacity-50' : ''}`, children: _jsx(StyledColumnFontStyleEditor, { api: api, disabled: cellTextDisabled, value: bullet.Font, onChange: (next) => {
+                                            ] }) }) })] }) })] }), _jsxs(Card, { shadow: false, className: "twa:mb-3", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Cell Text" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Pick which values to display and where each one sits around the bar" })] }), _jsxs(Card.Body, { children: [_jsx(FormLayout, { sizes: [...BULLET_STYLE_FORM_SIZES], children: _jsx(BarStyleCellTextLayoutEditor, { disabled: disabled, cellTextProperties: cellTextProperties, onToggle: toggleCellText, onPlacementChange: onCellTextPlacementChange }) }), _jsx(Box, { className: `twa:mt-3 twa:pt-3 twa:border-t twa:border-foreground/15 ${cellTextDisabled ? 'twa:opacity-50' : ''}`, children: _jsx(StyledColumnFontStyleEditor, { api: api, disabled: cellTextDisabled, value: bullet.Font, onChange: (next) => {
                                         if (next) {
                                             update({ Font: next });
                                         }

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

@@ -7,7 +7,7 @@ import { Tag } from '../../../components/Tag';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { Box, Flex } from '../../../components/Flex';
 import { NumberInput } from '../../../components/Input/NumberInput';
-import { DEFAULT_GRADIENT_MAX_ALPHA, DEFAULT_GRADIENT_MIN_ALPHA, } from '../../../Utilities/Helpers/StyledColumnGradientHelper';
+import { DEFAULT_GRADIENT_MAX_ALPHA, DEFAULT_GRADIENT_MIN_ALPHA, } from '../../../Utilities/Helpers/StyledColumns/GradientStyleHelper';
 import { getCellFontStyleSummaryItems, StyledColumnFontStyleEditor, } from './StyledColumnSliceStyleEditors';
 import { Card } from '../../../components/Card';
 import { renderSummaryStringTags } from '../../Wizard/SummaryColorTag';

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

@@ -14,7 +14,7 @@ import { IconSelectorPanel } from '../../../components/IconSelector';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { useAdaptable } from '../../AdaptableContext';
 import { AdaptableIconComponent } from '../../Components/AdaptableIconComponent';
-import { ICON_STYLE_PRESET_DESCRIPTIONS, ICON_STYLE_PRESET_LABELS, getIconStylePresetMappings, } from '../../../Utilities/Helpers/IconStylePresets';
+import { ICON_STYLE_PRESET_DESCRIPTIONS, ICON_STYLE_PRESET_LABELS, getIconStylePresetMappings, } from '../../../Utilities/Helpers/StyledColumns/IconStyleHelper';
 import { resolveEffectiveIconStyleMappings, resolveIconStyleMappingsForSummaryPreview } from '../../../agGrid/cellRenderers/IconRenderer';
 import { Card } from '../../../components/Card';
 import { renderSummaryStringTags } from '../../Wizard/SummaryColorTag';
@@ -78,8 +78,9 @@ export const getStyledColumnIconMappingsViewValues = (data) => {
     if (ic.MatchMode && ic.MatchMode !== 'Exact') {
         items.push(`Match Mode: ${ic.MatchMode}`);
     }
-    if (ic.Fallback && ic.Fallback !== 'Hide') {
-        items.push(`Fallback: ${ic.Fallback}`);
+    const fallbackMode = ic.FallbackProperties?.Mode;
+    if (fallbackMode && fallbackMode !== 'Hide') {
+        items.push(`Fallback: ${fallbackMode}`);
     }
     return items;
 };
@@ -91,9 +92,10 @@ const buildStyledColumnIconStyleSummaryStrings = (ic, options) => {
     if (ic.Gap != null) {
         items.push(`Gap: ${ic.Gap}px`);
     }
-    if (ic.CellText?.length) {
-        items.push(`Cell Text: ${formatIconCellTextSummary(ic.CellText)}`);
-        items.push(`Cell Text Position: ${ic.CellTextPosition ?? 'After'}`);
+    const ctp = ic.CellTextProperties;
+    if (ctp?.CellText?.length) {
+        items.push(`Cell Text: ${formatIconCellTextSummary(ctp.CellText)}`);
+        items.push(`Cell Text Position: ${ctp.CellTextPosition ?? 'After'}`);
     }
     else if (options.includeEmptyCellText) {
         items.push('Cell Text: None');
@@ -253,12 +255,35 @@ export const StyledColumnWizardIconSection = (props) => {
     // -----------------------------------------------------------------------
     // CellText helpers
     // -----------------------------------------------------------------------
+    const updateCellTextProperties = (patch) => {
+        const merged = {
+            ...iconStyle.CellTextProperties,
+            ...patch,
+        };
+        // Strip the wrapper when both inner properties are unset, so empty state
+        // serialises cleanly.
+        const isEmpty = !merged.CellText?.length && merged.CellTextPosition == undefined;
+        update({ CellTextProperties: isEmpty ? undefined : merged });
+    };
     const toggleCellText = (token, checked) => {
-        const current = iconStyle.CellText ?? [];
+        const current = iconStyle.CellTextProperties?.CellText ?? [];
         const next = checked
             ? Array.from(new Set([...current, token]))
             : current.filter((t) => t !== token);
-        update({ CellText: next });
+        updateCellTextProperties({ CellText: next });
+    };
+    // -----------------------------------------------------------------------
+    // Fallback helpers
+    // -----------------------------------------------------------------------
+    const updateFallbackProperties = (patch) => {
+        const merged = {
+            ...iconStyle.FallbackProperties,
+            ...patch,
+        };
+        // Strip the wrapper when there's nothing to remember; the renderer
+        // already defaults to `Mode: 'Hide'` when `FallbackProperties` is unset.
+        const isEmpty = (merged.Mode == undefined || merged.Mode === 'Hide') && merged.Icon == undefined;
+        update({ FallbackProperties: isEmpty ? undefined : merged });
     };
     const toggleToolTipText = (token, checked) => {
         const current = iconStyle.ToolTipText ?? [];
@@ -287,14 +312,14 @@ export const StyledColumnWizardIconSection = (props) => {
                                                         }), placeholder: "Tooltip label (optional)" }) }), _jsx(Box, { className: "twa:w-8 twa:shrink-0 twa:flex twa:justify-center", children: _jsx(SimpleButton, { icon: "delete", variant: "text", tooltip: "Remove mapping", onClick: () => removeMapping(i) }) })] }, i)))] })), _jsx(Box, { className: "twa:mt-2", children: _jsx(ButtonNew, { onClick: addMapping, children: "Add Mapping" }) })] })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Matching" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "How keys are compared to cell values, and what to render when no mapping matches" })] }), _jsx(Card.Body, { children: _jsxs(FormLayout, { children: [_jsx(FormRow, { label: "Match Mode:", children: _jsx(Box, { className: "twa:max-w-[200px]", children: _jsx(SingleSelect, { className: "twa:w-full", value: iconStyle.MatchMode ?? 'Exact', onValueChange: (v) => update({ MatchMode: v }), items: [
                                                     { value: 'Exact', label: 'Exact Match Required' },
                                                     { value: 'CaseInsensitive', label: 'Case-insensitive (strings)' },
-                                                ] }) }) }), _jsx(FormRow, { label: "Fallback:", children: _jsx(Box, { className: "twa:max-w-[200px]", children: _jsx(SingleSelect, { className: "twa:w-full", value: iconStyle.Fallback ?? 'Hide', onValueChange: (v) => update({ Fallback: v }), items: [
+                                                ] }) }) }), _jsx(FormRow, { label: "Fallback:", children: _jsx(Box, { className: "twa:max-w-[200px]", children: _jsx(SingleSelect, { className: "twa:w-full", value: iconStyle.FallbackProperties?.Mode ?? 'Hide', onValueChange: (v) => updateFallbackProperties({ Mode: v }), items: [
                                                     { value: 'Hide', label: 'Show No Value' },
                                                     { value: 'ShowText', label: 'Show Raw Value' },
                                                     { value: 'Icon', label: 'Show Fallback Icon' },
-                                                ] }) }) }), iconStyle.Fallback === 'Icon' && (_jsx(FormRow, { label: "Fallback Icon:", children: _jsx(IconPickerButton, { value: iconStyle.FallbackIcon, onChange: (next) => update({ FallbackIcon: next }) }) }))] }) })] })] }));
+                                                ] }) }) }), iconStyle.FallbackProperties?.Mode === 'Icon' && (_jsx(FormRow, { label: "Fallback Icon:", children: _jsx(IconPickerButton, { value: iconStyle.FallbackProperties?.Icon, onChange: (next) => updateFallbackProperties({ Icon: next }) }) }))] }) })] })] }));
     }
     // ----- Style variant (wizard step title: "Style") ------------------------
-    const cellText = iconStyle.CellText ?? [];
+    const cellText = iconStyle.CellTextProperties?.CellText ?? [];
     const toolTipText = iconStyle.ToolTipText ?? [];
     const cellTextDisabled = cellText.length === 0;
     return (_jsxs(Box, { children: [_jsxs(Card, { shadow: false, className: "twa:mb-3", children: [_jsx(Card.Title, { children: "Sizing" }), _jsx(Card.Body, { children: _jsxs(FormLayout, { sizes: [...STYLE_FORM_SIZES], children: [_jsx(FormRow, { label: "Icon Size (px):", children: _jsx(Box, { className: "twa:max-w-[100px]", children: _jsx(Input, { type: "number", min: 8, step: 1, value: iconStyle.Size ?? '', placeholder: "18", className: "twa:w-full", onChange: (event) => {
@@ -307,7 +332,9 @@ export const StyledColumnWizardIconSection = (props) => {
                                                 update({
                                                     Size: Number.isFinite(parsed) && parsed >= 8 ? parsed : undefined,
                                                 });
-                                            } }) }) }), _jsx(FormRow, { label: "Gap (px):", children: _jsx(Box, { className: "twa:max-w-[100px]", children: _jsx(NumberInput, { value: iconStyle.Gap ?? '', placeholder: "4", min: 0, step: 1, onChange: (value) => update({ Gap: typeof value === 'number' ? value : undefined }) }) }) })] }) })] }), _jsxs(Card, { shadow: false, className: "twa:mb-3", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Cell Text" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Optionally show the raw value or the matched description alongside the icon (e.g. flag plus label)." })] }), _jsxs(Card.Body, { children: [_jsxs(FormLayout, { sizes: [...STYLE_FORM_SIZES], children: [_jsxs(FormRow, { label: "Cell Display:", children: [_jsx(CheckBox, { checked: cellText.includes('CellValue'), onChange: (checked) => toggleCellText('CellValue', checked), children: "Cell Value" }), ' ', _jsx(CheckBox, { className: "twa:ml-3", checked: cellText.includes('IconDescription'), onChange: (checked) => toggleCellText('IconDescription', checked), children: "Description" })] }), _jsx(FormRow, { label: "Position:", children: _jsx(Box, { className: "twa:max-w-[160px]", children: _jsx(SingleSelect, { className: "twa:w-full", value: iconStyle.CellTextPosition ?? 'After', onValueChange: (v) => update({ CellTextPosition: v }), items: [
+                                            } }) }) }), _jsx(FormRow, { label: "Gap (px):", children: _jsx(Box, { className: "twa:max-w-[100px]", children: _jsx(NumberInput, { value: iconStyle.Gap ?? '', placeholder: "4", min: 0, step: 1, onChange: (value) => update({ Gap: typeof value === 'number' ? value : undefined }) }) }) })] }) })] }), _jsxs(Card, { shadow: false, className: "twa:mb-3", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Cell Text" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Optionally show the raw value or the matched description alongside the icon (e.g. flag plus label)." })] }), _jsxs(Card.Body, { children: [_jsxs(FormLayout, { sizes: [...STYLE_FORM_SIZES], children: [_jsxs(FormRow, { label: "Cell Display:", children: [_jsx(CheckBox, { checked: cellText.includes('CellValue'), onChange: (checked) => toggleCellText('CellValue', checked), children: "Cell Value" }), ' ', _jsx(CheckBox, { className: "twa:ml-3", checked: cellText.includes('IconDescription'), onChange: (checked) => toggleCellText('IconDescription', checked), children: "Description" })] }), _jsx(FormRow, { label: "Position:", children: _jsx(Box, { className: "twa:max-w-[160px]", children: _jsx(SingleSelect, { className: "twa:w-full", value: iconStyle.CellTextProperties?.CellTextPosition ?? 'After', onValueChange: (v) => updateCellTextProperties({
+                                                    CellTextPosition: v,
+                                                }), items: [
                                                     { value: 'Before', label: 'Before' },
                                                     { value: 'After', label: 'After' },
                                                     { value: 'Above', label: 'Above' },