@adaptabletools/adaptable-cjs 23.0.0-canary.7 → 23.0.0-canary.8

package/src/agGrid/cellRenderers/PercentBarRenderer.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const clamp_1 = tslib_1.__importDefault(require("../../Utilities/utils/clamp"));
 const shouldRenderStyledColumnOnRow_1 = require("./shouldRenderStyledColumnOnRow");
+const barChartCellText_1 = require("../../Utilities/Helpers/barChartCellText");
 /**
  * Resolve the origin value (in the same numeric space as `min`/`max`) the bar
  * should grow from.
@@ -45,58 +46,6 @@ const columnComparisonUsesCentredAxis = (origin) => {
     }
     return o === 'Zero' || o === 'Auto';
 };
-/**
- * Linear (non-comparison) mode: bar grows from an interior point of the scale
- * (so positives / negatives can diverge left and right).
- */
-const linearScaleUsesCentredAxis = (percentBarStyle, cellValue, min, max) => {
-    const origin = percentBarStyle.Origin ?? 'Auto';
-    if (origin === 'Zero') {
-        return true;
-    }
-    if (origin === 'Min') {
-        return false;
-    }
-    if (typeof origin === 'number') {
-        if (max === min) {
-            return false;
-        }
-        const f = toFraction(origin, min, max);
-        return f > 0 && f < 1;
-    }
-    // Auto — same condition as resolveOrigin using 0 as the pivot.
-    return min < 0 || max < 0 || cellValue < 0;
-};
-const resolveCellTextAlignCss = (percentBarStyle, args) => {
-    const mode = percentBarStyle.CellTextAlignment;
-    if (mode == undefined) {
-        return undefined;
-    }
-    if (mode === 'Left') {
-        return 'left';
-    }
-    if (mode === 'Right') {
-        return 'right';
-    }
-    if (mode === 'Center') {
-        return 'center';
-    }
-    // Auto
-    const centred = args.hasColumnComparison
-        ? columnComparisonUsesCentredAxis(percentBarStyle.Origin)
-        : linearScaleUsesCentredAxis(percentBarStyle, args.numericValue, args.min, args.max);
-    if (!centred) {
-        return undefined;
-    }
-    const v = args.hasColumnComparison ? args.percentageValue : args.numericValue;
-    if (v > 0) {
-        return 'right';
-    }
-    if (v < 0) {
-        return 'left';
-    }
-    return 'center';
-};
 const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
     if (!styledColumn.PercentBarStyle) {
         return;
@@ -195,11 +144,14 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
                 }
             }
             // ----- Build the DOM -------------------------------------------------
-            const hasCellText = percentBarStyle.CellText && percentBarStyle.CellText.length > 0;
-            const isTextPositionMerged = percentBarStyle.CellTextPosition === 'Merged';
+            const cellTextProperties = percentBarStyle.CellTextProperties;
+            const hasCellText = (0, barChartCellText_1.hasBarChartCellTextConfigured)(cellTextProperties);
+            // Wrapper always fills the cell. The bar is the flex-grow child so it
+            // claims whatever space the (compact) text rows leave, with a small
+            // floor to stay visible even on short rows.
             this.eGui = document.createElement('div');
             this.eGui.className = 'ab-PercentBar__wrapper';
-            this.eGui.style.height = hasCellText && !isTextPositionMerged ? '80%' : '100%';
+            this.eGui.style.height = '100%';
             this.eGui.style.display = 'flex';
             this.eGui.style.flexDirection = 'column';
             this.eGui.style.justifyContent = 'center';
@@ -212,7 +164,10 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
             if (percentBarStyle.BackColor) {
                 barEl.style.background = percentBarStyle.BackColor;
             }
-            barEl.style.flex = '1';
+            barEl.style.flex = '1 1 0';
+            // Floor so the bar can't be squeezed out of existence when both
+            // `Above` and `Below` bands are populated on a short row.
+            barEl.style.minHeight = '6px';
             // Render the inside bar whenever a colour has been resolved, even at
             // 0% width. A zero-width div is visually identical to skipping the
             // element but keeps the DOM consistent so tests / tooling can still
