@adaptabletools/adaptable 13.1.1 → 14.0.0-canary.1

package/src/agGrid/FilterWrapper.js

@@ -15,7 +15,7 @@ let FilterWrapperFactory = (adaptable) => {
         return adaptable.api.filterApi.getColumnFilters().findIndex((x) => x.ColumnId == colId) > -1;
     }
     function getFilterContext(colId, hidePopup) {
-        let column = adaptable.api.columnApi.getColumnFromId(colId);
+        let column = adaptable.api.columnApi.getColumnWithColumnId(colId);
         let filterContext = {
             Column: column,
             Adaptable: adaptable,
@@ -30,7 +30,7 @@ let FilterWrapperFactory = (adaptable) => {
         return (0, react_1.forwardRef)(function ReactFilterWrapper(props, ref) {
             const [filterContext, setFilterContext] = (0, react_1.useState)(null);
             const colId = props.column.getId();
-            const column = adaptable.api.columnApi.getColumnFromId(colId);
+            const column = adaptable.api.columnApi.getColumnWithColumnId(colId);
             (0, react_1.useImperativeHandle)(ref, () => {
                 return {
                     isFilterActive: () => isFilterActive(colId),
@@ -80,7 +80,7 @@ let FilterWrapperFactory = (adaptable) => {
             var _a, _b;
             //we always unmount first so the autofocus from the form works... in other grids we unmount when hidden
             (_a = this.unmountReactRoot) === null || _a === void 0 ? void 0 : _a.call(this);
-            let column = adaptable.api.columnApi.getColumnFromId(this.column.getColId());
+            let column = adaptable.api.columnApi.getColumnWithColumnId(this.column.getColId());
             if (column) {
                 const hidePopup = (_b = params === null || params === void 0 ? void 0 : params.hidePopup) !== null && _b !== void 0 ? _b : null;
                 const filterContext = getFilterContext(this.column.getColId(), !!hidePopup);

package/src/agGrid/FloatingFilterWrapper.js

@@ -18,7 +18,7 @@ const FloatingFilterWrapperFactory = (adaptable) => {
         return `floatingFilter_${colId}_${adaptable.adaptableOptions.adaptableId}`;
     }
     function getFilterContext(colId) {
-        const column = adaptable.api.columnApi.getColumnFromId(colId);
+        const column = adaptable.api.columnApi.getColumnWithColumnId(colId);
         const filterContext = {
             Column: column,
             Adaptable: adaptable,
@@ -36,7 +36,7 @@ const FloatingFilterWrapperFactory = (adaptable) => {
     if (adaptable.variant === 'react') {
         return (0, react_1.forwardRef)(function ReactFloatingFilterWrapper(props, ref) {
             const colId = props.column.getId();
-            const column = adaptable.api.columnApi.getColumnFromId(colId);
+            const column = adaptable.api.columnApi.getColumnWithColumnId(colId);
             (0, react_1.useImperativeHandle)(ref, () => {
                 return {
                     onParentModelChanged() { },
@@ -63,7 +63,7 @@ const FloatingFilterWrapperFactory = (adaptable) => {
                 //@ts-ignore
                 this.filterContainer.style[key] = filterContainerStyle[key];
             });
-            const column = adaptable.api.columnApi.getColumnFromId(colId);
+            const column = adaptable.api.columnApi.getColumnWithColumnId(colId);
             if (column) {
                 const filterContext = getFilterContext(colId);
                 this.unmountReactRoot = adaptable.renderReactRoot((0, QuickFilterForm_1.QuickFilterFormReact)(filterContext), this.filterContainer);

package/src/agGrid/PercentBarRenderer.js

@@ -14,8 +14,8 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
             if (!styledColumn.IncludeGroupedRows && api.gridApi.isGroupRowNode(params.node)) {
                 return;
             }
-            const min = api.styledColumnApi.getNumericStyleMinValue(styledColumn, abColumn, params.node, params.value);
-            const max = api.styledColumnApi.getNumericStyleMaxValue(styledColumn, abColumn, params.node, params.value);
+            const min = api.styledColumnApi.internalApi.getNumericStyleMinValue(styledColumn, abColumn, params.node, params.value);
+            const max = api.styledColumnApi.internalApi.getNumericStyleMaxValue(styledColumn, abColumn, params.node, params.value);
             let value = params.value;
             if (Helper_1.default.objectNotExists(value)) {
                 value = 0;
@@ -28,7 +28,7 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
                 cellBackColor = percentBarStyle.ColumnComparison.Color;
             }
             else {
-                const matchingRange = api.styledColumnApi.findRangeForColumn(percentBarStyle.CellRanges, abColumn, percentBarStyle.RangeValueType, params.value);
+                const matchingRange = api.styledColumnApi.internalApi.findRangeForColumn(percentBarStyle.CellRanges, abColumn, percentBarStyle.RangeValueType, params.value);
                 if (matchingRange) {
                     cellBackColor = matchingRange.Color;
                 }
@@ -56,11 +56,11 @@ const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
                     textEl.className = 'ab-PercentBar__text';
                     textEl.style.lineHeight = '1.2';
                     if (percentBarStyle.CellText.includes('CellValue')) {
-                        const activeFormatColumnsWithDisplayFormat = api.formatColumnApi.getFormatColumnsWithDisplayFormatForColumn(abColumn);
-                        const [formatColumn] = api.formatColumnApi.getFormatColumnsRelevantForColumn(activeFormatColumnsWithDisplayFormat, abColumn, { node: params.node, value });
+                        const activeFormatColumnsWithDisplayFormat = api.formatColumnApi.internalApi.getFormatColumnsWithDisplayFormatForColumn(abColumn);
+                        const [formatColumn] = api.formatColumnApi.internalApi.getFormatColumnsRelevantForColumn(activeFormatColumnsWithDisplayFormat, abColumn, { node: params.node, value });
                         if (formatColumn && api.scopeApi.isColumnInNumericScope(abColumn, formatColumn.Scope)) {
                             const options = formatColumn.DisplayFormat.Options;
-                            value = api.formatColumnApi.getNumberFormattedValue(params.value, params.node, abColumn, options);
+                            value = api.formatColumnApi.internalApi.getNumberFormattedValue(params.value, params.node, abColumn, options);
                         }
                         else {
                             value = (0, FormatHelper_1.NumberFormatter)(value, { FractionDigits: 2 });

package/src/agGrid/agGridHelper.js

@@ -388,7 +388,7 @@ class agGridHelper {
         }
         let dataType = 'Unknown';
         // get the column type if already in store (and not unknown)
-        const existingColumn = this.adaptable.api.columnApi.getColumnFromId(column.getId(), logWarning);
+        const existingColumn = this.adaptable.api.columnApi.getColumnWithColumnId(column.getId(), logWarning);
         if (existingColumn && existingColumn.dataType != 'Unknown') {
             return existingColumn.dataType;
         }
@@ -523,7 +523,7 @@ class agGridHelper {
         if (this.adaptable.adaptableOptions.searchOptions.clearSearchesOnStartUp) {
             if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.adaptable.api.quickSearchApi.getQuickSearchState().QuickSearchText) ||
                 StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.adaptable.api.queryApi.getCurrentQuery()) ||
-                ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(this.adaptable.api.dataSetApi.getAllDataSets())) {
+                ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(this.adaptable.api.dataSetApi.getDataSets())) {
                 (0, LoggingHelper_1.LogAdaptableWarning)('Clearing existing Searches as "clearSearchesOnStartUp" is true');
                 this.adaptable.api.quickSearchApi.clearQuickSearch();
                 this.adaptable.api.queryApi.clearCurrentQuery();
@@ -537,7 +537,7 @@ class agGridHelper {
             const { nodeA, nodeB } = params;
             let firstGroupedColumn = adaptable.getFirstGroupedColumn();
             if (firstGroupedColumn) {
-                const definedColumnComparator = adaptable.getActiveColumnComparator(firstGroupedColumn.columnId, adaptable.api.customSortApi.getCustomSortByColumn(firstGroupedColumn.columnId), adaptable.api.internalApi.getCustomSortComparer(firstGroupedColumn));
+                const definedColumnComparator = adaptable.getActiveColumnComparator(firstGroupedColumn.columnId, adaptable.api.customSortApi.getCustomSortForColumn(firstGroupedColumn.columnId), adaptable.api.customSortApi.internalApi.getCustomSortComparer(firstGroupedColumn));
                 if (definedColumnComparator) {
                     return definedColumnComparator(nodeA.key, nodeB.key);
                 }

package/src/agGrid/agGridMenuHelper.js

@@ -29,7 +29,7 @@ class agGridMenuHelper {
         if (hasAdaptableColumnMenuItems) {
             agGridColumnMenuItems.push('separator');
         }
-        const adaptableColumn = this.adaptable.api.columnApi.getColumnFromId(colId);
+        const adaptableColumn = this.adaptable.api.columnApi.getColumnWithColumnId(colId);
         const menuContext = this.createColumnMenuContextObject(adaptableColumn, params.column);
         // then Get Adaptable Menu Items
         if (menuContext.isRowGroupColumn) {
@@ -75,7 +75,7 @@ class agGridMenuHelper {
         const adaptableMenuItems = [];
         const agGridColumn = params.column;
         if (agGridColumn) {
-            const adaptableColumn = this.adaptable.api.columnApi.getColumnFromId(agGridColumn.getColId());
+            const adaptableColumn = this.adaptable.api.columnApi.getColumnWithColumnId(agGridColumn.getColId());
             // if (adaptableColumn != undefined) {
             let menuContext = this.createContextMenuContextObject(params, adaptableColumn);
             // keep it simple for now - if its a grouped cell then don't add the shipped menu items
@@ -382,7 +382,7 @@ class agGridMenuHelper {
         });
     }
     buildStandaloneColumnHeader(adaptableColumn) {
-        const agGridColumn = this.adaptable.api.columnApi.getAgGridColumnForAdaptableColumn(adaptableColumn.columnId);
+        const agGridColumn = this.adaptable.api.columnApi.internalApi.getAgGridColumnForAdaptableColumn(adaptableColumn.columnId);
         let menuContext = this.createColumnMenuContextObject(adaptableColumn, agGridColumn);
         let returnMenuItems = [];
         returnMenuItems.push(...this.getAdaptableMenuItemsColumnHeader(adaptableColumn, menuContext));

package/src/agGrid/weightedAverage.js

@@ -82,11 +82,11 @@ const cellSummaryWeightedAverage = ({ numericColumns, selectedCellInfo, adaptabl
         if (!isValid) {
             return '';
         }
-        const abColumn = adaptableApi.columnApi.getColumnFromId(columnId);
+        const abColumn = adaptableApi.columnApi.getColumnWithColumnId(columnId);
         if (!abColumn) {
             return '';
         }
-        const activeFormatColumnsWithDisplayFormat = adaptableApi.formatColumnApi.getFormatColumnsWithDisplayFormatForColumn(abColumn);
+        const activeFormatColumnsWithDisplayFormat = adaptableApi.formatColumnApi.internalApi.getFormatColumnsWithDisplayFormatForColumn(abColumn);
         if (activeFormatColumnsWithDisplayFormat.length === 1 &&
             activeFormatColumnsWithDisplayFormat[0].DisplayFormat.Formatter === 'NumberFormatter') {
             // there only one FormatColumn on this column, so we will use it to format the aggregated value

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -20,6 +20,10 @@ const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const icons_1 = require("../icons");
 const AdaptableContext_1 = require("../../View/AdaptableContext");
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
+const ExpressionFunctionDocumentation_1 = require("./ExpressionFunctionDocumentation");
+const Tag_1 = require("../Tag");
+const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
+const Radio_1 = tslib_1.__importDefault(require("../Radio"));
 const VarEditorButton = () => {
     var _a, _b;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -32,6 +36,93 @@ const VarEditorButton = () => {
         return (React.createElement(EditorButton_1.default, { data: varString, key: varOption }, varString));
     })));
 };
+const FunctionsDropdown = ({ expressionFunctions, baseClassName }) => {
+    const [currentFunctionCategory, setCurrentFunctionCategory] = React.useState('all');
+    const dropdownRef = React.useRef(null);
+    const [overFunction, setOverFunction] = React.useState();
+    React.useEffect(() => {
+        setOverFunction(null);
+    }, [currentFunctionCategory]);
+    const groupedFunctions = React.useMemo(() => {
+        return Object.keys(expressionFunctions).reduce((acc, key) => {
+            const functionDef = expressionFunctions[key];
+            // filter
+            if (currentFunctionCategory !== 'all' && functionDef.category !== currentFunctionCategory) {
+                return acc;
+            }
+            if (functionDef.category) {
+                acc[functionDef.category] = Object.assign(Object.assign({}, acc[functionDef.category]), { [key]: functionDef });
+            }
+            else {
+                acc.noCategory[key] = functionDef;
+            }
+            return acc;
+        }, { noCategory: {} });
+    }, [currentFunctionCategory]);
+    const handleFunctionCategoryChange = React.useCallback((type) => (event) => {
+        setCurrentFunctionCategory(type);
+    }, [currentFunctionCategory]);
+    const categoryOptions = React.useMemo(() => {
+        const categoryOptions = Object.keys(expressionFunctions)
+            .reduce((acc, functionName) => {
+            const funcitonExpression = expressionFunctions[functionName];
+            if (!acc.includes(funcitonExpression.category)) {
+                acc.push(funcitonExpression.category);
+            }
+            return acc;
+        }, [])
+            .map((category) => ({
+            label: StringExtensions_1.default.Humanize(category),
+            value: category,
+        }));
+        return [{ label: 'All', value: 'all' }, ...categoryOptions];
+    }, [expressionFunctions]);
+    const hidePopup = () => {
+        dropdownRef.current.hide();
+        setOverFunction(null);
+    };
+    /**
+     * Hide when:
+     * - mouse leaves
+     * - a function is inserted
+     */
+    return (React.createElement(OverlayTrigger_1.default, { ref: dropdownRef, showEvent: "mouseenter", hideEvent: "mouseleave", targetOffset: 5, render: () => (React.createElement(rebass_1.Flex, { className: `${baseClassName}__dropdown-functions-list-wrapper`, flexDirection: "column", onMouseLeave: () => hidePopup() },
+            React.createElement(rebass_1.Flex, { pl: 2, style: { gap: 10 } }, categoryOptions.map((option) => {
+                return (React.createElement(Radio_1.default, { onFocus: (event) => {
+                        event.preventDefault();
+                        event.stopPropagation();
+                    }, onClick: handleFunctionCategoryChange(option.value), checked: currentFunctionCategory === option.value }, option.label));
+            })),
+            React.createElement(rebass_1.Flex, null,
+                React.createElement(rebass_1.Flex, { className: `${baseClassName}__dropdown-functions-list`, "data-name": "expression-dropdown-fuctions-list", flexDirection: "column", p: 2, maxHeight: '50vh' }, Object.keys(groupedFunctions).map((groupName) => {
+                    const functionsInGroup = Object.keys(groupedFunctions[groupName]);
+                    if (functionsInGroup.length === 0) {
+                        return React.createElement(React.Fragment, null);
+                    }
+                    const getEditorButtonData = (functionName) => {
+                        // handle special cases
+                        if (functionName === 'CASE') {
+                            return `CASE <caseValue> WHEN <whenValue> THEN <thenValue> ELSE <defaultValue> END`;
+                        }
+                        return `${functionName}()`;
+                    };
+                    return (React.createElement(rebass_1.Box, { mb: 2, key: groupName },
+                        React.createElement(Tag_1.Tag, { mb: 1 }, StringExtensions_1.default.Humanize(groupName)),
+                        functionsInGroup.map((functionName) => (React.createElement(rebass_1.Box, { key: functionName, onMouseEnter: () => setOverFunction(functionName), onClick: () => hidePopup() }, functionName === 'VAR' ? (React.createElement(VarEditorButton, { key: functionName })) : (React.createElement(EditorButton_1.default, { data: getEditorButtonData(functionName), key: functionName, mr: 1 }, functionName)))))));
+                })),
+                React.createElement(rebass_1.Box, { className: `${baseClassName}__dropdown-functions-description`, p: 2, width: 600, maxWidth: "30vw" }, overFunction ? (React.createElement(React.Fragment, null,
+                    React.createElement(Tag_1.Tag, null, overFunction),
+                    React.createElement(ExpressionFunctionDocumentation_1.ExpressionFunctionDocumentation, { expressionFunction: expressionFunctions[overFunction] }))) : (React.createElement(Tag_1.Tag, { padding: 20 },
+                    React.createElement("ul", null,
+                        React.createElement("li", null,
+                            "Hover over a Function to learn more",
+                            React.createElement("br", null),
+                            React.createElement("br", null)),
+                        React.createElement("li", null, "Select a Function to add to the Expression in the Editor")))))))) },
+        React.createElement(SimpleButton_1.default, { "data-name": "expression-dropdown", icon: "arrow-down", iconPosition: 'end', mr: 1 },
+            React.createElement(rebass_1.Flex, { marginRight: 1, fontSize: 2 },
+                React.createElement(icons_1.Icon, { name: "equation" })))));
+};
 function BaseEditorInput(props) {
     const { expressionFunctions, testData, style, type } = props;
     const { ref: textAreaRefCallback, selectionStart, selectionEnd } = (0, useSelectionRange_1.useSelectionRange)();
@@ -103,12 +194,6 @@ function BaseEditorInput(props) {
             props.onSelectedFunctionChange(selectedFunctionName ? expressionFunctions[selectedFunctionName] : null);
         }
     }, [selectedFunctionName]);
-    const functionsDropdown = (React.createElement(OverlayTrigger_1.default, { render: () => (React.createElement(rebass_1.Flex, { className: `${baseClassName}__dropdown-functions-list`, "data-name": "expression-dropdown-fuctions-list", flexDirection: "column", p: 2, maxHeight: '50vh' }, Object.keys(expressionFunctions)
-            .filter((functionName) => !expressionFunctions[functionName].isHiddenFromMenu)
-            .map((functionName) => functionName === 'VAR' ? (React.createElement(VarEditorButton, { key: functionName })) : (React.createElement(EditorButton_1.default, { data: `${functionName}()`, key: functionName, mr: 1 }, functionName))))), showEvent: "focus", hideEvent: "blur" },
-        React.createElement(SimpleButton_1.default, { "data-name": "expression-dropdown", icon: "arrow-down", iconPosition: 'end', mr: 1 },
-            React.createElement(rebass_1.Flex, { marginRight: 1, fontSize: 2 },
-                React.createElement(icons_1.Icon, { name: "equation" })))));
     const operatorButtons = props.editorButtons
         .filter((editorButtonDef) => !!expressionFunctions[editorButtonDef.functionName])
         .map((editorButtonDef) => (React.createElement(EditorButton_1.default, { key: `${editorButtonDef.functionName}-operator`, data: editorButtonDef.data, icon: editorButtonDef.icon }, !editorButtonDef.icon && (editorButtonDef.text || editorButtonDef.functionName))));
@@ -116,7 +201,7 @@ function BaseEditorInput(props) {
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Flex, { className: baseClassName, "data-name": "expression-toolbar", py: 2, mb: 2, mt: 2, flexWrap: "wrap" },
             React.createElement(rebass_1.Flex, { style: { flex: 1, marginLeft: 5 }, flexWrap: "wrap" },
-                functionsDropdown,
+                React.createElement(FunctionsDropdown, { expressionFunctions: expressionFunctions, baseClassName: baseClassName }),
                 operatorButtons),
             showDocumentationLink && (React.createElement(rebass_1.Flex, { alignItems: "flex-start" },
                 React.createElement(ButtonInfo_1.ButtonInfo, { mr: 2, tooltip: 'Learn how to use the Expression Editor', onClick: () => window.open(DocumentationLinkConstants_1.ExpressionEditorDocsLink, '_blank') })))),

package/src/components/ExpressionEditor/ExpressionFunctionDocumentation.js

@@ -4,6 +4,7 @@ exports.ExpressionFunctionDocumentation = void 0;
 const tslib_1 = require("tslib");
 const rebass_1 = require("rebass");
 const React = tslib_1.__importStar(require("react"));
+const Tag_1 = require("../Tag");
 const ExpressionFunctionDocumentation = (props) => {
     return props.expressionFunction ? (React.createElement(rebass_1.Box, { "data-name": "expression-editor-documentation", my: 2, p: 2, style: {
             background: 'var(--ab-color-primary)',
@@ -17,6 +18,9 @@ const ExpressionFunctionDocumentation = (props) => {
         props.expressionFunction.examples && (React.createElement(rebass_1.Box, { "data-name": "expression-editor-documentation-examples" },
             React.createElement("b", null, "Examples"),
             React.createElement("ul", null, props.expressionFunction.examples.map((example, index) => (React.createElement("li", { key: index },
-                React.createElement("pre", { style: { whiteSpace: 'pre-wrap', margin: 0 } }, example))))))))) : null;
+                React.createElement("pre", { style: { whiteSpace: 'pre-wrap', margin: 0 } }, example))))))),
+        props.expressionFunction.returnType && (React.createElement(rebass_1.Box, { "data-name": "expression-editor-documentation-examples" },
+            React.createElement("b", null, "Return Type"),
+            React.createElement(Tag_1.Tag, null, props.expressionFunction.returnType))))) : null;
 };
 exports.ExpressionFunctionDocumentation = ExpressionFunctionDocumentation;

package/src/components/OverlayTrigger/index.js

@@ -60,6 +60,10 @@ const OverlayTrigger = React.forwardRef((props, ref) => {
         ['TopRight', 'BottomCenter'],
         ['TopRight', 'BottomLeft'],
         ['TopRight', 'BottomLeft'],
+        ['BottomLeft', 'TopLeft'],
+        ['BottomRight', 'TopRight'],
+        ['BottomRight', 'TopCenter'],
+        ['BottomRight', 'TopLeft'],
     ], constrainTo, target: targetProp } = props, domProps = tslib_1.__rest(props, ["visible", "showTriangle", "showEvent", "hideEvent", "render", "targetOffset", "preventPortalEventPropagation", "defaultZIndex", "anchor", "hideDelay", "opacityTransitionDuration", "onVisibleChange", "alignPosition", "constrainTo", "target"]);
     const { showOverlay, clearAll: clearAllOverlays, hideOverlay, portal, } = (0, InfiniteTable_1.useOverlay)({
         portalContainer: portalElement,
@@ -114,7 +118,6 @@ const OverlayTrigger = React.forwardRef((props, ref) => {
             }
         }
     }, [ref]);
-    const previousVisible = (0, usePrevious_1.default)(visible, visible);
     (0, react_1.useEffect)(() => {
         let target = domRef.current.previousSibling;
         if (targetProp) {
@@ -174,11 +177,12 @@ const OverlayTrigger = React.forwardRef((props, ref) => {
                 preparedConstrinTo = adaptable === null || adaptable === void 0 ? void 0 : adaptable.getAgGridContainerElement();
             }
             // show only if visible or if it was visible and now it is invisible
+            const alignToRect = (0, utils_1.getRect)(target, targetOffset !== null && targetOffset !== void 0 ? targetOffset : 0);
             const showOverlayOptions = {
                 id: 'overlay-trigger',
                 alignPosition,
                 constrainTo: (_b = (_a = preparedConstrinTo === null || preparedConstrinTo === void 0 ? void 0 : preparedConstrinTo.getBoundingClientRect) === null || _a === void 0 ? void 0 : _a.call(preparedConstrinTo)) !== null && _b !== void 0 ? _b : true,
-                alignTo: target.getBoundingClientRect(),
+                alignTo: alignToRect,
             };
             showOverlay(() => overlayContent, showOverlayOptions);
         }

package/src/components/OverlayTrigger/utils.d.ts

@@ -1,4 +1,4 @@
 import { BoundingClientRect } from '../utils/getAvailableSizeInfo';
-export declare const getRect: (node: HTMLElement) => BoundingClientRect;
+export declare const getRect: (node: HTMLElement, offset?: number) => BoundingClientRect;
 export declare const getDocRect: () => BoundingClientRect;
 export declare const getIntersection: (rect1: BoundingClientRect, rect2: BoundingClientRect) => BoundingClientRect;

package/src/components/OverlayTrigger/utils.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIntersection = exports.getDocRect = exports.getRect = void 0;
-const getRect = (node) => {
+const getRect = (node, offset = 0) => {
     const rect = node.getBoundingClientRect();
     return {
-        top: rect.top,
+        top: rect.top - offset,
         left: rect.left,
-        bottom: rect.bottom,
+        bottom: rect.bottom + offset,
         right: rect.right,
         width: rect.width,
-        height: rect.height,
+        height: rect.height + offset,
     };
 };
 exports.getRect = getRect;

package/src/components/icons/index.js

@@ -89,6 +89,7 @@ const cloud_upload_1 = tslib_1.__importDefault(require("./cloud-upload"));
 const upload_1 = tslib_1.__importDefault(require("./upload"));
 const ipushpull_1 = tslib_1.__importDefault(require("./ipushpull"));
 const folder_open_1 = tslib_1.__importDefault(require("./folder-open"));
+const open_in_new_1 = tslib_1.__importDefault(require("./open-in-new"));
 const folder_1 = tslib_1.__importDefault(require("./folder"));
 const folder_shared_1 = tslib_1.__importDefault(require("./folder-shared"));
 const play_1 = tslib_1.__importDefault(require("./play"));
@@ -219,6 +220,7 @@ const allIcons = {
     justify: justify_1.default,
     check: check_1.default,
     ok: check_1.default,
+    'open-in-new': open_in_new_1.default,
     plus: plus_1.default,
     home: home_1.default,
     'sort-asc': sort_asc_1.default,

package/src/components/icons/open-in-new.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: (props: any) => JSX.Element;
+export default _default;

package/src/components/icons/open-in-new.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const DefaultIcon_1 = tslib_1.__importDefault(require("./DefaultIcon"));
+exports.default = (props) => (React.createElement(DefaultIcon_1.default, Object.assign({}, props),
+    React.createElement("path", { xmlns: "http://www.w3.org/2000/svg", d: "M5 21q-.825 0-1.413-.587Q3 19.825 3 19V5q0-.825.587-1.413Q4.175 3 5 3h7v2H5v14h14v-7h2v7q0 .825-.587 1.413Q19.825 21 19 21Zm4.7-5.3-1.4-1.4L17.6 5H14V3h7v7h-2V6.4Z" })));

package/src/env.js

@@ -1,7 +1,5 @@
 "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',
+    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

@@ -557,6 +557,26 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         })[];
     };
+    AdaptableObjectLookupCriteria: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference: string;
+        })[];
+    };
     AdaptableObjectTag: {
         name: string;
         kind: string;
@@ -737,16 +757,6 @@ export declare const ADAPTABLE_METAMODEL: {
             gridInfo?: undefined;
             noCode?: undefined;
             defaultValue?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            gridInfo: string;
-            defaultValue: string;
-            reference: string;
-            noCode?: undefined;
         })[];
     };
     AdaptableQuery: {
@@ -1635,6 +1645,11 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         })[];
     };
+    ColumnFilterDef: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     ColumnFilterPredicate: {
         name: string;
         kind: string;
@@ -4872,6 +4887,11 @@ export declare const ADAPTABLE_METAMODEL: {
             reference?: undefined;
         })[];
     };
+    SparkLineStyle: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     SpecialColumnSettings: {
         name: string;
         kind: string;