@adaptabletools/adaptable-react-aggrid 13.0.0-canary.7 → 13.0.0-canary.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-react-aggrid",
-  "version": "13.0.0-canary.7",
+  "version": "13.0.0-canary.8",
   "description": "React version of AdapTable - the powerful AG Grid add-on that provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [],
   "license": "contact sales@adaptabletools.com for details",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@adaptabletools/adaptable": "13.0.0-canary.7"
+    "@adaptabletools/adaptable": "13.0.0-canary.8"
   },
   "peerDependencies": {
     "@ag-grid-community/core": ">=28.1.0",

package/src/setupFrameworkComponents.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupFrameworkComponents = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const react_dom_1 = require("react-dom");
 const logger_1 = require("./logger");
+const weakMap = new WeakMap();
 const setupFrameworkComponents = (adaptableApi) => {
     adaptableApi.internalApi
         .getAdaptableInstance()
@@ -13,7 +13,10 @@ const setupFrameworkComponents = (adaptableApi) => {
             try {
                 (0, logger_1.LogAdaptableInfo)(`Mounting custom framework component ${componentType}`, containerDomNode);
                 const ReactComponent = frameworkComponent;
-                (0, react_dom_1.render)(React.createElement(ReactComponent, { adaptableApi: adaptableApi }), containerDomNode);
+                const unmount = adaptableApi.internalApi
+                    .getAdaptableInstance()
+                    .renderReactRoot(React.createElement(ReactComponent, { adaptableApi: adaptableApi }), containerDomNode);
+                weakMap.set(containerDomNode, unmount);
             }
             catch (err) {
                 (0, logger_1.LogAdaptableError)(`Cannot correctly mount custom framework component ${componentType}`, err);
@@ -22,7 +25,12 @@ const setupFrameworkComponents = (adaptableApi) => {
         else {
             (0, logger_1.LogAdaptableInfo)(`Unmounting custom framework component  ${componentType}`, containerDomNode);
             try {
-                (0, react_dom_1.unmountComponentAtNode)(containerDomNode);
+                const unmount = weakMap.get(containerDomNode);
+                weakMap.delete(containerDomNode);
+                if (!unmount) {
+                    throw 'Cannot find render root for given node.';
+                }
+                unmount();
             }
             catch (err) {
                 (0, logger_1.LogAdaptableError)(`Cannot correctly unmount custom framework component ${componentType}`, err);