#2717 Tooltip for S-Group appears in upper left area of canvas

epam · May 31, 2023 · 78d156c · 78d156c
1 parent cc40113
commit 78d156c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/ketcher-core/src/domain/entities/sgroup.ts b/packages/ketcher-core/src/domain/entities/sgroup.ts
@@ -632,7 +632,14 @@ export class SGroup {
     if (!sGroup) {
       return false
     }
-    return sGroup.type === 'SUP'
+    return sGroup.type === SGroup.TYPES.SUP
+  }
+
+  static isDataSGroup(sGroup) {
+    if (!sGroup) {
+      return false
+    }
+    return sGroup.type === SGroup.TYPES.DAT
   }
 
   static isExpandedSGroup(sGroup) {

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
@@ -95,7 +95,7 @@ const InfoPanel: FC<InfoPanelProps> = (props) => {
   const groupName = sGroup?.data?.name
 
   useEffect(() => {
-    if (!groupStruct && sGroup?.type === 'DAT') {
+    if (SGroup.isDataSGroup(sGroup)) {
       setSGroupData(`${sGroup.data?.fieldName}=${sGroup.data?.fieldValue}`)
     } else {
       setSGroupData(null)
@@ -119,7 +119,9 @@ const InfoPanel: FC<InfoPanelProps> = (props) => {
   const width = size.x
   const height = size.y
 
-  return molecule ? (
+  const showMolecule = molecule && !SGroup.isDataSGroup(sGroup)
+
+  return showMolecule ? (
     <div
       style={{
         left: x + 'px',