Fix color chooser interaction with stop propagation moved to native e…

…vent
cBioPortal · Jun 8, 2022 · b1e6bb2 · b1e6bb2
1 parent 4cb5ff3
commit b1e6bb2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 25 deletions.
diff --git a/src/pages/groupComparison/comparisonGroupManager/GroupCheckbox.tsx b/src/pages/groupComparison/comparisonGroupManager/GroupCheckbox.tsx
@@ -78,15 +78,15 @@ export default class GroupCheckbox extends React.Component<
         this.props.shareGroup(this.props.group);
     }
 
-    @autobind
-    private onOverlayEnter() {
-        this.props.store.numberOfVisibleColorChooserModals += 1;
-    }
-
-    @autobind
-    private onOverlayExit() {
-        this.props.store.numberOfVisibleColorChooserModals -= 1;
-    }
+    // @autobind
+    // private onOverlayEnter() {
+    //     this.props.store.numberOfVisibleColorChooserModals += 1;
+    // }
+    //
+    // @autobind
+    // private onOverlayExit() {
+    //     this.props.store.numberOfVisibleColorChooserModals -= 1;
+    // }
 
     @computed get label() {
         return (
@@ -230,19 +230,19 @@ export default class GroupCheckbox extends React.Component<
                                 trigger="click"
                                 placement="bottom"
                                 overlay={this.buildColorChooserWidget()}
-                                onEnter={this.onOverlayEnter}
-                                onExit={this.onOverlayExit}
+                                // onEnter={this.onOverlayEnter}
+                                // onExit={this.onOverlayExit}
                                 rootClose={true}
                             >
                                 <DefaultTooltip
                                     overlay={
                                         'Optional: Select color for group to be used in group comparison. If no color is selected, a random color will be applied.'
                                     }
-                                    disabled={
-                                        this.props.store
-                                            .numberOfVisibleColorChooserModals >
-                                        0
-                                    }
+                                    // disabled={
+                                    //     this.props.store
+                                    //         .numberOfVisibleColorChooserModals >
+                                    //     0
+                                    // }
                                 >
                                     <span
                                         style={{

diff --git a/src/pages/studyView/StudyViewPage.tsx b/src/pages/studyView/StudyViewPage.tsx
@@ -402,7 +402,6 @@ export default class StudyViewPage extends React.Component<
                 {/*    </InfoBeacon>*/}
                 {/*</If>*/}
                 <DefaultTooltip
-                    visible={this.store.showComparisonGroupUI}
                     trigger={['click']}
                     placement="bottomLeft"
                     destroyTooltipOnHide={true}
@@ -412,14 +411,6 @@ export default class StudyViewPage extends React.Component<
                         );
                         arrowEl.style.right = '10px';
                     }}
-                    onVisibleChange={visible => {
-                        if (
-                            this.store.numberOfVisibleColorChooserModals == 0 &&
-                            !this.shareLinkModal
-                        ) {
-                            this.store.showComparisonGroupUI = !!visible;
-                        }
-                    }}
                     getTooltipContainer={() =>
                         document.getElementById(
                             'comparisonGroupManagerContainer'