@adaptabletools/adaptable 11.0.9 → 11.1.1-canary.1

package/src/components/WindowModal/WindowModal.js

@@ -7,6 +7,7 @@ const re_resizable_1 = require("re-resizable");
 const useDraggable_1 = tslib_1.__importDefault(require("../utils/useDraggable"));
 const UIHelper_1 = require("../../View/UIHelper");
 const react_dom_1 = require("react-dom");
+const useStacking_1 = require("./useStacking");
 let portalElement;
 const ensurePortalElement = () => {
     if (!UIHelper_1.isBrowserDocumentAvailable()) {
@@ -43,6 +44,7 @@ exports.WindowModal = (props) => {
     ensurePortalElement();
     const positionDeltaRef = React.useRef(null);
     const positionRef = React.useRef(props.position);
+    const stacking = useStacking_1.useStacking();
     /**
      * This is needed because the function called in onDrop is saved when
      * it gets attached to the DOM element event handler.
@@ -50,7 +52,7 @@ exports.WindowModal = (props) => {
      */
     positionRef.current = props.position;
     const style = {
-        zIndex: 1000,
+        zIndex: stacking.zIndex,
         position: 'absolute',
         left: props.position.x,
         top: props.position.y,
@@ -97,7 +99,7 @@ exports.WindowModal = (props) => {
     }, []);
     return react_dom_1.createPortal(React.createElement("div", { style: style, 
         //@ts-ignore
-        ref: targetRef },
+        ref: targetRef, onMouseDown: stacking.bringInFront },
         React.createElement(re_resizable_1.Resizable, { onResizeStop: handleResizeStop, onResize: handleResize, bounds: "window", defaultSize: {
                 width: props.size.width,
                 height: props.size.height,

package/src/components/WindowModal/useStacking.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Used to facilitate the stacking between multiple opened windows.
+ * When calling 'bringToFront' brings caller to top.
+ * This is done by changing the zIndex of all registered window-modals.
+ */
+export declare const useStacking: () => {
+    zIndex: number;
+    bringInFront: () => void;
+};

package/src/components/WindowModal/useStacking.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useStacking = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const uuid_1 = tslib_1.__importDefault(require("uuid"));
+const setZIndexMap = {};
+const zIndexMap = [];
+const BASE_Z_INDEX = 1000;
+/**
+ * Used to facilitate the stacking between multiple opened windows.
+ * When calling 'bringToFront' brings caller to top.
+ * This is done by changing the zIndex of all registered window-modals.
+ */
+exports.useStacking = () => {
+    const modalZIndexId = React.useMemo(() => uuid_1.default(), []);
+    const [zIndex, setZIndex] = React.useState(BASE_Z_INDEX);
+    React.useEffect(() => {
+        setZIndexMap[modalZIndexId] = setZIndex;
+        return () => {
+            // clean-up
+            delete setZIndexMap[modalZIndexId];
+            const indexInMap = zIndexMap.indexOf(modalZIndexId);
+            zIndexMap.splice(indexInMap, 1);
+        };
+    }, [modalZIndexId]);
+    const bringInFront = React.useCallback(() => {
+        if (zIndexMap.includes(modalZIndexId)) {
+            const indexInMap = zIndexMap.indexOf(modalZIndexId);
+            zIndexMap.splice(indexInMap, 1);
+            zIndexMap.push(modalZIndexId);
+        }
+        else {
+            zIndexMap.push(modalZIndexId);
+        }
+        zIndexMap.forEach((id, index) => {
+            var _a;
+            (_a = setZIndexMap === null || setZIndexMap === void 0 ? void 0 : setZIndexMap[id]) === null || _a === void 0 ? void 0 : _a.call(setZIndexMap, BASE_Z_INDEX + index * 10);
+        });
+    }, []);
+    return {
+        zIndex,
+        bringInFront,
+    };
+};

package/src/env.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
-    IPUSHPULL_API_KEY: "CbBaMaoqHVifScrYwKssGnGyNkv5xHOhQVGm3cYP",
-    IPUSHPULL_API_SECRET: "xYzE51kuHyyt9kQCvMe0tz0H2sDSjyEQcF5SOBlPQmcL9em0NqcCzyqLYj5fhpuZxQ8BiVcYl6zoOHeI6GYZj1TkUiiLVFoW3HUxiCdEUjlPS8Vl2YHUMEPD5qkLYnGj",
-    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",
+    IPUSHPULL_API_KEY: 'CbBaMaoqHVifScrYwKssGnGyNkv5xHOhQVGm3cYP',
+    IPUSHPULL_API_SECRET: 'xYzE51kuHyyt9kQCvMe0tz0H2sDSjyEQcF5SOBlPQmcL9em0NqcCzyqLYj5fhpuZxQ8BiVcYl6zoOHeI6GYZj1TkUiiLVFoW3HUxiCdEUjlPS8Vl2YHUMEPD5qkLYnGj',
+    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',
 };

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

@@ -78,27 +78,23 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
+    };
+    AdaptableAlertBase: {
+        name: string;
+        kind: string;
+        description: string;
         properties: ({
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
             reference: string;
-            isOptional?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            reference: string;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
             reference?: undefined;
-            isOptional?: undefined;
         })[];
     };
     AdaptableAlertQuery: {
@@ -149,6 +145,18 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    AdaptableCellChangedAlert: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        }[];
+    };
     AdaptableColumn: {
         name: string;
         kind: string;
@@ -514,6 +522,18 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         }[];
     };
+    AdaptableRowChangedAlert: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        }[];
+    };
     AdaptableScope: {
         name: string;
         kind: string;
@@ -832,6 +852,18 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
         }[];
     };
+    BaseMenuContext: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        }[];
+    };
     BulkUpdateApi: {
         name: string;
         kind: string;
@@ -968,6 +1000,40 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
         })[];
     };
+    CellDataChangedInfo: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference?: undefined;
+            isOptional?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+            isOptional?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference: string;
+        })[];
+    };
     CellHighlightInfo: {
         name: string;
         kind: string;
@@ -1563,40 +1629,6 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
         }[];
     };
-    DataChangedInfo: {
-        name: string;
-        kind: string;
-        description: string;
-        properties: ({
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            reference?: undefined;
-            isOptional?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            reference: string;
-            isOptional?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            reference?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            reference: string;
-        })[];
-    };
     DataChangeHistoryApi: {
         name: string;
         kind: string;
@@ -2643,7 +2675,7 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
-        properties: {
+        properties: ({
             name: string;
             kind: string;
             description: string;
@@ -2651,7 +2683,15 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             gridInfo: string;
             defaultValue: string;
-        }[];
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo?: undefined;
+            defaultValue?: undefined;
+        })[];
     };
     LayoutState: {
         name: string;