Sfoglia il codice sorgente

Merge branch 'feat/77525-80783-control-selected-pages' into feat/77525-80785-implement-select-all

# Conflicts:
#	packages/app/src/components/SearchPage/SearchResultListItem.tsx
SULLEY\ryo-h 4 anni fa
parent
commit
895c27b7be

+ 2 - 0
packages/app/src/components/SearchPage/SearchResultList.tsx

@@ -16,6 +16,7 @@ type Props = {
   pages: ISearchedPage[],
   pages: ISearchedPage[],
   selectedPages: ISearchedPage[],
   selectedPages: ISearchedPage[],
   onClickInvoked?: (pageId: string) => void,
   onClickInvoked?: (pageId: string) => void,
+  onChangedInvoked?: (page: ISearchedPage) => void,
   searchResultCount?: number,
   searchResultCount?: number,
   activePage?: number,
   activePage?: number,
   pagingLimit?: number,
   pagingLimit?: number,
@@ -34,6 +35,7 @@ const SearchResultList: FC<Props> = (props:Props) => {
             key={page._id}
             key={page._id}
             page={page}
             page={page}
             onClickInvoked={props.onClickInvoked}
             onClickInvoked={props.onClickInvoked}
+            onChangedInvoked={props.onChangedInvoked}
             isSelected={page._id === focusedPageId || false}
             isSelected={page._id === focusedPageId || false}
           />
           />
         );
         );

+ 1 - 2
packages/app/src/components/SearchPage/SearchResultListItem.tsx

@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useTranslation } from 'react-i18next';
 import { UserPicture, PageListMeta, PagePathLabel } from '@growi/ui';
 import { UserPicture, PageListMeta, PagePathLabel } from '@growi/ui';
 import { DevidedPagePath } from '@growi/core';
 import { DevidedPagePath } from '@growi/core';
@@ -82,7 +82,6 @@ const SearchResultListItem: FC<Props> = (props:Props) => {
   const dPagePath = new DevidedPagePath(page.path, false, true);
   const dPagePath = new DevidedPagePath(page.path, false, true);
   const pagePathElem = <PagePathLabel page={page} isFormerOnly />;
   const pagePathElem = <PagePathLabel page={page} isFormerOnly />;
 
 
-
   return (
   return (
     <li key={page._id} className={`page-list-li w-100 border-bottom pr-4 list-group-item-action ${isSelected ? 'active' : ''}`}>
     <li key={page._id} className={`page-list-li w-100 border-bottom pr-4 list-group-item-action ${isSelected ? 'active' : ''}`}>
       <a
       <a