@adaptabletools/adaptable 23.0.14 → 23.0.15

package/index.css

@@ -663,6 +663,9 @@
   .twa\:h-\[22px\] {
     height: 22px;
   }
+  .twa\:h-\[24px\] {
+    height: 24px;
+  }
   .twa\:h-\[33px\] {
     height: 33px;
   }
@@ -867,6 +870,9 @@
   .twa\:w-\[15rem\] {
     width: 15rem;
   }
+  .twa\:w-\[36px\] {
+    width: 36px;
+  }
   .twa\:w-\[44px\] {
     width: 44px;
   }
@@ -3513,6 +3519,19 @@
       background-color: color-mix(in oklab, var(--ab-color-destructive) 20%, transparent);
     }
   }
+  .twa\:\[\&_\.ab-ColorPicker-swatch\]\:absolute .ab-ColorPicker-swatch {
+    position: absolute;
+  }
+  .twa\:\[\&_\.ab-ColorPicker-swatch\]\:inset-0 .ab-ColorPicker-swatch {
+    inset: 0px;
+  }
+  .twa\:\[\&_\.ab-ColorPicker-swatch\]\:size-full .ab-ColorPicker-swatch {
+    width: 100%;
+    height: 100%;
+  }
+  .twa\:\[\&_\.ab-ColorPicker-swatch\]\:opacity-0 .ab-ColorPicker-swatch {
+    opacity: 0%;
+  }
   .twa\:\[\&_\.ab-Input\]\:w-full .ab-Input {
     width: 100%;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "23.0.14",
+  "version": "23.0.15",
   "description": "Powerful AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/ColumnOptions.d.ts

@@ -39,9 +39,19 @@ export interface ColumnOptions {
  */
 export interface BaseColumnHeaderContext extends BaseContext {
     /**
-     * Default header name for Column
+     * Resolved header name for the Column — the layout-specific header if one is defined, otherwise the ColDef header.
+     * This is the value that would be displayed when no `columnHeader` function is provided.
      */
     defaultHeaderName: string;
+    /**
+     * Original header name from the Column Definition (`headerName`, or a humanised `field` when `headerName` is not set).
+     * Never affected by Layout-specific headers.
+     */
+    colDefHeaderName: string;
+    /**
+     * Layout-specific header name for the Column, when one is defined in the current Layout's `ColumnHeaders`.
+     */
+    layoutSpecificHeaderName?: string;
     /**
      * Name of Current Layout
      */

package/src/AdaptableOptions/DefaultAdaptableOptions.js

@@ -47,6 +47,7 @@ const DefaultAdaptableOptions = {
         showMissingColumnsWarning: true,
         addColumnGroupToColumnFriendlyName: false,
         columnHeader: undefined,
+        alwaysCallHeaderFunction: false,
     },
     columnMenuOptions: {
         customColumnMenu: undefined,

package/src/Api/Internal/ColumnInternalApi.js

@@ -61,18 +61,20 @@ export class ColumnInternalApi extends ApiBase {
         const columnParams = params;
         const isColumnGroup = !!params.columnGroup;
         const columnGroupParams = params;
-        const defaultHeaderName = params.colDef?.headerName ??
+        const colDefHeaderName = params.colDef?.headerName ??
             (isColumn ? StringExtensions.CamelCaseToHumanText(columnParams.colDef?.field) : '') ??
             '';
         if (params.location !== 'header') {
-            return defaultHeaderName;
+            return colDefHeaderName;
         }
-        const layoutSpecificCustomHeader = this.getLayoutApi().getCurrentLayout().ColumnHeaders?.[isColumn ? columnParams.column.getColId() : columnGroupParams.columnGroup.getGroupId()];
-        if (layoutSpecificCustomHeader) {
-            return layoutSpecificCustomHeader;
+        const layoutSpecificHeaderName = this.getLayoutApi().getCurrentLayout().ColumnHeaders?.[isColumn ? columnParams.column.getColId() : columnGroupParams.columnGroup.getGroupId()];
+        const defaultHeaderName = layoutSpecificHeaderName ?? colDefHeaderName;
+        const alwaysCallHeaderFunction = this.getColumnOptions().alwaysCallHeaderFunction;
+        if (layoutSpecificHeaderName && !alwaysCallHeaderFunction) {
+            return layoutSpecificHeaderName;
         }
         if (typeof this.getColumnOptions().columnHeader === 'function') {
-            const columnHeaderContext = this.buildColumnHeaderContext(params, defaultHeaderName);
+            const columnHeaderContext = this.buildColumnHeaderContext(params, colDefHeaderName, layoutSpecificHeaderName);
             if (columnHeaderContext === 'skip') {
                 return defaultHeaderName;
             }
@@ -81,12 +83,14 @@ export class ColumnInternalApi extends ApiBase {
         }
         return defaultHeaderName;
     }
-    buildColumnHeaderContext(params, defaultHeaderName) {
+    buildColumnHeaderContext(params, colDefHeaderName, layoutSpecificHeaderName) {
         const currentLayoutType = this.getLayoutApi().isCurrentLayoutPivot() ? 'pivot' : 'table';
         const currentLayout = this.getLayoutApi().getCurrentLayout();
         const baseContext = {
             ...this.getAdaptableApi().internalApi.buildBaseContext(),
-            defaultHeaderName,
+            defaultHeaderName: layoutSpecificHeaderName ?? colDefHeaderName,
+            colDefHeaderName,
+            layoutSpecificHeaderName,
             currentLayout,
             currentLayoutName: currentLayout.Name,
             currentLayoutType: currentLayoutType,

package/src/components/ColorPicker/OptionalColorPicker.js

@@ -1,5 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useRef } from 'react';
 import { Box, Flex } from '../Flex';
 import SimpleButton from '../SimpleButton';
 import { twMerge } from '../../twMerge';
@@ -7,20 +6,8 @@ import { ColorPicker } from './ColorPicker';
 const DEFAULT_COLOR = '#000000';
 export const OptionalColorPicker = (props) => {
     const { api, value, onChange, defaultColor = DEFAULT_COLOR, disabled = false, includeAlpha = true, className, } = props;
-    const pickerRef = useRef(null);
-    const pendingOpenRef = useRef(false);
-    useEffect(() => {
-        if (pendingOpenRef.current && value && pickerRef.current) {
-            pendingOpenRef.current = false;
-            pickerRef.current.click();
-        }
-    }, [value]);
-    const handleActivate = () => {
-        pendingOpenRef.current = true;
-        onChange(defaultColor);
-    };
     if (!value) {
-        return (_jsxs(Flex, { alignItems: "center", className: twMerge('OptionalColorPicker twa:gap-1', className), children: [_jsx("button", { type: "button", disabled: disabled, className: "ab-OptionalColorPicker-empty", onClick: handleActivate, "aria-label": "Set colour", title: "Click to set colour" }), _jsx(Box, { className: "twa:text-2 twa:text-muted-foreground", children: "None" })] }));
+        return (_jsxs(Flex, { alignItems: "center", className: twMerge('OptionalColorPicker twa:gap-1', className), children: [_jsxs(Box, { className: "twa:relative twa:w-[36px] twa:h-[24px] twa:shrink-0", children: [_jsx(Box, { className: "ab-OptionalColorPicker-empty twa:absolute twa:inset-0 twa:pointer-events-none", "aria-hidden": true }), _jsx(ColorPicker, { api: api, value: defaultColor, disabled: disabled, includeAlpha: false, onChange: onChange, title: "Click to set colour", className: twMerge('twa:absolute twa:inset-0 twa:gap-0', 'twa:[&_.ab-ColorPicker-swatch]:absolute twa:[&_.ab-ColorPicker-swatch]:inset-0', 'twa:[&_.ab-ColorPicker-swatch]:size-full twa:[&_.ab-ColorPicker-swatch]:opacity-0') })] }), _jsx(Box, { className: "twa:text-2 twa:text-muted-foreground", children: "None" })] }));
     }
-    return (_jsxs(Flex, { alignItems: "center", className: twMerge('OptionalColorPicker twa:gap-1', className), children: [_jsx(ColorPicker, { ref: pickerRef, api: api, value: value, disabled: disabled, includeAlpha: includeAlpha, onChange: onChange }), _jsx(SimpleButton, { icon: "close", variant: "text", disabled: disabled, tooltip: "Clear colour", onClick: () => onChange(undefined) })] }));
+    return (_jsxs(Flex, { alignItems: "center", className: twMerge('OptionalColorPicker twa:gap-1', className), children: [_jsx(ColorPicker, { api: api, value: value, disabled: disabled, includeAlpha: includeAlpha, onChange: onChange }), _jsx(SimpleButton, { icon: "close", variant: "text", disabled: disabled, tooltip: "Clear colour", onClick: () => onChange(undefined) })] }));
 };

package/src/env.js

@@ -1,5 +1,5 @@
 export 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: 1784643848184 || Date.now(),
-    VERSION: "23.0.14" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1785238938170 || Date.now(),
+    VERSION: "23.0.15" || '--current-version--',
 };