diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-edit-mode-Check-If-cursor-is-located--e1550-en-pasted-fragment-is-considered-as-new-chain-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-edit-mode-Check-If-cursor-is-located--e1550-en-pasted-fragment-is-considered-as-new-chain-1-chromium-linux.png index ed0aa5b8b4..c44e6a595b 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-edit-mode-Check-If-cursor-is-located--e1550-en-pasted-fragment-is-considered-as-new-chain-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-edit-mode-Check-If-cursor-is-located--e1550-en-pasted-fragment-is-considered-as-new-chain-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-edit-mode-Check-If-cursor-is-located--f4d93-en-pasted-fragment-is-considered-as-new-chain-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-edit-mode-Check-If-cursor-is-located--f4d93-en-pasted-fragment-is-considered-as-new-chain-2-chromium-linux.png index bfd0c2f7ff..e83b05bbd4 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-edit-mode-Check-If-cursor-is-located--f4d93-en-pasted-fragment-is-considered-as-new-chain-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-edit-mode-Check-If-cursor-is-located--f4d93-en-pasted-fragment-is-considered-as-new-chain-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-1-chromium-linux.png index a84447e600..0bffafdfc2 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-2-chromium-linux.png index de49f1b33f..3f362c9ff4 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-3-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-3-chromium-linux.png index f8137835d7..ec3f8537e5 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-3-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Copy-paste-selection-with-LClick-drag-and-undo-3-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--1104a-owLeft-then-paste-ket-from-clipboard-and-undo-3-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--1104a-owLeft-then-paste-ket-from-clipboard-and-undo-3-chromium-linux.png index 9ddcb062df..70cb78c434 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--1104a-owLeft-then-paste-ket-from-clipboard-and-undo-3-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--1104a-owLeft-then-paste-ket-from-clipboard-and-undo-3-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--18554-t-then-paste-sequence-from-clipboard-and-undo-3-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--18554-t-then-paste-sequence-from-clipboard-and-undo-3-chromium-linux.png index 058f2a0f77..70be47c368 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--18554-t-then-paste-sequence-from-clipboard-and-undo-3-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--18554-t-then-paste-sequence-from-clipboard-and-undo-3-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--49151-t-then-paste-sequence-from-clipboard-and-undo-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--49151-t-then-paste-sequence-from-clipboard-and-undo-1-chromium-linux.png index c970a3d902..e6be395487 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--49151-t-then-paste-sequence-from-clipboard-and-undo-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--49151-t-then-paste-sequence-from-clipboard-and-undo-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--68b8f-owLeft-then-paste-ket-from-clipboard-and-undo-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--68b8f-owLeft-then-paste-ket-from-clipboard-and-undo-1-chromium-linux.png index 4124005a4b..58c66ef859 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--68b8f-owLeft-then-paste-ket-from-clipboard-and-undo-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--68b8f-owLeft-then-paste-ket-from-clipboard-and-undo-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--d04bc-t-then-paste-sequence-from-clipboard-and-undo-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--d04bc-t-then-paste-sequence-from-clipboard-and-undo-2-chromium-linux.png index 0255e83c88..c044658e78 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--d04bc-t-then-paste-sequence-from-clipboard-and-undo-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--d04bc-t-then-paste-sequence-from-clipboard-and-undo-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--fad51-owLeft-then-paste-ket-from-clipboard-and-undo-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--fad51-owLeft-then-paste-ket-from-clipboard-and-undo-2-chromium-linux.png index fb882fcdcb..e5dfef394e 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--fad51-owLeft-then-paste-ket-from-clipboard-and-undo-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-edit-mode-Select--fad51-owLeft-then-paste-ket-from-clipboard-and-undo-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Copy-paste-selection-with-rectangular-tool-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Copy-paste-selection-with-rectangular-tool-1-chromium-linux.png index 8d51761c26..8ab444f2c6 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Copy-paste-selection-with-rectangular-tool-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Copy-paste-selection-with-rectangular-tool-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Copy-paste-selection-with-rectangular-tool-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Copy-paste-selection-with-rectangular-tool-2-chromium-linux.png index 9b80cfb4fa..f52bfe8932 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Copy-paste-selection-with-rectangular-tool-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Copy-paste-selection-with-rectangular-tool-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--0f3ce-with-Ctrl-Lclick-then-copy-and-paste-and-undo-3-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--0f3ce-with-Ctrl-Lclick-then-copy-and-paste-and-undo-3-chromium-linux.png index 9febb90e7f..4af08a9eb4 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--0f3ce-with-Ctrl-Lclick-then-copy-and-paste-and-undo-3-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--0f3ce-with-Ctrl-Lclick-then-copy-and-paste-and-undo-3-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--87e1a-with-Ctrl-Lclick-then-copy-and-paste-and-undo-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--87e1a-with-Ctrl-Lclick-then-copy-and-paste-and-undo-1-chromium-linux.png index 63dc3dd490..f903cadc51 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--87e1a-with-Ctrl-Lclick-then-copy-and-paste-and-undo-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--87e1a-with-Ctrl-Lclick-then-copy-and-paste-and-undo-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--e2c16-with-Ctrl-Lclick-then-copy-and-paste-and-undo-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--e2c16-with-Ctrl-Lclick-then-copy-and-paste-and-undo-2-chromium-linux.png index d25626d7c6..efb2880aa6 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--e2c16-with-Ctrl-Lclick-then-copy-and-paste-and-undo-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts-snapshots/Sequence-mode-copy-paste-for-view-mode-Select--e2c16-with-Ctrl-Lclick-then-copy-and-paste-and-undo-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-edit.spec.ts-snapshots/Sequence-edit-mode-Add-edit-sequence-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-edit.spec.ts-snapshots/Sequence-edit-mode-Add-edit-sequence-1-chromium-linux.png index d7fdd5dc12..41ced905b6 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-edit.spec.ts-snapshots/Sequence-edit-mode-Add-edit-sequence-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-edit.spec.ts-snapshots/Sequence-edit-mode-Add-edit-sequence-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-LClick-drag-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-LClick-drag-1-chromium-linux.png index 84e4911f64..2589bf4d09 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-LClick-drag-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-LClick-drag-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-LClick-drag-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-LClick-drag-2-chromium-linux.png index e67c5cebed..431c152ff8 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-LClick-drag-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-LClick-drag-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-1-chromium-linux.png index b22db52fbc..829df18007 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-2-chromium-linux.png index f7e220b306..e33806f72d 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-3-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-3-chromium-linux.png index 03ee1417b3..1133fbff4c 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-3-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-3-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-4-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-4-chromium-linux.png index e67c5cebed..431c152ff8 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-4-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowLeft-then-delete-and-undo-4-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowRight-button-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowRight-button-1-chromium-linux.png index 501c22f0eb..f854fa6d73 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowRight-button-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowRight-button-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowRight-button-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowRight-button-2-chromium-linux.png index 69332baac3..595b4ff742 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowRight-button-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-edit-mode-Select-letters-with-Shift-ArrowRight-button-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-entire-chain-with-Ctrl-Lclick-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-entire-chain-with-Ctrl-Lclick-1-chromium-linux.png index 63dc3dd490..f903cadc51 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-entire-chain-with-Ctrl-Lclick-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-entire-chain-with-Ctrl-Lclick-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-letters-with-Shift-Lclick-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-letters-with-Shift-Lclick-1-chromium-linux.png index 354ee73228..482aadd4d3 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-letters-with-Shift-Lclick-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-letters-with-Shift-Lclick-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-letters-with-rectangular-selection-tool-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-letters-with-rectangular-selection-tool-1-chromium-linux.png index 8d51761c26..8ab444f2c6 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-letters-with-rectangular-selection-tool-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode-selection.spec.ts-snapshots/Sequence-mode-selection-for-view-mode-Select-letters-with-rectangular-selection-tool-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-modified-RNA-in-sequence-mode-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-modified-RNA-in-sequence-mode-1-chromium-linux.png index 172d9aecc6..2a922a0bb5 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-modified-RNA-in-sequence-mode-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-modified-RNA-in-sequence-mode-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-modified-RNA-in-sequence-mode-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-modified-RNA-in-sequence-mode-2-chromium-linux.png index daed3a930a..65219d5bbf 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-modified-RNA-in-sequence-mode-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-modified-RNA-in-sequence-mode-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-monomers-chains-and-switch-to-sequence-mode-2-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-monomers-chains-and-switch-to-sequence-mode-2-chromium-linux.png index e67c5cebed..431c152ff8 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-monomers-chains-and-switch-to-sequence-mode-2-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-monomers-chains-and-switch-to-sequence-mode-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-monomers-cyclic-chains-and-switch-to-sequence-mode-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-monomers-cyclic-chains-and-switch-to-sequence-mode-1-chromium-linux.png index cb19be65b3..dd91ff372e 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-monomers-cyclic-chains-and-switch-to-sequence-mode-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Open-monomers-cyclic-chains-and-switch-to-sequence-mode-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Switch-from-flex-view-to-sequence-view-to-snake-view-and-back-to-flex-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Switch-from-flex-view-to-sequence-view-to-snake-view-and-back-to-flex-1-chromium-linux.png index 69332baac3..595b4ff742 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Switch-from-flex-view-to-sequence-view-to-snake-view-and-back-to-flex-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts-snapshots/Sequence-Mode-Switch-from-flex-view-to-sequence-view-to-snake-view-and-back-to-flex-1-chromium-linux.png differ diff --git a/packages/ketcher-core/src/application/render/renderers/sequence/NucleosideSequenceItemRenderer.ts b/packages/ketcher-core/src/application/render/renderers/sequence/NucleosideSequenceItemRenderer.ts new file mode 100644 index 0000000000..cd53d1f144 --- /dev/null +++ b/packages/ketcher-core/src/application/render/renderers/sequence/NucleosideSequenceItemRenderer.ts @@ -0,0 +1,37 @@ +import { Nucleoside, Phosphate } from 'domain/entities'; +import { getNextMonomerInChain } from 'domain/helpers/monomers'; +import { RNASequenceItemRenderer } from './RNASequenceItemRenderer'; +import { D3SvgElementSelection } from 'application/render/types'; + +export class NucleosideSequenceItemRenderer extends RNASequenceItemRenderer { + private nucleosideCircleElement?: D3SvgElementSelection< + SVGCircleElement, + void + >; + + protected drawModification() { + const node = this.node as Nucleoside; + const nextNode = getNextMonomerInChain(node.sugar); + + this.drawCommonModification(node); + + if (this.nucleosideCircleElement) { + this.nucleosideCircleElement.remove(); + } + + // show modification for not last Nucleoside + if (nextNode && !(nextNode instanceof Phosphate)) { + this.nucleosideCircleElement = this.rootElement + ?.append('circle') + .attr('r', '3px') + .attr( + 'stroke', + this.isSequenceEditInRnaBuilderModeTurnedOn ? '#24545A' : '#585858', + ) + .attr('stroke-width', '1px') + .attr('fill', 'none') + .attr('cx', '10') + .attr('cy', '-16'); + } + } +} diff --git a/packages/ketcher-core/src/application/render/renderers/sequence/NucleotideSequenceItemRenderer.ts b/packages/ketcher-core/src/application/render/renderers/sequence/NucleotideSequenceItemRenderer.ts index e482d50ec5..479a407860 100644 --- a/packages/ketcher-core/src/application/render/renderers/sequence/NucleotideSequenceItemRenderer.ts +++ b/packages/ketcher-core/src/application/render/renderers/sequence/NucleotideSequenceItemRenderer.ts @@ -1,50 +1,23 @@ -import { BaseSequenceItemRenderer } from 'application/render/renderers/sequence/BaseSequenceItemRenderer'; import { Nucleotide } from 'domain/entities'; import { D3SvgElementSelection } from 'application/render/types'; -export class NucleotideSequenceItemRenderer extends BaseSequenceItemRenderer { +import { RNASequenceItemRenderer } from './RNASequenceItemRenderer'; + +export class NucleotideSequenceItemRenderer extends RNASequenceItemRenderer { private phosphateModificationCircleElement?: D3SvgElementSelection< SVGCircleElement, void >; - get symbolToDisplay(): string { - return ( - this.node.monomer.attachmentPointsToBonds.R3?.getAnotherMonomer( - this.node.monomer, - )?.monomerItem?.props.MonomerNaturalAnalogCode || '@' - ); - } - - protected drawModification() { + drawModification() { const node = this.node as Nucleotide; + this.drawCommonModification(node); + if (this.phosphateModificationCircleElement) { this.phosphateModificationCircleElement.remove(); } - if (node.rnaBase.isModification) { - this.backgroundElement?.attr( - 'fill', - this.node.monomer.selected - ? this.isSequenceEditInRnaBuilderModeTurnedOn - ? '#41A8B2' - : '#3ACA6A' - : this.isSequenceEditModeTurnedOn - ? '#ff7a004f' - : '#CAD3DD', - ); - } - - if (node.sugar.isModification) { - this.backgroundElement - ?.attr( - 'stroke', - this.isSequenceEditInRnaBuilderModeTurnedOn ? '#24545A' : '#585858', - ) - .attr('stroke-width', '1px'); - } - if (node.phosphate?.isModification) { this.phosphateModificationCircleElement = this.rootElement ?.append('circle') diff --git a/packages/ketcher-core/src/application/render/renderers/sequence/RNASequenceItemRenderer.ts b/packages/ketcher-core/src/application/render/renderers/sequence/RNASequenceItemRenderer.ts new file mode 100644 index 0000000000..94b11d23fa --- /dev/null +++ b/packages/ketcher-core/src/application/render/renderers/sequence/RNASequenceItemRenderer.ts @@ -0,0 +1,36 @@ +import { BaseSequenceItemRenderer } from 'application/render/renderers/sequence/BaseSequenceItemRenderer'; +import { Nucleoside, Nucleotide } from 'domain/entities'; + +export abstract class RNASequenceItemRenderer extends BaseSequenceItemRenderer { + get symbolToDisplay(): string { + return ( + this.node.monomer.attachmentPointsToBonds.R3?.getAnotherMonomer( + this.node.monomer, + )?.monomerItem?.props.MonomerNaturalAnalogCode || '@' + ); + } + + protected drawCommonModification(node: Nucleoside | Nucleotide) { + if (node.rnaBase.isModification) { + this.backgroundElement?.attr( + 'fill', + this.node.monomer.selected + ? this.isSequenceEditInRnaBuilderModeTurnedOn + ? '#41A8B2' + : '#3ACA6A' + : this.isSequenceEditModeTurnedOn + ? '#ff7a004f' + : '#CAD3DD', + ); + } + + if (node.sugar.isModification) { + this.backgroundElement + ?.attr( + 'stroke', + this.isSequenceEditInRnaBuilderModeTurnedOn ? '#24545A' : '#585858', + ) + .attr('stroke-width', '1px'); + } + } +} diff --git a/packages/ketcher-core/src/application/render/renderers/sequence/SequenceNodeRendererFactory.ts b/packages/ketcher-core/src/application/render/renderers/sequence/SequenceNodeRendererFactory.ts index 580cfa5ec8..b0550de404 100644 --- a/packages/ketcher-core/src/application/render/renderers/sequence/SequenceNodeRendererFactory.ts +++ b/packages/ketcher-core/src/application/render/renderers/sequence/SequenceNodeRendererFactory.ts @@ -12,6 +12,7 @@ import { EmptySequenceItemRenderer } from 'application/render/renderers/sequence import { BaseMonomerRenderer } from 'application/render'; import { BaseSequenceItemRenderer } from 'application/render/renderers/sequence/BaseSequenceItemRenderer'; import { LinkerSequenceNode } from 'domain/entities/LinkerSequenceNode'; +import { NucleosideSequenceItemRenderer } from './NucleosideSequenceItemRenderer'; export class SequenceNodeRendererFactory { static fromNode( @@ -30,7 +31,7 @@ export class SequenceNodeRendererFactory { RendererClass = NucleotideSequenceItemRenderer; break; case Nucleoside: - RendererClass = NucleotideSequenceItemRenderer; + RendererClass = NucleosideSequenceItemRenderer; break; case EmptySequenceNode: RendererClass = EmptySequenceItemRenderer; diff --git a/packages/ketcher-core/src/domain/entities/Nucleoside.ts b/packages/ketcher-core/src/domain/entities/Nucleoside.ts index bf7bc2a189..52bc95d220 100644 --- a/packages/ketcher-core/src/domain/entities/Nucleoside.ts +++ b/packages/ketcher-core/src/domain/entities/Nucleoside.ts @@ -2,6 +2,7 @@ import { RNABase } from 'domain/entities/RNABase'; import { Sugar } from 'domain/entities/Sugar'; import assert from 'assert'; import { + getNextMonomerInChain, getRnaBaseFromSugar, isValidNucleoside, isValidNucleotide, @@ -97,6 +98,12 @@ export class Nucleoside { } public get modified() { - return this.rnaBase.isModification || this.sugar.isModification; + // TODO move isNotLastNode to separate getter because it is not modification + // It was added here because it needs to show similar icon as for phosphates modifications + const isNotLastNode = !!getNextMonomerInChain(this.sugar); + + return ( + this.rnaBase.isModification || this.sugar.isModification || isNotLastNode + ); } }