@adaptabletools/adaptable-cjs 17.0.0-canary.4 → 18.0.0-canary.1

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,10 +3,25 @@ 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) => {
+    // Keeping a reference to previous roots causes an error.
+    // Already (correctly) unmouted elements are not unmounted again, and triggers an error.
+    //
+    // let root = renderWeakMap.get(container);
+    // if (!root) {
+    //   renderWeakMap.set(container, (root = ReactDOMClient.createRoot(container)));
+    // }
     const root = ReactDOMClient.createRoot(container);
     root.render(el);
     return () => {
+        // 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
+        // });
+        // This needs to be syncronous, if not, in a raf it may be to late, the element may be gone.
+        // To reproduce, move this in RAF and play with filters.
         root.unmount();
     };
 };

package/src/themes/index.js

@@ -11,4 +11,8 @@ exports.StaticThemes = [
         Name: GeneralConstants_1.DARK_THEME,
         Description: 'Dark Theme',
     },
+    {
+        Name: GeneralConstants_1.OS_THEME,
+        Description: 'OS Theme',
+    },
 ];

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';
@@ -23,18 +23,15 @@ export type { DataSetOptions, DataSet, DataSetFormContext, } from './AdaptableOp
 export type { CellSummaryOptions } from './AdaptableOptions/CellSummaryOptions';
 export type { CustomSortOptions, ColumnValuesComparer } from './AdaptableOptions/CustomSortOptions';
 export type { NotesOptions, NotableCellContext } from './AdaptableOptions/NotesOptions';
-export type { GroupingOptions, UnbalancedGroupsKeyContext, } from './AdaptableOptions/GroupingOptions';
-export type { Glue42PluginOptions } from './AdaptableOptions/Glue42PluginOptions';
-export type { Glue42WebPluginOptions } from './AdaptableOptions/Glue42WebPluginOptions';
+export type { GroupingOptions, BalancedGroupsKeyContext, } from './AdaptableOptions/GroupingOptions';
 export type { IPushPullPluginOptions } from './AdaptableOptions/IPushPullPluginOptions';
 export type { LayoutOptions, LayoutViewOptions, LayoutTagOptions, LayoutAvailableContext, AutoGenerateTagsForLayoutsContext, LayoutAssociatedObject, PivotPreviewColumnsContext, } from './AdaptableOptions/LayoutOptions';
 export type { ChartingOptions, ChartContainer, ExternalChartingContext, ExternalChartingOptions, } from './AdaptableOptions/ChartingOptions';
 export type { OpenFinPluginOptions } from './AdaptableOptions/OpenFinPluginOptions';
 export type { MasterDetailPluginOptions, DetailInitContext, } from './AdaptableOptions/MasterDetailPluginOptions';
-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';
@@ -43,7 +40,7 @@ export type { AggregationColumns, WeightedAverageAggregation, } from './Predefin
 export type { AccessLevel, Entitlement } from './PredefinedConfig/Common/Entitlement';
 export type { FilterActionOnDataChange } from './PredefinedConfig/Common/FilterActionOnDataChange';
 export type { ConfigState } from './PredefinedConfig/ConfigState';
-export type { AdaptableNote, NotesState as NoteState, AdaptableNotes, NoteGridCell, } from './PredefinedConfig/NotesState';
+export type { AdaptableNote, NotesState as NoteState, AdaptableNotes, } from './PredefinedConfig/NotesState';
 export type { TeamSharingOptions, SharedEntitiesContext, } from './AdaptableOptions/TeamSharingOptions';
 export type { ToolPanelOptions, CustomToolPanel, ToolPanelButtonContext, CustomToolPanelButtonContext, } from './AdaptableOptions/ToolPanelOptions';
 export type { UserInterfaceOptions, BasePermittedValues, PermittedValues, EditLookUpPermittedValues, FilterPermittedValues, CustomSortPermittedValues, BulkUpdatePermittedValues, EditLookUpContext, PermittedValuesContext, FilterPermittedValuesContext, BulkUpdatePermittedValuesContext, ObjectTagsContext, CustomIcon, } from './AdaptableOptions/UserInterfaceOptions';
