Desktop: Improved local search by highlighting even partial matches

ElectronClient/app/gui/NoteText.jsx

@@ -6,7 +6,7 @@ const Search = require('lib/models/Search.js');
 const { time } = require('lib/time-utils.js');
 const Setting = require('lib/models/Setting.js');
 const { IconButton } = require('./IconButton.min.js');
-const { urlDecode, escapeHtml } = require('lib/string-utils');
+const { urlDecode, escapeHtml, pregQuote } = require('lib/string-utils');
 const Toolbar = require('./Toolbar.min.js');
 const TagList = require('./TagList.min.js');
 const { connect } = require('react-redux');
@@ -1588,7 +1588,11 @@ class NoteTextComponent extends React.Component {
 			const markerOptions = {};
 
 			if (this.state.showLocalSearch) {
-				keywords = [this.state.localSearch.query];
+				keywords = [{
+					type: 'text',
+					value: this.state.localSearch.query,
+					accuracy: 'partially',
+				}]
 				markerOptions.selectedIndex = this.state.localSearch.selectedIndex;
 			} else {
 				const search = BaseModel.byId(this.props.searches, this.props.selectedSearchId);

ElectronClient/app/gui/note-viewer/index.html

@@ -257,15 +257,22 @@
 		for (let i = 0; i < keywords.length; i++) {
 			const keyword = keywords[i];
 
+			if (typeof keyword === 'string') {
+				keyword = {
+					type: 'text',
+					value: keyword,
+				};
+			}
+
 			if (keyword.type === 'regex') {
 				mark_.markRegExp(new RegExp(keyword.value, 'gmi'), {
 					each: onEachElement,
 					acrossElements: true,
 				});
 			} else {
-				mark_.mark([keyword], {
+				mark_.mark([keyword.value], {
 					each: onEachElement,
-					accuracy: 'exactly', 
+					accuracy: keyword.accuracy ? keyword.accuracy : 'exactly', 
 				});
 			}
 		}