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

refactor the related codes about keyword highlighting

Yuki Takei 3 лет назад
Родитель
Сommit
19af95ed2a

+ 0 - 3
packages/app/src/components/Page/RevisionLoader.tsx

@@ -16,9 +16,6 @@ export type RevisionLoaderProps = {
   revisionId: Ref<IRevision>,
   revisionId: Ref<IRevision>,
   lazy?: boolean,
   lazy?: boolean,
   onRevisionLoaded?: (revision: IRevisionHasId) => void,
   onRevisionLoaded?: (revision: IRevisionHasId) => void,
-
-  pagePath: string,
-  highlightKeywords?: string[],
 }
 }
 
 
 const logger = loggerFactory('growi:Page:RevisionLoader');
 const logger = loggerFactory('growi:Page:RevisionLoader');

+ 1 - 3
packages/app/src/components/PageComment.tsx

@@ -34,7 +34,6 @@ export type PageCommentProps = {
   currentUser: any,
   currentUser: any,
   isReadOnly: boolean,
   isReadOnly: boolean,
   titleAlign?: 'center' | 'left' | 'right',
   titleAlign?: 'center' | 'left' | 'right',
-  highlightKeywords?: string[],
   hideIfEmpty?: boolean,
   hideIfEmpty?: boolean,
 }
 }
 
 
@@ -42,7 +41,7 @@ export const PageComment: FC<PageCommentProps> = memo((props:PageCommentProps):
 
 
   const {
   const {
     rendererOptions: rendererOptionsByProps,
     rendererOptions: rendererOptionsByProps,
-    pageId, revision, currentUser, highlightKeywords, isReadOnly, titleAlign, hideIfEmpty,
+    pageId, revision, currentUser, isReadOnly, titleAlign, hideIfEmpty,
   } = props;
   } = props;
 
 
   const { data: comments, mutate } = useSWRxPageComment(pageId);
   const { data: comments, mutate } = useSWRxPageComment(pageId);
@@ -131,7 +130,6 @@ export const PageComment: FC<PageCommentProps> = memo((props:PageCommentProps):
       revisionCreatedAt={revisionCreatedAt as Date}
       revisionCreatedAt={revisionCreatedAt as Date}
       currentUser={currentUser}
       currentUser={currentUser}
       isReadOnly={isReadOnly}
       isReadOnly={isReadOnly}
-      highlightKeywords={highlightKeywords}
       deleteBtnClicked={onClickDeleteButton}
       deleteBtnClicked={onClickDeleteButton}
       onComment={mutate}
       onComment={mutate}
     />
     />

+ 0 - 1
packages/app/src/components/PageComment/Comment.tsx

@@ -29,7 +29,6 @@ type CommentProps = {
   revisionCreatedAt: Date,
   revisionCreatedAt: Date,
   currentUser: IUser,
   currentUser: IUser,
   isReadOnly: boolean,
   isReadOnly: boolean,
-  highlightKeywords?: string[],
   deleteBtnClicked: (comment: ICommentHasId) => void,
   deleteBtnClicked: (comment: ICommentHasId) => void,
   onComment: () => void,
   onComment: () => void,
 }
 }

+ 1 - 3
packages/app/src/components/PageComment/ReplyComments.tsx

@@ -21,7 +21,6 @@ type ReplycommentsProps = {
   revisionCreatedAt: Date,
   revisionCreatedAt: Date,
   currentUser: IUser,
   currentUser: IUser,
   replyList: ICommentHasIdList,
   replyList: ICommentHasIdList,
-  highlightKeywords?: string[],
   deleteBtnClicked: (comment: ICommentHasId) => void,
   deleteBtnClicked: (comment: ICommentHasId) => void,
   onComment: () => void,
   onComment: () => void,
 }
 }
@@ -29,7 +28,7 @@ type ReplycommentsProps = {
 export const ReplyComments = (props: ReplycommentsProps): JSX.Element => {
 export const ReplyComments = (props: ReplycommentsProps): JSX.Element => {
 
 
   const {
   const {
-    rendererOptions, isReadOnly, revisionId, revisionCreatedAt, currentUser, replyList, highlightKeywords,
+    rendererOptions, isReadOnly, revisionId, revisionCreatedAt, currentUser, replyList,
     deleteBtnClicked, onComment,
     deleteBtnClicked, onComment,
   } = props;
   } = props;
 
 
@@ -47,7 +46,6 @@ export const ReplyComments = (props: ReplycommentsProps): JSX.Element => {
           revisionCreatedAt={revisionCreatedAt}
           revisionCreatedAt={revisionCreatedAt}
           currentUser={currentUser}
           currentUser={currentUser}
           isReadOnly={isReadOnly}
           isReadOnly={isReadOnly}
-          highlightKeywords={highlightKeywords}
           deleteBtnClicked={deleteBtnClicked}
           deleteBtnClicked={deleteBtnClicked}
           onComment={onComment}
           onComment={onComment}
         />
         />

+ 0 - 1
packages/app/src/components/PageTimeline.tsx

@@ -65,7 +65,6 @@ export const PageTimeline = (): JSX.Element => {
                   lazy
                   lazy
                   rendererOptions={rendererOptions}
                   rendererOptions={rendererOptions}
                   pageId={page._id}
                   pageId={page._id}
-                  pagePath={page.path}
                   revisionId={page.revision}
                   revisionId={page.revision}
                 />
                 />
               </div>
               </div>

+ 0 - 3
packages/app/src/components/SearchPage/SearchResultContent.tsx

@@ -215,16 +215,13 @@ export const SearchResultContent: FC<Props> = (props: Props) => {
         <RevisionLoader
         <RevisionLoader
           rendererOptions={rendererOptions}
           rendererOptions={rendererOptions}
           pageId={page._id}
           pageId={page._id}
-          pagePath={page.path}
           revisionId={page.revision}
           revisionId={page.revision}
-          highlightKeywords={highlightKeywords}
         />
         />
         <PageComment
         <PageComment
           rendererOptions={rendererOptions}
           rendererOptions={rendererOptions}
           pageId={page._id}
           pageId={page._id}
           revision={page.revision}
           revision={page.revision}
           currentUser={currentUser}
           currentUser={currentUser}
-          highlightKeywords={highlightKeywords}
           isReadOnly
           isReadOnly
           hideIfEmpty
           hideIfEmpty
         />
         />