Yohei-Shiina 4 лет назад
Родитель
Сommit
e564c20e46

+ 0 - 1
packages/app/src/components/SearchPage.jsx

@@ -243,7 +243,6 @@ class SearchPage extends React.Component {
 
   onClickDeleteAllButton() {
     if (this.state.selectedPagesIdList.size === 0) { return }
-
     this.setState({ isDeleteConfirmModalShown: true });
   }
 

+ 6 - 7
packages/app/src/components/SearchPage/DeleteSelectedPageGroup.tsx

@@ -5,14 +5,14 @@ import { CheckboxType } from '../../interfaces/search';
 type Props = {
   isSelectAllCheckboxDisabled: boolean,
   selectAllCheckboxType: CheckboxType,
-  onClickDeleteButton?: () => void,
+  onClickDeleteAllButton?: () => void,
   onClickSelectAllCheckbox?: (nextSelectAllCheckboxType: CheckboxType) => void,
 }
 
 const DeleteSelectedPageGroup:FC<Props> = (props:Props) => {
   const { t } = useTranslation();
   const {
-    onClickDeleteButton, onClickSelectAllCheckbox, selectAllCheckboxType,
+    onClickDeleteAllButton, onClickSelectAllCheckbox, selectAllCheckboxType,
   } = props;
 
   const onClickCheckbox = () => {
@@ -20,7 +20,10 @@ const DeleteSelectedPageGroup:FC<Props> = (props:Props) => {
       const next = selectAllCheckboxType === CheckboxType.ALL_CHECKED ? CheckboxType.NONE_CHECKED : CheckboxType.ALL_CHECKED;
       onClickSelectAllCheckbox(next);
     }
+  };
 
+  const onClickDeleteButton = () => {
+    if (onClickDeleteAllButton != null) { onClickDeleteAllButton() }
   };
 
   return (
@@ -39,11 +42,7 @@ const DeleteSelectedPageGroup:FC<Props> = (props:Props) => {
         type="button"
         className="btn text-danger font-weight-light p-0 ml-3"
         disabled={selectAllCheckboxType === CheckboxType.NONE_CHECKED}
-        onClick={() => {
-          if (onClickDeleteButton != null) {
-            onClickDeleteButton();
-          }
-        }}
+        onClick={onClickDeleteButton}
       >
         <i className="icon-trash"></i>
         {t('search_result.delete_all_selected_page')}

+ 1 - 1
packages/app/src/components/SearchPage/SearchControl.tsx

@@ -51,7 +51,7 @@ const SearchControl: FC <Props> = (props: Props) => {
         <DeleteSelectedPageGroup
           isSelectAllCheckboxDisabled={searchResultCount === 0}
           selectAllCheckboxType={props.selectAllCheckboxType}
-          onClickDeleteButton={props.onClickDeleteAllButton}
+          onClickDeleteAllButton={props.onClickDeleteAllButton}
           onClickSelectAllCheckbox={props.onClickSelectAllCheckbox}
         />
         <div className="d-flex align-items-center border rounded border-gray px-2 py-1 mr-2 ml-auto">