@adaptabletools/adaptable 17.0.0-canary.0 → 17.0.0-canary.2

package/src/agGrid/AdaptableLogger.js

@@ -1,4 +1,4 @@
-const debugFactory = require('debug');
+import debugFactory from 'debug';
 function humanize(ms) {
     return `${ms}ms`;
 }
@@ -8,20 +8,6 @@ const performanceTime = (previousTime) => {
     return previousTime ? now - previousTime : now;
 };
 export class AdaptableLogger {
-    constructor(adaptableId) {
-        this.adaptableId = adaptableId;
-        this.debugger = debugFactory(`Adaptable:${adaptableId}`);
-        this.infoLogger = this.debugger.extend(`info`);
-        this.infoLogger.log = console.info.bind(console);
-        this.successLogger = this.debugger.extend(`success`);
-        this.successLogger.log = console.log.bind(console);
-        this.warnLogger = this.debugger.extend(`warn`);
-        this.warnLogger.log = console.warn.bind(console);
-        this.errorLogger = this.debugger.extend(`error`);
-        this.errorLogger.log = console.error.bind(console);
-        this.perfLogger = this.debugger.extend(`perf`);
-        this.perfLogger.log = console.debug.bind(console);
-    }
     // use static loggers whenever access to AdaptableLogger instance is not feasible
     static consoleErrorBase(message, ...optionalParams) {
         if (optionalParams === null || optionalParams === void 0 ? void 0 : optionalParams.length) {
@@ -47,6 +33,20 @@ export class AdaptableLogger {
             console.log(message);
         }
     }
+    constructor(adaptableId) {
+        this.adaptableId = adaptableId;
+        this.debugger = debugFactory(`Adaptable:${adaptableId}`);
+        this.infoLogger = this.debugger.extend(`info`);
+        this.infoLogger.log = console.info.bind(console);
+        this.successLogger = this.debugger.extend(`success`);
+        this.successLogger.log = console.log.bind(console);
+        this.warnLogger = this.debugger.extend(`warn`);
+        this.warnLogger.log = console.warn.bind(console);
+        this.errorLogger = this.debugger.extend(`error`);
+        this.errorLogger.log = console.error.bind(console);
+        this.perfLogger = this.debugger.extend(`perf`);
+        this.perfLogger.log = console.debug.bind(console);
+    }
     beginPerf(sectionName) {
         this.perfLogger(`[BEGIN] - ${sectionName}`);
         const startTime = performanceTime();

package/src/agGrid/CheckboxRenderer.d.ts

@@ -1,5 +1,10 @@
 import { ICellEditorComp, ICellEditorParams, ICellRendererFunc } from '@ag-grid-community/core';
 import { AdaptableApi } from '../Api/AdaptableApi';
+/**
+ * This file is not used any more
+ * We removed the CheckboxStyle as Ag Grid provide it
+ * And for Boolean FreeTexts we use the boolean cell data type
+ */
 export declare const getCheckboxRendererForColumn: (columnId: string, isColumnReadOnly: boolean, api: AdaptableApi) => ICellRendererFunc;
 export declare class CheckboxEditor implements ICellEditorComp {
     private eGui;

package/src/agGrid/CheckboxRenderer.js

@@ -1,3 +1,8 @@
+/**
+ * This file is not used any more
+ * We removed the CheckboxStyle as Ag Grid provide it
+ * And for Boolean FreeTexts we use the boolean cell data type
+ */
 export const getCheckboxRendererForColumn = (columnId, isColumnReadOnly, api) => {
     const CheckboxRenderer = function () {
         return '';
@@ -27,7 +32,6 @@ export const getCheckboxRendererForColumn = (columnId, isColumnReadOnly, api) =>
     CheckboxRenderer.prototype.checkedHandler = function (e) {
         let checked = e.target.checked;
         this.params.node.setDataValue(columnId, checked);
-        api.styledColumnApi.internalApi.fireCheckboxColumnClickedEvent(columnId, this.params.node.data, api.gridApi.getPrimaryKeyValueForRowNode(this.params.node), checked);
     };
     CheckboxRenderer.prototype.suppressEditEvent = function (event) {
         if (event.target === this.eGui) {

package/src/agGrid/ColumnSetupInfo.d.ts

@@ -1,6 +1,6 @@
 import { ColDef, Column } from '@ag-grid-community/core';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-export declare type ColumnSetupInfo = {
+export type ColumnSetupInfo = {
     col: Column;
     colDef: ColDef;
     colId: string;

package/src/agGrid/agGridHelper.d.ts

@@ -21,7 +21,6 @@ export declare class agGridHelper {
     getAgGridDarkThemeName(): string;
     setUpModules(): Map<AdaptableModule, IModule>;
     TrySetUpNodeIds(hasAutogeneratedPrimaryKey: boolean): boolean;
-    createCheckboxRendererComp(columnId: string, isColumnReadOnly: boolean): ICellRendererFunc | undefined;
     createPercentBarRendererComp(styledColumn: StyledColumn, abColumn: AdaptableColumn): ICellRendererFunc;
     createBadgeRendererComp(styledColumn: StyledColumn, abColumn: AdaptableColumn): any;
     getCleanValue(value: string): string | undefined;

package/src/agGrid/agGridHelper.js

@@ -42,9 +42,8 @@ import { StringExtensions } from '../Utilities/Extensions/StringExtensions';
 import { Helper } from '../Utilities/Helpers/Helper';
 import UIHelper from '../View/UIHelper';
 import { getBadgeRendererForColumn } from './BadgeRenderer';
-import { getCheckboxRendererForColumn } from './CheckboxRenderer';
 import { getPercentBarRendererForColumn } from './PercentBarRenderer';
-const tinycolor = require('tinycolor2');
+import tinycolor from 'tinycolor2';
 /**
  * Adaptable AG Grid implementation is getting really big and unwieldy
  * So lets put some of the more obvious 'Helper' functions here
@@ -150,9 +149,6 @@ export class agGridHelper {
         }
         return true;
     }
-    createCheckboxRendererComp(columnId, isColumnReadOnly) {
-        return getCheckboxRendererForColumn(columnId, isColumnReadOnly, this.adaptable.api);
-    }
     createPercentBarRendererComp(styledColumn, abColumn) {
         return getPercentBarRendererForColumn(styledColumn, abColumn, this.adaptable.api);
     }
@@ -402,6 +398,9 @@ export class agGridHelper {
     }
     isColumnFilterable(colDef) {
         // follow agGrid logic which is that ONLY filterable if explicitly set
+        if (this.adaptable.EntitlementService.getEntitlementAccessLevelForModule(ModuleConstants.ColumnFilterModuleId) == 'Hidden') {
+            return false;
+        }
         return colDef != null && colDef.filter != null && colDef.filter != false;
     }
     getColumnPinnedPosition(colDef) {
@@ -575,21 +574,24 @@ export class agGridHelper {
     }
     checkShouldClearExistingFiltersOrSearches() {
         // if they have selected to clear column filters on startup then do it
-        if (this.adaptable.adaptableOptions.columnFilterOptions.clearFiltersOnStartUp) {
+        if (this.adaptable.adaptableOptions.columnFilterOptions.clearColumnFiltersOnStartUp) {
             if (ArrayExtensions.IsNotNullOrEmpty(this.adaptable.api.columnFilterApi.getColumnFilters())) {
-                this.adaptable.logger.warn('Clearing existing Column Filters as "clearFiltersOnStartUp" is true');
+                this.adaptable.logger.warn('Clearing existing Column Filters as "clearColumnFiltersOnStartUp" is true');
                 this.adaptable.api.columnFilterApi.clearColumnFilters();
             }
         }
+        // if they have selected to clear the Grid filter on startup then do it
+        if (this.adaptable.adaptableOptions.gridFilterOptions.clearGridFilterOnStartUp) {
+            if (StringExtensions.IsNotNullOrEmpty(this.adaptable.api.gridFilterApi.getCurrentGridFilterExpression())) {
+                this.adaptable.logger.warn('Clearing existing Grid Filter as "clearGridFilterOnStartUp" is true');
+                this.adaptable.api.gridFilterApi.setGridFilterExpression('');
+            }
+        }
         // if they have selected to clear searches on startup then do it
-        if (this.adaptable.adaptableOptions.quickSearchOptions.clearSearchesOnStartUp) {
-            if (StringExtensions.IsNotNullOrEmpty(this.adaptable.api.quickSearchApi.getQuickSearchState().QuickSearchText) ||
-                StringExtensions.IsNotNullOrEmpty(this.adaptable.api.gridFilterApi.getCurrentGridFilterExpression()) ||
-                ArrayExtensions.IsNotNullOrEmpty(this.adaptable.api.dataSetApi.getDataSets())) {
-                this.adaptable.logger.warn('Clearing existing Searches as "clearSearchesOnStartUp" is true');
+        if (this.adaptable.adaptableOptions.quickSearchOptions.clearQuickSearchOnStartUp) {
+            if (StringExtensions.IsNotNullOrEmpty(this.adaptable.api.quickSearchApi.getQuickSearchState().QuickSearchText)) {
+                this.adaptable.logger.warn('Clearing existing Searches as "clearQuickSearchOnStartUp" is true');
                 this.adaptable.api.quickSearchApi.clearQuickSearch();
-                this.adaptable.api.gridFilterApi.setGridFilterExpression('');
-                this.adaptable.api.dataSetApi.clearCurrentDataSet();
             }
         }
     }

package/src/agGrid/editors/AdaptableDateEditor/InternalAdaptableDateEditor.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
-export declare type InternalAdaptableDateEditorApi = {
+export type InternalAdaptableDateEditorApi = {
     focus: VoidFunction;
 };
-export declare type InternalAdaptableDateEditorProps = {
+export type InternalAdaptableDateEditorProps = {
     defaultValue?: string | Date | number | null;
     value?: string | Date | number | null;
     dateFormat: string;

package/src/agGrid/editors/AdaptableNumberEditor/InternalAdaptableNumberEditor.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-export declare type InternalAdaptableNumberEditorApi = {
+export type InternalAdaptableNumberEditorApi = {
     focus: VoidFunction;
     setValue: (value: any) => void;
 };
-export declare type InternalAdaptableNumberEditorProps = {
+export type InternalAdaptableNumberEditorProps = {
     /**
      * Value to set when the x (when showClear: true) is pressed
      */

package/src/components/CheckBox/index.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { ReactNode, SyntheticEvent } from 'react';
 import { FlexProps } from 'rebass';
 import { ContainerProps } from '../ContainerProps';
-declare type TypeProps = {
+type TypeProps = {
     checked?: boolean | null;
     disabled?: boolean;
     readOnly?: boolean;

package/src/components/ColorPicker/ColorPicker.d.ts

@@ -2,10 +2,10 @@ import * as React from 'react';
 import { HTMLProps } from 'react';
 import { BoxProps } from 'rebass';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-export declare type ColorPickerProps = Omit<HTMLProps<HTMLInputElement>, 'onChange'> & {
+export type ColorPickerProps = Omit<HTMLProps<HTMLInputElement>, 'onChange'> & {
     api: AdaptableApi;
     onChange: (color: string) => void;
     value: string;
     includeAlpha?: boolean;
 } & Omit<BoxProps, 'onChange'>;
-export declare const ColorPicker: React.ForwardRefExoticComponent<Pick<ColorPickerProps, "type" | "key" | "api" | "children" | "size" | "name" | "tabIndex" | "color" | "style" | "cite" | "data" | "form" | "label" | "p" | "slot" | "span" | "summary" | "title" | "pattern" | "start" | "hidden" | "content" | "default" | "flex" | "wrap" | "open" | "padding" | "multiple" | "disabled" | "checked" | "download" | "list" | "order" | "target" | "src" | "className" | "onTransitionEnd" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEndCapture" | "opacity" | "step" | "value" | "sizes" | "variant" | "tx" | "as" | "css" | "m" | "margin" | "mt" | "marginTop" | "mr" | "marginRight" | "mb" | "marginBottom" | "ml" | "marginLeft" | "mx" | "marginX" | "my" | "marginY" | "pt" | "paddingTop" | "pr" | "paddingRight" | "pb" | "paddingBottom" | "pl" | "paddingLeft" | "px" | "paddingX" | "py" | "paddingY" | "width" | "height" | "minWidth" | "minHeight" | "maxWidth" | "maxHeight" | "display" | "verticalAlign" | "overflow" | "overflowX" | "overflowY" | "fontFamily" | "fontSize" | "fontWeight" | "lineHeight" | "letterSpacing" | "fontStyle" | "textAlign" | "bg" | "backgroundColor" | "alignItems" | "alignContent" | "justifyItems" | "justifyContent" | "flexWrap" | "flexDirection" | "flexGrow" | "flexShrink" | "flexBasis" | "justifySelf" | "alignSelf" | "sx" | "accept" | "acceptCharset" | "action" | "allowFullScreen" | "allowTransparency" | "alt" | "async" | "autoComplete" | "autoFocus" | "autoPlay" | "capture" | "cellPadding" | "cellSpacing" | "charSet" | "challenge" | "classID" | "cols" | "colSpan" | "controls" | "coords" | "crossOrigin" | "dateTime" | "defer" | "encType" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "frameBorder" | "headers" | "high" | "href" | "hrefLang" | "htmlFor" | "httpEquiv" | "integrity" | "keyParams" | "keyType" | "kind" | "loop" | "low" | "manifest" | "marginHeight" | "marginWidth" | "max" | "maxLength" | "media" | "mediaGroup" | "method" | "min" | "minLength" | "muted" | "nonce" | "noValidate" | "optimum" | "playsInline" | "poster" | "preload" | "readOnly" | "rel" | "required" | "reversed" | "rows" | "rowSpan" | "sandbox" | "scope" | "scoped" | "scrolling" | "seamless" | "selected" | "shape" | "srcDoc" | "srcLang" | "srcSet" | "useMap" | "wmode" | "includeAlpha"> & React.RefAttributes<unknown>>;
+export declare const ColorPicker: React.ForwardRefExoticComponent<Pick<ColorPickerProps, "api" | "children" | "size" | "name" | "tabIndex" | "color" | "style" | "cite" | "data" | "form" | "label" | "p" | "slot" | "span" | "summary" | "title" | "pattern" | "start" | "hidden" | "content" | "default" | "flex" | "wrap" | "open" | "padding" | "multiple" | "disabled" | "checked" | "download" | "list" | "order" | "target" | "src" | "className" | "onTransitionEnd" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEndCapture" | "opacity" | "value" | "key" | "sizes" | "variant" | "tx" | "as" | "css" | "m" | "margin" | "mt" | "marginTop" | "mr" | "marginRight" | "mb" | "marginBottom" | "ml" | "marginLeft" | "mx" | "marginX" | "my" | "marginY" | "pt" | "paddingTop" | "pr" | "paddingRight" | "pb" | "paddingBottom" | "pl" | "paddingLeft" | "px" | "paddingX" | "py" | "paddingY" | "width" | "height" | "minWidth" | "minHeight" | "maxWidth" | "maxHeight" | "display" | "verticalAlign" | "overflow" | "overflowX" | "overflowY" | "fontFamily" | "fontSize" | "fontWeight" | "lineHeight" | "letterSpacing" | "fontStyle" | "textAlign" | "bg" | "backgroundColor" | "alignItems" | "alignContent" | "justifyItems" | "justifyContent" | "flexWrap" | "flexDirection" | "flexGrow" | "flexShrink" | "flexBasis" | "justifySelf" | "alignSelf" | "sx" | "accept" | "acceptCharset" | "action" | "allowFullScreen" | "allowTransparency" | "alt" | "async" | "autoComplete" | "autoFocus" | "autoPlay" | "capture" | "cellPadding" | "cellSpacing" | "charSet" | "challenge" | "classID" | "cols" | "colSpan" | "controls" | "coords" | "crossOrigin" | "dateTime" | "defer" | "encType" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "frameBorder" | "headers" | "high" | "href" | "hrefLang" | "htmlFor" | "httpEquiv" | "integrity" | "keyParams" | "keyType" | "kind" | "loop" | "low" | "manifest" | "marginHeight" | "marginWidth" | "max" | "maxLength" | "media" | "mediaGroup" | "method" | "min" | "minLength" | "muted" | "nonce" | "noValidate" | "optimum" | "playsInline" | "poster" | "preload" | "readOnly" | "rel" | "required" | "reversed" | "rows" | "rowSpan" | "sandbox" | "scope" | "scoped" | "scrolling" | "seamless" | "selected" | "shape" | "srcDoc" | "srcLang" | "srcSet" | "step" | "type" | "useMap" | "wmode" | "includeAlpha"> & React.RefAttributes<unknown>>;

package/src/components/ColorPicker/ColorPicker.js

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { Box, Flex } from 'rebass';
 import Input from '../Input';
 import { getVariableColor } from '../../Utilities/Helpers/StyleHelper';
-const tinycolor = require('tinycolor2');
+import tinycolor from 'tinycolor2';
 export const ColorPicker = React.forwardRef((props, ref) => {
     const ColorPalette = props.api.userInterfaceApi.getColorPalette();
     let { api, value, includeAlpha = true } = props, restProps = __rest(props, ["api", "value", "includeAlpha"]);

package/src/components/ContainerProps.d.ts

@@ -1,5 +1,5 @@
-export declare type ContainerScaleType = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
-export declare type ContainerProps = Partial<{
+export type ContainerScaleType = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
+export type ContainerProps = Partial<{
     margin: ContainerScaleType;
     marginLeft: ContainerScaleType;
     ml: ContainerScaleType;

package/src/components/Dashboard/Dashboard.d.ts

@@ -1,10 +1,10 @@
 import { ReactElement, ReactNode, Dispatch, SetStateAction } from 'react';
 import { DashboardTabProps } from './DashboardTab';
-export declare type DashboardPosition = {
+export type DashboardPosition = {
     x: number;
     y: number;
 };
-export declare type DashboardProps = {
+export type DashboardProps = {
     title: string;
     children: ReactElement<DashboardTabProps>[];
     left: ReactNode;

package/src/components/Dashboard/DashboardTab.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-export declare type DashboardTabProps = {
+export type DashboardTabProps = {
     title: string;
     children: ReactNode;
 };

package/src/components/Dashboard/DashboardToolbar.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
-export declare type DashboardToolbarProps = {
+export type DashboardToolbarProps = {
     className?: string;
     title: string;
     tooltip?: string;

package/src/components/Datepicker/index.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { BoxProps } from 'rebass';
 import { DatepickerButton } from '../../AdaptableOptions/DateInputOptions';
-export declare type DatepickerProps = Omit<BoxProps, 'value' | 'onChange' | 'defaultValue'> & {
+export type DatepickerProps = Omit<BoxProps, 'value' | 'onChange' | 'defaultValue'> & {
     value: Date | undefined;
     defaultValue?: Date | undefined;
     onChange: (value: Date | undefined) => void;
@@ -15,4 +15,4 @@ export declare type DatepickerProps = Omit<BoxProps, 'value' | 'onChange' | 'def
     showWeekNumber?: boolean;
     showOutsideDays?: boolean;
 };
-export declare const Datepicker: React.ForwardRefExoticComponent<Pick<DatepickerProps, "type" | "key" | "children" | "size" | "name" | "tabIndex" | "color" | "style" | "cite" | "data" | "form" | "label" | "p" | "slot" | "span" | "summary" | "title" | "pattern" | "start" | "hidden" | "content" | "default" | "flex" | "wrap" | "open" | "padding" | "multiple" | "disabled" | "checked" | "download" | "list" | "order" | "target" | "src" | "className" | "onTransitionEnd" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEndCapture" | "opacity" | "step" | "value" | "sizes" | "variant" | "tx" | "as" | "css" | "m" | "margin" | "mt" | "marginTop" | "mr" | "marginRight" | "mb" | "marginBottom" | "ml" | "marginLeft" | "mx" | "marginX" | "my" | "marginY" | "pt" | "paddingTop" | "pr" | "paddingRight" | "pb" | "paddingBottom" | "pl" | "paddingLeft" | "px" | "paddingX" | "py" | "paddingY" | "width" | "height" | "minWidth" | "minHeight" | "maxWidth" | "maxHeight" | "display" | "verticalAlign" | "overflow" | "overflowX" | "overflowY" | "fontFamily" | "fontSize" | "fontWeight" | "lineHeight" | "letterSpacing" | "fontStyle" | "textAlign" | "bg" | "backgroundColor" | "alignItems" | "alignContent" | "justifyItems" | "justifyContent" | "flexWrap" | "flexDirection" | "flexGrow" | "flexShrink" | "flexBasis" | "justifySelf" | "alignSelf" | "sx" | "accept" | "acceptCharset" | "action" | "allowFullScreen" | "allowTransparency" | "alt" | "async" | "autoComplete" | "autoFocus" | "autoPlay" | "capture" | "cellPadding" | "cellSpacing" | "charSet" | "challenge" | "classID" | "cols" | "colSpan" | "controls" | "coords" | "crossOrigin" | "dateTime" | "defer" | "encType" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "frameBorder" | "headers" | "high" | "href" | "hrefLang" | "htmlFor" | "httpEquiv" | "integrity" | "keyParams" | "keyType" | "kind" | "loop" | "low" | "manifest" | "marginHeight" | "marginWidth" | "max" | "maxLength" | "media" | "mediaGroup" | "method" | "min" | "minLength" | "muted" | "nonce" | "noValidate" | "optimum" | "playsInline" | "poster" | "preload" | "readOnly" | "rel" | "required" | "reversed" | "rows" | "rowSpan" | "sandbox" | "scope" | "scoped" | "scrolling" | "seamless" | "selected" | "shape" | "srcDoc" | "srcLang" | "srcSet" | "useMap" | "wmode" | "onHide" | "showClearButton" | "datepickerButtons" | "dateProps" | "showWeekNumber" | "showOutsideDays"> & React.RefAttributes<HTMLInputElement>>;
+export declare const Datepicker: React.ForwardRefExoticComponent<Pick<DatepickerProps, "children" | "size" | "name" | "tabIndex" | "color" | "style" | "cite" | "data" | "form" | "label" | "p" | "slot" | "span" | "summary" | "title" | "pattern" | "start" | "hidden" | "content" | "default" | "flex" | "wrap" | "open" | "padding" | "multiple" | "disabled" | "checked" | "download" | "list" | "order" | "target" | "src" | "className" | "onTransitionEnd" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEndCapture" | "opacity" | "value" | "key" | "sizes" | "variant" | "tx" | "as" | "css" | "m" | "margin" | "mt" | "marginTop" | "mr" | "marginRight" | "mb" | "marginBottom" | "ml" | "marginLeft" | "mx" | "marginX" | "my" | "marginY" | "pt" | "paddingTop" | "pr" | "paddingRight" | "pb" | "paddingBottom" | "pl" | "paddingLeft" | "px" | "paddingX" | "py" | "paddingY" | "width" | "height" | "minWidth" | "minHeight" | "maxWidth" | "maxHeight" | "display" | "verticalAlign" | "overflow" | "overflowX" | "overflowY" | "fontFamily" | "fontSize" | "fontWeight" | "lineHeight" | "letterSpacing" | "fontStyle" | "textAlign" | "bg" | "backgroundColor" | "alignItems" | "alignContent" | "justifyItems" | "justifyContent" | "flexWrap" | "flexDirection" | "flexGrow" | "flexShrink" | "flexBasis" | "justifySelf" | "alignSelf" | "sx" | "accept" | "acceptCharset" | "action" | "allowFullScreen" | "allowTransparency" | "alt" | "async" | "autoComplete" | "autoFocus" | "autoPlay" | "capture" | "cellPadding" | "cellSpacing" | "charSet" | "challenge" | "classID" | "cols" | "colSpan" | "controls" | "coords" | "crossOrigin" | "dateTime" | "defer" | "encType" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "frameBorder" | "headers" | "high" | "href" | "hrefLang" | "htmlFor" | "httpEquiv" | "integrity" | "keyParams" | "keyType" | "kind" | "loop" | "low" | "manifest" | "marginHeight" | "marginWidth" | "max" | "maxLength" | "media" | "mediaGroup" | "method" | "min" | "minLength" | "muted" | "nonce" | "noValidate" | "optimum" | "playsInline" | "poster" | "preload" | "readOnly" | "rel" | "required" | "reversed" | "rows" | "rowSpan" | "sandbox" | "scope" | "scoped" | "scrolling" | "seamless" | "selected" | "shape" | "srcDoc" | "srcLang" | "srcSet" | "step" | "type" | "useMap" | "wmode" | "onHide" | "showClearButton" | "datepickerButtons" | "dateProps" | "showWeekNumber" | "showOutsideDays"> & React.RefAttributes<HTMLInputElement>>;

package/src/components/Dialog/index.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { BoxProps } from 'rebass';
 import { ModalProps } from '../Modal';
 import { WindowModalProps } from '../WindowModal';
-declare type TypeProps = {
+type TypeProps = {
     modal?: boolean;
     autoFocus?: boolean;
     focusOnBrowserVisible?: boolean;
@@ -18,7 +18,7 @@ declare type TypeProps = {
 };
 export interface DialogProps extends Omit<BoxProps, 'ref'>, TypeProps {
 }
-export declare type DialogRefType = {
+export type DialogRefType = {
     bringToFront: VoidFunction;
 };
 export declare const Dialog: React.ForwardRefExoticComponent<DialogProps & {

package/src/components/Dropdown/index.d.ts

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { ReactNode } from 'react';
 import { BoxProps } from 'rebass';
-export declare type DropdownOption = {
+export type DropdownOption = {
     label: string;
     value: string;
 };
-export declare type DropdownProps = Omit<BoxProps, 'onChange' | 'value'> & {
+export type DropdownProps = Omit<BoxProps, 'onChange' | 'value'> & {
     autoFocus?: boolean;
     expanded?: boolean;
     disabled?: boolean;

package/src/components/DropdownButton/DropdownButtonItem.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-declare type DropdownButtonItem = {
+type DropdownButtonItem = {
     onClick?: (e: React.SyntheticEvent, item: DropdownButtonItem) => any;
     onChange?: (e: React.SyntheticEvent, item: DropdownButtonItem) => any;
     disabled?: boolean;

package/src/components/DropdownButton/index.d.ts

@@ -5,7 +5,7 @@ import { ExpandedProps } from './useExpanded';
 import DropdownButtonItem from './DropdownButtonItem';
 import { OverlayTriggerProps } from '../OverlayTrigger';
 export declare const DROPDOWN_ICON: JSX.Element;
-export declare type DropdownButtonProps = React.PropsWithChildren<Omit<BoxProps, 'ref'>> & Omit<React.HTMLProps<HTMLElement>, 'ref'> & SimpleButtonProps & ExpandedProps & {
+export type DropdownButtonProps = React.PropsWithChildren<Omit<BoxProps, 'ref'>> & Omit<React.HTMLProps<HTMLElement>, 'ref'> & SimpleButtonProps & ExpandedProps & {
     collapseOnItemClick?: boolean;
     columns?: string[];
     overlayProps?: OverlayTriggerProps;

package/src/components/DropdownButton/renderItem.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import DropdownButtonItem from './DropdownButtonItem';
-declare type Params = {
+type Params = {
     item: DropdownButtonItem;
     index: number;
     columns: string[];

package/src/components/DropdownButton/useExpanded.d.ts

@@ -6,7 +6,7 @@ export interface PositionInfo {
     maxHeight: number | string;
     maxWidth: number | string;
 }
-export declare type ExpandedProps = {
+export type ExpandedProps = {
     expanded?: boolean;
     constrainTo?: ConstrainToType;
     defaultExpanded?: boolean;

package/src/components/EllipsisContainer/index.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { FlexProps } from 'rebass';
-declare type EllipsisContainerProps = {
+type EllipsisContainerProps = {
     direction: 'horizontal' | 'vertical';
     count: number;
     allowWrap?: boolean;

package/src/components/EmptyContent/index.d.ts

@@ -1,5 +1,5 @@
 import { HTMLProps } from 'react';
 import { FlexProps } from 'rebass';
-declare type EmptyContentProps = HTMLProps<HTMLElement> & FlexProps & {};
+type EmptyContentProps = HTMLProps<HTMLElement> & FlexProps & {};
 declare const EmptyContent: ({ children, className, style, ...flexProps }: EmptyContentProps) => JSX.Element;
 export default EmptyContent;

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -242,7 +242,7 @@ export function BaseEditorInput(props) {
                 props.onChange(event.target.value);
             }, style: style }),
         props.isFullExpression !== true && (React.createElement(HelpBlock, { mt: 2, mb: 2, p: 2, fontSize: 3 },
-            "This Query must resolve to a ",
+            "This Expression must resolve to a ",
             React.createElement("b", null, "boolean "),
             "(i.e. true / false) value")),
         expressionError && (React.createElement(ErrorBox, { width: "100%", style: { whiteSpace: 'pre-wrap' }, mt: 2 }, expressionError)),

package/src/components/ExpressionEditor/NamedQueryContext.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { NamedQuery } from '../../types';
-export declare type ExpressionEditorNamedQuery = false | NamedQuery;
+export type ExpressionEditorNamedQuery = false | NamedQuery;
 export declare const NamedQueryContext: import("react").Context<{
     namedQuery: ExpressionEditorNamedQuery;
     setNamedQuery: (q: ExpressionEditorNamedQuery) => void;

package/src/components/ExpressionEditor/QueryBuilder/QueryBuilder.js

@@ -1,14 +1,16 @@
 import * as React from 'react';
 import { DragDropContext } from 'react-beautiful-dnd';
-import { Box } from 'rebass';
+import { Box, Flex } from 'rebass';
 import { mapExpressionToQlPredicate, } from '../../../parser/src/predicate';
 import { mapQlPredicateToExpression } from '../../../parser/src/predicate/mapQlPredicateToExpression';
 import { useAdaptable } from '../../../View/AdaptableContext';
 import ErrorBox from '../../ErrorBox';
 import HelpBlock from '../../HelpBlock';
 import Panel from '../../Panel';
+import SimpleButton from '../../SimpleButton';
+import { WarningBox } from '../../WarningBox';
 import { QueryPredicateBuilder } from './QueryPredicateBuilder';
-import { getFunctionsForColumnType, reorder } from './utils';
+import { getFunctionsForColumnType, getUnsuportedExpressionFromQlPredicate, reorder, } from './utils';
 const QUERY_BUILDER_CLASSNAME = 'ab-QueryBuilder';
 const QueryBuilderContext = React.createContext(null);
 export function useQueryBuilderContext() {
@@ -19,6 +21,7 @@ export function useQueryBuilderContext() {
     return context;
 }
 export const QueryBuilder = (props) => {
+    var _a, _b;
     const adaptable = useAdaptable();
     const [qlPredicate, setQlPredicate] = React.useState(() => {
         const qlPredicate = mapExpressionToQlPredicate(props.query);
@@ -33,6 +36,12 @@ export const QueryBuilder = (props) => {
             setExpressionStr(newQuery);
         }
     };
+    const clearExpression = () => {
+        const predicate = mapExpressionToQlPredicate('');
+        setQlPredicate(predicate);
+        setExpressionStr('');
+        props.onChange('');
+    };
     const booleanExpressions = React.useMemo(() => {
         const expressionMap = adaptable.api.internalApi
             .getQueryLanguageService()
@@ -54,6 +63,37 @@ export const QueryBuilder = (props) => {
             onQlPredicateChange: handleQlPredicateChange,
         };
     }, []);
+    const clearExpressionButton = (React.createElement(SimpleButton, { onClick: () => {
+            clearExpression();
+        } }, "Clear Expression"));
+    const unsupportedExpressionFunction = getUnsuportedExpressionFromQlPredicate(qlPredicate);
+    let errorOrEditor = null;
+    if (qlPredicate && 'errorMessage' in qlPredicate) {
+        errorOrEditor = ((_b = (_a = props.query) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, 'QUERY')) ? (React.createElement(WarningBox, null,
+            React.createElement(Flex, { alignItems: "center" },
+                "Named Queries are not supported in the Query Builder",
+                React.createElement(Box, { flex: 1 }),
+                clearExpressionButton))) : (React.createElement(ErrorBox, null,
+            React.createElement(Flex, null,
+                qlPredicate.errorMessage,
+                React.createElement(Box, { flex: 1 }),
+                clearExpressionButton)));
+    }
+    else if (unsupportedExpressionFunction) {
+        errorOrEditor = React.createElement(WarningBox, null, unsupportedExpressionFunction);
+    }
+    else if (qlPredicate && !('errorMessage' in qlPredicate)) {
+        errorOrEditor = (React.createElement(QueryPredicateBuilder, { isRoot: true, index: 0, id: "0", predicate: qlPredicate, onNewPredicate: (type) => {
+                // add to its children
+                const newPredicate = {
+                    operator: type === 'filter' ? undefined : 'AND',
+                    args: [],
+                };
+                handleQlPredicateChange(Object.assign(Object.assign({}, qlPredicate), { args: [...qlPredicate.args, newPredicate] }));
+            }, onChange: (predicate) => {
+                handleQlPredicateChange(predicate);
+            } }));
+    }
     return (React.createElement(DragDropContext, { onDragEnd: (result) => {
             if (!result.destination) {
                 return;
@@ -65,18 +105,8 @@ export const QueryBuilder = (props) => {
         } },
         React.createElement(QueryBuilderContext.Provider, { value: context },
             React.createElement(Box, { className: QUERY_BUILDER_CLASSNAME },
-                React.createElement(HelpBlock, { mt: 2, mb: 2, p: 2, fontSize: 3 }, "Create a Grid Filter by adding as many Conditions and AND / OR Groups as required.          "),
-                qlPredicate &&
-                    ('errorMessage' in qlPredicate ? (React.createElement(ErrorBox, null, qlPredicate.errorMessage)) : (React.createElement(QueryPredicateBuilder, { isRoot: true, index: 0, id: "0", predicate: qlPredicate, onNewPredicate: (type) => {
-                            // add to its children
-                            const newPredicate = {
-                                operator: type === 'filter' ? undefined : 'AND',
-                                args: [],
-                            };
-                            handleQlPredicateChange(Object.assign(Object.assign({}, qlPredicate), { args: [...qlPredicate.args, newPredicate] }));
-                        }, onChange: (predicate) => {
-                            handleQlPredicateChange(predicate);
-                        } }))),
+                React.createElement(HelpBlock, { mt: 2, mb: 2, p: 2, fontSize: 3 }, "Build the Grid Filter by adding Column Conditions and AND / OR Groups as required"),
+                errorOrEditor,
                 React.createElement(Panel, { variant: "default", header: "AdapTableQL Expression", mt: 3 },
-                    React.createElement(Box, { className: `${QUERY_BUILDER_CLASSNAME}__expression`, minHeight: 48, my: 2, p: 3 }, expressionStr !== null && expressionStr !== void 0 ? expressionStr : ' '))))));
+                    React.createElement(Box, { className: `${QUERY_BUILDER_CLASSNAME}__expression`, minHeight: 48, my: 2, p: 3 }, expressionStr || 'Outputted Expression will display here'))))));
 };

package/src/components/ExpressionEditor/QueryBuilder/QueryBuilderInputs.d.ts

@@ -2,15 +2,20 @@
 import { QlLogicalOperator } from '../../../parser/src/predicate';
 import { ExpressionFunctionInputType } from '../../../parser/src/types';
 import { AdaptableColumn, AdaptableColumnDataType, BooleanFunctionName } from '../../../types';
-export declare const ColumnSelector: (props: {
+export declare const PrimitiveColumnSelector: (props: {
     columnId: string;
     type?: AdaptableColumnDataType;
     onChange: (colId: string) => void;
 }) => JSX.Element;
 export declare const PrimiteValueInput: (props: {
-    type: ExpressionFunctionInputType;
+    inputType: ExpressionFunctionInputType;
     value: any;
     onChange(value: any): void;
+    /**
+     * We use this to retrieve values, we consider only the values
+     * of the column which is selected in lefthand of the expression
+     */
+    lefthandColumnIdParam: string;
 }) => JSX.Element;
 export declare const ExpressionSelector: (props: {
     value: BooleanFunctionName;