#4981 - removing the mount check

epam · Jul 29, 2024 · bbcf1f4 · bbcf1f4
1 parent 3dd35eb
commit bbcf1f4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 103 deletions.
diff --git a/example-ssr/next.config.mjs b/example-ssr/next.config.mjs
@@ -1,6 +1,6 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  reactStrictMode: true,
+  // reactStrictMode: true,
 };
 
 export default nextConfig;
diff --git a/example-ssr/src/app/editor.tsx b/example-ssr/src/app/editor.tsx
@@ -17,20 +17,19 @@ export function EditorComponent() {
     <Editor
       staticResourcesUrl={process.env.PUBLIC_URL || ''}
       structServiceProvider={structServiceProvider}
+      ssr={false}
       errorHandler={(message: string) => {
         console.error(message);
       }}
       onInit={(ketcher) => {
-        if (window) {
-          window.ketcher = ketcher;
+        window.ketcher = ketcher;
 
-          window.parent.postMessage(
-            {
-              eventType: 'init',
-            },
-            '*',
-          );
-        }
+        window.parent.postMessage(
+          {
+            eventType: 'init',
+          },
+          '*',
+        );
       }}
     />
   );

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ketcher-react/src/Editor.tsx b/packages/ketcher-react/src/Editor.tsx
@@ -22,7 +22,7 @@ import 'whatwg-fetch';
 import './index.less';
 
 import init, { Config } from './script';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef } from 'react';
 import { createRoot, Root } from 'react-dom/client';
 
 import { Ketcher } from 'ketcher-core';
@@ -41,10 +41,9 @@ const mediaSizes = {
 
 interface EditorProps extends Omit<Config, 'element' | 'appRoot'> {
   onInit?: (ketcher: Ketcher) => void;
-  ssr?: boolean;
 }
 
-function EditorComponent(props: EditorProps) {
+function Editor(props: EditorProps) {
   const initPromiseRef = useRef<ReturnType<typeof init> | null>(null);
   const appRootRef = useRef<Root | null>(null);
   const cleanupRef = useRef<(() => unknown) | null>(null);
@@ -104,22 +103,4 @@ function EditorComponent(props: EditorProps) {
   );
 }
 
-function EditorSsr(props: EditorProps) {
-  const [hasMounted, setHasMounted] = useState(false);
-
-  useEffect(() => {
-    setHasMounted(true);
-  }, []);
-
-  if (!hasMounted) {
-    return null;
-  }
-
-  return <EditorComponent {...props} />;
-}
-
-function Editor(props: EditorProps) {
-  return props.ssr ? <EditorSsr {...props} /> : <EditorComponent {...props} />;
-}
-
 export { Editor };