@revolist/react-datagrid 4.23.5 → 4.23.6

package/dist/index.d.ts

@@ -44,17 +44,11 @@ export declare type EditorType = {
 
 export declare interface ReactElement extends HTMLElement {
     _root?: Root;
-    _renderedComponent?: RenderedComponent<any>;
-    _templateComponent?: ComponentType<any>;
-    _templateKey?: string;
 }
 
 export declare interface RenderedComponent<T> {
-    el: ReactElement;
     update: (newProps: T) => void;
     destroy: () => void;
-    scheduleDestroy: () => void;
-    cancelDestroy: () => void;
 }
 
 export declare const RevoGrid: ForwardRefExoticComponent<JSX_2.RevoGrid & Omit<HTMLAttributes<HTMLRevoGridElement>, "style"> & StyleReactProps & RefAttributes<HTMLRevoGridElement>>;

package/dist/react-datagrid.js

@@ -5,7 +5,6 @@ import { defineCustomElements } from "@revolist/revogrid/loader";
 export * from "@revolist/revogrid/loader";
 export * from "@revolist/revogrid";
 import { createRoot } from "react-dom/client";
-import { flushSync } from "react-dom";
 import React, { createElement } from "react";
 import { jsx } from "react/jsx-runtime";
 const dashToPascalCase = (str) => str.toLowerCase().split("-").map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1)).join("");
@@ -169,85 +168,40 @@ const createReactComponent = (tagName, ReactComponentContext, manipulatePropsFun
   };
   return createForwardRef(ReactComponent, displayName);
 };
-function TemplateConstructor(el, ReactComponent, initialProps, key, lastEl = null) {
-  if (!el) {
-    lastEl == null ? void 0 : lastEl.scheduleDestroy();
-    return lastEl;
-  }
-  if (lastEl && lastEl.el !== el) {
-    lastEl.destroy();
-  }
-  if (!el._root) {
-    el._root = createRoot(el);
-  }
-  const renderedComponent = el._renderedComponent;
-  if (renderedComponent && el._templateComponent === ReactComponent && el._templateKey === key) {
-    renderedComponent.cancelDestroy();
-    renderedComponent.update(initialProps);
-    return renderedComponent;
-  }
-  renderedComponent == null ? void 0 : renderedComponent.destroy();
+function TemplateConstructor(el, ReactComponent, initialProps, key) {
   if (!el._root) {
     el._root = createRoot(el);
   }
-  const root = el._root;
-  let destroyFrame = null;
-  let destroyed = false;
   const renderComponent = (props) => {
+    var _a;
     const vNode = createElement(ReactComponent, { ...props, key });
-    flushSync(() => {
-      root.render(vNode);
-    });
+    (_a = el._root) == null ? void 0 : _a.render(vNode);
   };
   renderComponent(initialProps);
   const update = (newProps) => {
     renderComponent(newProps);
   };
   const destroy = () => {
-    if (destroyed) return;
-    destroyed = true;
-    if (destroyFrame !== null) {
-      cancelAnimationFrame(destroyFrame);
-      destroyFrame = null;
-    }
-    root.unmount();
-    if (el._root === root) {
-      el._root = void 0;
-      el._renderedComponent = void 0;
-      el._templateComponent = void 0;
-      el._templateKey = void 0;
-    }
-  };
-  const scheduleDestroy = () => {
-    if (destroyFrame !== null) return;
-    destroyFrame = requestAnimationFrame(() => {
-      destroyFrame = null;
-      if (el.isConnected && el._renderedComponent === component) {
-        return;
-      }
-      destroy();
-    });
-  };
-  const cancelDestroy = () => {
-    if (destroyFrame === null) return;
-    cancelAnimationFrame(destroyFrame);
-    destroyFrame = null;
+    var _a;
+    (_a = el._root) == null ? void 0 : _a.unmount();
+    el._root = void 0;
   };
-  const component = { el, update, destroy, scheduleDestroy, cancelDestroy };
-  el._renderedComponent = component;
-  el._templateComponent = ReactComponent;
-  el._templateKey = key;
-  return component;
+  return { update, destroy };
 }
 const Template = (ReactComponent, customProps) => {
   return (h, p, addition) => {
-    const props = customProps ? { ...customProps, ...p, addition } : { ...p, addition };
+    const props = customProps ? { ...customProps, ...p } : p;
+    props.addition = addition;
     const key = `${p.prop}-${p.rowIndex || 0}`;
     let lastEl = null;
     return h("span", {
-      key,
       ref: (el) => {
-        lastEl = TemplateConstructor(el, ReactComponent, props, key, lastEl);
+        var _a;
+        if (!el) {
+          (_a = lastEl == null ? void 0 : lastEl.destroy) == null ? void 0 : _a.call(lastEl);
+        } else {
+          lastEl = TemplateConstructor(el, ReactComponent, props, key);
+        }
       }
     });
   };

package/dist/react-datagrid.umd.cjs

@@ -1,6 +1,6 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@revolist/revogrid/loader"), require("@revolist/revogrid"), require("react-dom/client"), require("react-dom"), require("react"), require("react/jsx-runtime")) : typeof define === "function" && define.amd ? define(["exports", "@revolist/revogrid/loader", "@revolist/revogrid", "react-dom/client", "react-dom", "react", "react/jsx-runtime"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.ReactDatagrid = {}, global.RevogridLoader, global.Revogrid, global.ReactDOM, global.ReactDOM, global.React, global.ReactJSXR));
-})(this, function(exports2, loader, revogrid, client, ReactDOM, React, jsxRuntime) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@revolist/revogrid/loader"), require("@revolist/revogrid"), require("react-dom/client"), require("react"), require("react/jsx-runtime")) : typeof define === "function" && define.amd ? define(["exports", "@revolist/revogrid/loader", "@revolist/revogrid", "react-dom/client", "react", "react/jsx-runtime"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.ReactDatagrid = {}, global.RevogridLoader, global.Revogrid, global.ReactDOM, global.React, global.ReactJSXR));
+})(this, function(exports2, loader, revogrid, client, React, jsxRuntime) {
   "use strict";var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -166,85 +166,40 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     };
     return createForwardRef(ReactComponent, displayName);
   };
