s whose text forms a single match).
+ const { text: fullText, nodes: textNodeMap } = this._buildTextNodeMap(elem);
+ if (!fullText) return;
+
+ regex.lastIndex = 0;
+ let match: RegExpExecArray | null;
+ while ((match = regex.exec(fullText)) !== null) {
+ const highlightIndex = data.highlightIndexes?.[matchIdx];
+ matchIdx++;
+
+ const range = this._createMatchRange(
+ textNodeMap,
+ match.index,
+ match.index + match[0].length,
+ );
+ if (!range) continue;
+
+ if (highlightIndex === this._currentMatchIndex) {
+ Find._currentHighlight!.add(range);
+ this._myCurrentRanges.push(range);
+ } else {
+ Find._findHighlight!.add(range);
+ this._myFindRanges.push(range);
}
- });
+ }
});
}
@@ -268,19 +338,6 @@ export class Find extends Module {
}
}
- _countMatches(elem: Node, regex: RegExp): number {
- let count = 0;
- this._walkTextNodes(elem, (textNode) => {
- const text = textNode.textContent;
- if (!text) {
- return;
- }
- const match = text.match(regex);
- count += match?.length ?? 0;
- });
- return count;
- }
-
_getRenderedRows(): RowComponent[] {
// Returns all rendered rows including buffer (not just viewport).
// This allows highlights to be applied to off-screen buffer rows,
@@ -338,4 +395,122 @@ export class Find extends Module {
return output;
}
+
+ // Collects all text nodes under root with their cumulative byte offsets into a
+ // flat array, plus the concatenated full text. Used by _applyHighlights so
+ // that a single regex match can span multiple sibling elements.
+ _buildTextNodeMap(root: Node): { text: string; nodes: Array<{ node: Text; start: number }> } {
+ const nodes: Array<{ node: Text; start: number }> = [];
+ let offset = 0;
+ this._walkTextNodes(root, (textNode) => {
+ nodes.push({ node: textNode, start: offset });
+ offset += textNode.textContent?.length ?? 0;
+ });
+ return { text: nodes.map((n) => n.node.textContent ?? '').join(''), nodes };
+ }
+
+ // Creates a Range covering [matchStart, matchEnd) in the text-node map
+ // produced by _buildTextNodeMap. Supports ranges that cross node boundaries.
+ _createMatchRange(
+ nodes: Array<{ node: Text; start: number }>,
+ matchStart: number,
+ matchEnd: number,
+ ): Range | null {
+ const range = new Range();
+ let startSet = false;
+
+ for (const { node, start } of nodes) {
+ const nodeEnd = start + (node.textContent?.length ?? 0);
+
+ if (!startSet && matchStart < nodeEnd) {
+ range.setStart(node, matchStart - start);
+ startSet = true;
+ }
+
+ if (startSet && matchEnd <= nodeEnd) {
+ range.setEnd(node, matchEnd - start);
+ return range;
+ }
+ }
+
+ return null;
+ }
+
+ // Runs the column formatter headlessly for a given row data + column, without
+ // requiring a CellComponent. This avoids row.getCells(), which triggers
+ // generateCells() and DOM element creation for every uninitialized off-screen row.
+ // Results are cached by (rowData, field) and reused on repeat searches.
+ _createMockCell(): CellComponent {
+ const mockElem = this._mockSearchElem;
+ return {
+ getElement: () => mockElem,
+ getData: () => this._mcData,
+ getValue: () => this._mcValue,
+ getInitialValue: () => this._mcValue,
+ getField: () => this._mcField,
+ getRow: () => ({ getData: () => this._mcData }) as unknown as RowComponent,
+ getColumn: () => this._mcColumn!,
+ checkHeight: () => {},
+ edit: () => {},
+ cancelEdit: () => {},
+ isEdited: () => false,
+ clearEdited: () => {},
+ isValid: () => true,
+ clearValidation: () => {},
+ validate: () => true,
+ popup: () => {},
+ } as unknown as CellComponent;
+ }
+
+ _runFormatterForColumn(
+ data: object,
+ field: string,
+ value: unknown,
+ columnComponent: ColumnComponent,
+ fmt:
+ | {
+ formatter?: (
+ cell: CellComponent,
+ params: object,
+ onRendered: () => void,
+ ) => string | HTMLElement;
+ params?: object | ((cell: CellComponent) => object);
+ }
+ | undefined,
+ ): string {
+ if (!fmt?.formatter) {
+ return String(value ?? '');
+ }
+
+ this._mcData = data;
+ this._mcValue = value;
+ this._mcField = field;
+ this._mcColumn = columnComponent;
+
+ const mockCell = this._mockCell;
+ const resolvedParams =
+ typeof fmt.params === 'function' ? fmt.params(mockCell) : (fmt.params ?? {});
+
+ let result: string | HTMLElement | undefined;
+ try {
+ const ctx: object = this.table.modules?.format ?? { table: this.table };
+ result = fmt.formatter.call(ctx, mockCell, resolvedParams, () => {});
+ } catch {
+ return String(value ?? '');
+ }
+
+ if (typeof result === 'string') {
+ if (result.includes('<') && result.includes('>')) {
+ const mockElem = this._mockSearchElem;
+ mockElem.innerHTML = result;
+ const text = mockElem.textContent ?? '';
+ mockElem.textContent = '';
+ return text;
+ }
+
+ return result;
+ }
+
+ return result?.textContent ?? '';
+ }
}
From 1448b816dc4a15092d4fd639ef4b69f2fd1b96e6 Mon Sep 17 00:00:00 2001
From: Luke Cotter <4013877+lukecotter@users.noreply.github.com>
Date: Thu, 9 Apr 2026 14:49:11 +0100
Subject: [PATCH 09/14] perf: convert progress formatter from HTML string to
HTMLElement
Eliminates innerHTML parsing in Find search by returning DOM elements directly.
_runFormatterForColumn now reads .textContent instead of parsing HTML via
innerHTML for every progress column cell.
---
log-viewer/src/tabulator/format/Progress.ts | 2 +-
.../src/tabulator/format/ProgressComponent.ts | 40 ++++++++++++++-----
log-viewer/src/tabulator/format/ProgressMS.ts | 2 +-
3 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/log-viewer/src/tabulator/format/Progress.ts b/log-viewer/src/tabulator/format/Progress.ts
index eae1d89b..2efd55e5 100644
--- a/log-viewer/src/tabulator/format/Progress.ts
+++ b/log-viewer/src/tabulator/format/Progress.ts
@@ -9,7 +9,7 @@ export function progressFormatter(
cell: CellComponent,
formatterParams: ProgressParams,
_onRendered: EmptyCallback,
-) {
+): string | HTMLElement {
const value = cell.getValue() ?? 0;
const totalVal = formatterParams.totalValue ?? 0;
diff --git a/log-viewer/src/tabulator/format/ProgressComponent.ts b/log-viewer/src/tabulator/format/ProgressComponent.ts
index ec17764c..0cedf6e3 100644
--- a/log-viewer/src/tabulator/format/ProgressComponent.ts
+++ b/log-viewer/src/tabulator/format/ProgressComponent.ts
@@ -7,7 +7,11 @@ type ProgressOptions = {
precision?: number;
};
-export function progressComponent(value: number, totalValue: number, options: ProgressOptions) {
+export function progressComponent(
+ value: number,
+ totalValue: number,
+ options: ProgressOptions,
+): string | HTMLElement {
const { showPercentageText = true, precision = 2 } = options;
const roundedValue = (value || 0).toFixed(precision);
@@ -17,18 +21,32 @@ export function progressComponent(value: number, totalValue: number, options: Pr
const percentComplete =
totalValue !== 0 ? (Math.round((value / totalValue) * 100) / 100) * 100 : 0;
- const percentageText = showPercent ? `(${percentComplete.toFixed(2)}%)` : '';
+ const wrapper = document.createElement('div');
+ wrapper.className = 'progress-wrapper';
- const progressBarElem = `${percentComplete ? `` : ''}`;
- const progressBarTextElem = `
- ${roundedValue}
- ${showPercent ? `${percentageText}` : ''}
-
`;
+ if (percentComplete) {
+ const bar = document.createElement('div');
+ bar.className = 'progress-bar';
+ bar.style.width = `${percentComplete}%`;
+ wrapper.appendChild(bar);
+ }
- return `
- ${progressBarElem}
- ${progressBarTextElem}
-
`;
+ const textEl = document.createElement('div');
+ textEl.className = 'progress-bar__text';
+
+ const valueSpan = document.createElement('span');
+ valueSpan.textContent = roundedValue;
+ textEl.appendChild(valueSpan);
+
+ if (showPercent) {
+ const pctSpan = document.createElement('span');
+ pctSpan.className = 'progress-bar__text__percent';
+ pctSpan.textContent = `(${percentComplete.toFixed(2)}%)`;
+ textEl.appendChild(pctSpan);
+ }
+
+ wrapper.appendChild(textEl);
+ return wrapper;
}
return roundedValue;
diff --git a/log-viewer/src/tabulator/format/ProgressMS.ts b/log-viewer/src/tabulator/format/ProgressMS.ts
index 63d9b302..bd70a5ce 100644
--- a/log-viewer/src/tabulator/format/ProgressMS.ts
+++ b/log-viewer/src/tabulator/format/ProgressMS.ts
@@ -9,7 +9,7 @@ export function progressFormatterMS(
cell: CellComponent,
formatterParams: ProgressParams,
_onRendered: EmptyCallback,
-) {
+): string | HTMLElement {
const value = (cell.getValue() || 0) / 1_000_000;
const totalVal = formatterParams.totalValue ?? 0;
const totalValAsMs = totalVal > 0 ? totalVal / 1_000_000 : 0;
From 9a1d9a110a6c732a780a52587a527974c3bb4f01 Mon Sep 17 00:00:00 2001
From: Luke Cotter <4013877+lukecotter@users.noreply.github.com>
Date: Thu, 9 Apr 2026 15:07:35 +0100
Subject: [PATCH 10/14] docs: update changelog
---
CHANGELOG.md | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8082a4e7..f4415a53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,12 +79,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
-- 🎯 **Call Tree Go To**: Go-to links in call tree now navigate to method definition instead of where method was called from ([#632] [#200])
+- 🎯 **Call Tree Go To**: Go-to links in call tree now navigate to method definition instead of where method was called from. ([#632] [#200])
- 🔍 **Search Navigation**: `Shift+Enter` navigates to the previous search result; hold `Enter` to continuously navigate.
-- ⚡ **Log Parsing**: Improved performance ([#552])
-- ✨ **Duration Formatting**: Human-readable duration formatting in tooltips (30000 ms -> 30s and 0.01 ms -> 10 µs) ([#671])
-- 🎯 **Number Precision**: Total and Self Time column precision changed to 2 decimal places for improved readability ([#671])
-- 🎨 **Navigation Bar**: Redesigned to better match VS Code’s look and feel ([#694])
+- ⚡ **Search Performance**: Up to 10x faster search on large logs. ([#627])
+- ⚡ **Log Parsing**: Improved performance. ([#552])
+- ✨ **Duration Formatting**: Human-readable duration formatting in tooltips (30000 ms -> 30s and 0.01 ms -> 10 µs). ([#671])
+- 🎯 **Number Precision**: Total and Self Time column precision changed to 2 decimal places for improved readability. ([#671])
+- 🎨 **Navigation Bar**: Redesigned to better match VS Code’s look and feel. ([#694])
## [1.18.1] 2025-07-09
@@ -476,6 +477,7 @@ Skipped due to adopting odd numbering for pre releases and even number for relea
+[#627]: https://github.com/certinia/debug-log-analyzer/issues/627
[#685]: https://github.com/certinia/debug-log-analyzer/issues/685
[#98]: https://github.com/certinia/debug-log-analyzer/issues/98
[#204]: https://github.com/certinia/debug-log-analyzer/issues/204
From 8c325c0023cb01a30323e15e826ad1efd00520ed Mon Sep 17 00:00:00 2001
From: Luke Cotter <4013877+lukecotter@users.noreply.github.com>
Date: Fri, 10 Apr 2026 10:55:25 +0100
Subject: [PATCH 11/14] fix: cache find regex and clean up highlights on table
destroy
Cache the compiled RegExp on the Find instance so _applyHighlights()
(called on every scroll RAF) avoids repeated string escaping and
RegExp construction. Clear stale highlight ranges on tableDestroyed
to prevent memory leaks when table instances are torn down.
---
log-viewer/src/tabulator/module/Find.ts | 36 +++++++++++++++++--------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/log-viewer/src/tabulator/module/Find.ts b/log-viewer/src/tabulator/module/Find.ts
index e45b95ff..278d941a 100644
--- a/log-viewer/src/tabulator/module/Find.ts
+++ b/log-viewer/src/tabulator/module/Find.ts
@@ -24,6 +24,7 @@ export class Find extends Module {
_myFindRanges: Range[] = [];
_myCurrentRanges: Range[] = [];
_findArgs: FindArgs | null = null;
+ _cachedRegex: RegExp | null = null;
_currentMatchIndex = 0;
_matchIndexes: { [key: number]: RowComponent } = {};
@@ -55,6 +56,10 @@ export class Find extends Module {
this._cellTextCache = new WeakMap();
});
+ this.table.on('tableDestroyed', () => {
+ this._clearFindHighlights();
+ });
+
this.table.on('renderComplete', () => {
if (this._findArgs?.text) {
this._applyHighlights();
@@ -118,10 +123,7 @@ export class Find extends Module {
const grps = tbl.getGroups().flatMap(flattenFromGrps);
const flattenedRows: RowComponent[] = grps.length ? grps : this._getRows(tbl.getRows('active'));
- const findOptions = findArgs.options;
- let searchString = findOptions.matchCase ? findArgs.text : findArgs.text.toLowerCase();
- searchString = searchString.replaceAll(/[[\]*+?{}.()^$|\\-]/g, '\\$&');
- const regex = new RegExp(searchString, `g${findArgs.options.matchCase ? '' : 'i'}`);
+ const regex = this._buildRegex(findArgs);
// Reset highlightIndexes on all rows (no reformat needed with CSS Highlight API)
for (const row of flattenedRows) {
@@ -134,7 +136,7 @@ export class Find extends Module {
}
let totalMatches = 0;
- if (searchString) {
+ if (regex) {
// Avoid row.getCells() — for uninitialized off-screen rows it calls generateCells()
// which creates a DOM element per cell (document.createElement). For 10k rows that
// is O(rows × cols) element creation before a single search character is matched.
@@ -249,12 +251,12 @@ export class Find extends Module {
return;
}
- const findOptions = this._findArgs.options;
- let searchString = findOptions.matchCase
- ? this._findArgs.text
- : this._findArgs.text.toLowerCase();
- searchString = searchString.replaceAll(/[[\]*+?{}.()^$|\\-]/g, '\\$&');
- const regex = new RegExp(searchString, `g${findOptions.matchCase ? '' : 'i'}`);
+ const regex = this._cachedRegex;
+ if (!regex) {
+ CSS.highlights.set('find-match', Find._findHighlight);
+ CSS.highlights.set('current-find-match', Find._currentHighlight);
+ return;
+ }
const rows = this._getRenderedRows();
for (const row of rows) {
@@ -305,10 +307,22 @@ export class Find extends Module {
_clearFindHighlights() {
this._clearInstanceRanges();
this._findArgs = null;
+ this._cachedRegex = null;
this._currentMatchIndex = 0;
this._matchIndexes = {};
}
+ _buildRegex(findArgs: FindArgs): RegExp | null {
+ if (!findArgs.text) {
+ this._cachedRegex = null;
+ return null;
+ }
+ let searchString = findArgs.options.matchCase ? findArgs.text : findArgs.text.toLowerCase();
+ searchString = searchString.replaceAll(/[[\]*+?{}.()^$|\\-]/g, '\\$&');
+ this._cachedRegex = new RegExp(searchString, `g${findArgs.options.matchCase ? '' : 'i'}`);
+ return this._cachedRegex;
+ }
+
_clearInstanceRanges() {
for (const range of this._myFindRanges) {
Find._findHighlight?.delete(range);
From 344ca2d3a9683d102c5c6503358b0db9b93c1094 Mon Sep 17 00:00:00 2001
From: Luke Cotter <4013877+lukecotter@users.noreply.github.com>
Date: Fri, 10 Apr 2026 10:57:22 +0100
Subject: [PATCH 12/14] fix: remove document event listener leaks in view
components
Add disconnectedCallback to CalltreeView, AnalysisView, DMLView, and
SOQLView to remove find event listeners registered on document. Extract
CalltreeView's inline calltree-go-to-row handler to a named field so
it can be properly removed. Restore the isTableVisible guard in DMLView
to prevent searching against hidden tables when switching views.
---
.../analysis/components/AnalysisView.ts | 7 +++++++
.../call-tree/components/CalltreeView.ts | 17 +++++++++++++----
.../src/features/database/components/DMLView.ts | 11 +++++++++++
.../features/database/components/SOQLView.ts | 7 +++++++
4 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/log-viewer/src/features/analysis/components/AnalysisView.ts b/log-viewer/src/features/analysis/components/AnalysisView.ts
index d46f920d..d820b5c9 100644
--- a/log-viewer/src/features/analysis/components/AnalysisView.ts
+++ b/log-viewer/src/features/analysis/components/AnalysisView.ts
@@ -126,6 +126,13 @@ export class AnalysisView extends LitElement {
document.addEventListener('lv-find-close', this._findEvt);
}
+ disconnectedCallback(): void {
+ super.disconnectedCallback();
+ document.removeEventListener('lv-find', this._findEvt);
+ document.removeEventListener('lv-find-match', this._findEvt);
+ document.removeEventListener('lv-find-close', this._findEvt);
+ }
+
updated(changedProperties: PropertyValues): void {
if (
this.timelineRoot &&
diff --git a/log-viewer/src/features/call-tree/components/CalltreeView.ts b/log-viewer/src/features/call-tree/components/CalltreeView.ts
index d84d3dd4..24022979 100644
--- a/log-viewer/src/features/call-tree/components/CalltreeView.ts
+++ b/log-viewer/src/features/call-tree/components/CalltreeView.ts
@@ -80,18 +80,27 @@ export class CalltreeView extends LitElement {
return (this.tableContainer = this.renderRoot?.querySelector('#call-tree-table') ?? null);
}
+ private _goToRowEvt = ((e: CustomEvent) => {
+ this._goToRow(e.detail.timestamp);
+ }) as EventListener;
+
constructor() {
super();
- document.addEventListener('calltree-go-to-row', ((e: CustomEvent) => {
- this._goToRow(e.detail.timestamp);
- }) as EventListener);
-
+ document.addEventListener('calltree-go-to-row', this._goToRowEvt);
document.addEventListener('lv-find', this._findEvt);
document.addEventListener('lv-find-match', this._findEvt);
document.addEventListener('lv-find-close', this._findEvt);
}
+ disconnectedCallback(): void {
+ super.disconnectedCallback();
+ document.removeEventListener('calltree-go-to-row', this._goToRowEvt);
+ document.removeEventListener('lv-find', this._findEvt);
+ document.removeEventListener('lv-find-match', this._findEvt);
+ document.removeEventListener('lv-find-close', this._findEvt);
+ }
+
updated(changedProperties: PropertyValues): void {
if (
this.timelineRoot &&
diff --git a/log-viewer/src/features/database/components/DMLView.ts b/log-viewer/src/features/database/components/DMLView.ts
index c921b46f..988382e2 100644
--- a/log-viewer/src/features/database/components/DMLView.ts
+++ b/log-viewer/src/features/database/components/DMLView.ts
@@ -72,6 +72,13 @@ export class DMLView extends LitElement {
document.addEventListener('lv-find-match', this._findEvt);
}
+ disconnectedCallback(): void {
+ super.disconnectedCallback();
+ document.removeEventListener('lv-find', this._findEvt);
+ document.removeEventListener('lv-find-close', this._findEvt);
+ document.removeEventListener('lv-find-match', this._findEvt);
+ }
+
updated(changedProperties: PropertyValues): void {
if (
this.timelineRoot &&
@@ -226,6 +233,10 @@ export class DMLView extends LitElement {
}
const newFindArgs = JSON.parse(JSON.stringify(e.detail));
+ if (!isTableVisible) {
+ newFindArgs.text = '';
+ }
+
const newSearch =
newFindArgs.text !== this.findArgs.text ||
newFindArgs.options.matchCase !== this.findArgs.options?.matchCase;
diff --git a/log-viewer/src/features/database/components/SOQLView.ts b/log-viewer/src/features/database/components/SOQLView.ts
index 1fdf9866..8515c8c7 100644
--- a/log-viewer/src/features/database/components/SOQLView.ts
+++ b/log-viewer/src/features/database/components/SOQLView.ts
@@ -83,6 +83,13 @@ export class SOQLView extends LitElement {
document.addEventListener('lv-find-match', this._findEvt);
}
+ disconnectedCallback(): void {
+ super.disconnectedCallback();
+ document.removeEventListener('lv-find', this._findEvt);
+ document.removeEventListener('lv-find-close', this._findEvt);
+ document.removeEventListener('lv-find-match', this._findEvt);
+ }
+
updated(changedProperties: PropertyValues): void {
if (
this.timelineRoot &&
From 753e651d981baf321418c808a59050eafc1b6066 Mon Sep 17 00:00:00 2001
From: Luke Cotter <4013877+lukecotter@users.noreply.github.com>
Date: Fri, 10 Apr 2026 10:58:22 +0100
Subject: [PATCH 13/14] fix: allow dataTreeChildIndent config to override
default in name formatter
Remove premature initialisation of
childIndent so the ??= fallback correctly reads
dataTreeChildIndent from table options on first use.
---
.../src/features/call-tree/components/CalltreeNameFormatter.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/log-viewer/src/features/call-tree/components/CalltreeNameFormatter.ts b/log-viewer/src/features/call-tree/components/CalltreeNameFormatter.ts
index 35bc4a33..3663c661 100644
--- a/log-viewer/src/features/call-tree/components/CalltreeNameFormatter.ts
+++ b/log-viewer/src/features/call-tree/components/CalltreeNameFormatter.ts
@@ -5,7 +5,7 @@ import type { LogEvent, LogEventType } from 'apex-log-parser';
import type { CellComponent, EmptyCallback } from 'tabulator-tables';
export function createCalltreeNameFormatter(excludedTypes: Set) {
- let childIndent: number = 9;
+ let childIndent: number;
return function calltreeNameFormatter(
cell: CellComponent,
From b5dc58fe3d532427b0b08e70b8a77232660fb41b Mon Sep 17 00:00:00 2001
From: Luke Cotter <4013877+lukecotter@users.noreply.github.com>
Date: Fri, 10 Apr 2026 16:49:08 +0100
Subject: [PATCH 14/14] fix: resolve database view find count and navigation
regressions
Prevent non-visible views from dispatching lv-find-results which
overwrote the active view's match count in FindWidget. Fall back to
the raw field value in headless formatter when custom elements like
yield empty textContent in a detached element. Remove
lv-find-match from DMLView/SOQLView since DatabaseView orchestrates
match navigation via highlightIndex property binding. Fix SOQLView
dispatching db-find-results with type 'dml' instead of 'soql'. Add
disconnectedCallback to DatabaseView for listener cleanup.
---
.../src/features/analysis/components/AnalysisView.ts | 4 ++--
.../src/features/call-tree/components/CalltreeView.ts | 4 ++--
log-viewer/src/features/database/components/DMLView.ts | 6 ------
.../src/features/database/components/DatabaseView.ts | 7 +++++++
.../src/features/database/components/SOQLView.ts | 4 +---
log-viewer/src/tabulator/module/Find.ts | 10 ++++++++--
6 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/log-viewer/src/features/analysis/components/AnalysisView.ts b/log-viewer/src/features/analysis/components/AnalysisView.ts
index d820b5c9..eaef06c1 100644
--- a/log-viewer/src/features/analysis/components/AnalysisView.ts
+++ b/log-viewer/src/features/analysis/components/AnalysisView.ts
@@ -247,14 +247,14 @@ export class AnalysisView extends LitElement {
this.totalMatches = result.totalMatches;
this.findMap = result.matchIndexes;
- if (!clearHighlights) {
+ if (!clearHighlights && isTableVisible) {
document.dispatchEvent(
new CustomEvent('lv-find-results', { detail: { totalMatches: result.totalMatches } }),
);
}
}
- if (this.totalMatches <= 0) {
+ if (this.totalMatches <= 0 || !isTableVisible) {
return;
}
this.blockClearHighlights = true;
diff --git a/log-viewer/src/features/call-tree/components/CalltreeView.ts b/log-viewer/src/features/call-tree/components/CalltreeView.ts
index 24022979..2a2a0629 100644
--- a/log-viewer/src/features/call-tree/components/CalltreeView.ts
+++ b/log-viewer/src/features/call-tree/components/CalltreeView.ts
@@ -395,7 +395,7 @@ export class CalltreeView extends LitElement {
this.totalMatches = result.totalMatches;
this.findMap = result.matchIndexes;
- if (!clearHighlights) {
+ if (!clearHighlights && isTableVisible) {
document.dispatchEvent(
new CustomEvent('lv-find-results', { detail: { totalMatches: result.totalMatches } }),
);
@@ -403,7 +403,7 @@ export class CalltreeView extends LitElement {
}
// Highlight the current row and reset the previous or next depending on whether we are stepping forward or back.
- if (this.totalMatches <= 0) {
+ if (this.totalMatches <= 0 || !isTableVisible) {
return;
}
this.blockClearHighlights = true;
diff --git a/log-viewer/src/features/database/components/DMLView.ts b/log-viewer/src/features/database/components/DMLView.ts
index 988382e2..da0bf100 100644
--- a/log-viewer/src/features/database/components/DMLView.ts
+++ b/log-viewer/src/features/database/components/DMLView.ts
@@ -69,14 +69,12 @@ export class DMLView extends LitElement {
document.addEventListener('lv-find', this._findEvt);
document.addEventListener('lv-find-close', this._findEvt);
- document.addEventListener('lv-find-match', this._findEvt);
}
disconnectedCallback(): void {
super.disconnectedCallback();
document.removeEventListener('lv-find', this._findEvt);
document.removeEventListener('lv-find-close', this._findEvt);
- document.removeEventListener('lv-find-match', this._findEvt);
}
updated(changedProperties: PropertyValues): void {
@@ -233,10 +231,6 @@ export class DMLView extends LitElement {
}
const newFindArgs = JSON.parse(JSON.stringify(e.detail));
- if (!isTableVisible) {
- newFindArgs.text = '';
- }
-
const newSearch =
newFindArgs.text !== this.findArgs.text ||
newFindArgs.options.matchCase !== this.findArgs.options?.matchCase;
diff --git a/log-viewer/src/features/database/components/DatabaseView.ts b/log-viewer/src/features/database/components/DatabaseView.ts
index c6d6e48f..bc0f9961 100644
--- a/log-viewer/src/features/database/components/DatabaseView.ts
+++ b/log-viewer/src/features/database/components/DatabaseView.ts
@@ -45,6 +45,13 @@ export class DatabaseView extends LitElement {
document.addEventListener('lv-find', this._findHandler as EventListener);
}
+ disconnectedCallback(): void {
+ super.disconnectedCallback();
+ document.removeEventListener('db-find-results', this._findResults as EventListener);
+ document.removeEventListener('lv-find-match', this._findHandler as EventListener);
+ document.removeEventListener('lv-find', this._findHandler as EventListener);
+ }
+
static styles = [
globalStyles,
css`
diff --git a/log-viewer/src/features/database/components/SOQLView.ts b/log-viewer/src/features/database/components/SOQLView.ts
index 8515c8c7..6458ed7a 100644
--- a/log-viewer/src/features/database/components/SOQLView.ts
+++ b/log-viewer/src/features/database/components/SOQLView.ts
@@ -80,14 +80,12 @@ export class SOQLView extends LitElement {
document.addEventListener('lv-find', this._findEvt);
document.addEventListener('lv-find-close', this._findEvt);
- document.addEventListener('lv-find-match', this._findEvt);
}
disconnectedCallback(): void {
super.disconnectedCallback();
document.removeEventListener('lv-find', this._findEvt);
document.removeEventListener('lv-find-close', this._findEvt);
- document.removeEventListener('lv-find-match', this._findEvt);
}
updated(changedProperties: PropertyValues): void {
@@ -595,7 +593,7 @@ export class SOQLView extends LitElement {
document.dispatchEvent(
new CustomEvent('db-find-results', {
- detail: { totalMatches: this.totalMatches, type: 'dml' },
+ detail: { totalMatches: this.totalMatches, type: 'soql' },
}),
);
}
diff --git a/log-viewer/src/tabulator/module/Find.ts b/log-viewer/src/tabulator/module/Find.ts
index 278d941a..0025caf1 100644
--- a/log-viewer/src/tabulator/module/Find.ts
+++ b/log-viewer/src/tabulator/module/Find.ts
@@ -513,18 +513,24 @@ export class Find extends Module {
return String(value ?? '');
}
+ // Fall back to the raw field value when the formatter result has no
+ // extractable text. This happens for custom-element HTML strings like
+ // whose content renders via shadow DOM — in a detached
+ // element they never connect, so textContent is empty.
+ const fallback = String(value ?? '');
+
if (typeof result === 'string') {
if (result.includes('<') && result.includes('>')) {
const mockElem = this._mockSearchElem;
mockElem.innerHTML = result;
const text = mockElem.textContent ?? '';
mockElem.textContent = '';
- return text;
+ return text || fallback;
}
return result;
}
- return result?.textContent ?? '';
+ return result?.textContent || fallback;
}
}