@adaptabletools/adaptable-react-aggrid 18.1.9 → 18.1.11

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@adaptabletools/adaptable-react-aggrid",
-  "version": "18.1.9",
+  "version": "18.1.11",
   "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",
   "typings": "src/index.d.ts",
   "dependencies": {
     "tslib": "^2.3.0",
-    "@adaptabletools/adaptable": "18.1.9"
+    "@adaptabletools/adaptable": "18.1.11"
   },
   "peerDependencies": {
     "@ag-grid-community/core": ">=31.3.1",

package/src/components/AdaptableReact.js

@@ -1,6 +1,6 @@
 import { __rest } from "tslib";
 import * as React from 'react';
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import { _AdaptableAgGrid } from '@adaptabletools/adaptable/agGrid';
 import { setupFrameworkComponents } from '../setupFrameworkComponents';
 import join from '../utils/join';
@@ -10,6 +10,7 @@ const AdaptableReact = (_a) => {
     const seedId = useMemo(() => `${getRandomInt(1000)}-${Date.now()}`, []);
     // TODO: not sure this is used anywhere
     const adaptableContainerId = `adaptable-${seedId}`;
+    const [adaptableJSXElement, setAdaptableJSXElement] = useState(null);
     const containerRef = useMemo(() => {
         let adaptableApi;
         return (node) => {
@@ -24,6 +25,8 @@ const AdaptableReact = (_a) => {
                 })
                     .then((api) => {
                     adaptableApi = api;
+                    //see #no_additional_react_root
+                    setAdaptableJSXElement(api.internalApi.getAdaptableJSXElement());
                     if (onAdaptableReady) {
                         adaptableApi.eventApi.on('AdaptableReady', onAdaptableReady);
                     }
@@ -41,6 +44,6 @@ const AdaptableReact = (_a) => {
             }
         };
     }, []);
-    return (React.createElement("div", { style: props.style, ref: containerRef, id: adaptableContainerId, className: join(props.className, 'ab__react-wrapper') }));
+    return (React.createElement("div", { style: props.style, ref: containerRef, id: adaptableContainerId, className: join(props.className, 'ab__react-wrapper') }, adaptableJSXElement));
 };
 export default AdaptableReact;

package/src/setupFrameworkComponents.js

@@ -7,6 +7,9 @@ export 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()
@@ -19,6 +22,9 @@ export 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);