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

package/src/Utilities/Helpers/barChartCellText.js

@@ -0,0 +1,316 @@
+/** Default placement applied to a value whose Horizontal/Vertical were omitted. */
+const DEFAULT_PLACEMENT = {
+    Horizontal: 'Left',
+    Vertical: 'Below',
+};
+const HORIZONTAL_VALUES = ['Left', 'Center', 'Right'];
+const VERTICAL_VALUES = ['Above', 'Below', 'Merged'];
+const isHorizontal = (value) => typeof value === 'string' &&
+    HORIZONTAL_VALUES.includes(value);
+const isVertical = (value) => typeof value === 'string' && VERTICAL_VALUES.includes(value);
+/** Normalise a placement, applying defaults for missing axes. */
+const sanitizePlacement = (placement) => ({
+    Horizontal: isHorizontal(placement?.Horizontal) ? placement.Horizontal : DEFAULT_PLACEMENT.Horizontal,
+    Vertical: isVertical(placement?.Vertical) ? placement.Vertical : DEFAULT_PLACEMENT.Vertical,
+});
+/** Returns a layout with only the values that are actually present, defaults filled in. */
+const sanitizeCellTextLayout = (layout) => {
+    const result = {};
+    if (layout?.CellValue) {
+        result.CellValue = sanitizePlacement(layout.CellValue);
+    }
+    if (layout?.PercentValue) {
+        result.PercentValue = sanitizePlacement(layout.PercentValue);
+    }
+    return result;
+};
+export const resolveBarChartCellTextLayout = (props) => sanitizeCellTextLayout(props?.CellTextLayout);
+/** True when any value is configured for display. */
+export const hasBarChartCellTextConfigured = (props) => {
+    const layout = resolveBarChartCellTextLayout(props);
+    return Boolean(layout.CellValue || layout.PercentValue);
+};
+/** Set of value tokens that currently have a placement. */
+export const getActiveBarChartCellTextTokens = (props) => {
+    const layout = resolveBarChartCellTextLayout(props);
+    const tokens = [];
+    if (layout.CellValue) {
+        tokens.push('CellValue');
+    }
+    if (layout.PercentValue) {
+        tokens.push('PercentageValue');
+    }
+    return tokens;
+};
+export const mergeBarChartCellTextProperties = (current, patch) => {
+    const merged = { ...current, ...patch };
+    if (merged.CellTextLayout) {
+        merged.CellTextLayout = sanitizeCellTextLayout(merged.CellTextLayout);
+        if (!merged.CellTextLayout.CellValue && !merged.CellTextLayout.PercentValue) {
+            delete merged.CellTextLayout;
+        }
+    }
+    if (!merged.CellTextLayout) {
+        return undefined;
+    }
+    return merged;
+};
+/**
+ * Set or clear a value's placement. Passing `placement: undefined` removes the value.
+ */
+export const setBarChartCellTextPlacement = (current, token, placement) => {
+    const layout = resolveBarChartCellTextLayout(current);
+    const next = { ...layout };
+    const key = token === 'CellValue' ? 'CellValue' : 'PercentValue';
+    if (placement) {
+        next[key] = sanitizePlacement(placement);
+    }
+    else {
+        delete next[key];
+    }
+    return mergeBarChartCellTextProperties(current, { CellTextLayout: next });
+};
+/**
+ * Patch a single axis of a value's placement (creating the value with defaults if
+ * needed). Used by the wizard's placement pickers.
+ */
+export const patchBarChartCellTextPlacement = (current, token, patch) => {
+    const layout = resolveBarChartCellTextLayout(current);
+    const key = token === 'CellValue' ? 'CellValue' : 'PercentValue';
+    const existing = layout[key];
+    const nextPlacement = {
+        ...(existing ?? DEFAULT_PLACEMENT),
+        ...patch,
+    };
+    return setBarChartCellTextPlacement(current, token, nextPlacement);
+};
+/**
+ * Toggle whether a value is displayed. When turning on a previously-hidden
+ * value we use the default placement (Left / Below).
+ */
+export const toggleBarChartCellTextToken = (current, token, show) => {
+    const layout = resolveBarChartCellTextLayout(current);
+    const key = token === 'CellValue' ? 'CellValue' : 'PercentValue';
+    if (show && !layout[key]) {
+        return {
+            CellTextProperties: setBarChartCellTextPlacement(current, token, DEFAULT_PLACEMENT),
+        };
+    }
+    if (!show && layout[key]) {
+        return {
+            CellTextProperties: setBarChartCellTextPlacement(current, token, undefined),
+        };
+    }
+    return { CellTextProperties: current };
+};
+export const buildBarChartCellTextLabels = (props, cellValueLabel, percentageLabel) => {
+    const layout = resolveBarChartCellTextLayout(props);
+    const labels = {};
+    if (layout.CellValue && cellValueLabel != undefined) {
+        labels.cellValue = cellValueLabel;
+    }
+    if (layout.PercentValue && percentageLabel != undefined) {
+        labels.percentage = percentageLabel;
+    }
+    return labels;
+};
+export const hasBarChartCellTextLabels = (labels) => Boolean(labels.cellValue || labels.percentage);
+/** Join active labels with a space, Cell Value first then Percent Value. */
+export const joinBarChartCellTextLabels = (labels) => {
+    const parts = [];
+    if (labels.cellValue)
+        parts.push(labels.cellValue);
+    if (labels.percentage)
+        parts.push(labels.percentage);
+    return parts.join(' ');
+};
+/**
+ * Resolve which placements are populated and what text goes in each cell of
+ * the 3 × 3 grid. Empty slots are omitted. Two values landing on the same
+ * (vertical, horizontal) slot are concatenated with a single space, Cell
+ * Value before Percent Value.
+ */
+export const resolveBarChartCellTextSlots = (props, labels) => {
+    const layout = resolveBarChartCellTextLayout(props);
+    // Iteration order matters when both values share a slot: Cell Value first,
+    // then Percent Value (matches the legacy "joined" behaviour).
+    const candidates = [];
+    if (layout.CellValue && labels.cellValue) {
+        candidates.push({
+            placement: sanitizePlacement(layout.CellValue),
+            text: labels.cellValue,
+        });
+    }
+    if (layout.PercentValue && labels.percentage) {
+        candidates.push({
+            placement: sanitizePlacement(layout.PercentValue),
+            text: labels.percentage,
+        });
+    }
+    const slotMap = new Map();
+    for (const { placement, text } of candidates) {
+        const key = `${placement.Vertical}|${placement.Horizontal}`;
+        const existing = slotMap.get(key);
+        if (existing) {
+            existing.parts.push(text);
+            existing.text = existing.parts.join(' ');
+        }
+        else {
+            slotMap.set(key, {
+                vertical: placement.Vertical,
+                horizontal: placement.Horizontal,
+                parts: [text],
+                text,
+            });
+        }
+    }
+    return Array.from(slotMap.values());
+};
+export const getBarChartCellTextSlotPresence = (props) => {
+    const layout = resolveBarChartCellTextLayout(props);
+    const verticals = new Set();
+    if (layout.CellValue)
+        verticals.add(sanitizePlacement(layout.CellValue).Vertical);
+    if (layout.PercentValue)
+        verticals.add(sanitizePlacement(layout.PercentValue).Vertical);
+    return {
+        hasAbove: verticals.has('Above'),
+        hasBelow: verticals.has('Below'),
+        hasMerged: verticals.has('Merged'),
+    };
+};
+// ---------------------------------------------------------------------------
+// Summary formatting
+// ---------------------------------------------------------------------------
+const HORIZONTAL_LABEL = {
+    Left: 'Left',
+    Center: 'Center',
+    Right: 'Right',
+};
+const VERTICAL_LABEL = {
+    Above: 'Above',
+    Below: 'Below',
+    Merged: 'Merged',
+};
+const formatTokenLabel = (token) => token === 'CellValue' ? 'Cell Value' : 'Percent Value';
+const formatPlacementSummary = (placement) => {
+    const { Horizontal, Vertical } = sanitizePlacement(placement);
+    return `${VERTICAL_LABEL[Vertical]}-${HORIZONTAL_LABEL[Horizontal]}`;
+};
+export const formatBarChartCellTextLayoutSummary = (layout) => {
+    const parts = [];
+    if (layout.CellValue) {
+        parts.push(`${formatTokenLabel('CellValue')}: ${formatPlacementSummary(layout.CellValue)}`);
+    }
+    if (layout.PercentValue) {
+        parts.push(`${formatTokenLabel('PercentageValue')}: ${formatPlacementSummary(layout.PercentValue)}`);
+    }
+    return parts.length ? parts.join('; ') : undefined;
+};
+// ---------------------------------------------------------------------------
+// DOM mount
+// ---------------------------------------------------------------------------
+const HORIZONTAL_FLEX_JUSTIFY = {
+    Left: 'flex-start',
+    Center: 'center',
+    Right: 'flex-end',
+};
+const HORIZONTAL_TEXT_ALIGN = {
+    Left: 'left',
+    Center: 'center',
+    Right: 'right',
+};
+const createCellTextRow = (slots, textClassName, compact) => {
+    const row = document.createElement('div');
+    row.className = textClassName;
+    row.style.display = 'flex';
+    row.style.flexDirection = 'row';
+    row.style.alignItems = 'center';
+    row.style.width = '100%';
+    // When `Above` AND `Below` are both populated, two default-size text rows
+    // would squeeze the bar to 0 on a standard ~28-40px cell, so the caller
+    // asks for a compact band (smaller font + tighter line-height).
+    // Otherwise we render at the inherited cell font for legibility.
+    if (compact) {
+        row.style.fontSize = '0.75em';
+        row.style.lineHeight = '1';
+    }
+    else {
+        row.style.lineHeight = '1.2';
+    }
+    row.style.flex = '0 0 auto';
+    row.style.gap = '4px';
+    // Render fixed Left / Center / Right cells so spacing is stable even when
+    // only one or two slots are present.
+    for (const horizontal of HORIZONTAL_VALUES) {
+        const slot = slots.find((s) => s.horizontal === horizontal);
+        const cell = document.createElement('span');
+        cell.style.flex = '1';
+        cell.style.minWidth = '0';
+        cell.style.textAlign = HORIZONTAL_TEXT_ALIGN[horizontal];
+        cell.style.display = 'flex';
+        cell.style.justifyContent = HORIZONTAL_FLEX_JUSTIFY[horizontal];
+        cell.style.alignItems = 'center';
+        if (slot) {
+            cell.textContent = slot.text;
+        }
+        row.append(cell);
+    }
+    // Suppress the dummy row in the rare case where every slot for this band is
+    // empty (e.g. the only label is empty string). `String(...)` because text
+    // may arrive as a number when `params.formatValue` is undefined for a
+    // numeric column — `(11).length` is `undefined`, which would otherwise
+    // wrongly trip the empty-row branch.
+    if (!slots.some((s) => String(s.text ?? '').length)) {
+        row.style.display = 'none';
+    }
+    return row;
+};
+export const mountBarChartCellText = (args) => {
+    const { cellTextProperties, labels, wrapperEl, textClassName } = args;
+    if (!hasBarChartCellTextConfigured(cellTextProperties) || !hasBarChartCellTextLabels(labels)) {
+        return;
+    }
+    const slots = resolveBarChartCellTextSlots(cellTextProperties, labels);
+    if (!slots.length) {
+        return;
+    }
+    const mergedOverlayEl = args.mergedOverlayEl ?? wrapperEl;
+    const mergedPointerEventsNone = args.mergedPointerEventsNone ?? mergedOverlayEl === wrapperEl;
+    const slotsByVertical = {
+        Above: slots.filter((s) => s.vertical === 'Above'),
+        Below: slots.filter((s) => s.vertical === 'Below'),
+        Merged: slots.filter((s) => s.vertical === 'Merged'),
+    };
+    // Compact when Cell Value and Percent Value have *different* verticals
+    // (i.e. the two tokens claim two separate bands of vertical space). When
+    // they share a vertical band — or when only one token is configured —
+    // we have room for the full-size font.
+    const layout = resolveBarChartCellTextLayout(cellTextProperties);
+    const compact = Boolean(layout.CellValue &&
+        layout.PercentValue &&
+        sanitizePlacement(layout.CellValue).Vertical !==
+            sanitizePlacement(layout.PercentValue).Vertical);
+    if (slotsByVertical.Above.length) {
+        const row = createCellTextRow(slotsByVertical.Above, textClassName, compact);
+        wrapperEl.prepend(row);
+    }
+    if (slotsByVertical.Below.length) {
+        const row = createCellTextRow(slotsByVertical.Below, textClassName, compact);
+        wrapperEl.append(row);
+    }
+    if (slotsByVertical.Merged.length) {
+        const row = createCellTextRow(slotsByVertical.Merged, textClassName, compact);
+        row.style.position = 'absolute';
+        row.style.top = '50%';
+        row.style.transform = 'translateY(-50%)';
+        row.style.left = '0';
+        row.style.right = '0';
+        row.style.paddingLeft = '5px';
+        row.style.paddingRight = '5px';
+        if (mergedPointerEventsNone) {
+            row.style.pointerEvents = 'none';
+        }
+        mergedOverlayEl.append(row);
+    }
+};

