Backmerge: #5255 – Fix adding new monomers to canvas in sequence mode…

… while editing RNA in builder (#5260)
epam · Aug 11, 2024 · 2b898c6 · 2b898c6
1 parent 54e7cda
commit 2b898c6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/...her-macromolecules/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.tsx b/...her-macromolecules/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.tsx
@@ -162,10 +162,13 @@ export const RnaAccordion = ({ libraryName, duplicatePreset, editPreset }) => {
   ];
 
   const selectItem = (monomer, groupName) => {
-    if (!isSequenceEditInRNABuilderMode) {
+    if (!isSequenceEditInRNABuilderMode && !isEditMode) {
       editor.events.selectMonomer.dispatch(monomer);
     }
-    if (!isEditMode) return;
+
+    if (!isEditMode) {
+      return;
+    }
 
     const monomerClass = monomer.props.MonomerClass.toLowerCase();
     const currentPreset = {

diff --git a/...mponents/monomerLibrary/RnaBuilder/RnaEditor/RnaEditorExpanded/RnaEditorExpanded.test.tsx b/...mponents/monomerLibrary/RnaBuilder/RnaEditor/RnaEditorExpanded/RnaEditorExpanded.test.tsx
@@ -3,6 +3,11 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import { RnaEditorExpanded } from 'components/monomerLibrary/RnaBuilder/RnaEditor/RnaEditorExpanded/RnaEditorExpanded';
 import { EmptyFunction } from 'helpers';
 
+jest.mock('hooks', () => ({
+  ...jest.requireActual('hooks'),
+  useLayoutMode: () => 'sequence-layout-mode',
+}));
+
 describe('Test Rna Editor Expanded component', () => {
   it('should render correctly in edit mode', async () => {
     render(

diff --git a/...rc/components/monomerLibrary/RnaBuilder/RnaEditor/RnaEditorExpanded/RnaEditorExpanded.tsx b/...rc/components/monomerLibrary/RnaBuilder/RnaEditor/RnaEditorExpanded/RnaEditorExpanded.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Entities } from 'ketcher-core';
+import { Entities, ModeTypes } from 'ketcher-core';
 import { MonomerGroups } from 'src/constants';
 import { GroupBlock } from './GroupBlock';
 import {
@@ -53,7 +53,7 @@ import {
   setSequenceSelectionName,
   selectIsActivePresetNewAndEmpty,
 } from 'state/rna-builder';
-import { useAppSelector } from 'hooks';
+import { useAppSelector, useLayoutMode } from 'hooks';
 import {
   scrollToSelectedMonomer,
   scrollToSelectedPreset,
@@ -126,6 +126,8 @@ export const RnaEditorExpanded = ({
       generateSequenceSelectionGroupNames(sequenceSelection),
     );
 
+  const isSequenceMode = useLayoutMode() === ModeTypes.sequence;
+
   const updatePresetMonomerGroup = () => {
     if (activePresetMonomerGroup) {
       const groupName =
@@ -216,7 +218,7 @@ export const RnaEditorExpanded = ({
       selectedGroup,
     );
 
-    if (selectedRNAPartMonomer) {
+    if (selectedRNAPartMonomer && !isSequenceMode) {
       editor.events.selectMonomer.dispatch(selectedRNAPartMonomer);
     }
     scrollToActiveItemInLibrary(selectedGroup);