Backmerge: #1934 hot key hot key 1 turns sulfur into carbon when cursor over the atom (#2010)

packages/ketcher-core/src/application/actions/action.types.ts

@@ -14,6 +14,13 @@
  * limitations under the License.
  ***************************************************************************/
 
+// import { Operation } from "application/operations"
+// import { ReStruct } from "application/render"
+
 export interface Action {
   perform: () => void
+  // operations: Array<Operation>
+  // mergeWith(action: Action): Action
+  // addOp(operation: Operation, restruct?: ReStruct): Operation
+  // isDummy(restruct?: ReStruct): boolean
 }

packages/ketcher-core/src/application/editor/editor.types.ts

@@ -52,4 +52,5 @@ export interface Editor {
   setOptions: (opts: string) => any
   zoom: (value?: any) => any
   structSelected: () => Struct
+  // update: (action: Action | true, ignoreHistory?: boolean) => void
 }

packages/ketcher-core/src/application/operations/index.ts

@@ -25,3 +25,4 @@ export * from './rxnPlus'
 export * from './sgroup'
 export * from './simpleObject'
 export * from './text'
+export * from './baseOperation'

packages/ketcher-core/src/application/operations/operations.types.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
+import { ReStruct } from 'application/render'
 import { Struct } from 'domain/entities'
 
 export type OperationType =
@@ -70,8 +71,13 @@ export type OperationType =
 export interface Operation {
   readonly type: OperationType
   readonly priority: number
+  readonly _inverted: OperationType | undefined
+  data: any
   // eslint-disable-next-line no-use-before-define
   perform: (struct: Struct) => PerformOperationResult
+  invert(): Operation
+  isDummy(_restruct: ReStruct): boolean
+  execute(_restruct: ReStruct): void
 }
 
 export type PerformOperationResult = {

packages/ketcher-react/src/script/editor/Editor.ts

@@ -387,7 +387,7 @@ class Editor implements KetcherEditor {
     }
   }
 
