@adaptabletools/adaptable-react-aggrid-cjs 18.0.9 → 18.0.10-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-react-aggrid-cjs",
-  "version": "18.0.9",
+  "version": "18.0.10-canary.1",
   "description": "React version of AdapTable - the powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [],
   "license": "contact sales@adaptabletools.com for details",
@@ -8,7 +8,7 @@
   "typings": "src/index.d.ts",
   "dependencies": {
     "tslib": "^2.3.0",
-    "@adaptabletools/adaptable-cjs": "18.0.9"
+    "@adaptabletools/adaptable-cjs": "18.0.10-canary.1"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/src/components/AdaptableProvider.js

@@ -87,20 +87,22 @@ const AdaptableUI = (props) => {
     if (transition === AdaptableAgGridStateTransitions.AG_GRID_EMIT_PROPS) {
         return null;
     }
-    return (React.createElement(AdaptableReact_1.default, Object.assign({ style: props.style, className: props.className, gridOptions: gridOptions, modules: modules }, adaptableProps)));
+    return (React.createElement(AdaptableReact_1.default
+    // This needs to be first, so gridOptions is the one passed and not from props
+    , Object.assign({}, adaptableProps, { style: props.style, className: props.className, gridOptions: gridOptions, modules: modules })));
 };
 const AdaptableAgGridReact = (props) => {
     const agGridRef = React.useRef(null);
     const { modules, gridOptions, setAgGridApi, transition, setAgGridProps } = useAdaptableAgGridContext();
+    const LIST_OF_PROPS_NOT_ON_GRID_OPTIONS = [
+        'containerStyle',
+        'className',
+        'setGridApi',
+        'componentWrappingElement',
+        'maxComponentCreationTimeMs',
+        'children',
+    ];
     React.useEffect(() => {
-        const LIST_OF_PROPS_NOT_ON_GRID_OPTIONS = [
-            'containerStyle',
-            'className',
-            'setGridApi',
-            'componentWrappingElement',
-            'maxComponentCreationTimeMs',
-            'children',
-        ];
         const agGridProps = Object.keys(props).reduce((acc, key) => {
             if (LIST_OF_PROPS_NOT_ON_GRID_OPTIONS.includes(key)) {
                 return acc;
@@ -109,10 +111,19 @@ const AdaptableAgGridReact = (props) => {
         }, {});
         setAgGridProps(agGridProps);
     }, []);
+    const agGridPassThroughProps = React.useMemo(() => {
+        return LIST_OF_PROPS_NOT_ON_GRID_OPTIONS.reduce((acc, key) => {
+            if (key in props) {
+                // @ts-ignore
+                acc[key] = props[key];
+            }
+            return acc;
+        }, {});
+    }, [props]);
     if (transition !== AdaptableAgGridStateTransitions.INITIALIZE_AG_GRID) {
         return null;
     }
-    return (React.createElement(react_1.AgGridReact, Object.assign({ ref: agGridRef }, props, { modules: modules, onGridReady: (event) => {
+    return (React.createElement(react_1.AgGridReact, Object.assign({ ref: agGridRef }, agGridPassThroughProps, { modules: modules, onGridReady: (event) => {
             setAgGridApi(event.api);
             if (props.onGridReady) {
                 props.onGridReady(event);