@adaptabletools/adaptable-cjs 23.0.2 → 23.0.3

package/package.json

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

package/src/AdaptableOptions/SettingsPanelOptions.d.ts

@@ -7,7 +7,7 @@ import { CustomRenderContext } from '../agGrid/AdaptableFrameworkComponent';
  */
 export interface SettingsPanelOptions {
     /**
-     * Title for the Settings Panel
+     * Title for Settings Panel
      *
      * @defaultValue 'Settings Panel'
      */
@@ -45,7 +45,7 @@ export interface SettingsPanelOptions {
      */
     navigation?: SettingsPanelNavigationConfigurer;
     /**
-     * Initial position of Settings Panel window
+     * Initial position of Settings Panel — pixel offset of top-left corner from top-left of viewport (requires `popupType` to be `'window'`)
      *
      * @defaultValue Middle of Screen
      */
@@ -54,7 +54,7 @@ export interface SettingsPanelOptions {
         y: number;
     };
     /**
-     * Initial size of Settings Panel
+     * Initial size (in pixels) of Settings Panel (requires `popupType` to be `'window'`)
      *
      * @defaultValue Computed based on size of screen
      */
@@ -63,7 +63,7 @@ export interface SettingsPanelOptions {
         height: number;
     };
     /**
-     * Whether Settings Panel is 'window' (i.e. movable, resizable, no backdrop) or 'modal' (centre of screen with backdrop)
+     * How the Settings Panel is rendered: `'modal'` (centred and unmovable and resizable) or `'window'` (supports size, position, drag and resize)
      *
      * @defaultValue 'modal'
      */

package/src/Utilities/Services/ThemeService.d.ts

@@ -7,7 +7,7 @@ export declare class ThemeService implements IThemeService {
     constructor(api: AdaptableApi);
     destroy(): void;
     subscribe(): void;
-    onThemeChanged: () => void;
+    onThemeSelected: () => void;
     applyNewThemeVariables(theme: AdaptableTheme): void;
     showMissingThemeFiles(theme: AdaptableTheme): void;
     getDOMPrefferedColorScheme(): 'dark' | 'light';

package/src/Utilities/Services/ThemeService.js

@@ -23,14 +23,14 @@ class ThemeService {
         document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
     }
     subscribe() {
-        const themeChangedUnsubscribe = this.api.eventApi.on('ThemeSelected', this.onThemeChanged);
+        const themeChangedUnsubscribe = this.api.eventApi.on('ThemeSelected', this.onThemeSelected);
         const prefferedColorSchemeUnsubscribe = this.attachPrefferedColorSchemeListener();
         this.unsubscribe = () => {
             themeChangedUnsubscribe();
             prefferedColorSchemeUnsubscribe();
         };
     }
-    onThemeChanged = () => {
+    onThemeSelected = () => {
         let currentTheme = this.api.themeApi.getCurrentThemeObject();
         currentTheme = this.mapOsTheme(currentTheme);
         this.applyNewThemeVariables(currentTheme);

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupDialog.js

@@ -11,7 +11,7 @@ const AdaptableContext_1 = require("../../../AdaptableContext");
 const Utilities_1 = require("../Utilities");
 const utils_1 = require("../../../../lib/utils");
 const WindowDialog = (props) => {
-    const { onChange, style, baseClassName, className, isActionModule, settingsPanelOptionsKey, onHide, ...dialogProps } = props;
+    const { onChange, style, baseClassName, className, isActionModule, settingsPanelOptionsKey, onHide, dataName, ...dialogProps } = props;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const dispatch = (0, react_redux_1.useDispatch)();
     const settingsPanelOptions = adaptable.adaptableOptions.settingsPanelOptions;
@@ -38,7 +38,7 @@ const WindowDialog = (props) => {
         position: popupSettings.position,
         onChange: handleWindowSettings,
     };
-    return ((0, jsx_runtime_1.jsx)(Dialog_1.default, { windowModal: true, fixed: false, windowModalProps: windowModalProps, style: props.style, onDismiss: onHide, isOpen: true, showCloseButton: true, ...dialogProps, className: (0, utils_1.cn)('twa:p-0 twa:h-full', className) }));
+    return ((0, jsx_runtime_1.jsx)(Dialog_1.default, { "data-name": dataName, windowModal: true, fixed: false, windowModalProps: windowModalProps, style: props.style, onDismiss: onHide, isOpen: true, showCloseButton: true, ...dialogProps, className: (0, utils_1.cn)('twa:p-0 twa:h-full', className) }));
 };
 const PopupDialog = (props) => {
     const { style, className, onHide, children, ...dialogProps } = props;

package/src/agGrid/agGridDataTypeDefinitions.js

@@ -38,6 +38,10 @@ exports.agGridDataTypeDefinitions = {
     // boolean: is kept as is
     // object: is kept as is
     // Adaptable specific types
+    unknown: {
+        baseDataType: 'text',
+        extendsDataType: 'text',
+    },
     [exports.TEXT_ARRAY_DATA_TYPE]: {
         baseDataType: 'text',
         extendsDataType: 'text',

package/src/components/WindowModal/WindowModal.js

@@ -104,9 +104,22 @@ const WindowModal = (props) => {
         }
     }, []);
     const ResizableCmp = re_resizable_1.Resizable;
+    // React propagates events through the component tree, not the DOM tree. A
+    // nested popup (e.g. a modal wizard) rendered as a React child of this window
+    // is portaled elsewhere in the DOM, so a mousedown inside it would bubble here
+    // and incorrectly bring this window to the front (covering the popup). Guard
+    // against this by only reacting to mousedowns that happen inside this window's
+    // own DOM subtree.
+    const handleMouseDown = (event) => {
+        const node = targetRef.current;
+        if (node && event.target instanceof Node && !node.contains(event.target)) {
+            return;
+        }
+        stacking.bringInFront();
+    };
     return (0, react_dom_1.createPortal)((0, jsx_runtime_1.jsx)("div", { style: style, 
         //@ts-ignore
-        ref: targetRef, onMouseDown: stacking.bringInFront, children: (0, jsx_runtime_1.jsx)(ResizableCmp, { minWidth: props.minWidth, minHeight: props.minHeight, onResizeStop: handleResizeStop, onResize: handleResize, bounds: "window", defaultSize: {
+        ref: targetRef, onMouseDown: handleMouseDown, children: (0, jsx_runtime_1.jsx)(ResizableCmp, { minWidth: props.minWidth, minHeight: props.minHeight, onResizeStop: handleResizeStop, onResize: handleResize, bounds: "window", defaultSize: {
                 width: props.size.width,
                 height: props.size.height,
             }, children: props.children }) }), portalElement);

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: 1782299022689 || Date.now(),
-    VERSION: "23.0.2" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1782392473893 || Date.now(),
+    VERSION: "23.0.3" || '--current-version--',
 };