-  update(action: Action | true, ignoreHistory?) {
+  update(action: Action | true, ignoreHistory?: boolean) {
     if (action === true) {
       this.render.update(true) // force
     } else {

packages/ketcher-react/src/script/editor/tool/select.ts

@@ -34,7 +34,7 @@ import {
 
 import LassoHelper from './helper/lasso'
 import { atomLongtapEvent } from './atom'
-import { sgroupDialog } from './sgroup'
+import SGroupTool from './sgroup'
 import utils from '../shared/utils'
 import { xor } from 'lodash/fp'
 import { Editor } from '../Editor'
@@ -536,7 +536,7 @@ class SelectTool {
       ci.map === 'sgroupData'
     ) {
       editor.selection(closestToSel(ci))
-      sgroupDialog(editor, ci.id, null)
+      SGroupTool.sgroupDialog(editor, ci.id, null)
     } else if (ci.map === 'texts') {
       editor.selection(closestToSel(ci))
       const text = molecule.texts.get(ci.id)

packages/ketcher-react/src/script/editor/tool/sgroup.ts

@@ -143,7 +143,7 @@ class SGroupTool {
         return
       }
 
-      sgroupDialog(this.editor, id !== undefined ? id : null, this.type)
+      SGroupTool.sgroupDialog(this.editor, id ?? null, this.type)
       this.isNotActiveTool = true
     }
   }
@@ -443,7 +443,7 @@ class SGroupTool {
 
     // TODO: handle click on an existing group?
     if (id !== null || (selection && selection.atoms))
-      sgroupDialog(this.editor, id, this.type)
+      SGroupTool.sgroupDialog(this.editor, id, this.type)
   }
 
   cancel() {
@@ -452,75 +452,75 @@ class SGroupTool {
     }
     this.editor.selection(null)
   }
-}
 
-export function sgroupDialog(editor, id, defaultType) {
-  const restruct = editor.render.ctab
-  const struct = restruct.molecule
-  const selection = editor.selection() || {}
-  const sg = id !== null ? struct.sgroups.get(id) : null
-  const type = sg ? sg.type : defaultType
-  const eventName = type === 'DAT' ? 'sdataEdit' : 'sgroupEdit'
-
-  if (!selection.atoms && !selection.bonds && !sg) {
-    console.info('There is no selection or sgroup')
-    return
-  }
+  static sgroupDialog(editor, id, defaultType) {
+    const restruct = editor.render.ctab
+    const struct = restruct.molecule
+    const selection = editor.selection() || {}
+    const sg = id !== null ? struct.sgroups.get(id) : null
+    const type = sg ? sg.type : defaultType
+    const eventName = type === 'DAT' ? 'sdataEdit' : 'sgroupEdit'
 
-  let attrs
-  if (sg) {
-    attrs = sg.getAttrs()
-    if (!attrs.context) attrs.context = getContextBySgroup(restruct, sg.atoms)
-  } else {
-    attrs = {
-      context: getContextBySelection(restruct, selection)
+    if (!selection.atoms && !selection.bonds && !sg) {
+      console.info('There is no selection or sgroup')
+      return
     }
-  }
 
-  const res = editor.event[eventName].dispatch({
-    type,
-    attrs
-  })
+    let attrs
+    if (sg) {
+      attrs = sg.getAttrs()
+      if (!attrs.context) attrs.context = getContextBySgroup(restruct, sg.atoms)
+    } else {
+      attrs = {
+        context: getContextBySelection(restruct, selection)
+      }
+    }
 
-  Promise.resolve(res)
-    .then((newSg) => {
-      // TODO: check before signal
-      if (
-        newSg.type !== 'DAT' && // when data s-group separates
-        checkOverlapping(struct, selection.atoms || [])
-      ) {
-        editor.event.message.dispatch({
-          error: 'Partial S-group overlapping is not allowed.'
-        })
-      } else {
+    const res = editor.event[eventName].dispatch({
+      type,
+      attrs
+    })
+
+    Promise.resolve(res)
+      .then((newSg) => {
+        // TODO: check before signal
         if (
-          !sg &&
-          newSg.type !== 'DAT' &&
-          (!selection.atoms || selection.atoms.length === 0)
-        )
-          return
+          newSg.type !== 'DAT' && // when data s-group separates
+          checkOverlapping(struct, selection.atoms || [])
+        ) {
+          editor.event.message.dispatch({
+            error: 'Partial S-group overlapping is not allowed.'
+          })
+        } else {
+          if (
+            !sg &&
+            newSg.type !== 'DAT' &&
+            (!selection.atoms || selection.atoms.length === 0)
+          )
+            return
 
-        const isDataSg = sg && sg.getAttrs().context === newSg.attrs.context
+          const isDataSg = sg && sg.getAttrs().context === newSg.attrs.context
 
-        if (isDataSg) {
-          const action = fromSeveralSgroupAddition(
-            restruct,
-            newSg.type,
-            sg.atoms,
-            newSg.attrs
-          ).mergeWith(fromSgroupDeletion(restruct, id))
+          if (isDataSg) {
+            const action = fromSeveralSgroupAddition(
+              restruct,
+              newSg.type,
+              sg.atoms,
+              newSg.attrs
+            ).mergeWith(fromSgroupDeletion(restruct, id))
 
-          editor.update(action)
-          editor.selection(selection)
-          return
-        }
+            editor.update(action)
+            editor.selection(selection)
+            return
+          }
 
-        const result = fromContextType(id, editor, newSg, selection)
-        editor.update(result.action)
-        editor.selection(null)
-      }
-    })
-    .catch(() => null)
+          const result = fromContextType(id, editor, newSg, selection)
+          editor.update(result.action)
+          editor.selection(null)
+        }
+      })
+      .catch(() => null)
+  }
 }
 
 function getContextBySgroup(restruct, sgAtoms) {

packages/ketcher-react/src/script/ui/action/tools.js

@@ -23,7 +23,7 @@ import { toBondType } from '../data/convert/structconv'
 const toolActions = {
   hand: {
     title: 'Hand tool',
-    shortcut: 'Mod+h',
+    shortcut: 'Mod+Alt+h',
     action: { tool: 'hand' },
     hidden: (options) => isHidden(options, 'hand')
   },