@@ -66,7 +63,7 @@ export type { ColumnApi } from './Api/ColumnApi';
 export type { ActionColumnApi } from './Api/ActionColumnApi';
 export type { ActionRowApi } from './Api/ActionRowApi';
 export type { ChartingApi } from './Api/ChartingApi';
-export type { NotesApi } from './Api/NotesAPi';
+export type { NotesApi } from './Api/NotesApi';
 export type { ConfigApi } from './Api/ConfigApi';
 export type { CustomSortApi } from './Api/CustomSortApi';
 export type { DashboardApi } from './Api/DashboardApi';
@@ -78,12 +75,9 @@ export type { ExportApi } from './Api/ExportApi';
 export type { Fdc3Api } from './Api/Fdc3Api';
 export type { ColumnFilterApi } from './Api/ColumnFilterApi';
 export type { GridFilterApi } from './Api/GridFilterApi';
-export type { FinsembleApi } from './Api/FinsembleApi';
 export type { FlashingCellApi } from './Api/FlashingCellApi';
 export type { FormatColumnApi } from './Api/FormatColumnApi';
 export type { FreeTextColumnApi } from './Api/FreeTextColumnApi';
-export type { Glue42Api } from './Api/Glue42Api';
-export type { Glue42WebApi } from './Api/Glue42WebApi';
 export type { GridApi } from './Api/GridApi';
 export type { IPushPullApi } from './Api/IPushPullApi';
 export type { LayoutApi } from './Api/LayoutApi';
@@ -118,6 +112,7 @@ export type { CellChangedInfo } from './Api/Events/CellChanged';
 export type { TeamSharingEntityChangedInfo } from './Api/Events/TeamSharingEntityChanged';
 export type { GridDataChangedInfo } from './Api/Events/GridDataChanged';
 export type { LayoutChangedInfo } from './Api/Events/LayoutChanged';
+export type { CalculatedColumnChangedInfo } from './Api/Events/CalculatedColumnChanged';
 export type { CustomToolbarConfiguredInfo } from './Api/Events/CustomToolbarConfigured';
 export type { LiveDataChangedInfo, LiveReport } from './Api/Events/LiveDataChanged';
 export type { ChartChangedInfo, ChartingOpenState, ChartDisplayedInfo, } from './Api/Events/ChartChanged';
@@ -127,7 +122,8 @@ export type { GridFilterAppliedInfo } from './Api/Events/GridFilterApplied';
 export type { GridSortedInfo, AdaptableSortState } from './Api/Events/GridSorted';
 export type { AdaptableSearchState } from './Api/Events/AdaptableSearchState';
 export type { DataSetSelectedInfo } from './Api/Events/DataSetSelected';
-export type { SelectionChangedInfo } from './Api/Events/SelectionChanged';
+export type { CellSelectionChangedInfo } from './Api/Events/CellSelectionChanged';
+export type { RowSelectionChangedInfo } from './Api/Events/RowSelectionChanged';
 export type { AdaptableStateReloadedInfo } from './Api/Events/AdaptableStateReloaded';
 export type { ThemeChangedInfo } from './Api/Events/ThemeChanged';
 export type { ThemeEditedInfo } from './Api/Events/ThemeEdited';
