From aab0f3d1489a0551ff5e4acf93a2034a54653b10 Mon Sep 17 00:00:00 2001
From: Yoshiko Sarakai <yoshiko@digitalcube.jp>
Date: Fri, 15 Nov 2024 12:32:07 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=B9=E3=83=8A=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=83=E3=83=88=E3=81=AE=E6=92=AE=E3=82=8A?=
 =?UTF-8?q?=E7=9B=B4=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Footer/__snapshots__/Footer.spec.tsx.snap    | 2 +-
 .../layouts/__snapshots__/PublicPageLayout.spec.tsx.snap    | 2 +-
 stories/pages/admin/__snapshots__/Guides.spec.tsx.snap      | 2 +-
 stories/pages/admin/__snapshots__/ListSites.spec.tsx.snap   | 2 +-
 .../pages/admin/__snapshots__/SiteSettings.spec.tsx.snap    | 2 +-
 .../pages/public/__snapshots__/ForgetPassword.spec.tsx.snap | 6 +++---
 stories/pages/public/__snapshots__/Login.spec.tsx.snap      | 6 +++---
 stories/pages/public/__snapshots__/LoginMFA.spec.tsx.snap   | 6 +++---
 stories/pages/public/__snapshots__/SignUp.spec.tsx.snap     | 4 ++--
 .../public/__snapshots__/SignUpVerification.spec.tsx.snap   | 4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/components/Footer/__snapshots__/Footer.spec.tsx.snap b/src/components/Footer/__snapshots__/Footer.spec.tsx.snap