@@ -233,47 +188,20 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
             }
             this.eGui.append(barEl);
             if (hasCellText) {
-                const textEl = document.createElement('div');
-                textEl.className = 'ab-PercentBar__text';
-                textEl.style.lineHeight = '1.2';
-                const parts = [];
-                if (percentBarStyle.CellText.includes('CellValue')) {
-                    parts.push(params.formatValue?.(rawCellValue) ?? String(rawCellValue));
-                }
-                if (percentBarStyle.CellText.includes('PercentageValue')) {
-                    parts.push(`${percentageValue.toFixed(0)}%`);
-                }
-                textEl.innerText = parts.join(' ');
-                const textAlignCss = resolveCellTextAlignCss(percentBarStyle, {
-                    numericValue,
-                    percentageValue,
-                    min,
-                    max,
-                    hasColumnComparison: !!percentBarStyle.ColumnComparison,
+                // Coerce to string: when no `valueFormatter` is set on the column,
+                // `params.formatValue` returns the raw value (a number for numeric
+                // columns), which then propagates through the helpers as a non-string
+                // and breaks string-only operations (e.g. `.length` checks).
+                const formattedCellValue = String(params.formatValue?.(rawCellValue) ?? rawCellValue);
+                const labels = (0, barChartCellText_1.buildBarChartCellTextLabels)(cellTextProperties, formattedCellValue, `${percentageValue.toFixed(0)}%`);
+                (0, barChartCellText_1.mountBarChartCellText)({
+                    wrapperEl: this.eGui,
+                    mergedOverlayEl: barEl,
+                    textClassName: 'ab-PercentBar__text',
+                    cellTextProperties,
+                    labels,
+                    mergedPointerEventsNone: false,
                 });
-                if (textAlignCss) {
-                    textEl.style.textAlign = textAlignCss;
-                }
-                switch (percentBarStyle.CellTextPosition) {
-                    case 'Above':
-                        this.eGui.prepend(textEl);
-                        break;
-                    case 'Merged':
-                        textEl.style.position = 'absolute';
-                        // Centre vertically without knowing the row height
-                        textEl.style.top = '50%';
-                        textEl.style.transform = 'translateY(-50%)';
-                        textEl.style.left = '0';
-                        textEl.style.right = '0';
-                        textEl.style.paddingLeft = '5px';
-                        textEl.style.paddingRight = '5px';
-                        barEl.append(textEl);
-                        break;
-                    case 'Below':
-                    default:
-                        this.eGui.append(textEl);
-                        break;
-                }
             }
         }
         getGui() {

package/src/agGrid/cellRenderers/RangeBarRenderer.js

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

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1781796455481 || Date.now(),
-    VERSION: "23.0.0-canary.7" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1782067371054 || Date.now(),
+    VERSION: "23.0.0-canary.8" || '--current-version--',
 };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -1121,6 +1121,20 @@ export declare const ADAPTABLE_METAMODEL: {
     BadgeDensity: {
         k: string;
     };
+    BadgeIconProperties: {
+        k: string;
+        p: ({
+            n: string;
+            k: string;
+            o: boolean;
+            r?: undefined;
+        } | {
+            n: string;
+            k: string;
+            r: string;
+            o?: undefined;
+        })[];
+    };
     BadgeOverflowMode: {
         k: string;
     };
@@ -1146,21 +1160,24 @@ export declare const ADAPTABLE_METAMODEL: {
     };
     BadgeStyleDefinition: {
         k: string;
-        p: ({
+        p: {
             n: string;
             k: string;
             o: boolean;
             r: string;
-        } | {
-            n: string;
-            k: string;
-            o: boolean;
-            r?: undefined;
-        })[];
+        }[];
     };
     BadgeStylePredicate: {
         k: string;
     };
+    BarChartMarker: {
+        k: string;
+        p: {
+            n: string;
+            k: string;
+            o: boolean;
+        }[];
+    };
     BaseColumnHeaderContext: {
         k: string;
         p: ({
@@ -1246,6 +1263,14 @@ export declare const ADAPTABLE_METAMODEL: {
             k: string;
         }[];
     };
+    BulletChartBarProperties: {
+        k: string;
+        p: {
+            n: string;
+            k: string;
+            o: boolean;
+        }[];
+    };
     BulletChartStyle: {
         k: string;
         p: ({
@@ -1282,13 +1307,19 @@ export declare const ADAPTABLE_METAMODEL: {
             r?: undefined;
         })[];
     };
-    BulletChartTargetMarker: {
+    BulletChartTargetProperties: {
         k: string;
-        p: {
+        p: ({
             n: string;
             k: string;
             o: boolean;
-        }[];
+            r: string;
+        } | {
+            n: string;
+            k: string;
+            o: boolean;
+            r?: undefined;
+        })[];
     };
     ButtonStyle: {
         k: string;
@@ -3370,9 +3401,6 @@ export declare const ADAPTABLE_METAMODEL: {
     IconStyleBuiltInPreset: {
         k: string;
     };
-    IconStyleFallback: {
-        k: string;
-    };
     IconStyleMapping: {
         k: string;
         p: ({
@@ -4153,7 +4181,7 @@ export declare const ADAPTABLE_METAMODEL: {
     RangeBarBound: {
         k: string;
     };
-    RangeBarMarker: {
+    RangeBarOutOfRangeProperties: {
         k: string;
         p: {
             n: string;
@@ -4161,6 +4189,20 @@ export declare const ADAPTABLE_METAMODEL: {
             o: boolean;
         }[];
     };
+    RangeBarReferenceProperties: {
+        k: string;
+        p: ({
+            n: string;
+            k: string;
+            o: boolean;
+            r: string;
+        } | {
+            n: string;
+            k: string;
+            r: string;
+            o?: undefined;
+        })[];
+    };
     RangeBarStyle: {
         k: string;
         p: ({
@@ -4180,6 +4222,14 @@ export declare const ADAPTABLE_METAMODEL: {
             o?: undefined;
         })[];
     };
+    RangeBarTrackProperties: {
+        k: string;
+        p: {
+            n: string;
+            k: string;
+            o: boolean;
+        }[];
+    };
     RangeValueType: {
         k: string;
     };
@@ -4593,6 +4643,22 @@ export declare const ADAPTABLE_METAMODEL: {
             k: string;
         }[];
     };
+    SettingsPanelNavigation: {
+        k: string;
+    };
+    SettingsPanelNavigationConfigurer: {
+        k: string;
+    };
+    SettingsPanelNavigationContext: {
+        k: string;
+    };
+    SettingsPanelNavigationGroup: {
+        k: string;
+        p: {
+            n: string;
+            k: string;
+        }[];
+    };
     SettingsPanelOptions: {
         k: string;
         p: ({