SULLEY\ryo-h 4 лет назад
Родитель
Сommit
837b9bc162

+ 2 - 2
packages/app/src/components/SearchPage.jsx

@@ -228,8 +228,8 @@ class SearchPage extends React.Component {
         onSearchInvoked={this.searchHandler}
         onExcludeUserPagesSwitched={this.switchExcludeUserPagesHandler}
         onExcludeTrashPagesSwitched={this.switchExcludeTrashPagesHandler}
-        excludeUnderUserPage={this.state.excludeUnderUserPage}
-        excludeUnderTrashPage={this.state.excludeUnderTrashPage}
+        excludeUserPages={this.state.excludeUserPages}
+        excludeTrashPages={this.state.excludeTrashPages}
       >
       </SearchControl>
     );

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

@@ -9,8 +9,8 @@ import { CheckboxType } from '../../interfaces/search';
 type Props = {
   searchingKeyword: string,
   appContainer: AppContainer,
-  excludeUnderUserPage: boolean,
-  excludeUnderTrashPage: boolean,
+  excludeUserPages: boolean,
+  excludeTrashPages: boolean,
   onSearchInvoked: (data: {keyword: string}) => boolean,
   onExcludeUserPagesSwitched?: () => void,
   onExcludeTrashPagesSwitched?: () => void,
@@ -73,8 +73,8 @@ const SearchControl: FC <Props> = (props: Props) => {
         onClose={closeSearchOptionModalHandler}
         onExcludeUserPagesSwitched={switchExcludeUserPagesHandler}
         onExcludeTrashPagesSwitched={switchExcludeTrashPagesHandler}
-        excludeUnderUserPage={props.excludeUnderUserPage}
-        excludeUnderTrashPage={props.excludeUnderTrashPage}
+        excludeUserPages={props.excludeUserPages}
+        excludeTrashPages={props.excludeTrashPages}
       />
     );
   };

+ 5 - 6
packages/app/src/components/SearchPage/SearchOptionModal.tsx

@@ -8,8 +8,8 @@ import {
 
 type Props = {
   isOpen: boolean,
-  excludeUnderUserPage: boolean,
-  excludeUnderTrashPage: boolean,
+  excludeUserPages: boolean,
+  excludeTrashPages: boolean,
   onClose?: () => void,
   onExcludeUserPagesSwitched?: () => void,
   onExcludeTrashPagesSwitched?: () => void,
@@ -21,8 +21,7 @@ const SearchOptionModal: FC<Props> = (props: Props) => {
   const { t } = useTranslation('');
 
   const {
-    isOpen, onClose, onSwitchExcludingUserPagesInvoked, onSwitchExcludingTrashPagesInvoked,
-    excludeUnderUserPage, excludeUnderTrashPage,
+    isOpen, onClose, excludeUserPages, excludeTrashPages,
   } = props;
 
   const onCloseModal = () => {
@@ -51,7 +50,7 @@ const SearchOptionModal: FC<Props> = (props: Props) => {
                 className="mr-2"
                 type="checkbox"
                 onClick={props.onExcludeUserPagesSwitched}
-                checked={!excludeUnderUserPage}
+                checked={!excludeUserPages}
               />
               {t('Include Subordinated Target Page', { target: '/user' })}
             </label>
@@ -62,7 +61,7 @@ const SearchOptionModal: FC<Props> = (props: Props) => {
                 className="mr-2"
                 type="checkbox"
                 onClick={props.onExcludeTrashPagesSwitched}
-                checked={!excludeUnderTrashPage}
+                checked={!excludeTrashPages}
               />
               {t('Include Subordinated Target Page', { target: '/trash' })}
             </label>