@adaptabletools/adaptable 10.0.4-canary.3 → 10.0.4-canary.4

package/index.css

@@ -801,25 +801,33 @@ template {
   --rdp-background-color-dark: #180270;
   /* Outline border for focused elements */
   --rdp-outline: 2px solid var(--rdp-accent-color);
+  /* Outline border for focused and selected elements */
+  --rdp-outline-selected: 2px solid rgba(0, 0, 0, 0.75);
 }
 
 .rdp {
-  display: inline-block;
-  font-size: 1rem;
   margin: 1em;
 }
 
 /* Hide elements for devices that are not screen readers */
 
 .rdp-vhidden {
-  border: 0;
-  clip: rect(1px, 1px, 1px, 1px);
-  height: 1px;
-  overflow: hidden;
+  box-sizing: border-box;
   padding: 0;
-  position: absolute;
+  margin: 0;
+  background: transparent;
+  border: 0;
+  -moz-appearance: none;
+  -webkit-appearance: none;
+  appearance: none;
+  position: absolute !important;
   top: 0;
-  width: 1px;
+  width: 1px !important;
+  height: 1px !important;
+  padding: 0 !important;
+  overflow: hidden !important;
+  clip: rect(1px, 1px, 1px, 1px) !important;
+  border: 0 !important
 }
 
 /* Buttons */
@@ -928,14 +936,14 @@ template {
   white-space: nowrap;
 }
 
