From 8faf1f7b15506e8e5999e82edb5ab9f240685601 Mon Sep 17 00:00:00 2001 From: emyarod Date: Tue, 28 Jan 2020 16:02:26 -0600 Subject: [PATCH 1/5] fix(FilterableMultiSelect): open item list when searching (#5192) --- .../react/src/components/MultiSelect/FilterableMultiSelect.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react/src/components/MultiSelect/FilterableMultiSelect.js b/packages/react/src/components/MultiSelect/FilterableMultiSelect.js index b76c75f7b2cc..05c36ce9d10c 100644 --- a/packages/react/src/components/MultiSelect/FilterableMultiSelect.js +++ b/packages/react/src/components/MultiSelect/FilterableMultiSelect.js @@ -243,6 +243,7 @@ export default class FilterableMultiSelect extends React.Component { } return { inputValue: inputValue || '', + isOpen: Boolean(inputValue) || this.state.isOpen, }; }); }; From 8009cd38fdbf743737d6ab97696103f8042bd9aa Mon Sep 17 00:00:00 2001 From: Alessandra Davila Date: Tue, 28 Jan 2020 16:30:55 -0600 Subject: [PATCH 2/5] docs(data-table): add storybook book expandable demo styles (#5034) --- .../data-table/_data-table-expandable.scss | 2 -- .../DataTable/stories/datatable-story.scss | 18 ++++++++++++++++++ .../DataTable/stories/with-expansion.js | 14 +++++++++++--- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 packages/react/src/components/DataTable/stories/datatable-story.scss diff --git a/packages/components/src/components/data-table/_data-table-expandable.scss b/packages/components/src/components/data-table/_data-table-expandable.scss index 78b42c6ebee1..229b7679da0a 100644 --- a/packages/components/src/components/data-table/_data-table-expandable.scss +++ b/packages/components/src/components/data-table/_data-table-expandable.scss @@ -63,8 +63,6 @@ } tr.#{$prefix}--parent-row.#{$prefix}--expandable-row + tr[data-child-row] td { - padding-bottom: rem(23px); - transition: padding $duration--moderate-01 motion(standard, productive); border-bottom: 1px solid $ui-03; } diff --git a/packages/react/src/components/DataTable/stories/datatable-story.scss b/packages/react/src/components/DataTable/stories/datatable-story.scss new file mode 100644 index 000000000000..ad10886f0757 --- /dev/null +++ b/packages/react/src/components/DataTable/stories/datatable-story.scss @@ -0,0 +1,18 @@ +@import '~@carbon/type/scss/type'; +@import '~@carbon/themes/scss/themes'; + +.demo-expanded-td td { + padding-left: 3.25rem !important; + padding-bottom: 1.5rem; + padding-top: 1rem; +} + +.demo-inner-container-header { + @include carbon--type-style('productive-heading-01'); + color: $text-01; +} + +.demo-inner-container-content { + @include carbon--type-style('body-long-01'); + color: $text-02; +} diff --git a/packages/react/src/components/DataTable/stories/with-expansion.js b/packages/react/src/components/DataTable/stories/with-expansion.js index 2f09176715a2..b7542f36ef46 100644 --- a/packages/react/src/components/DataTable/stories/with-expansion.js +++ b/packages/react/src/components/DataTable/stories/with-expansion.js @@ -5,6 +5,8 @@ * LICENSE file in the root directory of this source tree. */ +import './datatable-story.scss'; + import React from 'react'; import DataTable, { Table, @@ -56,9 +58,15 @@ export default props => ( {cell.value} ))} - -

Expandable row content

-

Description here

+ +

+ Expandable row content +

+

+ Description here +

))} From 104eddb4bed8fcec3a34399bf928f338a112962c Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Tue, 28 Jan 2020 22:43:33 +0000 Subject: [PATCH 3/5] chore(project): sync generated files --- packages/components/docs/sass.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index 5084b1b942cf..e7a94bd8d583 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -15374,8 +15374,6 @@ Data table expandable styles } tr.#{$prefix}--parent-row.#{$prefix}--expandable-row + tr[data-child-row] td { - padding-bottom: rem(23px); - transition: padding $duration--moderate-01 motion(standard, productive); border-bottom: 1px solid $ui-03; } From 2ce57b31b3308fc8badb561ece4feaf612c2932f Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Wed, 29 Jan 2020 09:55:59 -0800 Subject: [PATCH 4/5] fix(button): remove margin added by safari (#5169) * fix(button): remove margin added by safari * fix(button): add button fix to reset file as well * fix(button): make margin reset less browser specific --- packages/components/src/components/button/_mixins.scss | 2 ++ packages/components/src/globals/scss/_css--reset.scss | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/packages/components/src/components/button/_mixins.scss b/packages/components/src/components/button/_mixins.scss index 020f645206cc..c97aea4c4cec 100644 --- a/packages/components/src/components/button/_mixins.scss +++ b/packages/components/src/components/button/_mixins.scss @@ -29,6 +29,8 @@ outline: none; position: relative; max-width: rem(320px); + // Fix to remove added margins on buttons in safari (see #5155) + margin: 0; &:disabled, &.#{$prefix}--btn--disabled { diff --git a/packages/components/src/globals/scss/_css--reset.scss b/packages/components/src/globals/scss/_css--reset.scss index d2e91732e7d3..8d60fd07128d 100644 --- a/packages/components/src/globals/scss/_css--reset.scss +++ b/packages/components/src/globals/scss/_css--reset.scss @@ -190,6 +190,11 @@ box-sizing: border-box; } + // Fix to remove added margins on buttons in safari (see #5155) + button { + margin: 0; + } + @include carbon--type-reset; @include carbon--icons; } From d46f153ea6a52b41652bd3a374f51bb0721d763d Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Wed, 29 Jan 2020 18:16:11 +0000 Subject: [PATCH 5/5] chore(project): sync generated files --- packages/components/docs/sass.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index e7a94bd8d583..2ab362462d0f 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -13165,6 +13165,8 @@ Button base styles outline: none; position: relative; max-width: rem(320px); + // Fix to remove added margins on buttons in safari (see #5155) + margin: 0; &:disabled, &.#{$prefix}--btn--disabled {