From 2cdf4aa68379b9cd6a3a5e70d4c5d50bdc68b53b Mon Sep 17 00:00:00 2001
From: Nikita <Nikita_Vozisov@epam.com>
Date: Fri, 17 Feb 2023 11:28:29 +0300
Subject: [PATCH 1/6] =?UTF-8?q?Backmerge:=20#2228=20=E2=80=93=20There=20ar?=
 =?UTF-8?q?e=20freezes=20in=20application=20when=20Chrome=20DevTools=20are?=
 =?UTF-8?q?=20opened=20(#2232)=20(#2234)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* #2228 – There are freezes in application when Chrome DevTools are opened

* #2228 – changed throttle to debounce; fixed issue of InfoPanel appearing at (0;0) coordinates
---
 .../src/script/ui/state/functionalGroups/index.ts            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/ketcher-react/src/script/ui/state/functionalGroups/index.ts b/packages/ketcher-react/src/script/ui/state/functionalGroups/index.ts
index 9cb2a017ac..7dfca64b89 100644
--- a/packages/ketcher-react/src/script/ui/state/functionalGroups/index.ts
+++ b/packages/ketcher-react/src/script/ui/state/functionalGroups/index.ts
@@ -23,6 +23,7 @@ import {
   Struct
 } from 'ketcher-core'
 import templatesRawData from '../../../../templates/fg.sdf'
+import _ from 'lodash'
 
 interface FGState {
   lib: []
@@ -58,10 +59,12 @@ const highlightFGroup = (group: any) => ({
   payload: group
 })
 
-export function highlightFG(dispatch, group: any) {
+function notDebouncedHighlightFG(dispatch, group: any) {
   dispatch(highlightFGroup(group))
 }
 
+export const highlightFG = _.debounce(notDebouncedHighlightFG, 200)
+
 export function initFGTemplates() {
   return async (dispatch) => {
     const provider = FunctionalGroupsProvider.getInstance()

From 983f35e909aa7b60576612368d3a44142074f520 Mon Sep 17 00:00:00 2001
From: Nikita <Nikita_Vozisov@epam.com>
Date: Fri, 17 Feb 2023 16:27:22 +0300
Subject: [PATCH 2/6] =?UTF-8?q?Backmerge:=20#2233=20=E2=80=93=20The=20sctu?=
 =?UTF-8?q?cture=20with=20different=20atoms=20is=20vanished=20after=20appl?=
 =?UTF-8?q?ying=20'Exact=20change'=20(#2236)=20(#2239)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/script/ui/state/modal/atoms.ts          | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/ketcher-react/src/script/ui/state/modal/atoms.ts b/packages/ketcher-react/src/script/ui/state/modal/atoms.ts
index 1d000ec758..defe43a04f 100644
--- a/packages/ketcher-react/src/script/ui/state/modal/atoms.ts
+++ b/packages/ketcher-react/src/script/ui/state/modal/atoms.ts
@@ -35,6 +35,18 @@ export function generateCommonProperties(
   return resultAtomAttributes
 }
 
+function castAtomPropToType(property, value) {
+  const typesMapping = {
+    charge: Number,
+    exactChangeFlag: Number,
+    unsaturatedAtom: Number
+  }
+  if (typesMapping[property]) {
+    return typesMapping[property](value)
+  }
+  return value
+}
+
 export function updateOnlyChangedProperties(atomId, userChangedAtom, molecule) {
   const unchangedAtom = molecule.atoms.get(atomId)
   const updatedKeys = Object.getOwnPropertyNames(userChangedAtom).filter(
@@ -44,10 +56,7 @@ export function updateOnlyChangedProperties(atomId, userChangedAtom, molecule) {
     (updatedAtom, key) => {
       const isPropertyChanged = updatedKeys.includes(key)
       if (isPropertyChanged) {
-        updatedAtom[key] = userChangedAtom[key]
-        if (key === 'charge') {
-          updatedAtom[key] = Number(updatedAtom[key])
-        }
+        updatedAtom[key] = castAtomPropToType(key, userChangedAtom[key])
       } else {
         updatedAtom[key] = unchangedAtom[key]
       }

From 643dbc48db4e0f78c741611c6c8dfc5236eeb4e7 Mon Sep 17 00:00:00 2001
From: Nikita <Nikita_Vozisov@epam.com>
Date: Mon, 20 Feb 2023 16:55:08 +0300
Subject: [PATCH 3/6] =?UTF-8?q?Backmerge:=20#2215=20=E2=80=93=20When=20mov?=
 =?UTF-8?q?ing=20mouse=20cursor=20over=20created=20S-Group=20pop-up=20tool?=
 =?UTF-8?q?=20tip=20does=20not=20disappear=20(#2240)=20(#2244)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ketcher-react/src/script/editor/Editor.ts | 29 ++------------
 .../editor/utils/functionalGroupsTooltip.ts   | 40 +++++++++++++++++++
 .../script/ui/state/functionalGroups/index.ts |  9 ++++-
 .../src/script/ui/utils/index.ts              | 28 +++++++++++++
 .../components/StructEditor/InfoPanel.tsx     | 11 +----
 5 files changed, 79 insertions(+), 38 deletions(-)
 create mode 100644 packages/ketcher-react/src/script/editor/utils/functionalGroupsTooltip.ts

diff --git a/packages/ketcher-react/src/script/editor/Editor.ts b/packages/ketcher-react/src/script/editor/Editor.ts
index 472cfc4bdb..657c8eb86f 100644
--- a/packages/ketcher-react/src/script/editor/Editor.ts
+++ b/packages/ketcher-react/src/script/editor/Editor.ts
@@ -22,8 +22,7 @@ import {
   Struct,
   Vec2,
   fromDescriptorsAlign,
-  fromNewCanvas,
-  FunctionalGroup
+  fromNewCanvas
 } from 'ketcher-core'
 import {
   DOMSubscription,
@@ -36,6 +35,7 @@ import { customOnChangeHandler } from './utils'
 import { isEqual } from 'lodash/fp'
 import toolMap from './tool'
 import { Highlighter } from './highlighter'
+import { showFunctionalGroupsTooltip } from './utils/functionalGroupsTooltip'
 
 const SCALE = 40
 const HISTORY_SIZE = 32 // put me to options
@@ -372,8 +372,6 @@ class Editor implements KetcherEditor {
   hover(ci: any, newTool?: any, event?: PointerEvent) {
     const tool = newTool || this._tool // eslint-disable-line
 
-    let infoPanelData: any = null
-
     if (
       'ci' in tool &&
       (!ci || tool.ci.map !== ci.map || tool.ci.id !== ci.id)
@@ -386,28 +384,7 @@ class Editor implements KetcherEditor {
 
     if (!event) return
 
-    const checkFunctionGroupTypes = ['sgroups', 'functionalGroups']
-    const closestCollapsibleStructures = this.findItem(
-      event,
-      checkFunctionGroupTypes
-    )
-    if (closestCollapsibleStructures) {
-      const sGroup = this.struct()?.sgroups.get(closestCollapsibleStructures.id)
-      if (sGroup && !sGroup.data.expanded) {
-        const groupName = sGroup.data.name
-        const groupStruct = FunctionalGroup.getFunctionalGroupByName(groupName)
-        infoPanelData = {
-          groupStruct,
-          event,
-          sGroup
-        }
-      }
-    }
-    if (infoPanelData) {
-      this.event.showInfo.dispatch(infoPanelData)
-    } else {
-      this.event.showInfo.dispatch(null)
-    }
+    showFunctionalGroupsTooltip(this)
   }
 
   update(action: Action | true, ignoreHistory?: boolean) {
diff --git a/packages/ketcher-react/src/script/editor/utils/functionalGroupsTooltip.ts b/packages/ketcher-react/src/script/editor/utils/functionalGroupsTooltip.ts
new file mode 100644
index 0000000000..debb7e3db4
--- /dev/null
+++ b/packages/ketcher-react/src/script/editor/utils/functionalGroupsTooltip.ts
@@ -0,0 +1,40 @@
+import { FunctionalGroup } from 'ketcher-core'
+
+let showTooltipTimer: ReturnType<typeof setTimeout> | null = null
+
+export const TOOLTIP_DELAY = 300
+
+export function showTooltip(editor, infoPanelData) {
+  editor.event.showInfo.dispatch(null)
+
+  if (showTooltipTimer) {
+    clearTimeout(showTooltipTimer)
+  }
+  if (infoPanelData) {
+    showTooltipTimer = setTimeout(() => {
+      editor.event.showInfo.dispatch(infoPanelData)
+    }, TOOLTIP_DELAY)
+  }
+}
+
+export function showFunctionalGroupsTooltip(editor) {
+  let infoPanelData: any = null
+  const checkFunctionGroupTypes = ['sgroups', 'functionalGroups']
+  const closestCollapsibleStructures = editor.findItem(
+    event,
+    checkFunctionGroupTypes
+  )
+  if (closestCollapsibleStructures) {
+    const sGroup = editor.struct()?.sgroups.get(closestCollapsibleStructures.id)
+    if (sGroup && !sGroup.data.expanded) {
+      const groupName = sGroup.data.name
+      const groupStruct = FunctionalGroup.getFunctionalGroupByName(groupName)
+      infoPanelData = {
+        groupStruct,
+        event,
+        sGroup
+      }
+    }
+  }
+  showTooltip(editor, infoPanelData)
+}
diff --git a/packages/ketcher-react/src/script/ui/state/functionalGroups/index.ts b/packages/ketcher-react/src/script/ui/state/functionalGroups/index.ts
index 7dfca64b89..8cbd13d9ef 100644
--- a/packages/ketcher-react/src/script/ui/state/functionalGroups/index.ts
+++ b/packages/ketcher-react/src/script/ui/state/functionalGroups/index.ts
@@ -23,7 +23,8 @@ import {
   Struct
 } from 'ketcher-core'
 import templatesRawData from '../../../../templates/fg.sdf'
-import _ from 'lodash'
+import { memoizedDebounce } from '../../utils'
+import { TOOLTIP_DELAY } from '../../../editor/utils/functionalGroupsTooltip'
 
 interface FGState {
   lib: []
@@ -63,7 +64,11 @@ function notDebouncedHighlightFG(dispatch, group: any) {
   dispatch(highlightFGroup(group))
 }
 
-export const highlightFG = _.debounce(notDebouncedHighlightFG, 200)
+export const highlightFG = memoizedDebounce(
+  notDebouncedHighlightFG,
+  TOOLTIP_DELAY / 3,
+  [0]
+)
 
 export function initFGTemplates() {
   return async (dispatch) => {
diff --git a/packages/ketcher-react/src/script/ui/utils/index.ts b/packages/ketcher-react/src/script/ui/utils/index.ts
index 447c531199..0b80baa4d7 100644
--- a/packages/ketcher-react/src/script/ui/utils/index.ts
+++ b/packages/ketcher-react/src/script/ui/utils/index.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
+import _ from 'lodash'
 import { escapeRegExp, filter as _filter, flow, reduce } from 'lodash/fp'
 import { Option } from '../component/form/Select'
 
@@ -84,5 +85,32 @@ export const getSelectOptionsFromSchema = (schema): Array<Option> => {
   }, [])
 }
 
+/**
+ * Creates a function, which is not called if the current argument is the same as the last one
+ * @param func function to be debounced
+ * @param delay delay in ms
+ * @param skipArguments indexes in arguments array to skip for comparison
+ * @returns debounced function, which is not called with previous argument
+ */
+export function memoizedDebounce(
+  func,
+  delay = 0,
+  skipArguments: number[] = []
+) {
+  let lastArgs
+  const debouncedFunction = _.debounce(func, delay)
+  const getArgumentsToCompare = (args) =>
+    args?.filter((_, index: number) => !skipArguments.includes(index)) || []
+  return function (...args) {
+    const lastArgsToCompare = getArgumentsToCompare(lastArgs)
+    const argsToCompare = getArgumentsToCompare(args)
+    if (lastArgs && _.isEqual(argsToCompare, lastArgsToCompare)) {
+      return
+    }
+    lastArgs = args
+    debouncedFunction(...args)
+  }
+}
+
 export { RenderStruct } from './renderStruct'
 export { fileOpener } from './fileOpener'
diff --git a/packages/ketcher-react/src/script/ui/views/components/StructEditor/InfoPanel.tsx b/packages/ketcher-react/src/script/ui/views/components/StructEditor/InfoPanel.tsx
index 4225d86b72..0064618e33 100644
--- a/packages/ketcher-react/src/script/ui/views/components/StructEditor/InfoPanel.tsx
+++ b/packages/ketcher-react/src/script/ui/views/components/StructEditor/InfoPanel.tsx
@@ -24,7 +24,6 @@ import clsx from 'clsx'
 
 import classes from './InfoPanel.module.less'
 
-const HOVER_DELAY = 400
 const HOVER_PANEL_PADDING = 20
 
 function getSGroupFirstAtom(sGroup: SGroup, render: Render): Vec2 {
@@ -108,15 +107,7 @@ const InfoPanel: FC<InfoPanelProps> = (props) => {
   }, [groupStruct, sGroup])
 
   useEffect(() => {
-    let timer
-    if (groupStruct) {
-      timer = setTimeout(() => {
-        setMolecule(groupStruct.clone())
-      }, HOVER_DELAY)
-    } else {
-      setMolecule(null)
-    }
-    return () => clearTimeout(timer)
+    setMolecule(groupStruct ? groupStruct.clone() : null)
   }, [groupName, groupStruct])
 
   if (

From b60a729b5cd4192127d0865a7f62fc5002ab9e3d Mon Sep 17 00:00:00 2001
From: Anna Zhuravleva <56927722+ansivgit@users.noreply.github.com>
Date: Mon, 20 Feb 2023 17:35:47 +0300
Subject: [PATCH 4/6] #2005 Add CDX export to output formats list (#2194)

* #2005 add Base 64 CDX export

* #2005 add binary CDX export

* #2005 fix after review

* #2005 change .b64 file format
---
 .../formatters/formatProperties.ts            |  6 +++
 .../formatters/formatterFactory.ts            |  1 +
 .../formatters/structFormatter.types.ts       |  1 +
 .../ketcher-core/src/utilities/b64toBlob.ts   | 23 ++++++++
 packages/ketcher-core/src/utilities/index.ts  |  1 +
 .../src/script/ui/utils/fileOpener.js         |  2 +-
 .../modal/components/document/Save/Save.jsx   | 54 ++++++++++++++++---
 7 files changed, 79 insertions(+), 9 deletions(-)
 create mode 100644 packages/ketcher-core/src/utilities/b64toBlob.ts

diff --git a/packages/ketcher-core/src/application/formatters/formatProperties.ts b/packages/ketcher-core/src/application/formatters/formatProperties.ts
index 8f34ca8d92..cf9171a196 100644
--- a/packages/ketcher-core/src/application/formatters/formatProperties.ts
+++ b/packages/ketcher-core/src/application/formatters/formatProperties.ts
@@ -98,6 +98,12 @@ const formatProperties: FormatPropertiesMap = {
   cdx: new SupportedFormatProperties(
     'Base64 CDX',
     ChemicalMimeType.CDX,
+    ['.b64cdx'],
+    true
+  ),
+  binaryCdx: new SupportedFormatProperties(
+    'CDX',
+    ChemicalMimeType.CDX,
     ['.cdx'],
     true
   ),
diff --git a/packages/ketcher-core/src/application/formatters/formatterFactory.ts b/packages/ketcher-core/src/application/formatters/formatterFactory.ts
index 1eb8cd2992..96085d69e3 100644
--- a/packages/ketcher-core/src/application/formatters/formatterFactory.ts
+++ b/packages/ketcher-core/src/application/formatters/formatterFactory.ts
@@ -92,6 +92,7 @@ export class FormatterFactory {
       case SupportedFormat.smarts:
       case SupportedFormat.cdxml:
       case SupportedFormat.cdx:
+      case SupportedFormat.binaryCdx:
       case SupportedFormat.unknown:
       default:
         formatter = new ServerFormatter(
diff --git a/packages/ketcher-core/src/application/formatters/structFormatter.types.ts b/packages/ketcher-core/src/application/formatters/structFormatter.types.ts
index 62e6fee943..cd6b872228 100644
--- a/packages/ketcher-core/src/application/formatters/structFormatter.types.ts
+++ b/packages/ketcher-core/src/application/formatters/structFormatter.types.ts
@@ -38,6 +38,7 @@ export enum SupportedFormat {
   ket = 'ket',
   cdxml = 'cdxml',
   cdx = 'cdx',
+  binaryCdx = 'binaryCdx',
   unknown = 'unknown'
 }
 
diff --git a/packages/ketcher-core/src/utilities/b64toBlob.ts b/packages/ketcher-core/src/utilities/b64toBlob.ts
new file mode 100644
index 0000000000..b8795410af
--- /dev/null
+++ b/packages/ketcher-core/src/utilities/b64toBlob.ts
@@ -0,0 +1,23 @@
+export function b64toBlob(
+  b64Data: string,
+  contentType = '',
+  sliceSize = 512
+): Blob {
+  const byteCharacters: string = window.atob(b64Data)
+  const byteArrays: Array<Uint8Array> = []
+
+  for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+    const slice: string = byteCharacters.slice(offset, offset + sliceSize)
+    const byteNumbers: Array<number> = new Array(slice.length)
+
+    for (let i = 0; i < slice.length; i++) {
+      byteNumbers[i] = slice.charCodeAt(i)
+    }
+
+    const byteArray: Uint8Array = new Uint8Array(byteNumbers)
+    byteArrays.push(byteArray)
+  }
+
+  const blob: Blob = new Blob(byteArrays, { type: contentType })
+  return blob
+}
diff --git a/packages/ketcher-core/src/utilities/index.ts b/packages/ketcher-core/src/utilities/index.ts
index 1390708010..c0fd2c2b3e 100644
--- a/packages/ketcher-core/src/utilities/index.ts
+++ b/packages/ketcher-core/src/utilities/index.ts
@@ -17,3 +17,4 @@
 export * from './ifDef'
 export * from './tfx'
 export * from './runAsyncAction'
+export * from './b64toBlob'
diff --git a/packages/ketcher-react/src/script/ui/utils/fileOpener.js b/packages/ketcher-react/src/script/ui/utils/fileOpener.js
index c8762db815..1d06ddccc6 100644
--- a/packages/ketcher-react/src/script/ui/utils/fileOpener.js
+++ b/packages/ketcher-react/src/script/ui/utils/fileOpener.js
@@ -40,7 +40,7 @@ export function fileOpener(server) {
 }
 
 function throughFileReader(file) {
-  const isCDX = file.name.endsWith('cdx')
+  const isCDX = file.name.endsWith('cdx') && !file.name.endsWith('b64cdx')
   return new Promise((resolve, reject) => {
     const rd = new FileReader() // eslint-disable-line no-undef
 
diff --git a/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.jsx b/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.jsx
index 37fc9c12fe..74f71b5ea2 100644
--- a/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.jsx
+++ b/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.jsx
@@ -23,7 +23,8 @@ import {
   KetSerializer,
   formatProperties,
   getPropertiesByFormat,
-  getPropertiesByImgFormat
+  getPropertiesByImgFormat,
+  b64toBlob
 } from 'ketcher-core'
 
 import { Dialog } from '../../../../components'
@@ -89,8 +90,9 @@ class SaveDialog extends Component {
         '<----secondDivider--->', // for dividers in select list
         'svg',
         'png',
-        'cdxml'
-        // 'cdx' TO DO: Uncomment, when export will be ready on Indigo side
+        'cdxml',
+        'cdx',
+        'binaryCdx'
       )
     // TODO: pass the necessary divider not like list element
 
@@ -120,6 +122,10 @@ class SaveDialog extends Component {
     return !!getPropertiesByImgFormat(format)
   }
 
+  isBinaryCdxFormat = (format) => {
+    return format === 'binaryCdx'
+  }
+
   showStructWarningMessage = (format) => {
     const { errors } = this.props.formState
     return format !== 'mol' && Object.keys(errors).length > 0
@@ -277,11 +283,14 @@ class SaveDialog extends Component {
     const { filename, format } = formState.result
     const { structStr, imageSrc, isLoading } = this.state
     const isCleanStruct = this.props.struct.isBlank()
-    return isLoading ? (
+
+    const LoadingState = () => (
       <div className={classes.loadingCirclesContainer}>
         <LoadingCircles />
       </div>
-    ) : this.isImageFormat(format) ? (
+    )
+
+    const ImageContent = () => (
       <div className={classes.imageContainer}>
         {!isCleanStruct && (
           <img
@@ -290,7 +299,20 @@ class SaveDialog extends Component {
           />
         )}
       </div>
-    ) : (
+    )
+
+    const BinaryContent = () => (
+      <div className={classes.previewBackground}>
+        <textarea
+          value="Can not display binary content"
+          className={classes.previewArea}
+          readOnly
+          ref={this.textAreaRef}
+        />
+      </div>
+    )
+
+    const PreviewContent = () => (
       <div className={classes.previewBackground}>
         <textarea
           value={structStr}
@@ -300,6 +322,16 @@ class SaveDialog extends Component {
         />
       </div>
     )
+
+    if (isLoading) {
+      return <LoadingState />
+    } else if (this.isImageFormat(format)) {
+      return <ImageContent />
+    } else if (this.isBinaryCdxFormat(format)) {
+      return <BinaryContent />
+    } else {
+      return <PreviewContent />
+    }
   }
 
   renderWarnings = () => {
@@ -319,10 +351,16 @@ class SaveDialog extends Component {
   }
 
   getButtons = () => {
-    const { disableControls, imageFormat, structStr } = this.state
+    const { disableControls, imageFormat, isLoading, structStr } = this.state
     const formState = this.props.formState
     const { filename, format } = formState.result
     const isCleanStruct = this.props.struct.isBlank()
+
+    const savingStruct =
+      this.isBinaryCdxFormat(format) && !isLoading
+        ? b64toBlob(structStr)
+        : structStr
+
     const isMoleculeContain =
       this.props.struct.atoms.size && this.props.struct.bonds.size
     const buttons = [
@@ -373,7 +411,7 @@ class SaveDialog extends Component {
       buttons.push(
         <SaveButton
           mode="saveFile"
-          data={structStr}
+          data={savingStruct}
           filename={filename + getPropertiesByFormat(format).extensions[0]}
           key="save-file-button"
           type={format.mime}

From 2be9c997064a041b795318b2b93e7b4138b65612 Mon Sep 17 00:00:00 2001
From: KonstantinEpam23 <101649391+KonstantinEpam23@users.noreply.github.com>
Date: Tue, 21 Feb 2023 10:33:39 +0100
Subject: [PATCH 5/6] Backmerge: #2227: Click and drag rotation is not working
 for Templates toolbar structures (#2248)

---
 .../src/script/editor/tool/template.ts             | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/ketcher-react/src/script/editor/tool/template.ts b/packages/ketcher-react/src/script/editor/tool/template.ts
index fed03d8617..8905a7a6c6 100644
--- a/packages/ketcher-react/src/script/editor/tool/template.ts
+++ b/packages/ketcher-react/src/script/editor/tool/template.ts
@@ -342,7 +342,19 @@ class TemplateTool {
     let action = null
     let pasteItems
 
-    if (ci?.map === 'atoms') {
+    if (!ci) {
+      const isAddingFunctionalGroup = this.template?.molecule?.sgroups.size
+      if (isAddingFunctionalGroup) {
+        // skip, b/c we dont want to do any additional actions (e.g. rotating for s-groups)
+        return true
+      }
+      ;[action, pasteItems] = fromTemplateOnCanvas(
+        restruct,
+        this.template,
+        targetPos,
+        angle
+      )
+    } else if (ci?.map === 'atoms') {
       ;[action, pasteItems] = fromTemplateOnAtom(
         restruct,
         this.template,

From 627a160b599f95756f93eeaee7ae636d25a63b9c Mon Sep 17 00:00:00 2001
From: Nikita <Nikita_Vozisov@epam.com>
Date: Tue, 21 Feb 2023 14:25:39 +0300
Subject: [PATCH 6/6] =?UTF-8?q?Backmerge:=20#2238=20=E2=80=93=20Deleting?=
 =?UTF-8?q?=20an=20atom=20that=20is=20bonded=20to=20another=20atom=20resul?=
 =?UTF-8?q?ts=20in=20deletion=20of=20the=20second=20atom=20as=20well=20(#2?=
 =?UTF-8?q?251)=20(#2253)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ketcher-core/src/application/editor/actions/erase.ts  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ketcher-core/src/application/editor/actions/erase.ts b/packages/ketcher-core/src/application/editor/actions/erase.ts
index 3f526cdf0b..14b46a9196 100644
--- a/packages/ketcher-core/src/application/editor/actions/erase.ts
+++ b/packages/ketcher-core/src/application/editor/actions/erase.ts
@@ -36,8 +36,8 @@ import { atomGetDegree } from './utils'
 import { fromBondStereoUpdate } from '../actions/bond'
 import { fromFragmentSplit } from './fragment'
 
-export function fromOneAtomDeletion(restruct, id) {
-  return fromFragmentDeletion(restruct, { atoms: [id] })
+export function fromOneAtomDeletion(restruct, atomId: number) {
+  return fromFragmentDeletion(restruct, { atoms: [atomId] })
 }
 
 function fromBondDeletion(restruct, bid: number, skipAtoms: Array<any> = []) {
@@ -49,7 +49,7 @@ function fromBondDeletion(restruct, bid: number, skipAtoms: Array<any> = []) {
 
   if (
     !skipAtoms.includes(bond.begin) &&
-    atomGetDegree(restruct, bond.begin) === 1
+    atomGetDegree(restruct, bond.begin) === 0
   ) {
     if (removeAtomFromSgroupIfNeeded(action, restruct, bond.begin)) {
       atomsToRemove.push(bond.begin)
@@ -60,7 +60,7 @@ function fromBondDeletion(restruct, bid: number, skipAtoms: Array<any> = []) {
 
   if (
     !skipAtoms.includes(bond.end) &&
-    atomGetDegree(restruct, bond.end) === 1
+    atomGetDegree(restruct, bond.end) === 0
   ) {
     if (removeAtomFromSgroupIfNeeded(action, restruct, bond.end)) {
       atomsToRemove.push(bond.end)