@adaptabletools/adaptable-cjs 21.0.9 → 21.0.11

package/package.json

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

package/src/AdaptableState/Common/AdaptablePredicate.js

@@ -36,11 +36,13 @@ exports.SystemPredicateDefs = [
                 if (!predicateInput) {
                     return;
                 }
-                if (adaptableApi.columnScopeApi.isScopeInScope(predicateInput.columnScope, 
-                // 'In' ColumnScope
-                {
-                    DataTypes: ['text', 'number', 'date', 'textArray', 'numberArray'],
-                })) {
+                // make sure that the input Predicate  is included in the 'In' Predicate
+                if (adaptableApi.columnScopeApi.scopeIsAll(predicateInput.columnScope) ||
+                    adaptableApi.columnScopeApi.isScopeInScope(predicateInput.columnScope, 
+                    // 'In' ColumnScope
+                    {
+                        DataTypes: ['text', 'number', 'date', 'textArray', 'numberArray'],
+                    })) {
                     return predicateInput;
                 }
             })
@@ -117,11 +119,13 @@ exports.SystemPredicateDefs = [
                 if (!predicateInput) {
                     return;
                 }
-                if (adaptableApi.columnScopeApi.isScopeInScope(predicateInput.columnScope, 
-                // 'NotIn' ColumnScope
-                {
-                    DataTypes: ['text', 'number', 'date', 'textArray', 'numberArray'],
-                })) {
+                // make sure that the input Predicate  is included in the 'NotIn' Predicate
+                if (adaptableApi.columnScopeApi.scopeIsAll(predicateInput.columnScope) ||
+                    adaptableApi.columnScopeApi.isScopeInScope(predicateInput.columnScope, 
+                    // 'NotIn' ColumnScope
+                    {
+                        DataTypes: ['text', 'number', 'date', 'textArray', 'numberArray'],
+                    })) {
                     return predicateInput;
                 }
             })

package/src/Utilities/Extensions/StringExtensions.js

