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

Merge branch 'master' into fix/116390-page-paths-in-search-results-are-not-displayed-correctly

Shun Miyazawa 3 лет назад
Родитель
Сommit
887c7bf0c0

+ 3 - 1
packages/app/src/components/SearchPage/SearchPageBase.tsx

@@ -150,7 +150,9 @@ const SearchPageBaseSubstance: ForwardRefRenderFunction<ISelectableAll & IReturn
   }
 
   const highlightKeywords = searchingKeyword != null
-    ? searchingKeyword.match(highlightKeywordsSplitter) ?? undefined
+    // Remove double quotation marks before and after a keyword if present
+    // https://regex101.com/r/4QKBwg/1
+    ? searchingKeyword.match(highlightKeywordsSplitter)?.map(keyword => keyword.replace(/^"(.*)"$/, '$1')) ?? undefined
     : undefined;
 
   return (

+ 3 - 0
packages/app/src/services/renderer/renderer.tsx

@@ -197,6 +197,9 @@ export const generateViewOptions = (
     components.h1 = Header;
     components.h2 = Header;
     components.h3 = Header;
+    components.h4 = Header;
+    components.h5 = Header;
+    components.h6 = Header;
     components.lsx = Lsx;
     components.drawio = DrawioViewerWithEditButton;
     components.table = TableWithEditButton;