disable button when flyout is open

elastic · Apr 16, 2020 · 2d3682f · 2d3682f
1 parent 6b11fee
commit 2d3682f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/index.js b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/index.js
@@ -22,7 +22,7 @@ function mapStateToProps(state = {}) {
     isReadOnly: getIsReadOnly(state),
     isLayerTOCOpen: getIsLayerTOCOpen(state),
     layerList: getLayerList(state),
-    isAddButtonActive: getFlyoutDisplay(state) === FLYOUT_STATE.NONE,
+    isFlyoutOpen: getFlyoutDisplay(state) !== FLYOUT_STATE.NONE,
   };
 }
 
@@ -38,7 +38,7 @@ function mapDispatchToProps(dispatch) {
     openLayerTOC: () => {
       dispatch(setIsLayerTOCOpen(true));
     },
-    openMapSettings: async flyoutDisplay => {
+    openMapSettings: async () => {
       await dispatch(setSelectedLayer(null));
       dispatch(trackMapSettings());
       dispatch(updateFlyout(FLYOUT_STATE.MAP_SETTINGS_PANEL));

diff --git a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/view.js b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/view.js
@@ -57,7 +57,7 @@ export function LayerControl({
   closeLayerTOC,
   openLayerTOC,
   layerList,
-  isAddButtonActive,
+  isFlyoutOpen,
   openMapSettings,
 }) {
   if (!isLayerTOCOpen) {
@@ -92,7 +92,7 @@ export function LayerControl({
       <Fragment>
         <EuiSpacer size="s" />
         <EuiButton
-          isDisabled={!isAddButtonActive}
+          isDisabled={isFlyoutOpen}
           className="mapLayerControl__addLayerButton"
           fill
           fullWidth
@@ -110,6 +110,7 @@ export function LayerControl({
       <EuiFlexItem grow={false}>
         <EuiToolTip delay="long" content={openMapSettingsLabel}>
           <EuiButtonIcon
+            isDisabled={isFlyoutOpen}
             className="mapLayerControl__openMapSettingsButton"
             onClick={openMapSettings}
             iconType="gear"