@@ -12,7 +12,7 @@ function IsNotNull(stringToCheck) {
 }
 exports.IsNotNull = IsNotNull;
 function IsEmpty(stringToCheck) {
-    return stringToCheck == '';
+    return stringToCheck === '';
 }
 exports.IsEmpty = IsEmpty;
 function IsNotEmpty(stringToCheck) {
@@ -28,7 +28,7 @@ function IsNotNullOrEmpty(stringToCheck) {
 }
 exports.IsNotNullOrEmpty = IsNotNullOrEmpty;
 function IsNullOrEmptyOrWhiteSpace(stringToCheck) {
-    return IsNullOrEmpty(stringToCheck) || IsEmpty(stringToCheck.trim());
+    return IsNullOrEmpty(stringToCheck) || IsEmpty(stringToCheck?.trim());
 }
 exports.IsNullOrEmptyOrWhiteSpace = IsNullOrEmptyOrWhiteSpace;
 function IsNotNullOrEmptyOrWhiteSpace(stringToCheck) {

package/src/View/Components/FilterForm/ListBoxFilterForm.js

@@ -19,8 +19,7 @@ const ColumnValuesSelect = (props) => {
         if (!isActive && distinctValue.value && distinctValue.value instanceof Date) {
             isActive = selectedColumnValues.some((dateStr) => (0, date_fns_1.isEqual)((0, DateHelper_1.parseDateValue)(dateStr), (0, DateHelper_1.parseDateValue)(distinctValue.value)));
         }
-        const columnLabel = distinctValue.label;
-        if (StringExtensions_1.StringExtensions.IsNullOrEmpty(columnLabel)) {
+        if (StringExtensions_1.StringExtensions.IsNullOrEmpty(distinctValue.value)) {
             return false;
         }
         if (isActive) {

package/src/agGrid/AdaptableAgGrid.js

@@ -2467,7 +2467,10 @@ You need to define at least one Layout!`);
                 const value = gridCell.rawValue;
                 // we want to filter out empty values
                 if (value === '' || value === null || value === undefined) {
-                    return;
+                    // 2025-10-31: we want to allow empty values to be included
+                    // after all - they are not displayed by default
+                    // but will be accessible in the customInFilterValues callback
+                    // return;
                 }
                 gridCells.push(gridCell);
             }

package/src/agGrid/AgGridColumnAdapter.js

@@ -581,7 +581,7 @@ class AgGridColumnAdapter {
             if (this.adaptableApi.gridApi.isTreeDataGrid()) {
                 this.setColDefProperty(col, 'filter', (original_filter) => {
                     const autoGroupColumnDef = this.agGridApi.getGridOption('autoGroupColumnDef');
-                    if (autoGroupColumnDef.filter != undefined) {
+                    if (autoGroupColumnDef?.filter != undefined) {
                         // we plan to provide a TreeListColumnFilter
                         // until then, it's the user's responsibility to explicitly set the filter in the provided `autoGroupColumnDef`
                         return original_filter;

package/src/components/OverlayTrigger/index.js

@@ -18,6 +18,7 @@ const UIHelper_1 = require("../../View/UIHelper");
 const InfiniteTable_1 = require("../InfiniteTable");
 const AdaptableContext_1 = require("../../View/AdaptableContext");
 const overlayBaseZIndex_1 = require("../overlayBaseZIndex");
+const DATA_NAME_OVERLAY_TRIGGER = 'OverlayTrigger';
 const getConstrainElement = (target, constrainTo) => {
     let el = null;
     if (typeof constrainTo === 'string') {
@@ -65,6 +66,7 @@ const defaultProps = {
 };
 const OverlayTrigger = React.forwardRef((givenProps, ref) => {
     const props = { ...defaultProps, ...givenProps };
+    (0, exports.ensurePortalElement)();
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     let { visible: _, showTriangle, showEvent, hideEvent, render, targetOffset, preventPortalEventPropagation = false, anchor, hideDelay = 0, opacityTransitionDuration, onVisibleChange, alignPosition = [
         // overlay - target
@@ -113,7 +115,6 @@ const OverlayTrigger = React.forwardRef((givenProps, ref) => {
         doSetVisible(true);
     }, 50), []);
     const prevVisible = (0, usePrevious_1.default)(visible, false);
-    (0, exports.ensurePortalElement)();
     const onShow = React.useCallback((event) => {
         const target = targetRef.current;
         if (event && preventPortalEventPropagation && !(0, contains_1.default)(target, event.target)) {
@@ -148,6 +149,9 @@ const OverlayTrigger = React.forwardRef((givenProps, ref) => {
     }, [ref]);
     (0, react_1.useEffect)(() => {
         let target = domRef.current.previousSibling;
+        while (target && target.dataset.name === DATA_NAME_OVERLAY_TRIGGER) {
+            target = target.previousSibling;
+        }
         if (targetProp) {
             target = targetProp(target);
         }
@@ -218,7 +222,7 @@ const OverlayTrigger = React.forwardRef((givenProps, ref) => {
     const agGridClassName = (0, useAgGridClassName_1.default)([visible]);
     return (React.createElement(React.Fragment, null,
         React.Children.only(props.children),
-        React.createElement("div", { "data-name": "OverlayTrigger", "data-visible": visible, ref: domRef, style: {
+        React.createElement("div", { "data-name": DATA_NAME_OVERLAY_TRIGGER, "data-visible": visible, ref: domRef, style: {
                 visibility: 'hidden',
                 flex: 'none',
                 width: 0,

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: 1761300055892 || Date.now(),
-    VERSION: "21.0.9" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1761929207492 || Date.now(),
+    VERSION: "21.0.11" || '--current-version--',
 };

package/src/layout-manager/src/index.js

@@ -381,6 +381,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             Ignore_RowSummaries: layout.Ignore_RowSummaries,
             Ignore_IsReadOnly: layout.Ignore_IsReadOnly,
             Ignore_Tags: layout.Ignore_Tags,
+            Ignore_Metadata: layout.Ignore_Metadata,
             Ignore_Source: layout.Ignore_Source,
             Ignore_AdaptableVersion: layout.Ignore_AdaptableVersion,
             Ignore_Uuid: layout.Ignore_Uuid,
@@ -709,6 +710,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             Ignore_RowSummaries: this.currentLayout?.Ignore_RowSummaries,
             Ignore_IsReadOnly: this.currentLayout?.Ignore_IsReadOnly,
             Ignore_Tags: this.currentLayout?.Ignore_Tags,
+            Ignore_Metadata: this.currentLayout?.Ignore_Metadata,
             Ignore_Source: this.currentLayout?.Ignore_Source,
             Ignore_AdaptableVersion: this.currentLayout?.Ignore_AdaptableVersion,
             Ignore_Uuid: this.currentLayout?.Ignore_Uuid,

package/src/layout-manager/src/isLayoutEqual.js

@@ -62,6 +62,7 @@ function clearIgnoredProperties(layout) {
     delete layout.Ignore_IsReadOnly;
     delete layout.Ignore_Tags;
     delete layout.Ignore_Source;
+    delete layout.Ignore_Metadata;
     delete layout.Ignore_AdaptableVersion;
     delete layout.Ignore_Uuid;
 }