Merge branch 'master' into release/2.4

epam · Nov 15, 2021 · e3348e1 · e3348e1
2 parents 8d84d9e + 5efa3c3
commit e3348e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/ketcher-core/src/application/editor/operations/atom/index.ts b/packages/ketcher-core/src/application/editor/operations/atom/index.ts
@@ -89,7 +89,7 @@ class AtomDelete extends BaseOperation {
   data: Data
 
   constructor(atomId?: any) {
-    super(OperationType.ATOM_DELETE, 4)
+    super(OperationType.ATOM_DELETE, 5)
     this.data = { aid: atomId, atom: null, pos: null }
   }
 

diff --git a/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAtom.ts b/packages/ketcher-core/src/application/editor/operations/sgroup/sgroupAtom.ts
@@ -66,7 +66,7 @@ class SGroupAtomRemove extends BaseOperation {
   data: Data
 
   constructor(sgroupId?: any, aid?: any) {
-    super(OperationType.S_GROUP_ATOM_REMOVE)
+    super(OperationType.S_GROUP_ATOM_REMOVE, 4)
     this.data = { sgid: sgroupId, aid }
   }
 

diff --git a/packages/ketcher-core/src/domain/entities/sgroup.ts b/packages/ketcher-core/src/domain/entities/sgroup.ts
@@ -175,7 +175,7 @@ export class SGroup {
   }
 
   static getOffset(sgroup: SGroup): null | Vec2 {
-    if (!sgroup.pp) return null
+    if (!sgroup?.pp) return null
     return Vec2.diff(sgroup.pp, sgroup.bracketBox.p1)
   }