@adaptabletools/adaptable-react-aggrid-cjs 18.1.8 → 18.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-react-aggrid-cjs",
-  "version": "18.1.8",
+  "version": "18.1.10",
   "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.1.8"
+    "@adaptabletools/adaptable-cjs": "18.1.10"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/src/components/AdaptableReact.js

@@ -12,6 +12,7 @@ const AdaptableReact = (_a) => {
     const seedId = (0, react_1.useMemo)(() => `${getRandomInt(1000)}-${Date.now()}`, []);
     // TODO: not sure this is used anywhere
     const adaptableContainerId = `adaptable-${seedId}`;
+    const [adaptableJSXElement, setAdaptableJSXElement] = (0, react_1.useState)(null);
     const containerRef = (0, react_1.useMemo)(() => {
         let adaptableApi;
         return (node) => {
@@ -26,6 +27,8 @@ const AdaptableReact = (_a) => {
                 })
                     .then((api) => {
                     adaptableApi = api;
+                    //see #no_additional_react_root
+                    setAdaptableJSXElement(api.internalApi.getAdaptableJSXElement());
                     if (onAdaptableReady) {
                         adaptableApi.eventApi.on('AdaptableReady', onAdaptableReady);
                     }
@@ -43,6 +46,6 @@ const AdaptableReact = (_a) => {
             }
         };
     }, []);
-    return (React.createElement("div", { style: props.style, ref: containerRef, id: adaptableContainerId, className: (0, join_1.default)(props.className, 'ab__react-wrapper') }));
+    return (React.createElement("div", { style: props.style, ref: containerRef, id: adaptableContainerId, className: (0, join_1.default)(props.className, 'ab__react-wrapper') }, adaptableJSXElement));
 };
 exports.default = AdaptableReact;

package/src/setupFrameworkComponents.js

@@ -11,6 +11,9 @@ const setupFrameworkComponents = (adaptableApi) => {
         if (command === 'create') {
             try {
                 adaptableApi.logInfo(`Mounting custom framework component ${componentType}`, containerDomNode);
+                if (adaptableApi.gridApi.getVariant() === 'react') {
+                    return;
+                }
                 const ReactComponent = frameworkComponent;
                 const unmount = adaptableApi.internalApi
                     .getAdaptableInstance()
@@ -23,6 +26,9 @@ const setupFrameworkComponents = (adaptableApi) => {
         }
         else {
             adaptableApi.logInfo(`Unmounting custom framework component  ${componentType}`, containerDomNode);
+            if (adaptableApi.gridApi.getVariant() === 'react') {
+                return;
+            }
             try {
                 const unmount = weakMap.get(containerDomNode);
                 weakMap.delete(containerDomNode);