@difizen/libro-search 0.1.0 → 0.1.2

package/es/libro-search-provider.js

@@ -20,13 +20,17 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
 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 { LibroView } from '@difizen/libro-core';
-import { inject, prop, transient, watch, equals } from '@difizen/mana-app';
+import { EditorCellView, LibroView, VirtualizedManagerHelper } from '@difizen/libro-core';
+import { inject, prop, transient, equals } from '@difizen/mana-app';
 import { Deferred, DisposableCollection } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
 import { AbstractSearchProvider } from "./abstract-search-provider.js";
 import { LibroCellSearchProvider } from "./libro-cell-search-provider.js";
 import { SearchProviderOption } from "./libro-search-protocol.js";
+export function elementInViewport(el) {
+  var boundingClientRect = el.getBoundingClientRect();
+  return boundingClientRect.top >= 0 && boundingClientRect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && boundingClientRect.left >= 0 && boundingClientRect.right <= (window.innerWidth || document.documentElement.clientWidth);
+}
 export var LibroSearchProviderFactory = Symbol('LibroSearchProviderFactory');
 /**
  * Libro view search provider
@@ -37,7 +41,7 @@ export var LibroSearchProvider = (_dec = transient(), _dec2 = inject(LibroCellSe
   /**
    * @param option Provide the view to search in
    */
-  function LibroSearchProvider(option) {
+  function LibroSearchProvider(option, virtualizedManagerHelper) {
     var _this;
     _classCallCheck(this, LibroSearchProvider);
     _this = _super.call(this, option);
@@ -149,7 +153,7 @@ export var LibroSearchProvider = (_dec = transient(), _dec2 = inject(LibroCellSe
      *
      */
     _this.startQuery = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(query, _filters) {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(query, filters) {
         var _this$filters;
         var highlightNext,
           cells,
@@ -385,9 +389,7 @@ export var LibroSearchProvider = (_dec = transient(), _dec2 = inject(LibroCellSe
           case 0:
             if (!_this.cellsChangeDeferred) {
               _this.cellsChangeDeferred = new Deferred();
-              _this.cellsChangeDeferred.promise.then(_this.doCellsChanged).catch(function () {
-                //
-              });
+              _this.cellsChangeDeferred.promise.then(_this.doCellsChanged).catch(console.error);
               _this.cellsChangeDeferred.resolve();
             }
           case 1:
@@ -424,16 +426,64 @@ export var LibroSearchProvider = (_dec = transient(), _dec2 = inject(LibroCellSe
             reverse = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : false;
             loop = _args12.length > 1 && _args12[1] !== undefined ? _args12[1] : false;
             activateNewMatch = /*#__PURE__*/function () {
-              var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+              var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(match) {
+                var _activeCell$container;
+                var activeCell, node, _activeCell$editor, line, editor;
                 return _regeneratorRuntime().wrap(function _callee11$(_context11) {
                   while (1) switch (_context11.prev = _context11.next) {
                     case 0:
+                      if (_this.getActiveIndex() !== _this.currentProviderIndex) {
+                        _this.selectCell(_this.currentProviderIndex);
+                      }
+                      activeCell = _this.view.activeCell;
+                      if (activeCell) {
+                        _context11.next = 4;
+                        break;
+                      }
+                      return _context11.abrupt("return");
+                    case 4:
+                      node = (_activeCell$container = activeCell.container) === null || _activeCell$container === void 0 ? void 0 : _activeCell$container.current;
+                      if (!elementInViewport(node)) {
+                        try {
+                          if (_this.view.activeCell) {
+                            if (_this.virtualizedManager.isVirtualized) {
+                              if (EditorCellView.is(activeCell)) {
+                                line = (_activeCell$editor = activeCell.editor) === null || _activeCell$editor === void 0 || (_activeCell$editor = _activeCell$editor.getPositionAt(match.position)) === null || _activeCell$editor === void 0 ? void 0 : _activeCell$editor.line;
+                                _this.view.model.scrollToCellView({
+                                  cellIndex: _this.view.activeCellIndex,
+                                  lineIndex: line
+                                });
+                              }
+                            } else {
+                              _this.view.model.scrollToView(_this.view.activeCell);
+                            }
+                          }
+                        } catch (error) {
+                          // no-op
+                        }
+                      }
+                      // Unhide cell
+                      if (activeCell.hasInputHidden) {
+                        activeCell.hasInputHidden = false;
+                      }
+                      if (elementInViewport(node)) {
+                        _context11.next = 9;
+                        break;
+                      }
+                      return _context11.abrupt("return");
+                    case 9:
+                      if (EditorCellView.is(activeCell)) {
+                        // await activeCell.editor;
+                        editor = activeCell.editor;
+                        editor === null || editor === void 0 || editor.revealSelection(editor.getSelection());
+                      }
+                    case 10:
                     case "end":
                       return _context11.stop();
                   }
                 }, _callee11);
               }));
-              return function activateNewMatch() {
+              return function activateNewMatch(_x6) {
                 return _ref12.apply(this, arguments);
               };
             }();
@@ -465,7 +515,7 @@ export var LibroSearchProvider = (_dec = transient(), _dec2 = inject(LibroCellSe
               break;
             }
             _context12.next = 19;
-            return activateNewMatch();
+            return activateNewMatch(match);
           case 19:
             return _context12.abrupt("return", match);
           case 22:
@@ -516,7 +566,7 @@ export var LibroSearchProvider = (_dec = transient(), _dec2 = inject(LibroCellSe
               break;
             }
             _context12.next = 43;
-            return activateNewMatch();
+            return activateNewMatch(_match);
           case 43:
             return _context12.abrupt("return", _match);
           case 44:
@@ -563,10 +613,10 @@ export var LibroSearchProvider = (_dec = transient(), _dec2 = inject(LibroCellSe
       }, _callee14);
     }));
     _this.view = option.view;
-    _this.toDispose.push(watch(_this.view.model, 'active', _this.onActiveCellChanged));
-    _this.toDispose.push(watch(_this.view.model, 'cells', _this.onCellsChanged));
+    _this.virtualizedManager = virtualizedManagerHelper.getOrCreate(_this.view.model);
     return _this;
   }
+  LibroSearchProvider = inject(VirtualizedManagerHelper)(LibroSearchProvider, undefined, 1) || LibroSearchProvider;
   LibroSearchProvider = inject(SearchProviderOption)(LibroSearchProvider, undefined, 0) || LibroSearchProvider;
   _createClass(LibroSearchProvider, [{
     key: "filters",
@@ -693,6 +743,13 @@ export var LibroSearchProvider = (_dec = transient(), _dec2 = inject(LibroCellSe
         }
       };
     }
+  }, {
+    key: "selectCell",
+    value: function selectCell(selectIndex) {
+      if (selectIndex >= 0 && selectIndex < this.view.model.cells.length - 1) {
+        this.view.model.selectCell(this.view.model.cells[selectIndex]);
+      }
+    }
   }], [{
     key: "isApplicable",
     value:

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

@@ -1,4 +1,4 @@
-import type { SearchMatch } from './libro-search-protocol.js';
+import type { SearchMatch } from '@difizen/libro-code-editor';
 /**
  * Search Utils
  */

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

@@ -1 +1 @@
-{"version":3,"file":"libro-search-utils.d.ts","sourceRoot":"","sources":["../src/libro-search-utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D;;GAEG;AACH,qBACa,gBAAgB;IAC3B;;;;;;;OAOG;IACH,QAAQ,CACN,OAAO,EAAE,WAAW,EAAE,EACtB,QAAQ,EAAE,MAAM,EAChB,KAAK,SAAI,EACT,MAAM,SAAW,GAChB,MAAM,GAAG,SAAS;IA+BrB;;;;;;;OAOG;IACH,UAAU,CACR,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,KAAK,EAAE,OAAO,GACb,MAAM,GAAG,SAAS;CAiBtB"}
+{"version":3,"file":"libro-search-utils.d.ts","sourceRoot":"","sources":["../src/libro-search-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D;;GAEG;AACH,qBACa,gBAAgB;IAC3B;;;;;;;OAOG;IACH,QAAQ,CACN,OAAO,EAAE,WAAW,EAAE,EACtB,QAAQ,EAAE,MAAM,EAChB,KAAK,SAAI,EACT,MAAM,SAAW,GAChB,MAAM,GAAG,SAAS;IA+BrB;;;;;;;OAOG;IACH,UAAU,CACR,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,KAAK,EAAE,OAAO,GACb,MAAM,GAAG,SAAS;CAoBtB"}

package/es/libro-search-utils.js

@@ -6,6 +6,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { singleton } from '@difizen/mana-app';
+
 /**
  * Search Utils
  */
@@ -70,15 +71,18 @@ export var LibroSearchUtils = (_dec = singleton(), _dec(_class = /*#__PURE__*/fu
       var flag = caseSensitive ? 'g' : 'gi';
       // escape regex characters in query if its a string search
       var queryText = regex ? queryString : queryString.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
-      var ret = new RegExp(queryText, flag);
-
-      // If the empty string is hit, the search logic will freeze the browser tab
-      //  Trying /^/ or /$/ on the codemirror search demo, does not find anything.
-      //  So this is a limitation of the editor.
-      if (ret.test('')) {
+      try {
+        var ret = new RegExp(queryText, flag);
+        // If the empty string is hit, the search logic will freeze the browser tab
+        //  Trying /^/ or /$/ on the codemirror search demo, does not find anything.
+        //  So this is a limitation of the editor.
+        if (ret.test('')) {
+          return undefined;
+        }
+        return ret;
+      } catch (error) {
         return undefined;
       }
-      return ret;
     }
   }]);
   return LibroSearchUtils;

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

@@ -1,31 +1,28 @@
+/// <reference types="react" resolution-mode="require"/>
 import type { LibroView } from '@difizen/libro-core';
 import { LirboContextKey } from '@difizen/libro-core';
 import { BaseView } from '@difizen/mana-app';
 import type { CheckboxChangeEvent } from 'antd/es/checkbox';
 import type { InputRef } from 'antd/es/input';
-import type { FC } from 'react';
 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: FC;
-export declare const SearchIndex: FC;
-export declare const SearchContent: FC;
+export declare const ReplaceToggle: () => import("react/jsx-runtime").JSX.Element;
+export declare const SearchIndex: () => import("react/jsx-runtime").JSX.Element;
+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 {
     findInputRef?: React.RefObject<InputRef> | null;
     contextKey: LirboContextKey;
     utils: LibroSearchUtils;
     searchProviderFactory: LibroSearchProviderFactory;
-    constructor(contextKey: LirboContextKey, utils: LibroSearchUtils, searchProviderFactory: LibroSearchProviderFactory);
-    protected _libro?: LibroView;
-    get libro(): LibroView | undefined;
-    set libro(value: LibroView | undefined);
+    libro?: LibroView;
     searchProvider?: LibroSearchProvider;
     searchVisible: boolean;
     get replaceVisible(): boolean;
     settingVisible: boolean;
-    findStr?: string | undefined;
-    lastSearch?: string | undefined;
+    findStr?: string;
+    lastSearch?: string;
     replaceStr: string;
     caseSensitive: boolean;
     useRegex: boolean;
@@ -33,7 +30,10 @@ export declare class LibroSearchView extends BaseView {
     get contentHeight(): number;
     get currentMatchIndex(): number | undefined;
     get matchesCount(): number | undefined;
-    onviewWillUnmount: () => void;
+    onViewMount: () => void;
+    onActiveCellChanged: () => void;
+    onCellsChanged: () => void;
+    onviewWillUnmount: () => Promise<void>;
     show: () => void;
     hide: () => void;
     onFocus: () => 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;AAE9C,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGhC,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,EAAE,EAY3B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,EAOzB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,EAsH3B,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;IAChD,UAAU,EAAE,eAAe,CAAC;IAC5B,KAAK,EAAE,gBAAgB,CAAC;IACxB,qBAAqB,EAAE,0BAA0B,CAAC;gBAGvB,UAAU,EAAE,eAAe,EAC1B,KAAK,EAAE,gBAAgB,EAEjD,qBAAqB,EAAE,0BAA0B;IAQnD,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;IAE7B,IAAI,KAAK,IAAI,SAAS,GAAG,SAAS,CAEjC;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,EAGrC;IAEO,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,aAAa,UAAS;IAC9B,IAAI,cAAc,IAAI,OAAO,CAE5B;IACO,cAAc,UAAS;IACvB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAa;IACzC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAa;IAC5C,UAAU,SAAM;IAChB,aAAa,UAAS;IACtB,QAAQ,UAAS;IAEhB,IAAI,2FAAmB;IAEhC,IAAI,aAAa,WAShB;IACD,IAAI,iBAAiB,uBAMpB;IACD,IAAI,YAAY,uBAEf;IAED,iBAAiB,aAEf;IAEF,IAAI,aAKF;IACF,IAAI,aAKF;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,aAEZ;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,+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"}