@difizen/libro-search 0.1.14 → 0.1.15

package/es/index.less

@@ -97,10 +97,10 @@
 }
 
 .libro-selectedtext {
-  background-color: rgb(255, 225, 0);
+  background-color: rgb(168, 172, 149) !important;
 
   span {
-    background-color: rgb(255, 225, 0);
+    background-color: rgb(168, 172, 149) !important;
   }
 }
 

package/es/libro-search-generic-provider.d.ts

@@ -89,6 +89,7 @@ export declare class GenericSearchProvider extends AbstractSearchProvider {
      * @returns A promise that resolves with a boolean indicating whether a replace occurred.
      */
     replaceAllMatches(newText: string): Promise<boolean>;
+    isMatchChanged(matches: HTMLSearchMatch[], newMatches: HTMLSearchMatch[]): boolean;
     /**
      * Initialize the search using the provided options.  Should update the UI
      * to highlight all matches and "select" whatever the first match should be.

package/es/libro-search-generic-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-search-generic-provider.d.ts","sourceRoot":"","sources":["../src/libro-search-generic-provider.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAI9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAGL,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,MAAM,4BAA4B,GAAG,CACzC,MAAM,EAAE,oBAAoB,KACzB,qBAAqB,CAAC;AAC3B,eAAO,MAAM,4BAA4B,eAAyC,CAAC;AACnF;;GAEG;AACH,qBACa,qBAAsB,SAAQ,sBAAsB;IAC/D,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAM;IACnD,SAAS,CAAC,iBAAiB,EAAE,gBAAgB,CAE3C;IACF,SAAS,CAAC,UAAU,oBAAgC;IACpD;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO;IAI1C;;OAEG;IACH,IAAa,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAEnD;IAED;;OAEG;IACH,IAAI,YAAY,IAAI,eAAe,GAAG,SAAS,CAE9C;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,eAAe,EAAE,CAM/B;IAED;;OAEG;IACH,IAAa,YAAY,IAAI,MAAM,GAAG,SAAS,CAE9C;IAED;;;;OAIG;IACH,QAAQ,CAAC,UAAU,QAAQ;gBAEe,MAAM,EAAE,oBAAoB;IAGtE;;OAEG;IACH,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAU/B;;;;;;;;;;OAUG;IACM,OAAO,IAAI,IAAI;IAWxB;;;;;;OAMG;IACG,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAIzE;;;;;;OAMG;IACG,iBAAiB,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAI7E;;;;;;;OAOG;IACG,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAI5E;;;;;;OAMG;IACG,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1D;;;;;;OAMG;IACH,UAAU,UAAiB,MAAM,GAAG,IAAI,mBAAiB,QAAQ,IAAI,CAAC,CAuDpE;IAEF;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAY/B,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI;cA0CjE,gBAAgB,CAC9B,SAAS,EAAE,cAAc,EAAE,EAC3B,QAAQ,EAAE,gBAAgB;CAO7B;AACD,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAU1D"}
+{"version":3,"file":"libro-search-generic-provider.d.ts","sourceRoot":"","sources":["../src/libro-search-generic-provider.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAI9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAGL,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,MAAM,4BAA4B,GAAG,CACzC,MAAM,EAAE,oBAAoB,KACzB,qBAAqB,CAAC;AAC3B,eAAO,MAAM,4BAA4B,eAAyC,CAAC;AACnF;;GAEG;AACH,qBACa,qBAAsB,SAAQ,sBAAsB;IAC/D,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACrC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAM;IACnD,SAAS,CAAC,iBAAiB,EAAE,gBAAgB,CAE3C;IACF,SAAS,CAAC,UAAU,oBAAgC;IACpD;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO;IAI1C;;OAEG;IACH,IAAa,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAEnD;IAED;;OAEG;IACH,IAAI,YAAY,IAAI,eAAe,GAAG,SAAS,CAE9C;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,eAAe,EAAE,CAM/B;IAED;;OAEG;IACH,IAAa,YAAY,IAAI,MAAM,GAAG,SAAS,CAE9C;IAED;;;;OAIG;IACH,QAAQ,CAAC,UAAU,QAAQ;gBAEe,MAAM,EAAE,oBAAoB;IAGtE;;OAEG;IACH,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAU/B;;;;;;;;;;OAUG;IACM,OAAO,IAAI,IAAI;IAWxB;;;;;;OAMG;IACG,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAIzE;;;;;;OAMG;IACG,iBAAiB,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAI7E;;;;;;;OAOG;IACG,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAI5E;;;;;;OAMG;IACG,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1D,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,OAAO;IAkBlF;;;;;;OAMG;IACH,UAAU,UAAiB,MAAM,GAAG,IAAI,mBAAiB,QAAQ,IAAI,CAAC,CA6DpE;IAEF;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAY/B,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI;cA0CjE,gBAAgB,CAC9B,SAAS,EAAE,cAAc,EAAE,EAC3B,QAAQ,EAAE,gBAAgB;CAO7B;AACD,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAU1D"}

package/es/libro-search-generic-provider.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _dec, _dec2, _class, _class2, _descriptor;
+var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -38,14 +38,15 @@ export var GenericSearchProviderFactory = Symbol('GenericSearchProviderFactory')
 /**
  * Generic DOM tree search provider.
  */
-export var GenericSearchProvider = (_dec = transient(), _dec2 = prop(), _dec(_class = (_class2 = /*#__PURE__*/function (_AbstractSearchProvid) {
+export var GenericSearchProvider = (_dec = transient(), _dec2 = prop(), _dec3 = prop(), _dec(_class = (_class2 = /*#__PURE__*/function (_AbstractSearchProvid) {
   _inherits(GenericSearchProvider, _AbstractSearchProvid);
   var _super = _createSuper(GenericSearchProvider);
   function GenericSearchProvider(option) {
     var _this;
     _classCallCheck(this, GenericSearchProvider);
     _this = _super.call(this, option);
-    _initializerDefineProperty(_this, "_matches", _descriptor, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "_currentMatchIndex", _descriptor, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "_matches", _descriptor2, _assertThisInitialized(_this));
     _this._mutationObserver = new MutationObserver(_this._onWidgetChanged.bind(_assertThisInitialized(_this)));
     _this._markNodes = new Array();
     /**
@@ -74,14 +75,14 @@ export var GenericSearchProvider = (_dec = transient(), _dec2 = prop(), _dec(_cl
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               filters = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
-              _context2.next = 3;
-              return _this.endQuery();
-            case 3:
               _this._query = query;
               if (!(query === null)) {
                 _context2.next = 6;
                 break;
               }
+              _context2.next = 5;
+              return _this.endQuery();
+            case 5:
               return _context2.abrupt("return", Promise.resolve());
             case 6:
               if (!((_this$view$container = _this.view.container) !== null && _this$view$container !== void 0 && _this$view$container.current)) {
@@ -98,6 +99,15 @@ export var GenericSearchProvider = (_dec = transient(), _dec2 = prop(), _dec(_cl
               _context2.t0 = [];
             case 13:
               matches = _context2.t0;
+              if (_this.isMatchChanged(_this.matches, matches)) {
+                _context2.next = 16;
+                break;
+              }
+              return _context2.abrupt("return", Promise.resolve());
+            case 16:
+              _context2.next = 18;
+              return _this.endQuery();
+            case 18:
               // Transform the DOM
               nodeIdx = 0;
               _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
@@ -132,16 +142,16 @@ export var GenericSearchProvider = (_dec = transient(), _dec2 = prop(), _dec(_cl
                   }
                 }, _loop);
               });
-            case 16:
+            case 20:
               if (!(nodeIdx < matches.length)) {
-                _context2.next = 20;
+                _context2.next = 24;
                 break;
               }
-              return _context2.delegateYield(_loop(), "t1", 18);
-            case 18:
-              _context2.next = 16;
+              return _context2.delegateYield(_loop(), "t1", 22);
+            case 22:
+              _context2.next = 20;
               break;
-            case 20:
+            case 24:
               if ((_this$view$container3 = _this.view.container) !== null && _this$view$container3 !== void 0 && _this$view$container3.current) {
                 // Watch for future changes:
                 _this._mutationObserver.observe((_this$view$container4 = _this.view.container) === null || _this$view$container4 === void 0 ? void 0 : _this$view$container4.current,
@@ -154,7 +164,7 @@ export var GenericSearchProvider = (_dec = transient(), _dec2 = prop(), _dec(_cl
                 });
               }
               _this._matches = matches;
-            case 22:
+            case 26:
             case "end":
               return _context2.stop();
           }
@@ -356,6 +366,25 @@ export var GenericSearchProvider = (_dec = transient(), _dec2 = prop(), _dec(_cl
       }
       return replaceAllMatches;
     }())
+  }, {
+    key: "isMatchChanged",
+    value: function isMatchChanged(matches, newMatches) {
+      if (matches.length !== newMatches.length) {
+        return true;
+      }
+      for (var i = 0; i < matches.length; i++) {
+        if (matches[i].text !== newMatches[i].text) {
+          return true;
+        }
+        if (matches[i].position !== newMatches[i].position) {
+          return true;
+        }
+        if (matches[i].node !== newMatches[i].node) {
+          return true;
+        }
+      }
+      return false;
+    }
   }, {
     key: "endQuery",
     value: (
@@ -456,7 +485,12 @@ export var GenericSearchProvider = (_dec = transient(), _dec2 = prop(), _dec(_cl
     }
   }]);
   return GenericSearchProvider;
-}(AbstractSearchProvider), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "_matches", [_dec2], {
+}(AbstractSearchProvider), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "_currentMatchIndex", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "_matches", [_dec3], {
   configurable: true,
   enumerable: true,
   writable: true,

package/es/libro-search-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-search-provider.d.ts","sourceRoot":"","sources":["../src/libro-search-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"libro-search-provider.d.ts","sourceRoot":"","sources":["../src/libro-search-provider.ts"],"names":[],"mappings":"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"}

package/es/libro-search-provider.js

@@ -783,7 +783,7 @@ export var LibroSearchProvider = (_dec = transient(), _dec2 = inject(LibroCellSe
   enumerable: true,
   writable: true,
   initializer: function initializer() {
-    return true;
+    return false;
   }
 }), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "onlySearchSelectedCells", [_dec5], {
   configurable: true,

package/es/libro-search-view.d.ts

@@ -8,7 +8,8 @@ import type { LibroSearchProvider } from './libro-search-provider.js';
 import { LibroSearchProviderFactory } from './libro-search-provider.js';
 import { LibroSearchUtils } from './libro-search-utils.js';
 export declare const ReplaceToggle: () => import("react/jsx-runtime").JSX.Element;
-export declare const SearchIndex: () => import("react/jsx-runtime").JSX.Element;
+export declare const SearchIndex: React.FC;
+export declare const SearchIndexMemo: import("react").NamedExoticComponent<{}>;
 export declare const SearchContent: () => import("react/jsx-runtime").JSX.Element;
 export declare const SearchComponent: import("react").ForwardRefExoticComponent<import("react").RefAttributes<HTMLDivElement>>;
 export declare class LibroSearchView extends BaseView {
@@ -26,6 +27,7 @@ export declare class LibroSearchView extends BaseView {
     replaceStr: string;
     caseSensitive: boolean;
     useRegex: boolean;
+    isSearching: boolean;
     view: import("react").ForwardRefExoticComponent<import("react").RefAttributes<HTMLDivElement>>;
     get contentHeight(): number;
     get currentMatchIndex(): number | undefined;
@@ -33,12 +35,12 @@ export declare class LibroSearchView extends BaseView {
     onViewMount: () => void;
     onActiveCellChanged: () => void;
     onCellsChanged: () => void;
-    onviewWillUnmount: () => Promise<void>;
+    onViewWillUnmount: () => Promise<void>;
     show: () => void;
     hide: () => void;
     onFocus: () => void;
     onBlur: (e: React.FocusEvent<HTMLDivElement>) => void;
-    search: (hightlightNext?: boolean) => void;
+    search: (hightlightNext?: boolean) => Promise<void>;
     toggleReplace: () => void;
     toggleSetting: () => void;
     toggleCaseSensitive: () => void;
@@ -50,9 +52,8 @@ export declare class LibroSearchView extends BaseView {
     replaceAll: () => void;
     initialQuery: () => void;
     getHeaderHeight: () => number;
-    nextMatch: (reverse: boolean) => void;
+    nextMatch: (reverse: boolean) => Promise<void>;
     handleKeydown: (e: KeyboardEvent) => void;
-    protected doHandleFindChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
     handleFindChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
     handleReplaceChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
 }

package/es/libro-search-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-search-view.d.ts","sourceRoot":"","sources":["../src/libro-search-view.tsx"],"names":[],"mappings":";AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAsB,MAAM,mBAAmB,CAAC;AAIjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAI9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAM3D,eAAO,MAAM,aAAa,+CAYzB,CAAC;AAEF,eAAO,MAAM,WAAW,+CAevB,CAAC;AAEF,eAAO,MAAM,aAAa,+CA+HzB,CAAC;AAEF,eAAO,MAAM,eAAe,0FAiB1B,CAAC;AAEH,qBAEa,eAAgB,SAAQ,QAAQ;IAC3C,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,eAAe,CAAC;IAC3B,KAAK,EAAE,gBAAgB,CAAC;IACd,qBAAqB,EAAE,0BAA0B,CAAC;IACtF,KAAK,CAAC,EAAE,SAAS,CAAC;IACV,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,aAAa,UAAS;IAC9B,IAAI,cAAc,IAAI,OAAO,CAE5B;IACO,cAAc,UAAS;IACvB,OAAO,CAAC,EAAE,MAAM,CAAa;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAa;IAChC,UAAU,SAAM;IAChB,aAAa,UAAS;IACtB,QAAQ,UAAS;IAEhB,IAAI,2FAAmB;IAEhC,IAAI,aAAa,WAShB;IACD,IAAI,iBAAiB,uBAMpB;IACD,IAAI,YAAY,uBAEf;IAEQ,WAAW,aAQlB;IAEF,mBAAmB,aAIjB;IAEF,cAAc,aAIZ;IAEF,iBAAiB,sBAGf;IAEF,IAAI,aAKF;IACF,IAAI,aAQF;IAEF,OAAO,aAEL;IAEF,MAAM,MAAO,gBAAgB,CAAC,cAAc,CAAC,UAI3C;IAEF,MAAM,qCAcJ;IACF,aAAa,aAKX;IAEF,aAAa,aAGX;IAEF,mBAAmB,aAGjB;IAEF,cAAc,aAGZ;IAEF,IAAI,aAEF;IAEF,QAAQ,aAEN;IAEF,sBAAsB,MAAO,mBAAmB,UAI9C;IAEF,OAAO,aAEL;IACF,UAAU,aAER;IACF,YAAY,aAMV;IACF,eAAe,eAUb;IAEF,SAAS,YAAa,OAAO,UAM3B;IAEF,aAAa,MAAO,aAAa,UAqB/B;IAEF,SAAS,CAAC,kBAAkB,MAAO,MAAM,WAAW,CAAC,gBAAgB,CAAC,UAEpE;IAEF,gBAAgB,MAAO,MAAM,WAAW,CAAC,gBAAgB,CAAC,UAKxD;IACF,mBAAmB,MAAO,MAAM,WAAW,CAAC,gBAAgB,CAAC,UAE3D;CACH"}
+{"version":3,"file":"libro-search-view.d.ts","sourceRoot":"","sources":["../src/libro-search-view.tsx"],"names":[],"mappings":";AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAsB,MAAM,mBAAmB,CAAC;AAIjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAI9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAM3D,eAAO,MAAM,aAAa,+CAYzB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAgB/B,CAAC;AAEF,eAAO,MAAM,eAAe,0CAAoB,CAAC;AAEjD,eAAO,MAAM,aAAa,+CA+HzB,CAAC;AAEF,eAAO,MAAM,eAAe,0FAiB1B,CAAC;AAEH,qBAEa,eAAgB,SAAQ,QAAQ;IAC3C,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,eAAe,CAAC;IAC3B,KAAK,EAAE,gBAAgB,CAAC;IACd,qBAAqB,EAAE,0BAA0B,CAAC;IACtF,KAAK,CAAC,EAAE,SAAS,CAAC;IACV,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,aAAa,UAAS;IAC9B,IAAI,cAAc,IAAI,OAAO,CAE5B;IACO,cAAc,UAAS;IACvB,OAAO,CAAC,EAAE,MAAM,CAAa;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAa;IAChC,UAAU,SAAM;IAChB,aAAa,UAAS;IACtB,QAAQ,UAAS;IACjB,WAAW,UAAS;IAEnB,IAAI,2FAAmB;IAEhC,IAAI,aAAa,WAShB;IACD,IAAI,iBAAiB,uBAMpB;IACD,IAAI,YAAY,uBAEf;IAEQ,WAAW,aAQlB;IAEF,mBAAmB,aAIjB;IAEF,cAAc,aAIZ;IAEF,iBAAiB,sBAGf;IAEF,IAAI,aAKF;IACF,IAAI,aAQF;IAEF,OAAO,aAEL;IAEF,MAAM,MAAO,gBAAgB,CAAC,cAAc,CAAC,UAI3C;IAEF,MAAM,8CAgBJ;IACF,aAAa,aAKX;IAEF,aAAa,aAGX;IAEF,mBAAmB,aAGjB;IAEF,cAAc,aAGZ;IAEF,IAAI,aAEF;IAEF,QAAQ,aAEN;IAEF,sBAAsB,MAAO,mBAAmB,UAI9C;IAEF,OAAO,aAEL;IACF,UAAU,aAER;IACF,YAAY,aAMV;IACF,eAAe,eAUb;IAEF,SAAS,YAAmB,OAAO,mBAMjC;IAEF,aAAa,MAAO,aAAa,UAqB/B;IAEF,gBAAgB,MAAO,MAAM,WAAW,CAAC,gBAAgB,CAAC,UAKxD;IAEF,mBAAmB,MAAO,MAAM,WAAW,CAAC,gBAAgB,CAAC,UAE3D;CACH"}

package/es/libro-search-view.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12;
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -20,16 +20,17 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, con
 function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'transform-class-properties is enabled and runs after the decorators transform.'); }
 import { ArrowDownOutlined, ArrowUpOutlined, CloseOutlined, createFromIconfontCN, EllipsisOutlined, RightOutlined } from '@ant-design/icons';
 import { LirboContextKey } from '@difizen/libro-core';
-import { prop, useInject, watch } from '@difizen/mana-app';
+import { prop, useInject, useObserve, watch } from '@difizen/mana-app';
 import { BaseView, view, ViewInstance } from '@difizen/mana-app';
 import { inject, transient } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
 import { Button, Checkbox, Input, Tag } from 'antd';
 import classnames from 'classnames';
-import { forwardRef, useEffect, useRef } from 'react';
+import { forwardRef, memo, useEffect, useRef } from 'react';
 import { LibroSearchProviderFactory } from "./libro-search-provider.js";
 import { LibroSearchUtils } from "./libro-search-utils.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var IconFont = createFromIconfontCN({
   scriptUrl: '//at.alicdn.com/t/a/font_3381673_65wfctnq7rt.js'
@@ -49,16 +50,19 @@ export var ReplaceToggle = function ReplaceToggle() {
 };
 export var SearchIndex = function SearchIndex() {
   var instance = useInject(ViewInstance);
-
-  // TODO: trigger update when current match index changed, matchesCount dont work
-  useEffect(function () {
-    //
-  }, [instance.currentMatchIndex]);
+  var currentMatchIndex = useObserve(instance.currentMatchIndex);
+  var matchesCount = useObserve(instance.matchesCount);
+  if (instance.isSearching) {
+    return /*#__PURE__*/_jsx(_Fragment, {
+      children: "searching..."
+    });
+  }
   return /*#__PURE__*/_jsx("div", {
     className: "libro-search-index",
-    children: instance.matchesCount !== undefined ? "".concat(instance.currentMatchIndex, "/").concat(instance.matchesCount) : '无结果'
+    children: instance.matchesCount !== undefined ? "".concat(currentMatchIndex !== null && currentMatchIndex !== void 0 ? currentMatchIndex : '-', "/").concat(matchesCount !== null && matchesCount !== void 0 ? matchesCount : ' -') : '无结果'
   });
 };
+export var SearchIndexMemo = /*#__PURE__*/memo(SearchIndex);
 export var SearchContent = function SearchContent() {
   var _instance$searchProvi;
   var instance = useInject(ViewInstance);
@@ -116,7 +120,7 @@ export var SearchContent = function SearchContent() {
           })
         }), /*#__PURE__*/_jsxs("td", {
           className: "libro-search-action",
-          children: [/*#__PURE__*/_jsx(SearchIndex, {}), /*#__PURE__*/_jsxs("div", {
+          children: [/*#__PURE__*/_jsx(SearchIndexMemo, {}), /*#__PURE__*/_jsxs("div", {
             children: [/*#__PURE__*/_jsx(Button, {
               title: "Previous Match",
               onClick: instance.previous,
@@ -200,7 +204,7 @@ export var SearchComponent = /*#__PURE__*/forwardRef(function SearchComponent(pr
     children: instance.searchVisible && /*#__PURE__*/_jsx(SearchContent, {})
   });
 });
-export var LibroSearchView = (_dec = transient(), _dec2 = view('libro-search-view'), _dec3 = inject(LirboContextKey), _dec4 = inject(LibroSearchUtils), _dec5 = inject(LibroSearchProviderFactory), _dec6 = prop(), _dec7 = prop(), _dec8 = prop(), _dec9 = prop(), _dec10 = prop(), _dec11 = prop(), _dec12 = prop(), _dec13 = prop(), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_BaseView) {
+export var LibroSearchView = (_dec = transient(), _dec2 = view('libro-search-view'), _dec3 = inject(LirboContextKey), _dec4 = inject(LibroSearchUtils), _dec5 = inject(LibroSearchProviderFactory), _dec6 = prop(), _dec7 = prop(), _dec8 = prop(), _dec9 = prop(), _dec10 = prop(), _dec11 = prop(), _dec12 = prop(), _dec13 = prop(), _dec14 = prop(), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_BaseView) {
   _inherits(LibroSearchView, _BaseView);
   var _super = _createSuper(LibroSearchView);
   function LibroSearchView() {
@@ -221,6 +225,7 @@ export var LibroSearchView = (_dec = transient(), _dec2 = view('libro-search-vie
     _initializerDefineProperty(_this, "replaceStr", _descriptor9, _assertThisInitialized(_this));
     _initializerDefineProperty(_this, "caseSensitive", _descriptor10, _assertThisInitialized(_this));
     _initializerDefineProperty(_this, "useRegex", _descriptor11, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "isSearching", _descriptor12, _assertThisInitialized(_this));
     _this.view = SearchComponent;
     _this.onViewMount = function () {
       if (!_this.searchProvider && _this.libro) {
@@ -245,7 +250,7 @@ export var LibroSearchView = (_dec = transient(), _dec2 = view('libro-search-vie
         (_this$searchProvider2 = _this.searchProvider) === null || _this$searchProvider2 === void 0 || _this$searchProvider2.onCellsChanged();
       }
     };
-    _this.onviewWillUnmount = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    _this.onViewWillUnmount = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _this$searchProvider3, _this$searchProvider4;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -286,20 +291,42 @@ export var LibroSearchView = (_dec = transient(), _dec2 = view('libro-search-vie
         _this.contextKey.enableCommandMode();
       }
     };
-    _this.search = function () {
-      var hightlightNext = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      if (_this.searchProvider) {
-        _this.lastSearch = _this.findStr;
-        var query = _this.utils.parseQuery(_this.findStr || '', _this.caseSensitive, _this.useRegex);
-        if (query) {
-          var _this$searchProvider6;
-          (_this$searchProvider6 = _this.searchProvider) === null || _this$searchProvider6 === void 0 || _this$searchProvider6.startQuery(query, undefined, hightlightNext);
-        } else {
-          var _this$searchProvider7;
-          (_this$searchProvider7 = _this.searchProvider) === null || _this$searchProvider7 === void 0 || _this$searchProvider7.endQuery();
+    _this.search = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var hightlightNext,
+        query,
+        _this$searchProvider6,
+        _this$searchProvider7,
+        _args2 = arguments;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            hightlightNext = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : true;
+            if (!_this.searchProvider) {
+              _context2.next = 13;
+              break;
+            }
+            _this.lastSearch = _this.findStr;
+            query = _this.utils.parseQuery(_this.findStr || '', _this.caseSensitive, _this.useRegex);
+            if (!query) {
+              _context2.next = 11;
+              break;
+            }
+            _this.isSearching = true;
+            _context2.next = 8;
+            return (_this$searchProvider6 = _this.searchProvider) === null || _this$searchProvider6 === void 0 ? void 0 : _this$searchProvider6.startQuery(query, undefined, hightlightNext);
+          case 8:
+            _this.isSearching = false;
+            _context2.next = 13;
+            break;
+          case 11:
+            _context2.next = 13;
+            return (_this$searchProvider7 = _this.searchProvider) === null || _this$searchProvider7 === void 0 ? void 0 : _this$searchProvider7.endQuery();
+          case 13:
+          case "end":
+            return _context2.stop();
         }
-      }
-    };
+      }, _callee2);
+    }));
     _this.toggleReplace = function () {
       if (_this.searchProvider) {
         _this.searchProvider.replaceMode = !_this.replaceVisible;
@@ -359,15 +386,34 @@ export var LibroSearchView = (_dec = transient(), _dec2 = view('libro-search-vie
       }
       return height;
     };
-    _this.nextMatch = function (reverse) {
-      if (reverse) {
-        var _this$searchProvider13;
-        (_this$searchProvider13 = _this.searchProvider) === null || _this$searchProvider13 === void 0 || _this$searchProvider13.highlightPrevious();
-      } else {
-        var _this$searchProvider14;
-        (_this$searchProvider14 = _this.searchProvider) === null || _this$searchProvider14 === void 0 || _this$searchProvider14.highlightNext();
-      }
-    };
+    _this.nextMatch = /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(reverse) {
+        var _this$searchProvider13, _this$searchProvider14;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              if (!reverse) {
+                _context3.next = 5;
+                break;
+              }
+              _context3.next = 3;
+              return (_this$searchProvider13 = _this.searchProvider) === null || _this$searchProvider13 === void 0 ? void 0 : _this$searchProvider13.highlightPrevious();
+            case 3:
+              _context3.next = 7;
+              break;
+            case 5:
+              _context3.next = 7;
+              return (_this$searchProvider14 = _this.searchProvider) === null || _this$searchProvider14 === void 0 ? void 0 : _this$searchProvider14.highlightNext();
+            case 7:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      return function (_x) {
+        return _ref3.apply(this, arguments);
+      };
+    }();
     _this.handleKeydown = function (e) {
       if (e.key === 'Escape') {
         e.stopPropagation();
@@ -390,9 +436,6 @@ export var LibroSearchView = (_dec = transient(), _dec2 = view('libro-search-vie
         return;
       }
     };
-    _this.doHandleFindChange = function (e) {
-      _this.findStr = e.target.value;
-    };
     _this.handleFindChange = function (e) {
       _this.findStr = e.target.value;
       if (_this.findStr !== _this.lastSearch) {
@@ -509,4 +552,11 @@ export var LibroSearchView = (_dec = transient(), _dec2 = view('libro-search-vie
   initializer: function initializer() {
     return false;
   }
+}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "isSearching", [_dec14], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function initializer() {
+    return false;
+  }
 })), _class2)) || _class) || _class);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-search",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "",
   "keywords": [
     "libro",
@@ -36,9 +36,9 @@
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "@ant-design/icons": "^5.1.0",
-    "@difizen/libro-common": "^0.1.14",
-    "@difizen/libro-core": "^0.1.14",
-    "@difizen/libro-code-editor": "^0.1.14",
+    "@difizen/libro-common": "^0.1.15",
+    "@difizen/libro-core": "^0.1.15",
+    "@difizen/libro-code-editor": "^0.1.15",
     "@types/lodash.debounce": "^4.0.7",
     "classnames": "^2.3.2",
     "lodash.debounce": "^4.0.8",

package/src/index.less

@@ -97,10 +97,10 @@
 }
 
 .libro-selectedtext {
-  background-color: rgb(255, 225, 0);
+  background-color: rgb(168, 172, 149) !important;
 
   span {
-    background-color: rgb(255, 225, 0);
+    background-color: rgb(168, 172, 149) !important;
   }
 }
 

package/src/libro-search-generic-provider.ts

@@ -23,7 +23,7 @@ export const GenericSearchProviderFactory = Symbol('GenericSearchProviderFactory
 @transient()
 export class GenericSearchProvider extends AbstractSearchProvider {
   protected _query: RegExp | null;
-  protected _currentMatchIndex: number;
+  @prop() protected _currentMatchIndex: number;
   @prop() protected _matches: HTMLSearchMatch[] = [];
   protected _mutationObserver: MutationObserver = new MutationObserver(
     this._onWidgetChanged.bind(this),
@@ -159,6 +159,24 @@ export class GenericSearchProvider extends AbstractSearchProvider {
     return Promise.resolve(false);
   }
 
+  isMatchChanged(matches: HTMLSearchMatch[], newMatches: HTMLSearchMatch[]): boolean {
+    if (matches.length !== newMatches.length) {
+      return true;
+    }
+    for (let i = 0; i < matches.length; i++) {
+      if (matches[i].text !== newMatches[i].text) {
+        return true;
+      }
+      if (matches[i].position !== newMatches[i].position) {
+        return true;
+      }
+      if (matches[i].node !== newMatches[i].node) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   /**
    * Initialize the search using the provided options.  Should update the UI
    * to highlight all matches and "select" whatever the first match should be.
@@ -167,10 +185,10 @@ export class GenericSearchProvider extends AbstractSearchProvider {
    * @param filters Filter parameters to pass to provider
    */
   startQuery = async (query: RegExp | null, filters = {}): Promise<void> => {
-    await this.endQuery();
     this._query = query;
 
     if (query === null) {
+      await this.endQuery();
       return Promise.resolve();
     }
 
@@ -178,6 +196,12 @@ export class GenericSearchProvider extends AbstractSearchProvider {
       ? await searchInHTML(query, this.view.container?.current)
       : [];
 
+    if (!this.isMatchChanged(this.matches, matches)) {
+      return Promise.resolve();
+    }
+
+    await this.endQuery();
+
     // Transform the DOM
     let nodeIdx = 0;
     while (nodeIdx < matches.length) {

package/src/libro-search-provider.ts

@@ -44,7 +44,7 @@ export class LibroSearchProvider extends AbstractSearchProvider {
 
   protected toDispose = new DisposableCollection();
   @prop() protected currentProviderIndex: number | undefined = undefined;
-  @prop() searchCellOutput = true;
+  @prop() searchCellOutput = false;
   @prop() protected onlySearchSelectedCells = false;
   @prop() replaceMode = false;
 

package/src/libro-search-view.tsx

@@ -8,7 +8,7 @@ import {
 } from '@ant-design/icons';
 import type { LibroView } from '@difizen/libro-core';
 import { LirboContextKey } from '@difizen/libro-core';
-import { prop, useInject, watch } from '@difizen/mana-app';
+import { prop, useInject, useObserve, watch } from '@difizen/mana-app';
 import { BaseView, view, ViewInstance } from '@difizen/mana-app';
 import { inject, transient } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
@@ -16,7 +16,7 @@ import { Button, Checkbox, Input, Tag } from 'antd';
 import type { CheckboxChangeEvent } from 'antd/es/checkbox';
 import type { InputRef } from 'antd/es/input';
 import classnames from 'classnames';
-import { forwardRef, useEffect, useRef } from 'react';
+import { forwardRef, memo, useEffect, useRef } from 'react';
 
 import type { LibroSearchProvider } from './libro-search-provider.js';
 import { LibroSearchProviderFactory } from './libro-search-provider.js';
@@ -40,23 +40,26 @@ export const ReplaceToggle = () => {
   );
 };
 
-export const SearchIndex = () => {
+export const SearchIndex: React.FC = () => {
   const instance = useInject<LibroSearchView>(ViewInstance);
+  const currentMatchIndex = useObserve(instance.currentMatchIndex);
+  const matchesCount = useObserve(instance.matchesCount);
 
-  // TODO: trigger update when current match index changed, matchesCount dont work
-  useEffect(() => {
-    //
-  }, [instance.currentMatchIndex]);
+  if (instance.isSearching) {
+    return <>searching...</>;
+  }
 
   return (
     <div className="libro-search-index">
       {instance.matchesCount !== undefined
-        ? `${instance.currentMatchIndex}/${instance.matchesCount}`
+        ? `${currentMatchIndex ?? '-'}/${matchesCount ?? ' -'}`
         : '无结果'}
     </div>
   );
 };
 
+export const SearchIndexMemo = memo(SearchIndex);
+
 export const SearchContent = () => {
   const instance = useInject<LibroSearchView>(ViewInstance);
   const findInputRef = useRef<InputRef>(null);
@@ -114,7 +117,7 @@ export const SearchContent = () => {
             />
           </td>
           <td className="libro-search-action">
-            <SearchIndex />
+            <SearchIndexMemo />
             <div>
               <Button
                 title="Previous Match"
@@ -224,6 +227,7 @@ export class LibroSearchView extends BaseView {
   @prop() replaceStr = '';
   @prop() caseSensitive = false;
   @prop() useRegex = false;
+  @prop() isSearching = false;
 
   override view = SearchComponent;
 
@@ -270,7 +274,7 @@ export class LibroSearchView extends BaseView {
     }
   };
 
-  onviewWillUnmount = async () => {
+  onViewWillUnmount = async () => {
     await this.searchProvider?.endQuery();
     this.searchProvider?.dispose();
   };
@@ -301,7 +305,7 @@ export class LibroSearchView extends BaseView {
     }
   };
 
-  search = (hightlightNext = true) => {
+  search = async (hightlightNext = true) => {
     if (this.searchProvider) {
       this.lastSearch = this.findStr;
       const query = this.utils.parseQuery(
@@ -310,9 +314,11 @@ export class LibroSearchView extends BaseView {
         this.useRegex,
       );
       if (query) {
-        this.searchProvider?.startQuery(query, undefined, hightlightNext);
+        this.isSearching = true;
+        await this.searchProvider?.startQuery(query, undefined, hightlightNext);
+        this.isSearching = false;
       } else {
-        this.searchProvider?.endQuery();
+        await this.searchProvider?.endQuery();
       }
     }
   };
@@ -377,11 +383,11 @@ export class LibroSearchView extends BaseView {
     return height;
   };
 
-  nextMatch = (reverse: boolean) => {
+  nextMatch = async (reverse: boolean) => {
     if (reverse) {
-      this.searchProvider?.highlightPrevious();
+      await this.searchProvider?.highlightPrevious();
     } else {
-      this.searchProvider?.highlightNext();
+      await this.searchProvider?.highlightNext();
     }
   };
 
@@ -408,16 +414,13 @@ export class LibroSearchView extends BaseView {
     }
   };
 
-  protected doHandleFindChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    this.findStr = e.target.value;
-  };
-
   handleFindChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     this.findStr = e.target.value;
     if (this.findStr !== this.lastSearch) {
       this.search(false);
     }
   };
+
   handleReplaceChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     this.replaceStr = e.target.value;
   };