Shun Miyazawa 4 лет назад
Родитель
Сommit
7741b1e69a

+ 1 - 1
packages/app/src/components/Page/RevisionLoader.jsx

@@ -126,7 +126,7 @@ LegacyRevisionLoader.propTypes = {
   revisionId: PropTypes.string.isRequired,
   lazy: PropTypes.bool,
   onRevisionLoaded: PropTypes.func,
-  highlightKeywords: PropTypes.arrayOf(PropTypes.string),
+  highlightKeywords: PropTypes.string,
 };
 
 const RevisionLoader = (props) => {

+ 1 - 1
packages/app/src/components/Page/RevisionRenderer.jsx

@@ -173,7 +173,7 @@ LegacyRevisionRenderer.propTypes = {
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   growiRenderer: PropTypes.instanceOf(GrowiRenderer).isRequired,
   markdown: PropTypes.string.isRequired,
-  highlightKeywords: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
+  highlightKeywords: PropTypes.string,
   additionalClassName: PropTypes.string,
 };
 

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

@@ -47,7 +47,7 @@ const MUTATION_OBSERVER_CONFIG = { childList: true, subtree: true };
 type Props ={
   appContainer: AppContainer,
   pageWithMeta : IPageWithMeta<IPageSearchMeta>,
-  highlightKeywords?: string[],
+  highlightKeywords?: string,
   showPageControlDropdown?: boolean,
   forceHideMenuItems?: ForceHideMenuItems,
 }

+ 1 - 1
packages/app/src/components/SearchPage2/SearchPageBase.tsx

@@ -54,7 +54,7 @@ const SearchPageBaseSubstance: ForwardRefRenderFunction<ISelectableAll & IReturn
   // TODO get search keywords and split
   // ref: RevisionRenderer
   //   [...keywords.match(/"[^"]+"|[^\u{20}\u{3000}]+/ug)].forEach((keyword, i) => {
-  const [highlightKeywords, setHightlightKeywords] = useState<string[]>([]);
+  const [highlightKeywords, setHightlightKeywords] = useState<string>('');
   const [selectedPageIdsByCheckboxes] = useState<Set<string>>(new Set());
   // const [allPageIds] = useState<Set<string>>(new Set());
   const [selectedPageWithMeta, setSelectedPageWithMeta] = useState<IPageWithMeta<IPageSearchMeta> | undefined>();