From 4c1fce2f88ea2b877de51b1b42035d9b6933afbe Mon Sep 17 00:00:00 2001 From: Roman Rodionov Date: Thu, 20 Feb 2025 16:45:56 +0100 Subject: [PATCH] #6546 - Macro structure duplicated on canvas when using ketcher.getMolfile() and pasting (#6547) * #6546 - Macro structure duplicated on canvas when using ketcher.getMolfile() and pasting * - updated ketcher to 3.0.1 --- package-lock.json | 8 ++++---- packages/ketcher-core/package.json | 2 +- packages/ketcher-core/src/application/editor/Editor.ts | 1 + packages/ketcher-core/src/application/utils.ts | 5 ++++- packages/ketcher-macromolecules/package.json | 2 +- packages/ketcher-react/package.json | 2 +- packages/ketcher-standalone/package.json | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index d0ae5aa76e..6709131596 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32119,7 +32119,7 @@ } }, "packages/ketcher-core": { - "version": "3.0.0", + "version": "3.0.1", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -32245,7 +32245,7 @@ "dev": true }, "packages/ketcher-macromolecules": { - "version": "3.0.0", + "version": "3.0.1", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -33674,7 +33674,7 @@ } }, "packages/ketcher-react": { - "version": "3.0.0", + "version": "3.0.1", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -35409,7 +35409,7 @@ } }, "packages/ketcher-standalone": { - "version": "3.0.0", + "version": "3.0.1", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", diff --git a/packages/ketcher-core/package.json b/packages/ketcher-core/package.json index 3b61586b81..65220565f5 100644 --- a/packages/ketcher-core/package.json +++ b/packages/ketcher-core/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-core", - "version": "3.0.0", + "version": "3.0.1", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", diff --git a/packages/ketcher-core/src/application/editor/Editor.ts b/packages/ketcher-core/src/application/editor/Editor.ts index 1fad72be35..37be6bcd27 100644 --- a/packages/ketcher-core/src/application/editor/Editor.ts +++ b/packages/ketcher-core/src/application/editor/Editor.ts @@ -759,6 +759,7 @@ export class CoreEditor { } this._monomersLibraryParsedJson = null; this._type = EditorType.Micromolecules; + this.drawingEntitiesManager = new DrawingEntitiesManager(); } private switchToMacromolecules() { diff --git a/packages/ketcher-core/src/application/utils.ts b/packages/ketcher-core/src/application/utils.ts index 9524c46766..aacb7fdb8a 100644 --- a/packages/ketcher-core/src/application/utils.ts +++ b/packages/ketcher-core/src/application/utils.ts @@ -38,10 +38,13 @@ export function getStructure( ): Promise { const serverSettings = ketcherProvider.getKetcher().editor.serverSettings; const formatter = formatterFactory.create(structureFormat, serverSettings); + const drawingEntitiesManagerCloningResult = drawingEntitiesManager?.mergeInto( + new DrawingEntitiesManager(), + ); return formatter.getStructureFromStructAsync( struct, - drawingEntitiesManager, + drawingEntitiesManagerCloningResult?.mergedDrawingEntities, selection, ); } diff --git a/packages/ketcher-macromolecules/package.json b/packages/ketcher-macromolecules/package.json index 05c0c67216..4b8637bdd5 100644 --- a/packages/ketcher-macromolecules/package.json +++ b/packages/ketcher-macromolecules/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-macromolecules", - "version": "3.0.0", + "version": "3.0.1", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", diff --git a/packages/ketcher-react/package.json b/packages/ketcher-react/package.json index 81365e610e..da46ef2362 100644 --- a/packages/ketcher-react/package.json +++ b/packages/ketcher-react/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-react", - "version": "3.0.0", + "version": "3.0.1", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", diff --git a/packages/ketcher-standalone/package.json b/packages/ketcher-standalone/package.json index 33af722ab7..7e78cd77b5 100644 --- a/packages/ketcher-standalone/package.json +++ b/packages/ketcher-standalone/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-standalone", - "version": "3.0.0", + "version": "3.0.1", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher",