Просмотр исходного кода

fix submit button enabled condition

Yuki Takei 4 лет назад
Родитель
Сommit
b1c661f5a7

+ 4 - 1
packages/app/src/components/PageDuplicateModal.tsx

@@ -159,6 +159,9 @@ const PageDuplicateModal = (): JSX.Element => {
   const { path } = page;
   const isTargetPageDuplicate = existingPaths.includes(pageNameInput);
 
+  const submitButtonEnabled = existingPaths.length === 0
+    || (isDuplicateRecursively && isDuplicateRecursivelyWithoutExistPath);
+
   return (
     <Modal size="lg" isOpen={isOpened} toggle={closeDuplicateModal} className="grw-duplicate-page" autoFocus={false}>
       <ModalHeader tag="h4" toggle={closeDuplicateModal} className="bg-primary text-light">
@@ -246,7 +249,7 @@ const PageDuplicateModal = (): JSX.Element => {
           type="button"
           className="btn btn-primary"
           onClick={duplicate}
-          disabled={(isDuplicateRecursively && !isDuplicateRecursivelyWithoutExistPath && existingPaths.length !== 0)}
+          disabled={!submitButtonEnabled}
         >
           { t('modal_duplicate.label.Duplicate page') }
         </button>

+ 5 - 1
packages/app/src/components/PageRenameModal.tsx

@@ -176,6 +176,10 @@ const PageRenameModal = (): JSX.Element => {
   const { path } = page.data;
   const isTargetPageDuplicate = existingPaths.includes(pageNameInput);
 
+  const submitButtonDisabled = isV5Compatible(page.meta)
+    ? existingPaths.length !== 0 // v5 data
+    : !isRenameRecursively; // v4 data
+
   return (
     <Modal size="lg" isOpen={isOpened} toggle={closeRenameModal} autoFocus={false}>
       <ModalHeader tag="h4" toggle={closeRenameModal} className="bg-primary text-light">
@@ -290,7 +294,7 @@ const PageRenameModal = (): JSX.Element => {
           type="button"
           className="btn btn-primary"
           onClick={rename}
-          disabled={(!isRenameRecursively && existingPaths.length !== 0)}
+          disabled={submitButtonDisabled}
         >Rename
         </button>
       </ModalFooter>