@adaptabletools/adaptable 17.0.0-canary.6 → 17.0.0-canary.8

package/src/parser/src/predicate/mapQlPredicateToExpression.js

@@ -37,7 +37,7 @@ function mapQlPredicateToExpression(predicate) {
             }
             return `"${arg}"`;
         }
-        if (typeof arg === 'object') {
+        if (typeof arg === 'object' && 'operator' in arg) {
             if ((0, types_1.isQlLogicalOperator)(arg.operator)) {
                 return `(${mapQlPredicateToExpression(arg)})`;
             }
@@ -48,7 +48,7 @@ function mapQlPredicateToExpression(predicate) {
         }
         return arg;
     });
-    if (typeof firstArg === 'object') {
+    if (typeof firstArg === 'object' && 'operator' in firstArg) {
         firstArg = mapQlPredicateToExpression(firstArg);
     }
     if ((0, types_1.isQlLogicalOperator)(operator)) {
@@ -61,6 +61,9 @@ function mapQlPredicateToExpression(predicate) {
         if (operator === 'BETWEEN') {
             return `${firstArg} ${operatorSymbol} (${mappedArgs})`;
         }
+        if (operator === 'IN') {
+            return `${firstArg} ${operatorSymbol} (${mappedArgs.join(', ')})`;
+        }
         return `${firstArg} ${operatorSymbol} ${mappedArgs.join(', ')}`;
     }
     if (predicateType === 'FUNCTION') {

package/src/parser/src/predicate/types.d.ts

@@ -4,7 +4,7 @@ export type QlPredicateError = {
 };
 export interface QlPredicate {
     operator: BooleanFunctionName;
-    args?: (QlPredicate | boolean | number | string)[];
+    args?: (QlPredicate | boolean | number | string | string[] | number[] | Date[])[];
 }
 export type QlLogicalOperator = 'AND' | 'OR';
 export declare const isQlLogicalOperator: (operator: string) => operator is QlLogicalOperator;

package/src/parser/src/types.d.ts

@@ -96,7 +96,7 @@ export interface ExpressionFunction {
 /**
  * Data Types of Inputs used by Expression (test, number, date, boolean)
  */
-export type ExpressionFunctionInputType = 'text' | 'number' | 'date' | 'boolean';
+export type ExpressionFunctionInputType = 'text' | 'number' | 'date' | 'boolean' | 'number[]' | 'date[]' | 'text[]';
 /**
  * Categories for Expression Functions
  */

package/src/renderReactRoot.js

@@ -3,11 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderReactRoot = void 0;
 const tslib_1 = require("tslib");
 const ReactDOMClient = tslib_1.__importStar(require("react-dom/client"));
+const renderWeakMap = new WeakMap();
 const renderReactRoot = (el, container) => {
-    const root = ReactDOMClient.createRoot(container);
+    let root = renderWeakMap.get(container);
+    if (!root) {
+        renderWeakMap.set(container, (root = ReactDOMClient.createRoot(container)));
+    }
     root.render(el);
     return () => {
-        root.unmount();
+        requestAnimationFrame(() => {
+            // This pervents this warning:
+            // Warning: Attempted to synchronously unmount a root while React was already rendering. React cannot finish unmounting the root until the current render has completed, which may lead to a race condition.
+            // https:stackoverflow.com/questions/73459382/react-18-async-way-to-unmount-root
+            root.unmount();
+        });
     };
 };
 exports.renderReactRoot = renderReactRoot;

package/src/types.d.ts

@@ -14,7 +14,7 @@ export type { FlashingCellOptions } from './AdaptableOptions/FlashingCellOptions
 export type { TOAST_POSITIONS, NotificationsOptions, } from './AdaptableOptions/NotificationsOptions';
 export type { AlertOptions, ActionHandler, AlertForm, AlertFormContext, AlertMessageContext, } from './AdaptableOptions/AlertOptions';
 export type { DashboardOptions, CustomToolbar, DashboardButtonContext, CustomToolbarButtonContext, } from './AdaptableOptions/DashboardOptions';
-export type { EditOptions, ValidationResult, SmartEditCustomOperation, SmartEditOperation, SmartEditOperationContext, ServerValidationContext, CellEditableContext, } from './AdaptableOptions/EditOptions';
+export type { EditOptions, ServerValidationResult, SmartEditCustomOperation, SmartEditOperation, SmartEditOperationContext, ServerValidationContext, CellEditableContext, } from './AdaptableOptions/EditOptions';
 export type { ActionRowOptions, ActionRowButtonOptions, ActionRowFormOptions, ActionRowParamContext, ActionRowParamFieldContext, CreateActionRowFormContext, EditActionRowFormContext, ActionRowFormContext, ActionRowType, ActionRowButtonType, ActionRowButtonConfigurationContext, ActionRowButtonsContext, SetPrimaryKeyValueContext, ActionRowFormColumnContext, } from './AdaptableOptions/ActionRowOptions';
 export type { ActionColumnContext, ActionColumn, ActionColumnSettings, ActionColumnOptions, } from './AdaptableOptions/ActionColumnOptions';
 export type { ExportOptions, SystemExportDestination, SystemExportDestinations, CustomDestination, ExternalReport, PreProcessExportContext, AdaptableReportColumn, DataFormatType, ExportFormContext, ReportContext, ExportableColumnContext, ReportFileNameContext, } from './AdaptableOptions/ExportOptions';
@@ -34,7 +34,7 @@ export type { MasterDetailPluginOptions, DetailInitContext, } from './AdaptableO
 export type { FinsemblePluginOptions, FinsemblePluginStateOptions, } from './AdaptableOptions/FinsemblePluginOptions';
 export type { DateInputOptions } from './AdaptableOptions/DateInputOptions';
 export type { ColumnFilterOptions, QuickFilterOptions, FilterFormOptions, ValuesFilterOptions, ColumnFilterContext, } from './AdaptableOptions/ColumnFilterOptions';
-export type { GridFilterOptions } from './AdaptableOptions/GridFilterOptions';
+export type { GridFilterOptions, GridFilterEditors, GridFilterEditor } from './AdaptableOptions/GridFilterOptions';
 export type { QuickSearchOptions, QuickSearchContext } from './AdaptableOptions/QuickSearchOptions';
 export type { FormatColumnOptions, CustomDisplayFormatter, CustomDisplayFormatterContext, } from './AdaptableOptions/FormatColumnOptions';
 export type { ColumnOptions, ColumnFriendlyNameContext } from './AdaptableOptions/ColumnOptions';

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "17.0.0-canary.6";
+declare const _default: "17.0.0-canary.8";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '17.0.0-canary.6'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '17.0.0-canary.8'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version