Merge branch 'master' of github.com:epam/ketcher into 3819-macro-sele…

…ction-in-sequence-representation-for-view-mode
epam · Feb 27, 2024 · a4acb0a · a4acb0a
2 parents 6a5027f + 7f0d927
commit a4acb0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/ketcher-core/src/application/render/renderStruct.ts b/packages/ketcher-core/src/application/render/renderStruct.ts
@@ -74,11 +74,7 @@ export class RenderStruct {
         return;
       }
 
-      console.log('-----START-------');
-      console.log(struct.sgroups);
       const preparedStruct = this.prepareStruct(struct);
-      console.log(preparedStruct.sgroups);
-      console.log('-----END-------');
       preparedStruct.initHalfBonds();
       preparedStruct.initNeighbors();
       preparedStruct.setImplicitHydrogen();

diff --git a/packages/ketcher-core/src/application/render/restruct/retext.ts b/packages/ketcher-core/src/application/render/restruct/retext.ts
@@ -238,6 +238,11 @@ class ReText extends ReObject {
       null,
     );
 
+    // Sort to apply font size styles first and then override it by subscript/superscript styles
+    ranges.sort((_, nextRange) => {
+      return nextRange.style.includes(TextCommand.FontSize) ? 1 : -1;
+    });
+
     return ranges.reduce(
       (styles: any, textRange: CustomRawDraftInlineStyleRange) => {
         const fontsz = customFontSize || options.fontsz;