From 42247e854b84fc71a5aa6317a03e887e1872a51e Mon Sep 17 00:00:00 2001
From: tpoisseau <22891227+tpoisseau@users.noreply.github.com>
Date: Fri, 29 Aug 2025 13:36:51 +0200
Subject: [PATCH 1/3] feat: support custom label edition on atom

Closes: https://github.com/cheminfo/nmrium/issues/3331
---
 package-lock.json                              | 18 +++++++++---------
 package.json                                   |  4 ++--
 .../MoleculesPanel/useAtomAssignment.tsx       |  1 +
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4472e6d09f..1072d1b3ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,8 +50,8 @@
         "react-icons": "^5.5.0",
         "react-inspector": "^6.0.2",
         "react-mf": "^3.1.1",
-        "react-ocl": "^8.0.1",
-        "react-ocl-nmr": "^4.0.1",
+        "react-ocl": "^8.2.0",
+        "react-ocl-nmr": "^4.1.1",
         "react-plot": "^3.1.1",
         "react-rnd": "^10.5.2",
         "react-science": "^19.1.0",
@@ -10906,9 +10906,9 @@
       }
     },
     "node_modules/react-ocl": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/react-ocl/-/react-ocl-8.0.1.tgz",
-      "integrity": "sha512-63PAu3d6miceecLZ40i/5MNh3Rg+Px1uCZPUmdp1omfZuaeuCJlRco/sZvOiuAColCgolepB98+kisEsOwuB4w==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/react-ocl/-/react-ocl-8.2.0.tgz",
+      "integrity": "sha512-S0JsH9uqpz06z5jfnUwl3HwulNZ0WwJdQaHo7Jl4y+cVb3XKOqzGToAlvSFtNzpTLKH+6Y9KdYcKtrUVrXIXRQ==",
       "license": "MIT",
       "peerDependencies": {
         "openchemlib": ">=8",
@@ -10917,14 +10917,14 @@
       }
     },
     "node_modules/react-ocl-nmr": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/react-ocl-nmr/-/react-ocl-nmr-4.0.1.tgz",
-      "integrity": "sha512-mSxdTHCRz3XQf/YTSHCJxrhBR3bXVZTpbd0xn+hqy/EOaLt3hfeGqooTSBo3+TP1rqKbOdqNsn4n5IaYkWWwHQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/react-ocl-nmr/-/react-ocl-nmr-4.1.1.tgz",
+      "integrity": "sha512-BxILOo3WcAmxtjIe6zWP5HTPrHnn+o9VRFDJ1G+DBbl6sN3/fWhWMbaxT2VZQhNX0mQOIfH0sbfj3cZMLmsI2A==",
       "license": "MIT",
       "dependencies": {
         "openchemlib": "^9.1.1",
         "openchemlib-utils": "^8.1.1",
-        "react-ocl": "^8.0.0"
+        "react-ocl": "^8.2.0"
       },
       "peerDependencies": {
         "openchemlib": ">=8"
diff --git a/package.json b/package.json
index a1da81fca5..dc2cd22e29 100644
--- a/package.json
+++ b/package.json
@@ -101,8 +101,8 @@
     "react-icons": "^5.5.0",
     "react-inspector": "^6.0.2",
     "react-mf": "^3.1.1",
-    "react-ocl": "^8.0.1",
-    "react-ocl-nmr": "^4.0.1",
+    "react-ocl": "^8.2.0",
+    "react-ocl-nmr": "^4.1.1",
     "react-plot": "^3.1.1",
     "react-rnd": "^10.5.2",
     "react-science": "^19.1.0",
diff --git a/src/component/panels/MoleculesPanel/useAtomAssignment.tsx b/src/component/panels/MoleculesPanel/useAtomAssignment.tsx
index 54c135e041..2851a639e0 100644
--- a/src/component/panels/MoleculesPanel/useAtomAssignment.tsx
+++ b/src/component/panels/MoleculesPanel/useAtomAssignment.tsx
@@ -185,6 +185,7 @@ export default function useAtomAssignment() {
   ) {
     if (checkModifierKeyActivated(event) || !activatedAssignment) return;
 
+    event.preventDefault(); // prevent floating form custom label edit
     const { axis, id } = activatedAssignment;
 
     if (!id || !axis) {

From 0734ec638f01d53c88eb13bd6953adf62e5035a5 Mon Sep 17 00:00:00 2001
From: tpoisseau <22891227+tpoisseau@users.noreply.github.com>
Date: Fri, 29 Aug 2025 14:57:59 +0200
Subject: [PATCH 2/3] fix: atom with link highlight

Refs: https://github.com/cheminfo/nmrium/pull/3668#issuecomment-3236938542
---
 .../components/FloatMoleculeStructures/DraggableStructure.tsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/component/1d-2d/components/FloatMoleculeStructures/DraggableStructure.tsx b/src/component/1d-2d/components/FloatMoleculeStructures/DraggableStructure.tsx
index 9467d06a96..6b6453eae0 100644
--- a/src/component/1d-2d/components/FloatMoleculeStructures/DraggableStructure.tsx
+++ b/src/component/1d-2d/components/FloatMoleculeStructures/DraggableStructure.tsx
@@ -215,6 +215,7 @@ function DraggableMolecule(props: DraggableMoleculeProps) {
           ? currentDiaIDsToHighlight
           : assignedDiaIDsMerged
       }
+      atomHighlightStrategy="prefer-editor-props"
       setHoverAtom={handleOnAtomHover}
       setMolfile={(molfile) => {
         dispatch({

From e71eb3ec84d40fd25de680c616986805567509e8 Mon Sep 17 00:00:00 2001
From: tpoisseau <22891227+tpoisseau@users.noreply.github.com>
Date: Fri, 29 Aug 2025 15:24:55 +0200
Subject: [PATCH 3/3] fix: atom with link highlight in panel

Refs: https://github.com/cheminfo/nmrium/pull/3668#issuecomment-3236976489
---
 src/component/panels/MoleculesPanel/MoleculePanel.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/component/panels/MoleculesPanel/MoleculePanel.tsx b/src/component/panels/MoleculesPanel/MoleculePanel.tsx
index 779fcd8063..38ad4fd4ad 100644
--- a/src/component/panels/MoleculesPanel/MoleculePanel.tsx
+++ b/src/component/panels/MoleculesPanel/MoleculePanel.tsx
@@ -157,6 +157,7 @@ function MoleculePanelInner(props: MoleculePanelInnerProps) {
                                 ? currentDiaIDsToHighlight
                                 : assignedDiaIDsMerged
                             }
+                            atomHighlightStrategy="prefer-editor-props"
                             setHoverAtom={handleOnAtomHover}
                             showAtomNumber={
                               moleculesView?.[mol.id]?.showAtomNumber || false