@xterm/addon-search 0.17.0-beta.9 → 0.17.0-beta.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xterm/addon-search",
-  "version": "0.17.0-beta.9",
+  "version": "0.17.0-beta.91",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
@@ -21,8 +21,8 @@
     "prepublishOnly": "npm run package",
     "start": "node ../../demo/start"
   },
-  "commit": "269d8c20aed41b71c743690b1fe70d82dbd420d6",
+  "commit": "94a264679e6bd51b7021ca59e3b2e1e80d02c633",
   "peerDependencies": {
-    "@xterm/xterm": "^6.1.0-beta.9"
+    "@xterm/xterm": "^6.1.0-beta.91"
   }
 }

package/src/DecorationManager.ts

@@ -135,6 +135,7 @@ export class DecorationManager extends Disposable {
         marker,
         x: range[1],
         width: range[2],
+        layer: isActiveResult ? 'top' : 'bottom',
         backgroundColor: isActiveResult ? options.activeMatchBackground : options.matchBackground,
         overviewRulerOptions: this._highlightedLines.has(marker.line) ? undefined : {
           color: isActiveResult ? options.activeMatchColorOverviewRuler : options.matchOverviewRuler,

package/src/SearchAddon.ts

@@ -5,7 +5,7 @@
 
 import type { Terminal, IDisposable, ITerminalAddon } from '@xterm/xterm';
 import type { SearchAddon as ISearchApi, ISearchOptions, ISearchAddonOptions, ISearchResultChangeEvent } from '@xterm/addon-search';
-import { Event } from 'vs/base/common/event';
+import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { disposableTimeout } from 'vs/base/common/async';
 import { SearchLineCache } from './SearchLineCache';
@@ -42,6 +42,11 @@ export class SearchAddon extends Disposable implements ITerminalAddon, ISearchAp
   private _decorationManager: DecorationManager | undefined;
   private _resultTracker = this._register(new SearchResultTracker());
 
+  private readonly _onAfterSearch = this._register(new Emitter<void>());
+  public readonly onAfterSearch = this._onAfterSearch.event;
+  private readonly _onBeforeSearch = this._register(new Emitter<void>());
+  public readonly onBeforeSearch = this._onBeforeSearch.event;
+
   public get onDidChangeResults(): Event<ISearchResultChangeEvent> {
     return this._resultTracker.onDidChangeResults;
   }
@@ -98,6 +103,8 @@ export class SearchAddon extends Disposable implements ITerminalAddon, ISearchAp
       throw new Error('Cannot use addon until it has been loaded');
     }
 
+    this._onBeforeSearch.fire();
+
     this._state.lastSearchOptions = searchOptions;
 
     if (this._state.shouldUpdateHighlighting(term, searchOptions)) {
@@ -108,6 +115,8 @@ export class SearchAddon extends Disposable implements ITerminalAddon, ISearchAp
     this._fireResults(searchOptions);
     this._state.cachedSearchTerm = term;
 
+    this._onAfterSearch.fire();
+
     return found;
   }
 
@@ -173,6 +182,8 @@ export class SearchAddon extends Disposable implements ITerminalAddon, ISearchAp
       throw new Error('Cannot use addon until it has been loaded');
     }
 
+    this._onBeforeSearch.fire();
+
     this._state.lastSearchOptions = searchOptions;
 
     if (this._state.shouldUpdateHighlighting(term, searchOptions)) {
@@ -183,6 +194,8 @@ export class SearchAddon extends Disposable implements ITerminalAddon, ISearchAp
     this._fireResults(searchOptions);
     this._state.cachedSearchTerm = term;
 
+    this._onAfterSearch.fire();
+
     return found;
   }
 

package/typings/addon-search.d.ts

@@ -152,8 +152,17 @@ declare module '@xterm/addon-search' {
     public clearActiveDecoration(): void;
 
     /**
-     * When decorations are enabled, fires when
-     * the search results change.
+     * Fires after a search is performed.
+     */
+    readonly onAfterSearch: IEvent<void>;
+
+    /**
+     * Fires before a search is performed.
+     */
+    readonly onBeforeSearch: IEvent<void>;
+
+    /**
+     * When decorations are enabled, fires when the search results change.
      */
     readonly onDidChangeResults: IEvent<ISearchResultChangeEvent>;
   }