From 61d1373730b695c5dbd7bd1679c8cbcae65181a7 Mon Sep 17 00:00:00 2001 From: emyarod Date: Mon, 17 Feb 2020 03:29:15 -0600 Subject: [PATCH 1/4] fix(OverflowMenu): call closeMenu method only when menu is open (#5336) --- packages/react/src/components/OverflowMenu/OverflowMenu.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/react/src/components/OverflowMenu/OverflowMenu.js b/packages/react/src/components/OverflowMenu/OverflowMenu.js index e135065af4bc..c7d6ee083a74 100644 --- a/packages/react/src/components/OverflowMenu/OverflowMenu.js +++ b/packages/react/src/components/OverflowMenu/OverflowMenu.js @@ -347,7 +347,10 @@ class OverflowMenu extends Component { }; handleClickOutside = evt => { - if (!this._menuBody || !this._menuBody.contains(evt.target)) { + if ( + this.state.open && + (!this._menuBody || !this._menuBody.contains(evt.target)) + ) { this.closeMenu(); } }; From 8adc849d7472af3aaf64b7d4176345983efcdd31 Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Mon, 17 Feb 2020 03:19:35 -0800 Subject: [PATCH 2/4] fix(button): update icon only ghost button colors (#5313) * fix(button): update icon only ghost button colors * fix(ghost-button): update disabled state behavior * fix(button): remove background when disabled --- .../src/components/button/_button.scss | 25 +++++++++++++++++++ .../src/components/Button/Button-story.js | 1 + 2 files changed, 26 insertions(+) diff --git a/packages/components/src/components/button/_button.scss b/packages/components/src/components/button/_button.scss index b13a0867d8f3..ffa7957e0d9d 100644 --- a/packages/components/src/components/button/_button.scss +++ b/packages/components/src/components/button/_button.scss @@ -206,6 +206,31 @@ } } + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only + .#{$prefix}--btn__icon + path, + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only .#{$prefix}--btn__icon { + fill: $icon-01; + } + + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] + .#{$prefix}--btn__icon + path, + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] + .#{$prefix}--btn__icon { + fill: $disabled-02; + } + + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] { + cursor: not-allowed; + } + + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] + .#{$prefix}--assistive-text, + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled]::before { + display: none; + } + .#{$prefix}--btn--icon-only.#{$prefix}--btn--tertiary { padding-left: rem(15px); padding-right: rem(15px); diff --git a/packages/react/src/components/Button/Button-story.js b/packages/react/src/components/Button/Button-story.js index 8260f1bf0896..bc35f1b3d6da 100644 --- a/packages/react/src/components/Button/Button-story.js +++ b/packages/react/src/components/Button/Button-story.js @@ -71,6 +71,7 @@ const props = { 'Primary button (primary)': 'primary', 'Secondary button (secondary)': 'secondary', 'Tertiary button (tertiary)': 'tertiary', + 'Ghost button (ghost)': 'ghost', }, 'primary' ), From 301f995e400b9b2de1486ce3555ead7080b78c45 Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Mon, 17 Feb 2020 11:30:12 +0000 Subject: [PATCH 3/4] chore(project): sync generated files --- packages/components/docs/sass.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index 70f16a48dede..4ba44f1cb5b8 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -6534,6 +6534,7 @@ $icon-01: if( - **Type**: `{undefined}` - **Used by**: - [carbon--theme [mixin]](#carbon--theme-mixin) + - [button [mixin]](#button-mixin) - [snippet [mixin]](#snippet-mixin) - [data-table-v2-action [mixin]](#data-table-v2-action-mixin) - [date-picker [mixin]](#date-picker-mixin) @@ -7641,6 +7642,7 @@ $disabled-02: if( - **Type**: `{undefined}` - **Used by**: - [carbon--theme [mixin]](#carbon--theme-mixin) + - [button [mixin]](#button-mixin) - [button-base [mixin]](#button-base-mixin) - [button-theme [mixin]](#button-theme-mixin) - [checkbox [mixin]](#checkbox-mixin) @@ -13062,6 +13064,31 @@ Button styles } } + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only + .#{$prefix}--btn__icon + path, + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only .#{$prefix}--btn__icon { + fill: $icon-01; + } + + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] + .#{$prefix}--btn__icon + path, + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] + .#{$prefix}--btn__icon { + fill: $disabled-02; + } + + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] { + cursor: not-allowed; + } + + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled] + .#{$prefix}--assistive-text, + .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only[disabled]::before { + display: none; + } + .#{$prefix}--btn--icon-only.#{$prefix}--btn--tertiary { padding-left: rem(15px); padding-right: rem(15px); @@ -13162,6 +13189,8 @@ Button styles - [hover-primary-text [variable]](#hover-primary-text-variable) - [focus [variable]](#focus-variable) - [ui-02 [variable]](#ui-02-variable) + - [icon-01 [variable]](#icon-01-variable) + - [disabled-02 [variable]](#disabled-02-variable) - [danger [variable]](#danger-variable) - [hover-danger [variable]](#hover-danger-variable) - [active-danger [variable]](#active-danger-variable) From 50b14ff8ced774585fe1162192f22356d577aaef Mon Sep 17 00:00:00 2001 From: Duy Tran Date: Mon, 17 Feb 2020 19:24:56 +0700 Subject: [PATCH 4/4] fix(ui-shell): add check for if href exists when handling onBlur (#5352) Co-authored-by: Josh Black Co-authored-by: TJ Egan --- packages/react/src/components/UIShell/HeaderMenu.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/react/src/components/UIShell/HeaderMenu.js b/packages/react/src/components/UIShell/HeaderMenu.js index fae3cde4b002..40d98c787a12 100644 --- a/packages/react/src/components/UIShell/HeaderMenu.js +++ b/packages/react/src/components/UIShell/HeaderMenu.js @@ -113,10 +113,11 @@ class HeaderMenu extends React.Component { const itemTriggeredBlur = this.items.find( element => element === event.relatedTarget ); - if ( event.relatedTarget && - (event.relatedTarget.getAttribute('href') !== '#' || itemTriggeredBlur) + ((event.relatedTarget.getAttribute('href') && + event.relatedTarget.getAttribute('href') !== '#') || + itemTriggeredBlur) ) { return; }