diff --git a/example-ssr/next.config.mjs b/example-ssr/next.config.mjs index d5456a15d4..080e770e66 100644 --- 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 index 048372a14c..d3d5d661c1 100644 --- a/example-ssr/src/app/editor.tsx +++ b/example-ssr/src/app/editor.tsx @@ -17,20 +17,19 @@ export function EditorComponent() { { 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 index 49c90409d6..9e626d48c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5741,65 +5741,6 @@ "rollup": "^2.30.0" } }, - "node_modules/@rollup/plugin-inject": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz", - "integrity": "sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^5.0.1", - "estree-walker": "^2.0.2", - "magic-string": "^0.30.3" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" - }, - "peerDependenciesMeta": { - "rollup": { - "optional": true - } - } - }, - "node_modules/@rollup/plugin-inject/node_modules/@rollup/pluginutils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", - "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", - "dev": true, - "dependencies": { - "@types/estree": "^1.0.0", - "estree-walker": "^2.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" - }, - "peerDependenciesMeta": { - "rollup": { - "optional": true - } - } - }, - "node_modules/@rollup/plugin-inject/node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true - }, - "node_modules/@rollup/plugin-inject/node_modules/magic-string": { - "version": "0.30.10", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz", - "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==", - "dev": true, - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" - } - }, "node_modules/@rollup/plugin-json": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz", @@ -26236,18 +26177,6 @@ "rollup": "*" } }, - "node_modules/rollup-plugin-polyfill-node": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-polyfill-node/-/rollup-plugin-polyfill-node-0.13.0.tgz", - "integrity": "sha512-FYEvpCaD5jGtyBuBFcQImEGmTxDTPbiHjJdrYIp+mFIwgXiXabxvKUK7ZT9P31ozu2Tqm9llYQMRWsfvTMTAOw==", - "dev": true, - "dependencies": { - "@rollup/plugin-inject": "^5.0.4" - }, - "peerDependencies": { - "rollup": "^1.20.0 || ^2.0.0 || ^3.0.0 || ^4.0.0" - } - }, "node_modules/rollup-plugin-postcss": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/rollup-plugin-postcss/-/rollup-plugin-postcss-4.0.2.tgz", @@ -32086,7 +32015,6 @@ "rollup-plugin-copy": "^3.4.0", "rollup-plugin-delete": "^2.0.0", "rollup-plugin-peer-deps-external": "^2.2.4", - "rollup-plugin-polyfill-node": "^0.13.0", "rollup-plugin-string": "^3.0.0", "rollup-plugin-typescript2": "^0.31.1", "rollup-plugin-visualizer": "^5.5.2", diff --git a/packages/ketcher-react/src/Editor.tsx b/packages/ketcher-react/src/Editor.tsx index 58a4b5c772..f07800e803 100644 --- 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 { onInit?: (ketcher: Ketcher) => void; - ssr?: boolean; } -function EditorComponent(props: EditorProps) { +function Editor(props: EditorProps) { const initPromiseRef = useRef | null>(null); const appRootRef = useRef(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 ; -} - -function Editor(props: EditorProps) { - return props.ssr ? : ; -} - export { Editor };