#3284 – Application crashes after selecting an attachment point and p…

…ressing the right mouse button (#3285)

packages/ketcher-react/src/script/ui/views/components/ContextMenu/hooks/useRGroupAttachmentPointEdit.ts

@@ -2,32 +2,50 @@ import { useCallback } from 'react';
 import assert from 'assert';
 import { useAppContext } from 'src/hooks';
 import Editor from 'src/script/editor';
-import { ItemEventParams } from '../contextMenu.types';
+import { ContextMenuShowProps, ItemEventParams } from '../contextMenu.types';
 import { editRGroupAttachmentPoint } from 'src/script/editor/tool/apoint.utils';
+import { Ketcher } from 'ketcher-core';
+
+const getAtomIdByProps = (
+  props: ContextMenuShowProps | undefined,
+  ketcher: Ketcher,
+): number => {
+  const editor = ketcher.editor as Editor;
+  const restruct = editor.render.ctab;
+  const atomId = props?.atomIds?.[0];
+  if (atomId != null) {
+    return atomId;
+  }
+
+  const attachmentPointId = props?.rgroupAttachmentPoints?.[0];
+  assert(attachmentPointId != null);
+  const attachmentPoint =
+    restruct.molecule.rgroupAttachmentPoints.get(attachmentPointId);
+  assert(attachmentPoint != null);
+  return attachmentPoint.atomId;
+};
 
 const useRGroupAttachmentPointEdit = () => {
   const { getKetcherInstance } = useAppContext();
 
   const handler = useCallback(
     ({ props }: ItemEventParams) => {
-      const editor = getKetcherInstance().editor as Editor;
-      const restruct = editor.render.ctab;
-      const atomId = props?.atomIds?.[0];
-      assert(atomId != null);
+      const ketcher = getKetcherInstance();
+      const restruct = ketcher.editor.render.ctab;
+      const atomId = getAtomIdByProps(props, ketcher);
       const atom = restruct.molecule.atoms.get(atomId);
       assert(atom != null);
 
-      editRGroupAttachmentPoint(editor, atom, atomId);
+      editRGroupAttachmentPoint(ketcher.editor, atom, atomId);
     },
     [getKetcherInstance],
   );
 
   const disabled = useCallback(
     ({ props }: ItemEventParams) => {
-      const editor = getKetcherInstance().editor as Editor;
-      const restruct = editor.render.ctab;
-      const atomId = props?.atomIds?.[0];
-      assert(atomId != null);
+      const ketcher = getKetcherInstance();
+      const restruct = ketcher.editor.render.ctab;
+      const atomId = getAtomIdByProps(props, ketcher);
       const atom = restruct.molecule.atoms.get(atomId);
       assert(atom != null);