From 47d01767278642eabc7297d624b9d455043daefe Mon Sep 17 00:00:00 2001 From: kuzhelov Date: Thu, 21 Mar 2019 12:19:37 +0100 Subject: [PATCH 1/2] fix shrink issue --- .../react/src/themes/teams/components/Flex/flexItemStyles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/themes/teams/components/Flex/flexItemStyles.ts b/packages/react/src/themes/teams/components/Flex/flexItemStyles.ts index 404cd4a76d..f8b6bb9125 100644 --- a/packages/react/src/themes/teams/components/Flex/flexItemStyles.ts +++ b/packages/react/src/themes/teams/components/Flex/flexItemStyles.ts @@ -11,7 +11,7 @@ const flexItemStyles: ComponentSlotStylesInput ...(p.size && toFlexItemSizeValues(v[p.size])), - ...(p.shrink && { flexShrink: p.shrink }), + ...(typeof p.shrink === 'number' && { flexShrink: p.shrink }), ...(p.shrink === false && { flexShrink: 0 }), ...(p.grow && { flexGrow: p.grow }), From d2d62e78d89a83ca27db5bd67cff9493dcdafa5c Mon Sep 17 00:00:00 2001 From: kuzhelov Date: Thu, 21 Mar 2019 12:25:33 +0100 Subject: [PATCH 2/2] upd changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25738ef630..d4953af444 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Fixes - Add aria posinset and setsize, hide menu indicator from narration @jurokapsiar ([#1066](https://github.com/stardust-ui/react/pull/1066)) - Fix applying accessibility key handlers @layershifter ([#1072](https://github.com/stardust-ui/react/pull/1072)) +- Fix `shrink` prop behavior for `Flex.Item` @kuzhelov ([#1086](https://github.com/stardust-ui/react/pull/1086)) ### Features - Add `Alert` component @Bugaa92 ([#1063](https://github.com/stardust-ui/react/pull/1063))