From 791217732362aad8086686e3c693c08301628e76 Mon Sep 17 00:00:00 2001 From: oti Date: Tue, 11 Jun 2024 18:12:04 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20ErrorScreen=20=E3=81=AE=20`footer`?= =?UTF-8?q?=20props=20=E3=82=92=20deprecated=20=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.tsx b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.tsx index 17ae164e16..c88662270a 100644 --- a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.tsx +++ b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.tsx @@ -24,7 +24,7 @@ type Props = { }> /** 表示するコンテンツ */ children?: ReactNode - /** フッター */ + /** @deprecated フッター指定は非推奨です。リンクの表示が必要な場合は links を使用してください。 */ footer?: ReactNode /** コンポーネントに適用するクラス名 */ className?: string From 959b6d9800eed8090cad6584a4aa72c49b3bbfdc Mon Sep 17 00:00:00 2001 From: oti Date: Tue, 11 Jun 2024 18:36:07 +0900 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20ErrorScreen=20=E3=81=AE=20Storybook?= =?UTF-8?q?=20=E3=81=AE=20`full`=20=E3=82=92=20`all`=20=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=A6=E5=86=85=E5=AE=B9=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ErrorScreen/ErrorScreen.stories.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx index 3b721c9fb9..774d9c654c 100644 --- a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx +++ b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx @@ -1,6 +1,8 @@ import { StoryFn } from '@storybook/react' import React from 'react' +import { Text } from '../Text' + import { Footer } from './Footer' import { ErrorScreen } from '.' @@ -13,27 +15,26 @@ export default { }, } -export const Full: StoryFn = () => ( +export const All: StoryFn = () => ( -

+ いつも SmartHR をご利用いただきありがとうございます。
ただいまメンテナンスのため、一時サービスを停止しております。
ご迷惑をおかけいたしますが、ご理解のほどよろしくお願いいたします。 -

+ ) -Full.storyName = 'full' export const WithoutChildren: StoryFn = () => ( ( } /> ) WithFooter.storyName = 'with footer' +All.storyName = 'all' From 34dcd80bffa944ca232c480188489f957659051d Mon Sep 17 00:00:00 2001 From: oti Date: Tue, 11 Jun 2024 18:36:55 +0900 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20`footer`=20props=E5=88=A9=E7=94=A8?= =?UTF-8?q?=E3=81=AE=E4=BE=8B=E3=82=92=E3=83=88=E3=83=AB=E3=83=84=E3=83=A1?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/ErrorScreen/ErrorScreen.stories.tsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx index 774d9c654c..c2384a53dd 100644 --- a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx +++ b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx @@ -3,8 +3,6 @@ import React from 'react' import { Text } from '../Text' -import { Footer } from './Footer' - import { ErrorScreen } from '.' export default { @@ -48,9 +46,4 @@ export const WithoutChildren: StoryFn = () => ( /> ) WithoutChildren.storyName = 'without children' - -export const WithFooter: StoryFn = () => ( - } /> -) -WithFooter.storyName = 'with footer' All.storyName = 'all' From 4579650c2845df50ff0689db413159105aefb0a5 Mon Sep 17 00:00:00 2001 From: oti Date: Tue, 11 Jun 2024 18:39:40 +0900 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20`without=20children`=20=E3=81=AE?= =?UTF-8?q?=E4=BE=8B=E3=82=92=E3=83=88=E3=83=AB=E3=83=84=E3=83=A1=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ErrorScreen/ErrorScreen.stories.tsx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx index c2384a53dd..0a229c3937 100644 --- a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx +++ b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx @@ -33,17 +33,4 @@ export const All: StoryFn = () => ( ) - -export const WithoutChildren: StoryFn = () => ( - -) -WithoutChildren.storyName = 'without children' All.storyName = 'all' From 132ecc9c997dc63666126e8f2bf68ca221e581a2 Mon Sep 17 00:00:00 2001 From: oti Date: Tue, 11 Jun 2024 18:46:43 +0900 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20`all`=20=E3=81=AE=E6=96=87=E8=A8=80?= =?UTF-8?q?=E3=82=92=E7=84=A1=E5=91=B3=E7=84=A1=E8=87=AD=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErrorScreen/ErrorScreen.stories.tsx | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx index 0a229c3937..213687180c 100644 --- a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx +++ b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.stories.tsx @@ -15,21 +15,26 @@ export default { export const All: StoryFn = () => ( - いつも SmartHR をご利用いただきありがとうございます。 -
- ただいまメンテナンスのため、一時サービスを停止しております。 -
- ご迷惑をおかけいたしますが、ご理解のほどよろしくお願いいたします。 + メッセージ ) From 3cb4633b18245bcda04aa5d4e47d3f1918e91e91 Mon Sep 17 00:00:00 2001 From: oti Date: Thu, 13 Jun 2024 19:29:11 +0900 Subject: [PATCH 6/7] =?UTF-8?q?feat:=20ErrorScreen=20=E3=81=8B=E3=82=89=20?= =?UTF-8?q?footer=20props=20=E3=82=92=20omit=20=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smarthr-ui/src/components/ErrorScreen/ErrorScreen.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.tsx b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.tsx index c88662270a..8b20fa04da 100644 --- a/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.tsx +++ b/packages/smarthr-ui/src/components/ErrorScreen/ErrorScreen.tsx @@ -24,8 +24,6 @@ type Props = { }> /** 表示するコンテンツ */ children?: ReactNode - /** @deprecated フッター指定は非推奨です。リンクの表示が必要な場合は links を使用してください。 */ - footer?: ReactNode /** コンポーネントに適用するクラス名 */ className?: string } @@ -41,7 +39,6 @@ export const ErrorScreen: FC = ({ title, links, children, - footer, className, ...props }) => { @@ -79,8 +76,6 @@ export const ErrorScreen: FC = ({ )} - - {footer &&
{footer}
} ) } From 9014b5ec53120f3741dd8938c96988f16f06c36f Mon Sep 17 00:00:00 2001 From: oti Date: Thu, 13 Jun 2024 20:44:42 +0900 Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=E4=B8=8D=E8=A6=81=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=9F=E5=86=85=E9=83=A8=E3=82=B3=E3=83=B3?= =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/ErrorScreen/Footer.tsx | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 packages/smarthr-ui/src/components/ErrorScreen/Footer.tsx diff --git a/packages/smarthr-ui/src/components/ErrorScreen/Footer.tsx b/packages/smarthr-ui/src/components/ErrorScreen/Footer.tsx deleted file mode 100644 index a8b61e8806..0000000000 --- a/packages/smarthr-ui/src/components/ErrorScreen/Footer.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import React from 'react' - -import { Cluster } from '../Layout' -import { TextLink } from '../TextLink' - -import type { ComponentProps, ComponentPropsWithoutRef, FC } from 'react' - -export const Footer: FC> = (props) => ( - - - ヘルプ - お知らせ - 利用規約 - プライバシーポリシー - 運営会社 - 開発者向けAPI - - © SmartHR, Inc. - -) - -const Item: FC> = ({ children, href }) => ( -
  • - - {children} - -
    • -)