Backmerge: #5521 - Sugar color is wrong if loaded from HELM with inli…

…ne SMILES (#5533)
epam · Sep 19, 2024 · f891d25 · f891d25
1 parent 64aa56d
commit f891d25
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 0 deletions.
diff --git a/...LM-sequence-51-RNA-RP-with-single-inline-Extended-SMILES-R-1-chromium-linux.png b/...LM-sequence-51-RNA-RP-with-single-inline-Extended-SMILES-R-1-chromium-linux.png
diff --git a/...M-sequence-52-RNA-RAP-with-single-inline-Extended-SMILES-P-1-chromium-linux.png b/...M-sequence-52-RNA-RAP-with-single-inline-Extended-SMILES-P-1-chromium-linux.png
diff --git a/...nce-53-RNA-RAP-with-all-monomer-inline-Extended-SMILES-RAP-1-chromium-linux.png b/...nce-53-RNA-RAP-with-all-monomer-inline-Extended-SMILES-RAP-1-chromium-linux.png
diff --git a/...gle-peptide-with-inline-SMILES-L-without-attachment-points-1-chromium-linux.png b/...gle-peptide-with-inline-SMILES-L-without-attachment-points-1-chromium-linux.png
diff --git a/...M-sequence-55-Single-peptide-with-inline-Extended-SMILES-L-1-chromium-linux.png b/...M-sequence-55-Single-peptide-with-inline-Extended-SMILES-L-1-chromium-linux.png
diff --git a/...gle-CHEM-with-inline-SMILES-A6OH-without-attachment-points-1-chromium-linux.png b/...gle-CHEM-with-inline-SMILES-A6OH-without-attachment-points-1-chromium-linux.png
diff --git a/...M-sequence-57-Single-CHEM-with-inline-Extended-SMILES-A6OH-1-chromium-linux.png b/...M-sequence-57-Single-CHEM-with-inline-Extended-SMILES-A6OH-1-chromium-linux.png
diff --git a/...uence-58-List-of-peptide-of-inline-Extended-Smiles-A-C-D-L-1-chromium-linux.png b/...uence-58-List-of-peptide-of-inline-Extended-Smiles-A-C-D-L-1-chromium-linux.png
diff --git a/packages/ketcher-core/src/application/render/renderers/PhosphateRenderer.ts b/packages/ketcher-core/src/application/render/renderers/PhosphateRenderer.ts
@@ -3,6 +3,7 @@ import { Phosphate } from 'domain/entities/Phosphate';
 import { BaseMonomerRenderer } from 'application/render/renderers/BaseMonomerRenderer';
 import { MONOMER_SYMBOLS_IDS } from 'application/render/renderers/constants';
 import { KetMonomerClass } from 'application/formatters';
+import { RNA_DNA_NON_MODIFIED_PART } from 'domain/constants/monomers';
 
 const PHOSPHATE_SELECTED_ELEMENT_ID =
   MONOMER_SYMBOLS_IDS[KetMonomerClass.Phosphate].selected;
@@ -20,6 +21,10 @@ export class PhosphateRenderer extends BaseMonomerRenderer {
     );
   }
 
+  protected getMonomerColor(theme) {
+    return theme.monomer.color[RNA_DNA_NON_MODIFIED_PART.PHOSPHATE].regular;
+  }
+
   protected appendBody(
     rootElement: Selection<SVGGElement, void, HTMLElement, never>,
     theme,

diff --git a/packages/ketcher-core/src/application/render/renderers/SugarRenderer.ts b/packages/ketcher-core/src/application/render/renderers/SugarRenderer.ts
@@ -3,6 +3,7 @@ import { Sugar } from 'domain/entities/Sugar';
 import { BaseMonomerRenderer } from 'application/render/renderers/BaseMonomerRenderer';
 import { MONOMER_SYMBOLS_IDS } from 'application/render/renderers/constants';
 import { KetMonomerClass } from 'application/formatters';
+import { RNA_DNA_NON_MODIFIED_PART } from 'domain/constants/monomers';
 
 const SUGAR_SELECTED_ELEMENT_ID =
   MONOMER_SYMBOLS_IDS[KetMonomerClass.Sugar].selected;
@@ -21,6 +22,14 @@ export class SugarRenderer extends BaseMonomerRenderer {
     );
   }
 
+  public get textColor() {
+    return '#fff';
+  }
+
+  protected getMonomerColor(theme) {
+    return theme.monomer.color[RNA_DNA_NON_MODIFIED_PART.SUGAR_RNA].regular;
+  }
+
   protected appendBody(
     rootElement: Selection<SVGGElement, void, HTMLElement, never>,
     theme,