package/src/Utilities/Helpers/percentBarPreviewHelper.d.ts

@@ -1,4 +1,5 @@
-import { PercentBarStyle, StyledColumn } from '../../AdaptableState/StyledColumnState';
+import { StyledColumn } from '../../AdaptableState/StyledColumnState';
+import { PercentBarStyle } from '../../AdaptableState/StyledColumns/PercentBarStyle';
 export declare const hasPercentBarRangesConfigured: (pb: PercentBarStyle | undefined) => boolean;
 /** Illustrative scale for preview — shows negatives when origin is Auto or Zero. */
 export declare const getPercentBarPreviewScale: (pb: PercentBarStyle) => {

package/src/Utilities/Helpers/percentBarPreviewHelper.js

@@ -1,6 +1,7 @@
 import { getVariableColor } from './StyleHelper';
 import clamp from '../utils/clamp';
 import { STYLED_COLUMN_PREVIEW_SAMPLE_COUNT, ZERO_CENTRED_PREVIEW_SCALE_MAX, ZERO_CENTRED_PREVIEW_SCALE_MIN, } from './StyledColumnGradientHelper';
+import { buildBarChartCellTextLabels, joinBarChartCellTextLabels, } from './barChartCellText';
 const evenlySpacedValues = (min, max, count) => {
     if (count <= 1) {
         return [min];
@@ -124,14 +125,8 @@ export const getPercentBarPreviewGeometry = (numericValue, pb, min, max) => {
     };
 };
 export const formatPercentBarPreviewCellText = (numericValue, percentageValue, pb) => {
-    const parts = [];
-    if (pb.CellText?.includes('CellValue')) {
-        parts.push(Number.isInteger(numericValue) ? String(numericValue) : numericValue.toFixed(1));
-    }
-    if (pb.CellText?.includes('PercentageValue')) {
-        parts.push(`${percentageValue.toFixed(0)}%`);
-    }
-    return parts.join(' ');
+    const labels = buildBarChartCellTextLabels(pb.CellTextProperties, Number.isInteger(numericValue) ? String(numericValue) : numericValue.toFixed(1), `${percentageValue.toFixed(0)}%`);
+    return joinBarChartCellTextLabels(labels);
 };
 export const getPercentBarPreviewTrackColor = (pb) => {
     if (pb.ColumnComparison) {

package/src/Utilities/Helpers/resolveSettingsPanelNavigation.d.ts

@@ -0,0 +1,3 @@
+import { AdaptableApi } from '../../Api/AdaptableApi';
+import { SettingsPanelNavigation, SettingsPanelOptions } from '../../AdaptableOptions/SettingsPanelOptions';
+export declare const resolveSettingsPanelNavigation: (api: AdaptableApi, settingsPanelOptions: SettingsPanelOptions) => SettingsPanelNavigation;

package/src/Utilities/Helpers/resolveSettingsPanelNavigation.js

@@ -0,0 +1,15 @@
+import { buildDefaultSettingsPanelNavigation } from '../Defaults/DefaultSettingsPanel';
+const cloneSettingsPanelNavigation = (navigation) => ({
+    groups: navigation.groups.map((group) => ({
+        label: group.label,
+        items: [...group.items],
+    })),
+});
+export const resolveSettingsPanelNavigation = (api, settingsPanelOptions) => {
+    const defaultNavigation = buildDefaultSettingsPanelNavigation(settingsPanelOptions.customSettingsPanels?.map((panel) => panel.name) ?? []);
+    if (!settingsPanelOptions.navigation) {
+        return defaultNavigation;
+    }
+    const context = api.internalApi.buildBaseContext();
+    return settingsPanelOptions.navigation(context, cloneSettingsPanelNavigation(defaultNavigation));
+};

package/src/Utilities/getScopeViewItems.js

@@ -1,4 +1,5 @@
 import StringExtensions from './Extensions/StringExtensions';
+import { getScopeViewItemsTagVariant } from '../components/Tag/columnScopeTagHelpers';
 export const getScopeViewItems = (scope, api) => {
     let values = [];
     if ('ColumnIds' in scope && Array.isArray(scope.ColumnIds)) {
@@ -20,5 +21,6 @@ export const getScopeViewItems = (scope, api) => {
         label: 'Columns',
         name: 'Target',
         values,
+        tagVariant: getScopeViewItemsTagVariant(scope),
     };
 };

package/src/Utilities/wizardSelection.d.ts

@@ -0,0 +1,10 @@
+import type { SimpleButtonProps } from '../components/SimpleButton';
+/** Selected wizard option — Tailwind overrides SimpleButton outlined defaults. */
+export declare const WIZARD_SELECTION_ACTIVE_CLASSES: string;
+/** Unselected wizard option — muted so the active choice reads immediately. */
+export declare const WIZARD_SELECTION_INACTIVE_CLASSES: string;
+export type CollapsibleWizardCardSurface = 'popup' | 'panel';
+export declare const getCollapsibleWizardCardCollapsedClasses: (surface?: CollapsibleWizardCardSurface) => string;
+export declare const getCollapsibleWizardCardExpandedClasses: (surface?: CollapsibleWizardCardSurface) => string;
+export declare const wizardSelectionButtonClassName: (selected: boolean, className?: string) => string;
+export declare const wizardSelectionSimpleButtonProps: (selected: boolean, className?: string) => Pick<SimpleButtonProps, "variant" | "tone" | "className">;

package/src/Utilities/wizardSelection.js

@@ -0,0 +1,15 @@
+import { cn } from '../lib/utils';
+/** Selected wizard option — Tailwind overrides SimpleButton outlined defaults. */
+export const WIZARD_SELECTION_ACTIVE_CLASSES = cn('ab-WizardSelection--active', 'twa:!border-[var(--ab-cmp-wizard-selection__border)]', 'twa:!bg-[var(--ab-cmp-wizard-selection__background)]', 'twa:!text-accent', 'twa:font-medium');
+/** Unselected wizard option — muted so the active choice reads immediately. */
+export const WIZARD_SELECTION_INACTIVE_CLASSES = cn('twa:!border-[color-mix(in_srgb,var(--ab-color-primarydark)_40%,transparent)]', 'twa:!text-[color-mix(in_srgb,var(--ab-color-foreground)_55%,transparent)]');
+export const getCollapsibleWizardCardCollapsedClasses = (surface = 'popup') => cn(surface === 'panel'
+    ? 'twa:border-[var(--ab-cmp-collapsible-wizard-card__collapsed-border)] twa:bg-card'
+    : 'twa:border-[var(--ab-cmp-collapsible-wizard-card__collapsed-border-popup)]');
+export const getCollapsibleWizardCardExpandedClasses = (surface = 'popup') => cn('ab-CollapsibleWizardCard--expanded', 'twa:border-[var(--ab-cmp-collapsible-wizard-card__expanded-border)]', surface === 'panel' && 'twa:bg-card', 'twa:p-0');
+export const wizardSelectionButtonClassName = (selected, className) => cn('ab-WizardSelection', selected ? WIZARD_SELECTION_ACTIVE_CLASSES : WIZARD_SELECTION_INACTIVE_CLASSES, className);
+export const wizardSelectionSimpleButtonProps = (selected, className) => ({
+    variant: 'outlined',
+    tone: 'none',
+    className: wizardSelectionButtonClassName(selected, className),
+});

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/AdaptableOptionsForm.js

@@ -1,7 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { CheckBox } from '../../../components/CheckBox';
-import DropdownButton from '../../../components/DropdownButton';
+import { NewDropdownButton } from '../../../components/DropdownButton';
 import HelpBlock from '../../../components/HelpBlock';
 import Input from '../../../components/Input';
 import StringExtensions from '../../../Utilities/Extensions/StringExtensions';
@@ -45,7 +45,7 @@ const OptionInput = (props) => {
             label: StringExtensions.Humanize(str),
             onClick: () => props.onChange({ ...option, value: str }),
         }));
-        input = (_jsx(DropdownButton, { ...inputProps, columns: ['label'], items: options, children: StringExtensions.Humanize(value) }));
+        input = (_jsx(NewDropdownButton, { className: "twa:min-w-[200px] twa:mr-2", items: options, children: StringExtensions.Humanize(value) }));
     }
     else {
         switch (option.kind) {

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsSidebarForm.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { CheckBox } from '../../../../components/CheckBox';
-import DropdownButton from '../../../../components/DropdownButton';
+import { NewDropdownButton } from '../../../../components/DropdownButton';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
 import HelpBlock from '../../../../components/HelpBlock';
 import StringExtensions from '../../../../Utilities/Extensions/StringExtensions';
@@ -73,7 +73,7 @@ export const UIOptionsSidebarForm = (props) => {
         };
         props.onChange(newGridOptions);
     };
-    return (_jsxs(Box, { children: [_jsx(HelpBlock, { children: "Tool Panels" }), _jsxs(Box, { className: "twa:m-2", children: [_jsx(Flex, { className: "twa:mb-2", children: ALL_SIDEBAR_OPTIONS.map(renderSidebarCheckbox) }), _jsx(FormLayout, { columns: [{ name: 'label' }, { name: 'children' }], children: _jsx(FormRow, { label: "Position", children: _jsx(DropdownButton, { columns: ['label'], items: [
+    return (_jsxs(Box, { children: [_jsx(HelpBlock, { children: "Tool Panels" }), _jsxs(Box, { className: "twa:m-2", children: [_jsx(Flex, { className: "twa:mb-2", children: ALL_SIDEBAR_OPTIONS.map(renderSidebarCheckbox) }), _jsx(FormLayout, { columns: [{ name: 'label' }, { name: 'children' }], children: _jsx(FormRow, { label: "Position", children: _jsx(NewDropdownButton, { items: [
                                     { label: 'Left', onClick: () => handleSidebarPositionChange('left') },
                                     { label: 'Right', onClick: () => handleSidebarPositionChange('right') },
                                 ], children: sidebarPosition === 'left' ? 'Left' : 'Right' }) }) })] })] }));

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsStatusbarForm.js

@@ -4,8 +4,8 @@ import { ModuleManager } from '../../../../components/DragAndDropContext/ModuleM
 import HelpBlock from '../../../../components/HelpBlock';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
 import Input from '../../../../components/Input';
-import SimpleButton from '../../../../components/SimpleButton';
-import DropdownButton from '../../../../components/DropdownButton';
+import { ButtonNew } from '../../../Components/Buttons/ButtonNew';
+import { NewDropdownButton } from '../../../../components/DropdownButton';
 import { NocodeWizardFormBox } from '../Components/FormBox';
 import { Box } from '../../../../components/Flex';
 export const UIOptionsStatusbarForm = (props) => {
@@ -91,7 +91,7 @@ export const UIOptionsStatusbarForm = (props) => {
             },
         });
     };
-    return (_jsxs(Box, { children: [_jsx(HelpBlock, { children: "Status Bar" }), _jsxs(Box, { className: "twa:p-2", children: [_jsxs(NocodeWizardFormBox, { children: [_jsx(Box, { as: "b", children: "Create Adaptable Statusbar Panel" }), _jsxs(FormLayout, { className: "twa:mt-2", children: [_jsx(FormRow, { label: "Panel Name", children: _jsx(Input, { value: adaptablePanelTitle, placeholder: 'Adaptable Panel Name', onChange: (event) => setAdaptablePanelTitle(event.target.value) }) }), _jsx(FormRow, { label: "Align", children: _jsx(DropdownButton, { columns: ['label'], items: alignOptions, children: alignOptions.find((option) => option.value === adaptablePanelAlign)?.label }) }), _jsxs(FormRow, { label: "", children: [_jsx(SimpleButton, { disabled: !isAdaptablePanelTitleAvailable, onClick: handleNewAdaptablePanel, icon: "plus", variant: "raised", children: "Add" }), !isAdaptablePanelTitleAvailable && (_jsx(Box, { className: "twa:mt-2 twa:text-error", children: "Adaptable panel name must be unique." }))] })] })] }), _jsx(ModuleManager, { permittedActions: {
+    return (_jsxs(Box, { children: [_jsx(HelpBlock, { children: "Status Bar" }), _jsxs(Box, { className: "twa:p-2", children: [_jsxs(NocodeWizardFormBox, { children: [_jsx(Box, { as: "b", children: "Create Adaptable Statusbar Panel" }), _jsxs(FormLayout, { className: "twa:mt-2", children: [_jsx(FormRow, { label: "Panel Name", children: _jsx(Input, { value: adaptablePanelTitle, placeholder: 'Adaptable Panel Name', onChange: (event) => setAdaptablePanelTitle(event.target.value) }) }), _jsx(FormRow, { label: "Align", children: _jsx(NewDropdownButton, { items: alignOptions, children: alignOptions.find((option) => option.value === adaptablePanelAlign)?.label }) }), _jsxs(FormRow, { label: "", children: [_jsx(ButtonNew, { disabled: !isAdaptablePanelTitleAvailable, onClick: handleNewAdaptablePanel, children: "Add" }), !isAdaptablePanelTitleAvailable && (_jsx(Box, { className: "twa:mt-2 twa:text-destructive", children: "Adaptable panel name must be unique." }))] })] })] }), _jsx(ModuleManager, { permittedActions: {
                             createTab: false,
                             dragAndDropTab: false,
                             deleteTab: false,

package/src/View/Alert/AlertViewPanel.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
+import { cn } from '../../lib/utils';
 import { connect } from 'react-redux';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { AdaptablePopover } from '../AdaptablePopover';
@@ -7,7 +8,6 @@ import { getAlertButtonStyle } from './Utilities/getAlertButtonStyle';
 import { ActiveAlertsPanel } from './ActiveAlertsPanel';
 import { Flex } from '../../components/Flex';
 import { ButtonClear } from '../Components/Buttons/ButtonClear';
-import clsx from 'clsx';
 class AlertViewPanelComponent extends React.Component {
     constructor(props) {
         super(props);
@@ -31,7 +31,7 @@ class AlertViewPanelComponent extends React.Component {
         const alertsPanel = _jsx(ActiveAlertsPanel, {});
         const isToolbar = this.props.viewType === 'Toolbar';
         const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
-        return (_jsxs(Flex, { alignItems: "stretch", className: clsx(`ab-${elementType}__Alert__wrap twa:gap-1`, {
+        return (_jsxs(Flex, { alignItems: "stretch", className: cn(`ab-${elementType}__Alert__wrap twa:gap-1`, {
                 'twa:min-w-[140px] twa:w-[140px]': isToolbar,
                 [`twa:flex-1`]: !isToolbar,
             }), children: [_jsx(Flex, { className: `ab-${elementType}__Alert__text twa:flex-1 twa:rounded-standard twa:p-2 text-2 twa:items-center twa:justify-center twa:min-h-input`, style: { color: buttonTextColor, backgroundColor: buttonBackground }, children: collapsedText }, `${buttonTextColor}_${buttonBackground}_${collapsedText}`), this.props.AdaptableAlerts.length > 0 && (_jsxs(Flex, { className: 'twa:gap-1', children: [_jsx(Flex, { className: "twa:flex twa:box-border", children: _jsx(ButtonClear, { "aria-label": 'Clear All Alerts', variant: 'outlined', className: `ab-${elementType}__Alert__clear`, onClick: () => this.props.onDeleteAllAlert(this.state.Alerts), tooltip: "Clear All Alerts", showText: this.props.viewType === 'ToolPanel', children: 'Clear Alerts' }) }), _jsx(AdaptablePopover, { className: `ab-${elementType}__Alert__info`, headerText: "Alerts Details", bodyText: [alertsPanel], MessageType: 'Info', useButton: true, showEvent: 'focus', hideEvent: "blur", popoverMinWidth: 400 })] }))] }));

package/src/View/Alert/Utilities/getAlertButtonStyle.js

@@ -6,10 +6,13 @@ export const getAlertButtonStyle = (alerts) => {
     const buttonTextColor = UIHelper.getButtonTextColourForArrayandMessageType(alerts, messageType);
     let cssClasses = '';
     if (alerts?.length) {
-        const cssMessageType = UIHelper.getCSSColorByMessageType(messageType);
-        cssClasses = cssMessageType
-            ? `twa:bg-${cssMessageType} twa:text-text-on-${cssMessageType}`
-            : '';
+        cssClasses =
+            {
+                Info: `twa:bg-info twa:text-info-foreground`,
+                Success: `twa:bg-success twa:text-success-foreground`,
+                Warning: `twa:bg-warning twa:text-warning-foreground`,
+                Error: `twa:bg-destructive twa:text-destructive-foreground`,
+            }[messageType] || '';
     }
     return {
         color: buttonTextColor,

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.d.ts

@@ -2,7 +2,6 @@ import * as React from 'react';
 import { AlertDefinition } from '../../../AdaptableState/AlertState';
 import { AdaptableApi } from '../../../types';
 import { AlertType } from '../Utilities/getAlertType';
-export declare const renderAlertBehaviourWizardSummary: (alertDefinition: AlertDefinition) => React.JSX.Element;
 export declare const renderAlertBehaviourSummary: (alert: AlertDefinition, api: AdaptableApi, allowWrap?: boolean) => React.JSX.Element;
 type AlertBehaviourWizardSectionProps = {
     onChange: (data: AlertDefinition) => void;

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.js

@@ -39,10 +39,6 @@ const HighlightStyle = (props) => {
                             props.onChange(style);
                         } }) }) }))] }));
 };
-export const renderAlertBehaviourWizardSummary = (alertDefinition) => {
-    const { api } = useOnePageAdaptableWizardContext();
-    return renderAlertBehaviourSummary(alertDefinition, api);
-};
 export const renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
     const { AlertProperties = {} } = alert;
     const ruleProperties = isRuleBasedAlertDefinition(alert)