Fix search

src/js/search/Search.js

@@ -66,7 +66,25 @@ export default class Search extends preact.Component {
             return { warnings, counter, results, start };
         }
 
-        const found = this.props.onSearch(this.state.search);
+        const found = Object.values(
+            this.props
+                .onSearch(this.state.search)
+                .reduce((acc, fieldResult) => {
+                    // FlexSearch returns results per field
+                    // We de-duplicate them here and have a single array of results
+                    fieldResult.result.forEach(result => {
+                        if (!acc.hasOwnProperty(result.id)) {
+                            acc[result.id] = {
+                                url: result.id,
+                                title: result.doc.title,
+                                text: result.doc.text
+                            };
+                        }
+                    });
+
+                    return acc;
+                }, {})
+        );
 
         counter = found.length;
 

src/js/search/index.js

@@ -1,5 +1,5 @@
 import * as preact from "preact";
-import FlexSearch from "flexsearch";
+import { Document } from "flexsearch";
 
 import Search from "./Search";
 
@@ -54,10 +54,12 @@ class SearchEngine {
             this.loadingPromise = new Promise(resolve => {
                 window.load_search_index = data => resolve(data);
             }).then(json => {
-                this.searchIndex = new FlexSearch({
+                this.searchIndex = new Document({
                     doc: {
                         id: "url",
-                        field: ["title", "text", "tags"]
+                        tag: "tags",
+                        field: ["title", "text"],
+                        store: ["title", "text"]
                     }
                 });
 
@@ -71,7 +73,7 @@ class SearchEngine {
                     );
                 }
 
-                this.searchIndex.add(pages);
+                pages.forEach(page => this.searchIndex.add(page));
             });
         }
 
@@ -133,7 +135,9 @@ class SearchEngine {
 
         preact.render(
             <Search
-                onSearch={term => this.searchIndex.search(term)}
+                onSearch={term =>
+                    this.searchIndex.search(term, { enrich: true })
+                }
                 onClose={this.handleClose}
                 onTitleChange={title => {
                     document.title = `${title} ${originalTitle}`;

src/js/theme_daux/code_toggle.js

@@ -37,8 +37,8 @@ function enableToggler(toggleCodeSection, codeBlocks) {
         }
 
         if (hidden) {
-            setCodeBlockStyle(codeBlocks, !!hidden);
-            toggleCodeBlockBtnSet.checked = !hidden;
+            setCodeBlockStyle(codeBlocks, true);
+            toggleCodeBlockBtnSet.checked = false;
         }
     } catch (e) {
         // local storage operations can fail with the file:// protocol