-  function TemplateConstructor(el, ReactComponent, initialProps, key, lastEl = null) {
-    if (!el) {
-      lastEl == null ? void 0 : lastEl.scheduleDestroy();
-      return lastEl;
-    }
-    if (lastEl && lastEl.el !== el) {
-      lastEl.destroy();
-    }
-    if (!el._root) {
-      el._root = client.createRoot(el);
-    }
-    const renderedComponent = el._renderedComponent;
-    if (renderedComponent && el._templateComponent === ReactComponent && el._templateKey === key) {
-      renderedComponent.cancelDestroy();
-      renderedComponent.update(initialProps);
-      return renderedComponent;
-    }
-    renderedComponent == null ? void 0 : renderedComponent.destroy();
+  function TemplateConstructor(el, ReactComponent, initialProps, key) {
     if (!el._root) {
       el._root = client.createRoot(el);
     }
-    const root = el._root;
-    let destroyFrame = null;
-    let destroyed = false;
     const renderComponent = (props) => {
+      var _a;
       const vNode = React.createElement(ReactComponent, { ...props, key });
-      ReactDOM.flushSync(() => {
-        root.render(vNode);
-      });
+      (_a = el._root) == null ? void 0 : _a.render(vNode);
     };
     renderComponent(initialProps);
     const update = (newProps) => {
       renderComponent(newProps);
     };
     const destroy = () => {
-      if (destroyed) return;
-      destroyed = true;
-      if (destroyFrame !== null) {
-        cancelAnimationFrame(destroyFrame);
-        destroyFrame = null;
-      }
-      root.unmount();
-      if (el._root === root) {
-        el._root = void 0;
-        el._renderedComponent = void 0;
-        el._templateComponent = void 0;
-        el._templateKey = void 0;
-      }
-    };
-    const scheduleDestroy = () => {
-      if (destroyFrame !== null) return;
-      destroyFrame = requestAnimationFrame(() => {
-        destroyFrame = null;
-        if (el.isConnected && el._renderedComponent === component) {
-          return;
-        }
-        destroy();
-      });
-    };
-    const cancelDestroy = () => {
-      if (destroyFrame === null) return;
-      cancelAnimationFrame(destroyFrame);
-      destroyFrame = null;
+      var _a;
+      (_a = el._root) == null ? void 0 : _a.unmount();
+      el._root = void 0;
     };
-    const component = { el, update, destroy, scheduleDestroy, cancelDestroy };
-    el._renderedComponent = component;
-    el._templateComponent = ReactComponent;
-    el._templateKey = key;
-    return component;
+    return { update, destroy };
   }
   const Template = (ReactComponent, customProps) => {
     return (h, p, addition) => {
-      const props = customProps ? { ...customProps, ...p, addition } : { ...p, addition };
+      const props = customProps ? { ...customProps, ...p } : p;
+      props.addition = addition;
       const key = `${p.prop}-${p.rowIndex || 0}`;
       let lastEl = null;
       return h("span", {
-        key,
         ref: (el) => {
-          lastEl = TemplateConstructor(el, ReactComponent, props, key, lastEl);
+          var _a;
+          if (!el) {
+            (_a = lastEl == null ? void 0 : lastEl.destroy) == null ? void 0 : _a.call(lastEl);
+          } else {
+            lastEl = TemplateConstructor(el, ReactComponent, props, key);
+          }
         }
       });
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@revolist/react-datagrid",
   "sideEffects": false,
-  "version": "4.23.5",
+  "version": "4.23.6",
   "description": "React DataGrid Spreadsheet component with native cell render support",
   "main": "./dist/react-datagrid.umd.cjs",
   "module": "./dist/react-datagrid.js",
@@ -64,7 +64,7 @@
   "homepage": "https://github.com/revolist/revogrid#readme",
   "license": "MIT",
   "dependencies": {
-    "@revolist/revogrid": "4.23.5"
+    "@revolist/revogrid": "4.23.6"
   },
   "devDependencies": {
     "@stencil/core": "^4.43.2",