@@ -182,7 +178,6 @@ export type { FormatColumn, FormatColumnState, FormatColumnRule, FormatColumnPre
 export type { StyledColumn, StyledColumnState, PercentBarStyle, GradientStyle, CellColorRange, ColumnComparison, CellTextOptions, CellTextOption, NumericStyledColumn, RangeValueType, SparkLineStyle, BadgeStyle, BadgeStyleDefinition, BadgeStylePredicate, SystemBadgeStylePredicateId, SystemBadgeStylePredicateIds, } from './PredefinedConfig/StyledColumnState';
 export type { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue, FreeTextColumnSettings, } from './PredefinedConfig/FreeTextColumnState';
 export type { StatusBarState, AdaptableStatusBar } from './PredefinedConfig/StatusBarState';
-export type { Glue42Report, Glue42Schedule, Glue42State } from './PredefinedConfig/Glue42State';
 export type { IPushPullDomain, IPushPullReport, IPushPullSchedule, IPushPullState, } from './PredefinedConfig/IPushPullState';
 export type { Layout, LayoutState } from './PredefinedConfig/LayoutState';
 export type { OpenFinReport, OpenFinSchedule, OpenFinState } from './PredefinedConfig/OpenFinState';
@@ -204,3 +199,5 @@ export type { AdaptableFrameworkComponent, AngularFrameworkComponent, ReactFrame
 export type { Fdc3StandardContextType, Fdc3CustomContextType, InstrumentContext, InstrumentListContext, PositionContext, PortfolioContext, ContactContext, ContactListContext, CountryContext, OrganizationContext, Fdc3ContextType, Fdc3Context, ChartContextType, ChartContext, ChatInitSettingsContext, ChatInitSettingsContextType, ContactContextType, ContactListContextType, CurrencyContext, EmailContext, CountryContextType, CurrencyContextType, EmailContextType, InstrumentContextType, InstrumentListContextType, NothingContextType, OrganizationContextType, PortfolioContextType, PositionContextType, NothingContext, Fdc3CustomContext, ValuationContext, ValuationContextType, TimeRangeContextType, TimeRangeContext, } from './PredefinedConfig/Common/Fdc3Context';
 export type { Fdc3IntentType, Fdc3StandardIntentType, Fdc3CustomIntentType, CompatibleContext, } from './PredefinedConfig/Common/Fdc3Intent';
 export type { Fdc3Options, GridDataContextMapping, ActionColumnDefaultConfiguration, ResolveContextDataContext, RaiseIntentConfig, BroadcastConfig, HandleFdc3IntentContext, HandleFdc3Context, Fdc3ButtonContext, Fdc3AdaptableButton, HandleFdc3IntentResolutionContext, UIControlConfig, Fdc3IntentOptions, Fdc3ContextOptions, RaiseIntentConfiguration, BroadcastConfiguration, FDC3ActionColumn, } from './AdaptableOptions/Fdc3Options';
+export type { CellAddress } from './PredefinedConfig/CellAddress';
+export type { CommentThread, AdaptableComment } from './PredefinedConfig/CommentState';

package/themes/dark.css

@@ -1,4 +1,4 @@
-html.ab--theme-dark {
+.ab--theme-dark {
   font-family: Helvetica, Arial, sans-serif;
   --ab-theme-loaded: dark;
   --ab-cmp-input--disabled__background: #232323;
@@ -14,8 +14,8 @@ html.ab--theme-dark {
   --ab-cmp-checkbox__border-color: var(--ab-color-text-on-primary);
   --ab-cmp-checkbox--checked__border-color: var(--ab-color-accent);
 }
-html.ab--theme-dark input[type=number].ab-Input::-webkit-outer-spin-button,
-html.ab--theme-dark input[type=number].ab-Input::-webkit-inner-spin-button {
+.ab--theme-dark input[type=number].ab-Input::-webkit-outer-spin-button,
+.ab--theme-dark input[type=number].ab-Input::-webkit-inner-spin-button {
   background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" viewBox="4 0 18 18" version="1.1"><path fill="%23f7f7f7" d="M7 10l5 5 5-5z" transform="translate(0, 2)"/><path fill="%23f7f7f7" d="M7 14l5-5 5 5z" transform="translate(0, -6)"/></svg>') no-repeat center center;
 }