From cf4d48038b8f40be5c7a691b3333076d6500c1c8 Mon Sep 17 00:00:00 2001 From: evan-moon Date: Sun, 20 Feb 2022 15:23:18 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat(Flex):=20flex=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=EB=A5=BC=20=EC=9B=90=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=EB=A1=9C=20=EB=A0=8C?= =?UTF-8?q?=EB=8D=94=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Flex/index.tsx | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/Flex/index.tsx b/src/components/Flex/index.tsx index 1cbbc33a..027a1b03 100644 --- a/src/components/Flex/index.tsx +++ b/src/components/Flex/index.tsx @@ -7,13 +7,25 @@ export interface FlexBaseProps { justify?: CSSProperties['justifyContent']; } +export const DEFAULT_ELEMENT = 'div' as const; + type Props = OverridableProps; const Flex = ( - { direction = 'row', align = 'flex-start', justify = 'flex-start', children, ...rest }: Props, + { + direction = 'row', + align = 'flex-start', + justify = 'flex-start', + children, + as, + ...rest + }: Props, ref: Ref ) => { + const target = as ?? DEFAULT_ELEMENT; + const Component = target; + return ( -
( {...rest} > {children} -
+ ); }; From 97886f08b5c44db01f2b66620a30286556ca6eb0 Mon Sep 17 00:00:00 2001 From: evan-moon Date: Sun, 20 Feb 2022 15:27:28 +0900 Subject: [PATCH 2/4] update github action --- .github/workflows/create-pull-request.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-pull-request.yml b/.github/workflows/create-pull-request.yml index dd1809aa..05542303 100644 --- a/.github/workflows/create-pull-request.yml +++ b/.github/workflows/create-pull-request.yml @@ -9,7 +9,8 @@ jobs: - name: Checkout uses: actions/checkout@master - name: Fire Notification - uses: Lubycon/github-reviewer-noti-action@v2.0.1 + uses: Lubycon/github-reviewer-noti-action@v3.2.0 with: - github-token: ${{ secrets.LUBYCON_GITHUB_TOKEN }} - mattermost-webhook: ${{ secrets.MATTERMOST_WEBHOOK_URL }} \ No newline at end of file + slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }} + slack-channel-id: ${{ secrets.SLACK_CHANNEL_ID }} + slack-bot-signing-secret: ${{ secrets.SLACK_SIGNING_SECRET }} \ No newline at end of file From 40a08427958cd1b73dadf387677791471aa7047f Mon Sep 17 00:00:00 2001 From: evan-moon Date: Tue, 22 Feb 2022 16:48:25 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Flex/index.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Flex/index.tsx b/src/components/Flex/index.tsx index 027a1b03..ca298bc9 100644 --- a/src/components/Flex/index.tsx +++ b/src/components/Flex/index.tsx @@ -21,8 +21,7 @@ const Flex = ( }: Props, ref: Ref ) => { - const target = as ?? DEFAULT_ELEMENT; - const Component = target; + const Component = as ?? DEFAULT_ELEMENT; return ( Date: Tue, 22 Feb 2022 16:49:36 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=9D=98=EB=AF=B8=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Grid/Column.tsx | 3 +-- src/components/Text/index.tsx | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/Grid/Column.tsx b/src/components/Grid/Column.tsx index 2ba3aa83..74559991 100644 --- a/src/components/Grid/Column.tsx +++ b/src/components/Grid/Column.tsx @@ -43,8 +43,7 @@ const Column = ( [] ); - const target = as ?? DEFAULT_ELEMENT; - const Component = target; + const Component = as ?? DEFAULT_ELEMENT; return ( ( { display, lineHeight, weight, size, color, align, as, children, ...props }: TextProps, ref: Ref ) => { - const target = as ?? DEFAULT_ELEMENT; - const Component = target; + const Component = as ?? DEFAULT_ELEMENT; return (