index f5ccc16..3f99c48 100644
--- a/src/components/Footer/__snapshots__/Footer.spec.tsx.snap
+++ b/src/components/Footer/__snapshots__/Footer.spec.tsx.snap
@@ -14,7 +14,7 @@ exports[`Footer to match snapshot 1`] = `
       <small
         class="d-flex align-items-center justify-content-center"
       >
-        ©2023 shifter | A Product by 
+        ©2024 shifter | A Product by 
         <a
           href="https://www.digitalcube.jp/"
           rel="nofollow noopener"
diff --git a/stories/layouts/__snapshots__/PublicPageLayout.spec.tsx.snap b/stories/layouts/__snapshots__/PublicPageLayout.spec.tsx.snap
index 1f6a8f8..c8f8712 100644
--- a/stories/layouts/__snapshots__/PublicPageLayout.spec.tsx.snap
+++ b/stories/layouts/__snapshots__/PublicPageLayout.spec.tsx.snap
@@ -219,7 +219,7 @@ exports[`Nav to match snapshot [OneColumns] 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
diff --git a/stories/pages/admin/__snapshots__/Guides.spec.tsx.snap b/stories/pages/admin/__snapshots__/Guides.spec.tsx.snap
index 2931eec..e580478 100644
--- a/stories/pages/admin/__snapshots__/Guides.spec.tsx.snap
+++ b/stories/pages/admin/__snapshots__/Guides.spec.tsx.snap
@@ -706,7 +706,7 @@ exports[`Guides to match snapshot(default) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
diff --git a/stories/pages/admin/__snapshots__/ListSites.spec.tsx.snap b/stories/pages/admin/__snapshots__/ListSites.spec.tsx.snap
index 76e6691..6c86d8c 100644
--- a/stories/pages/admin/__snapshots__/ListSites.spec.tsx.snap
+++ b/stories/pages/admin/__snapshots__/ListSites.spec.tsx.snap
@@ -778,7 +778,7 @@ exports[`ListSites to match snapshot(default) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
diff --git a/stories/pages/admin/__snapshots__/SiteSettings.spec.tsx.snap b/stories/pages/admin/__snapshots__/SiteSettings.spec.tsx.snap
index b5c905b..721cdf1 100644
--- a/stories/pages/admin/__snapshots__/SiteSettings.spec.tsx.snap
+++ b/stories/pages/admin/__snapshots__/SiteSettings.spec.tsx.snap
@@ -807,7 +807,7 @@ exports[`SiteSettings to match snapshot(default) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
diff --git a/stories/pages/public/__snapshots__/ForgetPassword.spec.tsx.snap b/stories/pages/public/__snapshots__/ForgetPassword.spec.tsx.snap
index aa10eb4..392df44 100644
--- a/stories/pages/public/__snapshots__/ForgetPassword.spec.tsx.snap
+++ b/stories/pages/public/__snapshots__/ForgetPassword.spec.tsx.snap
@@ -190,7 +190,7 @@ exports[`ForgetPassword to match snapshot (failure) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
@@ -321,7 +321,7 @@ exports[`ForgetPassword to match snapshot (inprogress) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
@@ -491,7 +491,7 @@ exports[`ForgetPassword to match snapshot(default) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
diff --git a/stories/pages/public/__snapshots__/Login.spec.tsx.snap b/stories/pages/public/__snapshots__/Login.spec.tsx.snap
index 7cea9b8..56ed4c8 100644
--- a/stories/pages/public/__snapshots__/Login.spec.tsx.snap
+++ b/stories/pages/public/__snapshots__/Login.spec.tsx.snap
@@ -303,7 +303,7 @@ exports[`Login to match snapshot (failure) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
@@ -581,7 +581,7 @@ exports[`Login to match snapshot (inprogress) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
@@ -859,7 +859,7 @@ exports[`Login to match snapshot(default) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
diff --git a/stories/pages/public/__snapshots__/LoginMFA.spec.tsx.snap b/stories/pages/public/__snapshots__/LoginMFA.spec.tsx.snap
index d47e76d..5616a3d 100644
--- a/stories/pages/public/__snapshots__/LoginMFA.spec.tsx.snap
+++ b/stories/pages/public/__snapshots__/LoginMFA.spec.tsx.snap
@@ -220,7 +220,7 @@ exports[`LoginMFA to match snapshot (failure) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
@@ -420,7 +420,7 @@ exports[`LoginMFA to match snapshot (inprogress) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
@@ -617,7 +617,7 @@ exports[`LoginMFA to match snapshot(default) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
diff --git a/stories/pages/public/__snapshots__/SignUp.spec.tsx.snap b/stories/pages/public/__snapshots__/SignUp.spec.tsx.snap
index 4d6b4c6..221ef75 100644
--- a/stories/pages/public/__snapshots__/SignUp.spec.tsx.snap
+++ b/stories/pages/public/__snapshots__/SignUp.spec.tsx.snap
@@ -279,7 +279,7 @@ exports[`SignUp to match snapshot (failure) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
@@ -523,7 +523,7 @@ exports[`SignUp to match snapshot(default) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
diff --git a/stories/pages/public/__snapshots__/SignUpVerification.spec.tsx.snap b/stories/pages/public/__snapshots__/SignUpVerification.spec.tsx.snap
index 0c1faf9..e67620c 100644
--- a/stories/pages/public/__snapshots__/SignUpVerification.spec.tsx.snap
+++ b/stories/pages/public/__snapshots__/SignUpVerification.spec.tsx.snap
@@ -190,7 +190,7 @@ exports[`SignUpVerification to match snapshot (failure) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"
@@ -360,7 +360,7 @@ exports[`SignUpVerification to match snapshot(default) 1`] = `
         <small
           class="d-flex align-items-center justify-content-center"
         >
-          ©2023 Shifter | A Product by 
+          ©2024 Shifter | A Product by 
           <a
             href="https://www.digitalcube.jp/"
             rel="nofollow noopener"

From 72ad68c6087f4caae85120e9e893feb058676d0b Mon Sep 17 00:00:00 2001
From: Yoshiko Sarakai <yoshiko@digitalcube.jp>
Date: Fri, 15 Nov 2024 12:32:37 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=80=E3=83=AB?=
 =?UTF-8?q?=E3=81=AB=E8=83=8C=E6=99=AF=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=82=82=E9=96=89=E3=81=98=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Modals/Modal.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/Modals/Modal.tsx b/src/components/Modals/Modal.tsx
index e64aec5..fe32918 100644
--- a/src/components/Modals/Modal.tsx
+++ b/src/components/Modals/Modal.tsx
@@ -25,6 +25,7 @@ export type ModalProps = PropsWithChildren<{
   style?: CSSProperties;
   noPadding?: boolean;
   targetElement?: Element;
+  backdropDismiss?: boolean; // モーダルの背景をクリックして閉じるかどうか
 }>;
 
 export const ModalRow: FC<
@@ -39,6 +40,7 @@ export const ModalRow: FC<
   onSubmit,
   style,
   noPadding = false,
+  backdropDismiss,
 }) => {
   const { open, isOpen: isOpenHandler, dismiss } = useModal();
 
@@ -64,7 +66,7 @@ export const ModalRow: FC<
           aria-labelledby="modal-label"
           aria-hidden="false"
           aria-modal="true"
-          onClick={() => isOpenHandler(false)}
+          onClick={() => backdropDismiss && isOpenHandler(false)}
           style={style}
         >
           <div
@@ -97,6 +99,7 @@ export const Modal: FC<ModalProps> = ({
   dismiss = false,
   setOpen,
   targetElement,
+  backdropDismiss = true, // デフォルト値をtrueに設定
   ...props
 }) => {
   const [_isOpen, _setIsOpen] = useState(open || false);
@@ -122,7 +125,7 @@ export const Modal: FC<ModalProps> = ({
           dismiss,
         }}
       >
-        <ModalRow {...props} />
+        <ModalRow {...props} backdropDismiss={backdropDismiss} />
       </ModalContext.Provider>,
       targetElement
     );
@@ -136,7 +139,7 @@ export const Modal: FC<ModalProps> = ({
         dismiss,
       }}
     >
-      <ModalRow {...props} />
+      <ModalRow {...props} backdropDismiss={backdropDismiss} />
     </ModalContext.Provider>
   );
 };