@adaptabletools/adaptable-cjs 22.0.1-canary.2 → 22.0.1

package/package.json

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

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -54,7 +54,7 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
             Predicates: [
                 {
                     PredicateId: this.getPredicateApi().internalApi.getEqualityPredicateForDataType(column.dataType),
-                    Inputs: [...new Set([gridCell.rawValue])],
+                    Inputs: [...new Set([gridCell.normalisedValue])],
                 },
             ],
         };

package/src/Redux/Store/AdaptableStore.js

@@ -193,7 +193,9 @@ class AdaptableStore {
             // but having the emitter emit the event here
             // is really useful
             const emitterArg = { action, state, newState };
-            this.emitter.emit(action.type, emitterArg);
+            if (!NON_PERSIST_ACTIONS[action.type]) {
+                this.emitter.emit(action.type, emitterArg);
+            }
             const finalState = emitterArg.newState;
             const shouldPersist = state !== finalState &&
                 didPersistentStateChange(state, finalState) &&
@@ -216,10 +218,26 @@ class AdaptableStore {
             return finalState;
         };
         const beforeEmitterMiddleware = (middlewareAPI) => (next) => (action) => {
-            this.beforeEmitter.emitSync(action.type, {
-                action,
-                state: middlewareAPI.getState(),
-            });
+            if (!NON_PERSIST_ACTIONS[action.type]) {
+                const wasProgressActive = middlewareAPI.getState().Popup?.ProgressIndicator?.active;
+                this.beforeEmitter.emitSync(action.type, {
+                    action,
+                    state: middlewareAPI.getState(),
+                });
+                const isProgressActive = middlewareAPI.getState().Popup?.ProgressIndicator?.active;
+                if (!wasProgressActive && isProgressActive) {
+                    // double rAF: first frame lets React render + ProgressIndicator's
+                    // useEffect schedule its own rAF for setVisible(); second frame
+                    // runs after the browser has actually painted the indicator
+                    // see #raf_progress_indicator
+                    requestAnimationFrame(() => {
+                        requestAnimationFrame(() => {
+                            next(action);
+                        });
+                    });
+                    return action;
+                }
+            }
             return next(action);
         };
         const devToolsActionMarkerMiddleware = createDevToolsActionMarkerMiddleware(adaptable);

package/src/View/Export/ExportViewPanel.js

@@ -33,7 +33,7 @@ const ExportViewPanel = (props) => {
         : 'Are you sure you want to delete this report?';
     const isToolbar = props.viewType === 'Toolbar';
     const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
-    return (React.createElement(Flex_1.Flex, { flexDirection: "row", className: (0, clsx_1.default)(`ab-${elementType}__CellSummary__wrap twa:gap-2 twa:flex-row`, {
+    return (React.createElement(Flex_1.Flex, { flexDirection: "row", className: (0, clsx_1.default)(`ab-${elementType}__CellSummary__wrap twa:gap-1 twa:flex-row`, {
             'twa:min-w-[486px] twa:flex-nowrap': isToolbar,
             'twa:flex-1 twa:flex-wrap': !isToolbar,
         }) },

package/src/View/QuickSearch/QuickSearchInput.js

@@ -21,7 +21,7 @@ const QuickSearchInput = (props) => {
         QuickSearchText,
         onRunQuickSearch,
     });
-    return (react_1.default.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { onClick: props.onClick, "aria-label": 'Quick Search', type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: (0, twMerge_1.twMerge)('ab-QuickSearch__control twa:h-full', props.className), value: searchText, OnTextChange: search, inputClassName: (0, twMerge_1.twMerge)('twa:w-[10rem]', props.inputClassName), actionTools: isServerSideRowModel ? null : (react_1.default.createElement(Flex_1.Flex, { flexDirection: "row", alignItems: "center", className: "twa:flex-none" },
+    return (react_1.default.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { onClick: props.onClick, "aria-label": 'Quick Search', type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: (0, twMerge_1.twMerge)('ab-QuickSearch__control twa:h-full twa:min-h-input', props.className), value: searchText, OnTextChange: search, inputClassName: (0, twMerge_1.twMerge)('twa:w-[10rem]', props.inputClassName), actionTools: isServerSideRowModel ? null : (react_1.default.createElement(Flex_1.Flex, { flexDirection: "row", alignItems: "center", className: "twa:flex-none" },
             react_1.default.createElement(SimpleButton_1.default, { "aria-label": 'Previous Match', icon: "arrow-up", className: "twa:px-0 twa:py-0 twa:mr-1", disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoPreviousMatch() }),
             react_1.default.createElement(SimpleButton_1.default, { "aria-label": 'Next Match', icon: "arrow-down", className: "twa:px-0 twa:py-0 twa:mr-1", disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoNextMatch() }))) }));
 };

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -16,6 +16,7 @@ const UIHelper_1 = require("../UIHelper");
 const react_redux_1 = require("react-redux");
 const Select_1 = require("../../components/Select");
 const Flex_1 = require("../../components/Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 class SmartEditViewPanelComponent extends React.Component {
     cleanupEvent;
     constructor(props) {
@@ -69,15 +70,18 @@ class SmartEditViewPanelComponent extends React.Component {
             !this.props.IsValidSelection ||
             this.props.api.layoutApi.isCurrentLayoutPivot() == true;
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-        return (React.createElement(Flex_1.Flex, { flexDirection: "row", className: `ab-${elementType}__SmartEdit__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
-            React.createElement(Flex_1.Flex, null,
+        return (React.createElement(Flex_1.Flex, { flexDirection: "row", className: (0, clsx_1.default)(`ab-${elementType}__SmartEdit__wrap twa:gap-1 twa:flex-row`, {
+                'twa:flex-nowrap': this.props.viewType === 'Toolbar',
+                'twa:flex-wrap': this.props.viewType !== 'Toolbar',
+            }), flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
+            React.createElement(Flex_1.Flex, { className: "twa:gap-1" },
                 React.createElement(Select_1.Select, { "aria-label": 'Select Smart Edit Operation', value: typeof this.props.SmartEditOperation === 'object'
                         ? this.props.SmartEditOperation.name
-                        : this.props.SmartEditOperation, options: operationMenuItems, onChange: (operation) => this.props.onSmartEditOperationChange(operation), style: { marginRight: 1 } }),
+                        : this.props.SmartEditOperation, options: operationMenuItems, onChange: (operation) => this.props.onSmartEditOperationChange(operation) }),
                 React.createElement(Input_1.default, { style: {
                         width: '5rem',
                     }, className: `ab-${elementType}__SmartEdit__select-value`, value: this.props.SmartEditValue.toString(), type: "number", placeholder: "Enter a Number", step: "any", onChange: (e) => this.onSmartEditValueChange(e), disabled: shouldDisable })),
-            React.createElement(Flex_1.Flex, null,
+            React.createElement(Flex_1.Flex, { className: "twa:gap-1" },
                 !shouldDisable && (React.createElement(ButtonApply_1.ButtonApply, { onClick: () => this.onApplyClick(), style: applyButtonStyle, className: `ab-${elementType}__SmartEdit__apply`, tooltip: "Apply Smart Edit", disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(`${this.props.SmartEditValue}`) ||
                         (this.props.PreviewInfo != null &&
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All'), accessLevel: this.props.accessLevel }, this.props.viewType === 'ToolPanel' && 'Apply Smart Edit')),

package/src/View/StateManagement/StateManagementViewPanel.js

@@ -12,7 +12,7 @@ const Flex_1 = require("../../components/Flex");
 const StateManagementViewPanel = (props) => {
     const isToolbar = props.viewType === 'Toolbar';
     const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
-    return (React.createElement(Flex_1.Flex, { flexDirection: isToolbar ? 'row' : 'column', className: (0, join_1.default)(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__StateManagement__wrap`) },
+    return (React.createElement(Flex_1.Flex, { flexDirection: isToolbar ? 'row' : 'column', className: (0, join_1.default)(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__StateManagement__wrap twa:min-h-input`) },
         React.createElement(Flex_1.Flex, { flexDirection: "row" },
             React.createElement(LoadButton_1.LoadButton, { tooltip: "Load Initial Adaptable State", variant: "text", icon: "upload", onLoad: (json) => props.api.stateApi.reloadInitialState(json), accessLevel: props.accessLevel }, !isToolbar && 'Load'),
             React.createElement(ClearButton_1.ClearButton, { icon: "delete", tooltip: "Clear User State", variant: "text", onClick: () => props.api.stateApi.reloadInitialState(), accessLevel: props.accessLevel }, !isToolbar && 'Clear')),

package/src/View/SystemStatus/SystemStatusViewPanel.js

@@ -16,7 +16,7 @@ class SystemStatusViewPanelComponent extends React.Component {
         const message = currentSystemStatusMessageInfo?.statusMessage;
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(Flex_1.Flex, { alignItems: "stretch", className: `ab-${elementType}__SystemStatus__wrap` },
-            React.createElement(Flex_1.Flex, { style: { color, backgroundColor: message ? background : '' }, className: `ab-${elementType}__SystemStatus__text twa:mr-2 twa:p-2 twa:text-2 twa:rounded-standard`, alignItems: "center", "data-name": "system-status-message" }, message || '0 Messages')));
+            React.createElement(Flex_1.Flex, { style: { color, backgroundColor: message ? background : '' }, className: `ab-${elementType}__SystemStatus__text twa:mr-2 twa:p-2 twa:text-2 twa:rounded-standard twa:min-h-input`, alignItems: "center", "data-name": "system-status-message" }, message || '0 Messages')));
     }
 }
 function mapStateToProps(state) {

package/src/agGrid/AdaptableAgGrid.js

@@ -2213,10 +2213,16 @@ class AdaptableAgGrid {
             return typeof rawValue !== 'string' ? String(rawValue) : rawValue;
         }
         if (dataType === 'number') {
+            if (typeof rawValue === 'number') {
+                return rawValue;
+            }
             // empty string or space should not be converted to 0
-            return typeof rawValue !== 'number' && StringExtensions_1.default.IsNumeric(rawValue)
-                ? Number(rawValue)
-                : rawValue;
+            if (typeof rawValue === 'string') {
+                return StringExtensions_1.default.IsNumeric(rawValue) ? Number(rawValue) : rawValue;
+            }
+            // handle objects with toString() (e.g. from valueGetters)
+            const numValue = Number(rawValue);
+            return isNaN(numValue) ? rawValue : numValue;
         }
         if (dataType === 'boolean') {
             return typeof rawValue !== 'boolean' ? Boolean(rawValue) : rawValue;

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1772181385361 || Date.now(),
-    VERSION: "22.0.1-canary.2" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1772196204253 || Date.now(),
+    VERSION: "22.0.1" || '--current-version--',
 };