@adaptabletools/adaptable-cjs 21.0.0-canary.5 → 21.0.0-canary.7

package/src/components/Select/Select.js

@@ -13,7 +13,7 @@ const react_1 = require("react");
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const re_resizable_1 = require("re-resizable");
 const Tooltip_1 = tslib_1.__importDefault(require("../Tooltip"));
-const overlayBaseZIndex_1 = require("../overlayBaseZIndex");
+const OverlayTrigger_1 = require("../OverlayTrigger");
 const resizableDirections = {
     right: true,
     bottom: true,
@@ -162,7 +162,10 @@ const Select = function (props) {
     }
     else {
         selectedOption = findOptionByValue(props.value);
-        if (!selectedOption && props.value !== undefined && props.value !== null) {
+        if (!selectedOption &&
+            props.value !== undefined &&
+            props.value !== null &&
+            props.value !== '') {
             selectedOption = {
                 value: props.value,
                 label: props.value,
@@ -489,7 +492,7 @@ const Select = function (props) {
     }, [props.onInputChange, isMulti]);
     return (React.createElement(SelectComponent, { ref: ref, openMenuOnClick: searchableInMenulist ? false : undefined, openMenuOnFocus: searchableInMenulist ? false : undefined, menuIsOpen: searchableInMenulist ? isSelectMenuOpen : undefined, isSearchable: searchableInline, "aria-label": props['aria-label'], onKeyDown: props.onKeyDown, inputValue: inputValue, onInputChange: onInputChange, onFocus: onFocus, onBlur: onBlur, onMenuOpen: props.onMenuOpen, isLoading: props.isLoading, options: props.options, className: (0, join_1.default)(props.className, 'ab-Select'), isDisabled: disabled, menuPlacement: props.menuPlacement ?? 'auto', hideSelectedOptions: false, isMulti: isMulti, value: selectedOption, blurInputOnSelect: false, menuPosition: props.menuPosition ?? 'absolute', 
         // This needed so the menu is not clipped by overflow: hidden
-        menuPortalTarget: props.menuPortalTarget === undefined ? document.body : null, isClearable: props.isClearable, closeMenuOnSelect: props.closeMenuOnSelect, onChange: (option) => {
+        menuPortalTarget: (0, OverlayTrigger_1.ensurePortalElement)(), isClearable: props.isClearable, closeMenuOnSelect: props.closeMenuOnSelect, onChange: (option) => {
             if (isMulti) {
                 const value = option.map((x) => x?.value);
                 props.onChange(value);
@@ -538,7 +541,9 @@ const Select = function (props) {
             menuPortal: (baseStyle) => {
                 return {
                     ...baseStyle,
-                    zIndex: overlayBaseZIndex_1.OVERLAY_BASE_Z_INDEX,
+                    // needed to avoid tooltips from being displayed under this menu
+                    // as otherwise react-select uses zIndex 1
+                    zIndex: 'auto',
                     textAlign: 'left',
                 };
             },
@@ -546,7 +551,9 @@ const Select = function (props) {
             menu: (baseStyle, state) => {
                 return {
                     ...baseStyle,
-                    zIndex: overlayBaseZIndex_1.OVERLAY_BASE_Z_INDEX,
+                    // needed to avoid tooltips from being displayed under this menu
+                    // as otherwise react-select uses zIndex 1
+                    zIndex: 'auto',
                     boxShadow: 'var(--ab-cmp-select-menu__box-shadow)',
                     minWidth: `var(--ab-cmp-select-menu__min-width)`,
                     width: resizable ? '100%' : `${Math.max(maxLabelLength, 10)}ch`,

package/src/components/Tooltip/index.js

@@ -4,6 +4,6 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const OverlayTrigger_1 = tslib_1.__importDefault(require("../OverlayTrigger"));
 const Tooltip = ({ label, children }) => {
-    return (React.createElement(OverlayTrigger_1.default, { defaultZIndex: 2000000, className: "ab-Tooltip", render: () => label }, children));
+    return (React.createElement(OverlayTrigger_1.default, { className: "ab-Tooltip", render: () => label }, children));
 };
 exports.default = Tooltip;

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: 1757191030366 || Date.now(),
-    VERSION: "21.0.0-canary.5" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1757331115735 || Date.now(),
+    VERSION: "21.0.0-canary.7" || '--current-version--',
 };

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

@@ -1953,32 +1953,32 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt: boolean;
             gridInfo: string;
-            noCode: string;
             defVal: string;
+            noCode?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
-            gridInfo: string;
             defVal: string;
+            gridInfo?: undefined;
             noCode?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
+            gridInfo: string;
+            noCode: string;
             defVal: string;
-            gridInfo?: undefined;
-            noCode?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
             gridInfo?: undefined;
-            noCode?: undefined;
             defVal?: undefined;
+            noCode?: undefined;
         } | {
             name: string;
             kind: string;