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

package/package.json

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

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1697536428665;
+declare const _default: 1697637650202;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/DataImportOptions.d.ts

@@ -19,6 +19,16 @@ export interface DataImportOptions<T = Record<string, unknown>> {
      * Function to apply the Import (instead of AdapTable)
      */
     applyImport?: (context: DataImportApplyImportContext<T>) => void;
+    /**
+     * Function to preprocess the data before it is imported
+     */
+    preprocessData?: (context: PreprocessDataContext<T>) => Record<string, unknown>[];
+}
+export interface PreprocessDataContext<T = Record<string, unknown>> extends BaseContext {
+    /**
+     * Data which has been imported
+     */
+    data: T[];
 }
 /**
  * Context used when importing Data

package/src/Api/Internal/DataImportInternalApi.js

@@ -7,15 +7,19 @@ const ApiBase_1 = require("../Implementation/ApiBase");
 class DataImportInternalApi extends ApiBase_1.ApiBase {
     async importData(partialRows) {
         const dataImportOptions = this.getOptions().dataImportOptions;
+        let importData = partialRows;
+        if (typeof dataImportOptions.preprocessData === 'function') {
+            importData = dataImportOptions.preprocessData(Object.assign({ data: partialRows }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
+        }
         if (dataImportOptions.applyImport) {
-            dataImportOptions.applyImport(Object.assign({ data: partialRows }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
+            dataImportOptions.applyImport(Object.assign({ data: importData }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
             return;
         }
         const gridApi = this.getGridApi();
         const primaryKey = this.getOptions().primaryKey;
         let newRows = 0;
         let updatedRows = 0;
-        const preparedDataRows = partialRows.map((dataRow) => {
+        const preparedDataRows = importData.map((dataRow) => {
             const node = gridApi.getRowNodeForPrimaryKey(dataRow[primaryKey]);
             if (!node) {
                 newRows += 1;

package/src/View/Components/ExternalRenderer.d.ts

@@ -7,6 +7,7 @@ interface ExternalRendererProps {
     render?: Render;
     frameworkComponent?: AdaptableFrameworkComponent;
     onDestroy?: () => void;
+    style?: React.CSSProperties;
 }
 export declare const ExternalRenderer: React.FunctionComponent<ExternalRendererProps>;
 export {};

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

@@ -23,25 +23,29 @@ const WindowPopups = () => {
     return (React.createElement(React.Fragment, null, windowItems === null || windowItems === void 0 ? void 0 : windowItems.map((windowItem) => {
         var _a, _b, _c, _d, _e, _f;
         let Component = (_a = windowFactory_1.windowFactory[windowItem.FactoryId]) !== null && _a !== void 0 ? _a : null;
-        if (!Component &&
-            (windowItem.PopupProps.render || windowItem.PopupProps.frameworkComponent)) {
-            // check if it is custom window
-            Component = () => (React.createElement(ExternalRenderer_1.ExternalRenderer, { render: windowItem.PopupProps.render, frameworkComponent: windowItem.PopupProps.frameworkComponent, onDestroy: windowItem.PopupProps.onFrameworkComponentDestroyed }));
-        }
-        else {
-            Component = Component !== null && Component !== void 0 ? Component : NoopComponent;
-        }
         const _g = (_b = windowItem === null || windowItem === void 0 ? void 0 : windowItem.PopupProps) !== null && _b !== void 0 ? _b : {}, { windowModalProps } = _g, restPopupProps = tslib_1.__rest(_g, ["windowModalProps"]);
         const handleDismiss = () => {
             dispatch((0, PopupRedux_1.PopupHideWindow)(windowItem.Id));
         };
         const size = (_d = (_c = windowModalSettings === null || windowModalSettings === void 0 ? void 0 : windowModalSettings[windowItem.Id]) === null || _c === void 0 ? void 0 : _c.size) !== null && _d !== void 0 ? _d : (0, Utilities_1.getWindowPopupSize)();
         const position = (_f = (_e = windowModalSettings === null || windowModalSettings === void 0 ? void 0 : windowModalSettings[windowItem.Id]) === null || _e === void 0 ? void 0 : _e.position) !== null && _f !== void 0 ? _f : (0, Utilities_1.getMiddlePosition)(size);
+        let componentNode = null;
+        if (!Component &&
+            (windowItem.PopupProps.render || windowItem.PopupProps.frameworkComponent)) {
+            componentNode = (React.createElement(ExternalRenderer_1.ExternalRenderer
+            // TODO AFL: add configurable width&height for custom popups
+            , { 
+                // TODO AFL: add configurable width&height for custom popups
+                style: { height: '100%' }, render: windowItem.PopupProps.render, frameworkComponent: windowItem.PopupProps.frameworkComponent, onDestroy: windowItem.PopupProps.onFrameworkComponentDestroyed }));
+        }
+        else {
+            Component = Component !== null && Component !== void 0 ? Component : NoopComponent;
+            componentNode = (React.createElement(Component, { api: adaptable.api, onDismiss: handleDismiss, popupProps: restPopupProps }));
+        }
         return (React.createElement(Dialog_1.default, { "data-name": windowItem.Id, style: { height: '100%' }, className: "ab-Window-Modal", key: windowItem.Id, windowModal: true, windowModalProps: Object.assign(Object.assign({}, windowModalProps), { onChange: (settings) => {
                     setWindowModalSettings((settingsMap) => (Object.assign(Object.assign({}, settingsMap), { [windowItem.Id]: settings })));
                 }, handleSelector: '.ab-Window-Modal .ab-Panel__header', size: size, position: position }), fixed: false, padding: 0, onDismiss: handleDismiss, isOpen: true, showCloseButton: true },
-            React.createElement(PanelWithImage_1.PanelWithImage, { style: { height: '100%' }, bodyProps: { padding: 0, height: '100%' }, header: windowItem.Title, glyphicon: windowItem.Icon, variant: "primary" },
-                React.createElement(Component, { api: adaptable.api, onDismiss: handleDismiss, popupProps: restPopupProps }))));
+            React.createElement(PanelWithImage_1.PanelWithImage, { style: { height: '100%' }, bodyProps: { padding: 0, height: '100%' }, header: windowItem.Title, glyphicon: windowItem.Icon, variant: "primary" }, componentNode)));
     })));
 };
 exports.WindowPopups = WindowPopups;