From 4c301a867e377959f3c9e67fc7b2e7978211d4e7 Mon Sep 17 00:00:00 2001 From: Ed Sungik Choi Date: Thu, 20 Oct 2022 21:12:37 +0900 Subject: [PATCH 1/6] fix(form-control): delete grid-column minmax style to avoid text overflow --- .../src/components/Forms/FormControl/FormControl.styled.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bezier-react/src/components/Forms/FormControl/FormControl.styled.ts b/packages/bezier-react/src/components/Forms/FormControl/FormControl.styled.ts index 6a00747acf..2fd8bc56c3 100644 --- a/packages/bezier-react/src/components/Forms/FormControl/FormControl.styled.ts +++ b/packages/bezier-react/src/components/Forms/FormControl/FormControl.styled.ts @@ -23,7 +23,7 @@ export const TopHelperTextWrapper = styled(Box)` export const Grid = styled(Box)` display: grid; grid-template-rows: repeat(2, auto); - grid-template-columns: minmax(${LEFT_LABEL_MIN_WIDTH}px, auto) 1fr; + grid-template-columns: ${LEFT_LABEL_MIN_WIDTH}px 1fr; grid-column-gap: 12px; align-items: center; ` From 702e3acd2df2c9acd7af56bb8a1426e83db50555 Mon Sep 17 00:00:00 2001 From: Ed Sungik Choi Date: Thu, 20 Oct 2022 21:15:17 +0900 Subject: [PATCH 2/6] fix(form-label): add word-break style and shrink to avoid text overflow --- .../src/components/Forms/FormLabel/FormLabel.styled.ts | 1 + .../bezier-react/src/components/Forms/FormLabel/FormLabel.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/bezier-react/src/components/Forms/FormLabel/FormLabel.styled.ts b/packages/bezier-react/src/components/Forms/FormLabel/FormLabel.styled.ts index 87bb98aa3a..6558dc7626 100644 --- a/packages/bezier-react/src/components/Forms/FormLabel/FormLabel.styled.ts +++ b/packages/bezier-react/src/components/Forms/FormLabel/FormLabel.styled.ts @@ -5,4 +5,5 @@ import { Text } from 'Components/Text' export const Label = styled(Text)` display: block; text-align: left; + word-break: break-all; ` diff --git a/packages/bezier-react/src/components/Forms/FormLabel/FormLabel.tsx b/packages/bezier-react/src/components/Forms/FormLabel/FormLabel.tsx index 21ee04d25d..1d3b486f53 100644 --- a/packages/bezier-react/src/components/Forms/FormLabel/FormLabel.tsx +++ b/packages/bezier-react/src/components/Forms/FormLabel/FormLabel.tsx @@ -78,7 +78,7 @@ forwardedRef: React.Ref, ? LabelComponent : ( - + { LabelComponent } From d2c5be1128f0c582722c14bfed7bcdc1e7c26173 Mon Sep 17 00:00:00 2001 From: Ed Sungik Choi Date: Thu, 20 Oct 2022 21:18:45 +0900 Subject: [PATCH 3/6] test: update snapshot --- .../FormControl/__snapshots__/FormControl.test.tsx.snap | 8 ++++++-- .../Forms/FormLabel/__snapshots__/FormLabel.test.tsx.snap | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/bezier-react/src/components/Forms/FormControl/__snapshots__/FormControl.test.tsx.snap b/packages/bezier-react/src/components/Forms/FormControl/__snapshots__/FormControl.test.tsx.snap index 6e0215e24f..cb01a29303 100644 --- a/packages/bezier-react/src/components/Forms/FormControl/__snapshots__/FormControl.test.tsx.snap +++ b/packages/bezier-react/src/components/Forms/FormControl/__snapshots__/FormControl.test.tsx.snap @@ -93,6 +93,7 @@ exports[`FormControl > Snapshot > With multiple field 1`] = ` .c3 { display: block; text-align: left; + word-break: break-all; } .c8 { @@ -322,7 +323,7 @@ exports[`FormControl > Snapshot > With multiple field and left label position 1` .c1 { display: grid; grid-template-rows: repeat(2,auto); - grid-template-columns: minmax(150px,auto) 1fr; + grid-template-columns: 150px 1fr; grid-column-gap: 12px; -webkit-align-items: center; -webkit-box-align: center; @@ -447,6 +448,7 @@ exports[`FormControl > Snapshot > With multiple field and left label position 1` .c4 { display: block; text-align: left; + word-break: break-all; } .c11 { @@ -711,6 +713,7 @@ exports[`FormControl > Snapshot > With single field 1`] = ` .c3 { display: block; text-align: left; + word-break: break-all; } .c5 { @@ -833,7 +836,7 @@ exports[`FormControl > Snapshot > With single field and left label position 1`] .c1 { display: grid; grid-template-rows: repeat(2,auto); - grid-template-columns: minmax(150px,auto) 1fr; + grid-template-columns: 150px 1fr; grid-column-gap: 12px; -webkit-align-items: center; -webkit-box-align: center; @@ -900,6 +903,7 @@ exports[`FormControl > Snapshot > With single field and left label position 1`] .c4 { display: block; text-align: left; + word-break: break-all; } .c6 { diff --git a/packages/bezier-react/src/components/Forms/FormLabel/__snapshots__/FormLabel.test.tsx.snap b/packages/bezier-react/src/components/Forms/FormLabel/__snapshots__/FormLabel.test.tsx.snap index 9a15878163..bd0e11267e 100644 --- a/packages/bezier-react/src/components/Forms/FormLabel/__snapshots__/FormLabel.test.tsx.snap +++ b/packages/bezier-react/src/components/Forms/FormLabel/__snapshots__/FormLabel.test.tsx.snap @@ -21,6 +21,7 @@ exports[`FormLabel > Snapshot > 1`] = ` .c1 { display: block; text-align: left; + word-break: break-all; }