-.rdp-multiple_months .rdp-caption_first .rdp-nav {
+.rdp-multiple_months .rdp-caption_start .rdp-nav {
   position: absolute;
   top: 50%;
   left: 0;
   transform: translateY(-50%);
 }
 
-.rdp-multiple_months .rdp-caption_last .rdp-nav {
+.rdp-multiple_months .rdp-caption_end .rdp-nav {
   position: absolute;
   top: 50%;
   right: 0;
@@ -989,8 +997,8 @@ template {
   color: unset;
 }
 
-.rdp-dropdown:focus:not([disabled]) + .rdp-caption_label,
-.rdp-dropdown:active:not([disabled]) + .rdp-caption_label {
+.rdp-dropdown:focus:not([disabled])+.rdp-caption_label,
+.rdp-dropdown:active:not([disabled])+.rdp-caption_label {
   border: var(--rdp-outline);
   border-radius: 6px;
   background-color: var(--rdp-background-color);
@@ -1067,16 +1075,30 @@ template {
   background-color: var(--rdp-accent-color);
 }
 
-.rdp-day_range_start {
+.rdp-day_selected:focus:not([disabled]) {
+  border: var(--rdp-outline-selected);
+}
+
+.rdp:not([dir='rtl']) .rdp-day_range_start:not(.rdp-day_range_end) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
 
-.rdp-day_range_end {
+.rdp:not([dir='rtl']) .rdp-day_range_end:not(.rdp-day_range_start) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.rdp[dir='rtl'] .rdp-day_range_start:not(.rdp-day_range_end) {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
 
+.rdp[dir='rtl'] .rdp-day_range_end:not(.rdp-day_range_start) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
 .rdp-day_range_end.rdp-day_range_start {
   border-radius: 100%;
 }
@@ -1085,12 +1107,54 @@ template {
   border-radius: 0;
 }
 
+:root {
+  --toastify-color-light: #fff;
+  --toastify-color-dark: #121212;
+  --toastify-color-info: #3498db;
+  --toastify-color-success: #07bc0c;
+  --toastify-color-warning: #f1c40f;
+  --toastify-color-error: #e74c3c;
+  --toastify-color-transparent: rgba(255, 255, 255, 0.7);
+  --toastify-icon-color-info: var(--toastify-color-info);
+  --toastify-icon-color-success: var(--toastify-color-success);
+  --toastify-icon-color-warning: var(--toastify-color-warning);
+  --toastify-icon-color-error: var(--toastify-color-error);
+  --toastify-toast-width: 320px;
+  --toastify-toast-background: #fff;
+  --toastify-toast-min-height: 64px;
+  --toastify-toast-max-height: 800px;
+  --toastify-font-family: sans-serif;
+  --toastify-z-index: 9999;
+  --toastify-text-color-light: #757575;
+  --toastify-text-color-dark: #fff;
+  --toastify-text-color-info: #fff;
+  --toastify-text-color-success: #fff;
+  --toastify-text-color-warning: #fff;
+  --toastify-text-color-error: #fff;
+  --toastify-spinner-color: #616161;
+  --toastify-spinner-color-empty-area: #e0e0e0;
+  --toastify-color-progress-light: linear-gradient(
+    to right,
+    #4cd964,
+    #5ac8fa,
+    #007aff,
+    #34aadc,
+    #5856d6,
+    #ff2d55
+  );
+  --toastify-color-progress-dark: #bb86fc;
+  --toastify-color-progress-info: var(--toastify-color-info);
+  --toastify-color-progress-success: var(--toastify-color-success);
+  --toastify-color-progress-warning: var(--toastify-color-warning);
+  --toastify-color-progress-error: var(--toastify-color-error);
+}
+
 .Toastify__toast-container {
-  z-index: 9999;
-  -webkit-transform: translate3d(0, 0, 9999px);
+  z-index: var(--toastify-z-index);
+  -webkit-transform: translate3d(0, 0, var(--toastify-z-index) px);
   position: fixed;
   padding: 4px;
-  width: 320px;
+  width: var(--toastify-toast-width);
   box-sizing: border-box;
   color: #fff;
 }
@@ -1150,7 +1214,7 @@ template {
 
 .Toastify__toast {
   position: relative;
-  min-height: 64px;
+  min-height: var(--toastify-toast-min-height);
   box-sizing: border-box;
   margin-bottom: 1rem;
   padding: 8px;
@@ -1160,9 +1224,9 @@ template {
   display: flex;
   -ms-flex-pack: justify;
       justify-content: space-between;
-  max-height: 800px;
+  max-height: var(--toastify-toast-max-height);
   overflow: hidden;
-  font-family: sans-serif;
+  font-family: var(--toastify-font-family);
   cursor: pointer;
   direction: ltr;
 }
@@ -1171,37 +1235,30 @@ template {
   direction: rtl;
 }
 
-.Toastify__toast--dark {
-  background: #121212;
-  color: #fff;
-}
-
-.Toastify__toast--default {
-  background: #fff;
-  color: #aaa;
-}
-
-.Toastify__toast--info {
-  background: #3498db;
-}
-
-.Toastify__toast--success {
-  background: #07bc0c;
-}
-
-.Toastify__toast--warning {
-  background: #f1c40f;
-}
-
-.Toastify__toast--error {
-  background: #e74c3c;
-}
-
 .Toastify__toast-body {
   margin: auto 0;
   -ms-flex: 1 1 auto;
       flex: 1 1 auto;
   padding: 6px;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-align: center;
+      align-items: center;
+}
+
+.Toastify__toast-body > div:last-child {
+  -ms-flex: 1;
+      flex: 1;
+}
+
+.Toastify__toast-icon {
+  -webkit-margin-end: 10px;
+          margin-inline-end: 10px;
+  width: 20px;
+  -ms-flex-negative: 0;
+      flex-shrink: 0;
+  display: -ms-flexbox;
+  display: flex;
 }
 
 .Toastify--animate {
@@ -1209,6 +1266,11 @@ template {
   animation-duration: 0.7s;
 }
 
+.Toastify--animate-icon {
+  animation-fill-mode: both;
+  animation-duration: 0.3s;
+}
+
 @media only screen and (max-width : 480px) {
   .Toastify__toast {
     margin-bottom: 0;
@@ -1216,6 +1278,69 @@ template {
   }
 }
 
+.Toastify__toast-theme--dark {
+  background: var(--toastify-color-dark);
+  color: var(--toastify-text-color-dark);
+}
+
+.Toastify__toast-theme--light {
+  background: var(--toastify-color-light);
+  color: var(--toastify-text-color-light);
+}
+
+.Toastify__toast-theme--colored.Toastify__toast--default {
+  background: var(--toastify-color-light);
+  color: var(--toastify-text-color-light);
+}
+
+.Toastify__toast-theme--colored.Toastify__toast--info {
+  color: var(--toastify-text-color-info);
+  background: var(--toastify-color-info);
+}
+
+.Toastify__toast-theme--colored.Toastify__toast--success {
+  color: var(--toastify-text-color-success);
+  background: var(--toastify-color-success);
+}
+
+.Toastify__toast-theme--colored.Toastify__toast--warning {
+  color: var(--toastify-text-color-warning);
+  background: var(--toastify-color-warning);
+}
+
+.Toastify__toast-theme--colored.Toastify__toast--error {
+  color: var(--toastify-text-color-error);
+  background: var(--toastify-color-error);
+}
+
+.Toastify__progress-bar-theme--light {
+  background: var(--toastify-color-progress-light);
+}
+
+.Toastify__progress-bar-theme--dark {
+  background: var(--toastify-color-progress-dark);
+}
+
+.Toastify__progress-bar--info {
+  background: var(--toastify-color-progress-info);
+}
+
+.Toastify__progress-bar--success {
+  background: var(--toastify-color-progress-success);
+}
+
+.Toastify__progress-bar--warning {
+  background: var(--toastify-color-progress-warning);
+}
+
+.Toastify__progress-bar--error {
+  background: var(--toastify-color-progress-error);
+}
+
+.Toastify__progress-bar-theme--colored.Toastify__progress-bar--info, .Toastify__progress-bar-theme--colored.Toastify__progress-bar--success, .Toastify__progress-bar-theme--colored.Toastify__progress-bar--warning, .Toastify__progress-bar-theme--colored.Toastify__progress-bar--error {
+  background: var(--toastify-color-transparent);
+}
+
 .Toastify__close-button {
   color: #fff;
   background: transparent;
@@ -1229,7 +1354,7 @@ template {
       align-self: flex-start;
 }
 
-.Toastify__close-button--default {
+.Toastify__close-button--light {
   color: #000;
   opacity: 0.3;
 }
@@ -1259,9 +1384,8 @@ template {
   left: 0;
   width: 100%;
   height: 5px;
-  z-index: 9999;
+  z-index: var(--toastify-z-index);
   opacity: 0.7;
-  background-color: rgba(255, 255, 255, 0.7);
   transform-origin: left;
 }
 
@@ -1279,12 +1403,15 @@ template {
   transform-origin: right;
 }
 
-.Toastify__progress-bar--default {
-  background: linear-gradient(to right, #4cd964, #5ac8fa, #007aff, #34aadc, #5856d6, #ff2d55);
-}
-
-.Toastify__progress-bar--dark {
-  background: #bb86fc;
+.Toastify__spinner {
+  width: 20px;
+  height: 20px;
+  box-sizing: border-box;
+  border: 2px solid;
+  border-radius: 100%;
+  border-color: var(--toastify-spinner-color-empty-area);
+  border-right-color: var(--toastify-spinner-color);
+  animation: Toastify__spin 0.65s linear infinite;
 }
 
 @keyframes Toastify__bounceInRight {
@@ -1648,6 +1775,15 @@ template {
   animation-name: Toastify__slideOutDown;
 }
 
+@keyframes Toastify__spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
 :root {
   --ab-space-0: 0px;
   --ab-space-1: 4px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "10.0.4-canary.3",
+  "version": "10.0.4-canary.4",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -14,11 +14,11 @@
     "prop-types": "^15.6.2",
     "react": ">=16.8.0",
     "react-beautiful-dnd": "13.1.0",
-    "react-day-picker": "8.0.0-beta.29",
+    "react-day-picker": "8.0.0-beta.36",
     "react-dom": ">=16.8.0",
     "react-redux": "7.2.4",
     "react-remove-scroll": "2.4.2",
-    "react-toastify": "^7.0.4",
+    "react-toastify": "8.1.0",
     "rebass": "^3.2.2",
     "redux": "4.0.5",
     "rxjs": "6.6.7",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1641807144241;
+declare const _default: 1642430147795;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1641807144241;
+exports.default = 1642430147795;

package/src/Api/Implementation/ColumnApiImpl.js

@@ -276,7 +276,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, false);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
-            return cv.displayValue;
+            return cv.normalisedValue;
         });
     }
     async getDistinctFilterDisplayValuesForColumn(columnId, filter) {
@@ -290,7 +290,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, false, filter);
         return {
             values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-                return cv.displayValue;
+                return cv.normalisedValue;
             }),
             suppressClientSideFilter,
         };
@@ -302,7 +302,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         const gridCells = await this.adaptable.getDistinctCustomSortValuesForColumn(abColumn, false);
         return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-            return cv.displayValue;
+            return cv.normalisedValue;
         });
     }
     async getDistinctBulkUpdateDisplayValuesForColumn(columnId, selectedGridCells) {
@@ -312,7 +312,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         const gridCells = await this.adaptable.getDistinctBulkUpdateValuesForColumn(abColumn, false, selectedGridCells);
         return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-            return cv.displayValue;
+            return cv.normalisedValue;
         });
     }
     getDistinctVisibleDisplayValuesForColumn(columnId) {
@@ -322,7 +322,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, true);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
-            return cv.displayValue;
+            return cv.normalisedValue;
         });
     }
     getDistinctRawValuesForColumn(columnId, skipRowNode) {

package/src/Api/Implementation/FilterApiImpl.js

@@ -174,7 +174,7 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, {
             value: gridCell.normalisedValue,
             oldValue: null,
-            displayValue: gridCell.displayValue,
+            displayValue: gridCell.normalisedValue,
             node,
             column,
         }, true);

package/src/PredefinedConfig/Common/AdaptableScope.d.ts

@@ -2,8 +2,8 @@ export declare type ScopeDataType = 'String' | 'Number' | 'Boolean' | 'Date';
 export declare type ScopeAll = {
     All: true;
 };
-export declare type ScopeDataTypes = {
-    DataTypes: ScopeDataType[];
+export declare type ScopeDataTypes<Type = ScopeDataType> = {
+    DataTypes: Type[];
 };
 export declare type ScopeColumnIds = {
     ColumnIds: string[];
@@ -11,4 +11,4 @@ export declare type ScopeColumnIds = {
 /**
  * Defines where a given Object / Module is active
  */
-export declare type AdaptableScope = ScopeAll | ScopeDataTypes | ScopeColumnIds;
+export declare type AdaptableScope<Type = ScopeDataType> = ScopeAll | ScopeDataTypes<Type> | ScopeColumnIds;

package/src/PredefinedConfig/ShortcutState.d.ts

@@ -10,6 +10,10 @@ export interface ShortcutState extends ConfigState {
      */
     Shortcuts?: Shortcut[];
 }
+/**
+ * Shortcut scope data type.
+ */
+export declare type ShortcutScopeDataType = 'Number';
 /**
  * Used to define a Shortcut as used in Shortcut State
  */
@@ -17,7 +21,7 @@ export interface Shortcut extends SuspendableObject {
     /**
      * On which numeric Columns the Rule is applied
      */
-    Scope: AdaptableScope;
+    Scope: AdaptableScope<ShortcutScopeDataType>;
     /**
      * Key which triggers the Shortcut when pressed
      */

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -92,7 +92,10 @@ exports.scalarExpressionFunctions = {
             if (!column.queryable) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not queryable`);
             }
-            return (_b = context.api) === null || _b === void 0 ? void 0 : _b.gridApi.getNormalisedValueFromRowNode(context.node, columnId);
+            // return context.api?.gridApi.getNormalisedValueFromRowNode(context.node, columnId);
+            // const gridCell = context.api?.gridApi.getGridCellFromRowNode(context.node, columnId);
+            // return gridCell.rawValue;
+            return (_b = context.api) === null || _b === void 0 ? void 0 : _b.gridApi.getRawValueFromRowNode(context.node, columnId);
         },
         description: 'Returns the value of a column',
         signatures: ['[colName]', 'COL(name: string)'],

package/src/Utilities/ObjectFactory.d.ts

@@ -26,9 +26,9 @@ import { Reminder, ReminderSchedule } from '../PredefinedConfig/ScheduleState';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
 import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
-import { ToastOptions } from '../components/Toastify';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
+import { ToastOptions } from 'react-toastify';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateEmptyDataSource(): DataSource;
 export declare function CreateEmptyPieChartDefinition(): PieChartDefinition;

package/src/Utilities/ObjectFactory.js

@@ -8,7 +8,7 @@ const DefaultPieChartProperties_1 = require("./Defaults/DefaultPieChartPropertie
 const DefaultCategoryChartProperties_1 = require("./Defaults/DefaultCategoryChartProperties");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
 const DefaultSparklinesChartProperties_1 = require("./Defaults/DefaultSparklinesChartProperties");
-const Toastify_1 = require("../components/Toastify");
+const react_toastify_1 = require("react-toastify");
 function CreateEmptyCustomSort() {
     return { Uuid: Uuid_1.createUuid(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
 }
@@ -434,29 +434,29 @@ exports.CreateToastOptions = CreateToastOptions;
 function getToastPosition(position) {
     switch (position) {
         case 'BottomLeft':
-            return Toastify_1.toast.POSITION.BOTTOM_LEFT;
+            return react_toastify_1.toast.POSITION.BOTTOM_LEFT;
         case 'BottomCenter':
-            return Toastify_1.toast.POSITION.BOTTOM_CENTER;
+            return react_toastify_1.toast.POSITION.BOTTOM_CENTER;
         case 'BottomRight':
-            return Toastify_1.toast.POSITION.BOTTOM_RIGHT;
+            return react_toastify_1.toast.POSITION.BOTTOM_RIGHT;
         case 'TopLeft':
-            return Toastify_1.toast.POSITION.TOP_LEFT;
+            return react_toastify_1.toast.POSITION.TOP_LEFT;
         case 'TopCenter':
-            return Toastify_1.toast.POSITION.TOP_CENTER;
+            return react_toastify_1.toast.POSITION.TOP_CENTER;
         case 'TopRight':
-            return Toastify_1.toast.POSITION.TOP_RIGHT;
+            return react_toastify_1.toast.POSITION.TOP_RIGHT;
     }
 }
 function getToastTransition(transition) {
     switch (transition) {
         case 'Bounce':
-            return Toastify_1.Bounce;
+            return react_toastify_1.Bounce;
         case 'Slide':
-            return Toastify_1.Slide;
+            return react_toastify_1.Slide;
         case 'Zoom':
-            return Toastify_1.Zoom;
+            return react_toastify_1.Zoom;
         case 'Flip':
-            return Toastify_1.Flip;
+            return react_toastify_1.Flip;
     }
 }
 exports.ObjectFactory = {

package/src/View/AdaptableView.js

@@ -13,11 +13,11 @@ const AdaptablePopupConfirmation_1 = require("./Components/Popups/AdaptablePopup
 const AdaptableChart_1 = require("./Components/Popups/AdaptableChart");
 const ChartEnums_1 = require("../PredefinedConfig/Common/ChartEnums");
 const AdaptableLoadingScreen_1 = require("./Components/Popups/AdaptableLoadingScreen");
-const Toastify_1 = require("../components/Toastify");
 const renderWithAdaptableContext_1 = require("./renderWithAdaptableContext");
 const License_1 = require("./License");
 const ExportCustomDestinationFormPopups_1 = require("./Export/ExportCustomDestinationFormPopups");
 const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressIndicator");
+const react_toastify_1 = require("react-toastify");
 class AdaptableView extends React.Component {
     render() {
         var _a, _b, _c, _d, _e;
@@ -30,8 +30,8 @@ class AdaptableView extends React.Component {
             React.createElement(AdaptablePopupConfirmation_1.AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi }),
             React.createElement(AdaptablePopup_1.AdaptablePopup, { showModal: this.props.PopupState.ScreenPopup.ShowScreenPopup, componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps }),
             React.createElement(ExportCustomDestinationFormPopups_1.ExportCustomDestinationFormPopups, { api: this.props.AdaptableApi }),
-            React.createElement(Toastify_1.ToastContainer, { limit: this.props.AdaptableApi.internalApi.getAdaptableOptions().notificationsOptions
-                    .maxNotifications, closeButton: false }),
+            React.createElement(react_toastify_1.ToastContainer, { limit: this.props.AdaptableApi.internalApi.getAdaptableOptions().notificationsOptions
+                    .maxNotifications, closeButton: false, icon: false }),
             (watermark === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(License_1.LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
             React.createElement(ProgressIndicator_1.ProgressIndicator, null)));
     }

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

@@ -82,7 +82,10 @@ class FilterFormComponent extends React.Component {
             : 'values';
     }
     static getDerivedStateFromProps(props, state) {
-        const editedColumnFilter = FilterFormComponent.createColumnFilterFromProps(props);
+        const filterOptions = props.api.internalApi.getAdaptableOptions().filterOptions;
+        const editedColumnFilter = filterOptions.autoApplyFilter
+            ? FilterFormComponent.createColumnFilterFromProps(props)
+            : state.editedColumnFilter;
         let columnFilters = state.columnFilters;
         let filtersChanged = false;
         if (props.columnFilters !== columnFilters) {

package/src/View/Components/Popups/AdaptableToaster.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.showToast = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const Toastify_1 = require("../../../components/Toastify");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const AdaptablePopupAlert_1 = require("./AdaptablePopupAlert");
+const react_toastify_1 = require("react-toastify");
 exports.showToast = (props) => {
     const toastProps = ObjectFactory_1.default.CreateToastOptions(props.api.internalApi.getAdaptableOptions().notificationsOptions, {
         onClose: () => {
@@ -13,21 +13,21 @@ exports.showToast = (props) => {
         },
     });
     const content = (React.createElement(AdaptablePopupAlert_1.AdaptablePopupAlert, Object.assign({ headless: true }, props, { onClose: () => {
-            Toastify_1.toast.dismiss(toastId);
+            react_toastify_1.toast.dismiss(toastId);
         } })));
     let toastId;
     switch (props.adaptableAlert.alertDefinition.MessageType) {
         case 'Info':
-            toastId = Toastify_1.toast.info(content, toastProps);
+            toastId = react_toastify_1.toast.info(content, toastProps);
             break;
         case 'Error':
-            toastId = Toastify_1.toast.error(content, toastProps);
+            toastId = react_toastify_1.toast.error(content, toastProps);
             break;
         case 'Success':
-            toastId = Toastify_1.toast.success(content, toastProps);
+            toastId = react_toastify_1.toast.success(content, toastProps);
             break;
         case 'Warning':
-            toastId = Toastify_1.toast.warn(content, toastProps);
+            toastId = react_toastify_1.toast.warn(content, toastProps);
             break;
     }
 };

package/src/View/License/LicenseWatermark.js

@@ -12,6 +12,8 @@ const style = {
     margin: '5px',
     fontSize: '14px',
     alignItems: 'center',
+    color: 'var(--ab-color-text-on-defaultbackground)',
+    background: 'var(--ab-color-defaultbackground)',
 };
 const isStyleValid = (element) => {
     const notAllowedProperties = [
@@ -46,6 +48,8 @@ exports.LicenseWatermark = (props) => {
                 ref.current.style.fontWeight = `${style.fontWeight}`;
                 ref.current.style.margin = style.margin;
                 ref.current.style.fontSize = style.fontSize;
+                ref.current.style.color = style.color;
+                ref.current.style.background = style.background;
                 ref.current.style.display = 'flex';
                 ref.current.style.position = 'static';
                 ref.current.style.opacity = '1';