Skip to content

Commit cd6fa76

Browse files
committed
Web Inspector: virtualized WI.TreeOutline shows nothing when filters are active
https://bugs.webkit.org/show_bug.cgi?id=306587 Reviewed by BJ Burg. None of the callsites that provide `ignoreHidden` probably actually want to ignore `hidden`, especially when trying to check if `revealed`. Put another way, it cannot be `revealed` if it is `hidden`. * Source/WebInspectorUI/UserInterface/Views/TreeElement.js: (WI.TreeElement.prototype.get revealed): Renamed from `revealed` to match `WI.DataGridNode`. (WI.TreeElement.prototype.traverseNextTreeElement.shouldSkip): (WI.TreeElement.prototype.traversePreviousTreeElement.shouldSkip): * Source/WebInspectorUI/UserInterface/Views/TreeOutline.js: (WI.TreeOutline.prototype._treeKeyDown): (WI.TreeOutline.prototype.get revealed): Renamed from `revealed` to match `WI.DataGridNode`. (WI.TreeOutline.prototype._updateVirtualizedElements): * Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js: (WI.SourceNavigationSidebarPanel.prototype.handleCopyEvent): Canonical link: https://commits.webkit.org/306680@main
1 parent 10f8087 commit cd6fa76

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -705,11 +705,10 @@ WI.SourcesNavigationSidebarPanel = class SourcesNavigationSidebarPanel extends W
705705

706706
let treeElement = this._callStackTreeOutline.children[0];
707707

708-
const ignoreHidden = true;
709708
const skipUnrevealed = true;
710709
const stayWithin = null;
711710
const dontPopulate = true;
712-
while (!treeElement.revealed(ignoreHidden))
711+
while (!treeElement.revealed)
713712
treeElement = treeElement.traverseNextTreeElement(skipUnrevealed, stayWithin, dontPopulate);
714713

715714
let indentString = WI.indentString();

Source/WebInspectorUI/UserInterface/Views/TreeElement.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -498,16 +498,16 @@ WI.TreeElement = class TreeElement extends WI.Object
498498
this.treeOutline.dispatchEventToListeners(WI.TreeOutline.Event.ElementRevealed, {element: this});
499499
}
500500

501-
revealed(ignoreHidden)
501+
get revealed()
502502
{
503-
if (!ignoreHidden && this.hidden)
503+
if (this._hidden)
504504
return false;
505505

506506
var currentAncestor = this.parent;
507507
while (currentAncestor && !currentAncestor.root) {
508508
if (!currentAncestor.expanded)
509509
return false;
510-
if (!ignoreHidden && currentAncestor.hidden)
510+
if (currentAncestor._hidden)
511511
return false;
512512
currentAncestor = currentAncestor.parent;
513513
}
@@ -590,7 +590,7 @@ WI.TreeElement = class TreeElement extends WI.Object
590590
traverseNextTreeElement(skipUnrevealed, stayWithin, dontPopulate, info)
591591
{
592592
function shouldSkip(element) {
593-
return skipUnrevealed && !element.revealed(true);
593+
return skipUnrevealed && !element.revealed;
594594
}
595595

596596
var depthChange = 0;
@@ -623,7 +623,7 @@ WI.TreeElement = class TreeElement extends WI.Object
623623
traversePreviousTreeElement(skipUnrevealed, dontPopulate)
624624
{
625625
function shouldSkip(element) {
626-
return skipUnrevealed && !element.revealed(true);
626+
return skipUnrevealed && !element.revealed;
627627
}
628628

629629
var element = this;

Source/WebInspectorUI/UserInterface/Views/TreeOutline.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ WI.TreeOutline = class TreeOutline extends WI.Object
141141

142142
set hidden(x)
143143
{
144+
console.assert(false, "not expected to be called");
145+
144146
if (this._hidden === x)
145147
return;
146148

@@ -568,7 +570,7 @@ WI.TreeOutline = class TreeOutline extends WI.Object
568570
this.selectedTreeElement.parent.collapse();
569571
}
570572
} else if (event.keyIdentifier === expandKeyIdentifier) {
571-
if (!this.selectedTreeElement.revealed()) {
573+
if (!this.selectedTreeElement.revealed) {
572574
this.selectedTreeElement.reveal();
573575
handled = true;
574576
} else if (this.selectedTreeElement.expandable) {
@@ -635,7 +637,7 @@ WI.TreeOutline = class TreeOutline extends WI.Object
635637
// this is the root, do nothing
636638
}
637639

638-
revealed()
640+
get revealed()
639641
{
640642
return true;
641643
}
@@ -936,14 +938,13 @@ WI.TreeOutline = class TreeOutline extends WI.Object
936938
const skipUnrevealed = true;
937939
const stayWithin = null;
938940
const dontPopulate = true;
939-
const ignoreHidden = true;
940941

941942
let firstChild = this.children[0];
942-
if (firstChild && !firstChild.revealed(ignoreHidden))
943+
if (firstChild && !firstChild.revealed)
943944
firstChild = firstChild.traverseNextTreeElement(skipUnrevealed, stayWithin, dontPopulate);
944945

945946
let shouldScroll = false;
946-
if (focusedTreeElement && focusedTreeElement.revealed(false)) {
947+
if (focusedTreeElement?.revealed) {
947948
let index = 0;
948949
for (let child = firstChild; child && child !== focusedTreeElement; child = child.traverseNextTreeElement(skipUnrevealed, stayWithin, dontPopulate))
949950
++index;

0 commit comments

Comments
 (0)