chrome-devtools-frontend 1.0.1696961 → 1.0.1697998
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.geminiignore +0 -1
- package/.stylelintignore +2 -0
- package/front_end/core/common/Color.ts +5 -2
- package/front_end/core/common/VersionController.ts +5 -1
- package/front_end/core/host/InspectorFrontendHostAPI.ts +16 -3
- package/front_end/core/host/InspectorFrontendHostStub.ts +3 -2
- package/front_end/core/host/ResourceLoader.ts +1 -2
- package/front_end/core/platform/api/HostRuntime.ts +1 -0
- package/front_end/core/platform/browser/HostRuntime.ts +4 -0
- package/front_end/core/platform/node/HostRuntime.ts +5 -0
- package/front_end/core/root/Runtime.ts +5 -0
- package/front_end/core/sdk/AnimationModel.ts +9 -1
- package/front_end/core/sdk/DOMModel.ts +13 -0
- package/front_end/core/sdk/SourceMapScopeChainEntry.ts +9 -6
- package/front_end/core/sdk/SourceMapScopesInfo.ts +3 -1
- package/front_end/foundation/Universe.ts +8 -0
- package/front_end/generated/InspectorBackendCommands.ts +4 -1
- package/front_end/generated/protocol-mapping.d.ts +19 -0
- package/front_end/generated/protocol-proxy-api.d.ts +15 -0
- package/front_end/generated/protocol.ts +43 -2
- package/front_end/models/ai_assistance/AiAgent2.ts +20 -18
- package/front_end/models/ai_assistance/AiConversation.ts +38 -12
- package/front_end/models/ai_assistance/agents/AccessibilityAgent.ts +9 -2
- package/front_end/models/ai_assistance/agents/ContextSelectionAgent.ts +26 -0
- package/front_end/models/ai_assistance/agents/StylingAgent.ts +13 -4
- package/front_end/models/ai_assistance/ai_assistance.ts +4 -4
- package/front_end/models/ai_assistance/skills/performance.md +4 -3
- package/front_end/models/ai_assistance/tools/CookieUtils.ts +10 -8
- package/front_end/models/ai_assistance/tools/ExecuteJavaScript.ts +1 -1
- package/front_end/models/ai_assistance/tools/GetElementAccessibilityDetails.ts +1 -3
- package/front_end/models/ai_assistance/tools/GetNetworkRequestDetails.ts +9 -8
- package/front_end/models/ai_assistance/tools/GetSourceContent.ts +5 -6
- package/front_end/models/ai_assistance/tools/GetStorageValues.ts +6 -25
- package/front_end/models/ai_assistance/tools/GetStyles.ts +1 -3
- package/front_end/models/ai_assistance/tools/{GetFunctionCode.ts → GetTraceFunctionCode.ts} +26 -13
- package/front_end/models/ai_assistance/tools/{GetResourceContent.ts → GetTraceResourceContent.ts} +31 -11
- package/front_end/models/ai_assistance/tools/ListNetworkRequests.ts +7 -6
- package/front_end/models/ai_assistance/tools/ListPageOrigins.ts +8 -5
- package/front_end/models/ai_assistance/tools/ListSources.ts +8 -10
- package/front_end/models/ai_assistance/tools/ListStorageKeys.ts +6 -25
- package/front_end/models/ai_assistance/tools/README.md +5 -3
- package/front_end/models/ai_assistance/tools/ResolveDevtoolsNodePath.ts +1 -2
- package/front_end/models/ai_assistance/tools/Tool.ts +54 -16
- package/front_end/models/ai_assistance/tools/ToolRegistry.ts +6 -6
- package/front_end/models/change_tracker/ChangeTracker.ts +89 -0
- package/front_end/models/change_tracker/change_tracker.ts +9 -0
- package/front_end/models/elements/DOMChanges.ts +238 -0
- package/front_end/models/elements/elements.ts +2 -0
- package/front_end/models/issues_manager/MarkdownIssueDescription.ts +2 -2
- package/front_end/models/live-metrics/LiveMetrics.ts +1 -2
- package/front_end/models/trace/ModelImpl.ts +0 -6
- package/front_end/models/trace/Processor.ts +4 -7
- package/front_end/models/trace/helpers/Timing.ts +2 -1
- package/front_end/models/trace/types/Overlays.ts +12 -1
- package/front_end/panels/accessibility/AccessibilityAnnouncementRecordingView.ts +67 -19
- package/front_end/panels/ai_assistance/AiAssistancePanel.ts +3 -1
- package/front_end/panels/ai_assistance/components/MarkdownRendererWithCodeBlock.ts +25 -5
- package/front_end/panels/application/IndexedDBViews.ts +1 -1
- package/front_end/panels/browser_debugger/ObjectEventListenersSidebarPane.ts +2 -3
- package/front_end/panels/elements/DOMTreeContextMenu.ts +16 -23
- package/front_end/panels/elements/ElementsTreeElement.ts +384 -79
- package/front_end/panels/elements/ElementsTreeOutline.ts +541 -82
- package/front_end/panels/elements/EventListenersWidget.ts +0 -1
- package/front_end/panels/event_listeners/EventListenersView.ts +241 -297
- package/front_end/panels/linear_memory_inspector/LinearMemoryInspectorController.ts +1 -1
- package/front_end/panels/mobile_throttling/ThrottlingSettingsTab.ts +10 -2
- package/front_end/panels/network/NetworkConfigView.ts +141 -116
- package/front_end/panels/network/NetworkPanel.ts +140 -52
- package/front_end/panels/network/RequestHeadersView.ts +65 -32
- package/front_end/panels/network/components/RequestHeadersView.css +7 -1
- package/front_end/panels/network/forward/BackendLinking.ts +52 -0
- package/front_end/panels/network/forward/forward.ts +2 -0
- package/front_end/panels/settings/BackendLinkingSettingsTab.ts +308 -0
- package/front_end/panels/settings/backendLinkingSettingsTab.css +78 -0
- package/front_end/panels/settings/settings-meta.ts +25 -0
- package/front_end/panels/settings/settings.ts +2 -0
- package/front_end/panels/timeline/README.md +3 -2
- package/front_end/panels/timeline/TimelineFlameChartView.ts +23 -2
- package/front_end/panels/timeline/TimelineTreeView.ts +11 -1
- package/front_end/panels/timeline/overlays/OverlaysImpl.ts +64 -4
- package/front_end/panels/timeline/timelineFlameChartView.css +47 -0
- package/front_end/panels/whats_new/ReleaseNoteText.ts +8 -8
- package/front_end/panels/whats_new/resources/WNDT.md +6 -6
- package/front_end/third_party/chromium/README.chromium +1 -1
- package/front_end/third_party/puppeteer/README.chromium +2 -2
- package/front_end/third_party/puppeteer/package/lib/es5-iife/puppeteer-core-browser.d.ts +6 -0
- package/front_end/third_party/puppeteer/package/lib/es5-iife/puppeteer-core-browser.js +5 -8
- package/front_end/third_party/puppeteer/package/lib/puppeteer/cdp/Coverage.d.ts +6 -0
- package/front_end/third_party/puppeteer/package/lib/puppeteer/cdp/Coverage.d.ts.map +1 -1
- package/front_end/third_party/puppeteer/package/lib/puppeteer/cdp/Coverage.js.map +1 -1
- package/front_end/third_party/puppeteer/package/lib/puppeteer/cdp/ScreenRecording.d.ts.map +1 -1
- package/front_end/third_party/puppeteer/package/lib/puppeteer/cdp/ScreenRecording.js +1 -5
- package/front_end/third_party/puppeteer/package/lib/puppeteer/cdp/ScreenRecording.js.map +1 -1
- package/front_end/third_party/puppeteer/package/lib/puppeteer/revisions.d.ts +3 -3
- package/front_end/third_party/puppeteer/package/lib/puppeteer/revisions.js +3 -3
- package/front_end/third_party/puppeteer/package/lib/puppeteer/revisions.js.map +1 -1
- package/front_end/third_party/puppeteer/package/lib/puppeteer/util/version.d.ts +1 -1
- package/front_end/third_party/puppeteer/package/lib/puppeteer/util/version.js +1 -1
- package/front_end/third_party/puppeteer/package/lib/types.d.ts +6 -0
- package/front_end/third_party/puppeteer/package/package.json +2 -2
- package/front_end/third_party/puppeteer/package/src/cdp/Coverage.ts +6 -0
- package/front_end/third_party/puppeteer/package/src/cdp/ScreenRecording.ts +3 -7
- package/front_end/third_party/puppeteer/package/src/revisions.ts +3 -3
- package/front_end/third_party/puppeteer/package/src/util/version.ts +1 -1
- package/front_end/third_party/web-vitals/README.chromium +2 -2
- package/front_end/third_party/web-vitals/package/dist/modules/attribution/onINP.js +8 -5
- package/front_end/third_party/web-vitals/package/package.json +1 -1
- package/front_end/third_party/web-vitals/package/src/attribution/onINP.ts +8 -4
- package/front_end/third_party/web-vitals/rebuild.sh +2 -2
- package/front_end/ui/comments/CommentOverlayManager.ts +169 -40
- package/front_end/ui/comments/CommentThreadWidget.ts +221 -0
- package/front_end/ui/comments/CommentsOverlayWidget.ts +124 -12
- package/front_end/ui/comments/commentThreadWidget.css +173 -0
- package/front_end/ui/comments/comments.ts +2 -0
- package/front_end/ui/comments/commentsOverlay.css +6 -0
- package/front_end/ui/legacy/ContextMenu.ts +19 -0
- package/front_end/ui/legacy/SoftContextMenu.ts +6 -0
- package/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection.ts +1 -1
- package/front_end/ui/legacy/components/perf_ui/FlameChart.ts +66 -22
- package/front_end/ui/visual_logging/KnownContextValues.ts +4 -0
- package/package.json +9 -8
|
@@ -39,6 +39,7 @@ import * as Host from '../../core/host/host.js';
|
|
|
39
39
|
import * as i18n from '../../core/i18n/i18n.js';
|
|
40
40
|
import * as SDK from '../../core/sdk/sdk.js';
|
|
41
41
|
import * as Badges from '../../models/badges/badges.js';
|
|
42
|
+
import * as ChangeTracker from '../../models/change_tracker/change_tracker.js';
|
|
42
43
|
import * as Elements from '../../models/elements/elements.js';
|
|
43
44
|
import * as Buttons from '../../ui/components/buttons/buttons.js';
|
|
44
45
|
import * as CodeHighlighter from '../../ui/components/code_highlighter/code_highlighter.js';
|
|
@@ -60,6 +61,7 @@ import {showContextMenu} from './DOMTreeContextMenu.js';
|
|
|
60
61
|
import {getElementIssueDetails} from './ElementIssueUtils.js';
|
|
61
62
|
import {
|
|
62
63
|
adornerRef,
|
|
64
|
+
buildChangeSelector,
|
|
63
65
|
ElementsTreeElement,
|
|
64
66
|
ElementsTreeWidget,
|
|
65
67
|
ForbiddenClosingTagElements,
|
|
@@ -73,7 +75,7 @@ import {ImagePreviewPopover} from './ImagePreviewPopover.js';
|
|
|
73
75
|
import {ShortcutTreeElement} from './ShortcutTreeElement.js';
|
|
74
76
|
import {TopLayerContainer} from './TopLayerContainer.js';
|
|
75
77
|
|
|
76
|
-
const {html, nothing, render, Directives: {classMap, styleMap}} = Lit;
|
|
78
|
+
const {html, nothing, render, Directives: {classMap, repeat, styleMap}} = Lit;
|
|
77
79
|
|
|
78
80
|
const UIStrings = {
|
|
79
81
|
/**
|
|
@@ -144,7 +146,8 @@ interface ViewInput {
|
|
|
144
146
|
|
|
145
147
|
onSelect?: (node: SDK.DOMModel.DOMNode, isClosingTag?: boolean, selectedByUser?: boolean) => void;
|
|
146
148
|
onExpand?: (node: SDK.DOMModel.DOMNode, expanded: boolean) => void;
|
|
147
|
-
onContextMenu?: (node: SDK.DOMModel.DOMNode, event: MouseEvent
|
|
149
|
+
onContextMenu?: (node: SDK.DOMModel.DOMNode, event: MouseEvent) => void;
|
|
150
|
+
onClearMaxRows?: () => void;
|
|
148
151
|
onHoverNode?: (node: SDK.DOMModel.DOMNode|null, showInfo?: boolean, isClosingTag?: boolean) => void;
|
|
149
152
|
onLeave?: () => void;
|
|
150
153
|
onToggleHideElement?: (node: SDK.DOMModel.DOMNode) => void;
|
|
@@ -159,6 +162,15 @@ interface ViewInput {
|
|
|
159
162
|
moveDirection?: string) => void;
|
|
160
163
|
nodeToEdit?: ({node: SDK.DOMModel.DOMNode}&InitialEditState)|null;
|
|
161
164
|
onInitialEditCompleted?: () => void;
|
|
165
|
+
attributeToHighlight?: {node: SDK.DOMModel.DOMNode, attribute: string}|null;
|
|
166
|
+
onAttributeHighlighted?: () => void;
|
|
167
|
+
nodesWithDirtyAdorners?: Set<SDK.DOMModel.DOMNode>;
|
|
168
|
+
nodeAdornerVersions?: WeakMap<SDK.DOMModel.DOMNode, number>;
|
|
169
|
+
onDirtyAdornersUpdated?: () => void;
|
|
170
|
+
forceOpenPopovers?: WeakSet<SDK.DOMModel.DOMNode>;
|
|
171
|
+
onPopoverAdornerToggled?: (node: SDK.DOMModel.DOMNode, active: boolean) => void;
|
|
172
|
+
forceOpenInterests?: WeakSet<SDK.DOMModel.DOMNode>;
|
|
173
|
+
onInterestAdornerToggled?: (node: SDK.DOMModel.DOMNode, active: boolean) => void;
|
|
162
174
|
multilineEditingNode?: SDK.DOMModel.DOMNode|null;
|
|
163
175
|
dragOverNode?: {node: SDK.DOMModel.DOMNode, isClosingTag: boolean}|null;
|
|
164
176
|
isValidDragSource?: (node: SDK.DOMModel.DOMNode) => boolean;
|
|
@@ -213,6 +225,7 @@ export const DEFAULT_VIEW = (input: ViewInput, output: ViewOutput, target: HTMLE
|
|
|
213
225
|
elementsTreeOutline.addEventListener(UI.TreeOutline.Events.ElementExpanded, input.onElementExpanded, this);
|
|
214
226
|
elementsTreeOutline.addEventListener(UI.TreeOutline.Events.ElementCollapsed, input.onElementCollapsed, this);
|
|
215
227
|
elementsTreeOutline.addEventListener(ElementsTreeOutline.Events.ShowAllRows, () => {
|
|
228
|
+
input.onClearMaxRows?.();
|
|
216
229
|
if (elementsTreeOutline.maxRowsShown) {
|
|
217
230
|
// Set max to undefined to show all rows
|
|
218
231
|
elementsTreeOutline.maxRowsShown = undefined;
|
|
@@ -221,7 +234,7 @@ export const DEFAULT_VIEW = (input: ViewInput, output: ViewOutput, target: HTMLE
|
|
|
221
234
|
elementsTreeOutline.elementInternal.addEventListener('contextmenu', (event: MouseEvent) => {
|
|
222
235
|
const treeElement = elementsTreeOutline.treeElementFromEventInternal(event);
|
|
223
236
|
if (treeElement instanceof ElementsTreeElement) {
|
|
224
|
-
input.onContextMenu?.(treeElement.node(), event
|
|
237
|
+
input.onContextMenu?.(treeElement.node(), event);
|
|
225
238
|
}
|
|
226
239
|
}, false);
|
|
227
240
|
elementsTreeOutline.elementInternal.addEventListener('keydown', (event: KeyboardEvent) => {
|
|
@@ -243,7 +256,7 @@ export const DEFAULT_VIEW = (input: ViewInput, output: ViewOutput, target: HTMLE
|
|
|
243
256
|
output.elementsTreeOutline.enableContextMenu = input.enableContextMenu ?? true;
|
|
244
257
|
output.elementsTreeOutline.showContextMenu = (treeElement, event) => {
|
|
245
258
|
if (event instanceof MouseEvent) {
|
|
246
|
-
input.onContextMenu?.(treeElement.node(), event
|
|
259
|
+
input.onContextMenu?.(treeElement.node(), event);
|
|
247
260
|
}
|
|
248
261
|
};
|
|
249
262
|
let needsUpdate = false;
|
|
@@ -363,6 +376,21 @@ export const DEFAULT_VIEW = (input: ViewInput, output: ViewOutput, target: HTMLE
|
|
|
363
376
|
}
|
|
364
377
|
}
|
|
365
378
|
}
|
|
379
|
+
|
|
380
|
+
if (input.attributeToHighlight) {
|
|
381
|
+
const treeElement = output.elementsTreeOutline.findTreeElement(input.attributeToHighlight.node);
|
|
382
|
+
if (treeElement) {
|
|
383
|
+
treeElement.reveal();
|
|
384
|
+
treeElement.highlightAttribute(input.attributeToHighlight.attribute);
|
|
385
|
+
input.onAttributeHighlighted?.();
|
|
386
|
+
}
|
|
387
|
+
}
|
|
388
|
+
if (input.nodesWithDirtyAdorners && input.nodesWithDirtyAdorners.size > 0) {
|
|
389
|
+
for (const node of input.nodesWithDirtyAdorners) {
|
|
390
|
+
void output.elementsTreeOutline.findTreeElement(node)?.updateAdorners();
|
|
391
|
+
}
|
|
392
|
+
input.onDirtyAdornersUpdated?.();
|
|
393
|
+
}
|
|
366
394
|
};
|
|
367
395
|
|
|
368
396
|
function isMaxDepthReached(node: SDK.DOMModel.DOMNode, rootDOMNode: SDK.DOMModel.DOMNode|null, maxTreeDepth?: number,
|
|
@@ -680,24 +708,121 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
680
708
|
// clang-format on
|
|
681
709
|
};
|
|
682
710
|
|
|
711
|
+
const isNodeExpanded = (node: SDK.DOMModel.DOMNode, isEditingAsHTML: boolean): boolean => {
|
|
712
|
+
const isNotCollapsible = node.nodeType() === Node.ELEMENT_NODE &&
|
|
713
|
+
node.parentNode?.nodeType() === Node.DOCUMENT_NODE && !node.parentNode.parentNode;
|
|
714
|
+
const isCollapsible = !isEditingAsHTML && !isNotCollapsible;
|
|
715
|
+
return !isCollapsible ||
|
|
716
|
+
Boolean((input.currentHighlightedNode && isAncestorOf(node, input.currentHighlightedNode)) ||
|
|
717
|
+
(input.isNodeExpanded ? input.isNodeExpanded(node) :
|
|
718
|
+
(input.expandRoot &&
|
|
719
|
+
(node === input.rootDOMNode ||
|
|
720
|
+
(input.omitRootDOMNode && node.parentNode === input.rootDOMNode)))));
|
|
721
|
+
};
|
|
722
|
+
|
|
723
|
+
const countTopLayerRows = (doc: SDK.DOMModel.DOMDocument): number => {
|
|
724
|
+
const shortcuts = input.getTopLayerShortcuts?.(doc) ?? [];
|
|
725
|
+
if (shortcuts.length === 0) {
|
|
726
|
+
return 0;
|
|
727
|
+
}
|
|
728
|
+
const countShortcutRows = (shortcut: SDK.DOMModel.DOMNodeShortcut): number => {
|
|
729
|
+
let shortcutRows = 1;
|
|
730
|
+
if (shortcut.childShortcuts.length > 0 && input.isTopLayerShortcutExpanded?.(shortcut)) {
|
|
731
|
+
for (const child of shortcut.childShortcuts) {
|
|
732
|
+
shortcutRows += countShortcutRows(child);
|
|
733
|
+
}
|
|
734
|
+
}
|
|
735
|
+
return shortcutRows;
|
|
736
|
+
};
|
|
737
|
+
let rows = 1;
|
|
738
|
+
if (input.isTopLayerExpanded?.(doc)) {
|
|
739
|
+
for (const shortcut of shortcuts) {
|
|
740
|
+
rows += countShortcutRows(shortcut);
|
|
741
|
+
}
|
|
742
|
+
}
|
|
743
|
+
return rows;
|
|
744
|
+
};
|
|
745
|
+
|
|
746
|
+
const countAdoptedStyleSheetsRows = (node: SDK.DOMModel.DOMNode): number => {
|
|
747
|
+
const sheets = node.adoptedStyleSheetsForNode;
|
|
748
|
+
if (!sheets || sheets.length === 0) {
|
|
749
|
+
return 0;
|
|
750
|
+
}
|
|
751
|
+
let rows = 1; // The "#adopted-style-sheets" container
|
|
752
|
+
if (input.isAdoptedStyleSheetsExpanded?.(node)) {
|
|
753
|
+
for (const sheet of sheets) {
|
|
754
|
+
rows += 1; // The sheet row
|
|
755
|
+
if (input.isAdoptedStyleSheetExpanded?.(sheet) && sheet.cssModel.styleSheetHeaderForId(sheet.id)) {
|
|
756
|
+
rows += 1; // The AdoptedStyleSheetContentsWidget row
|
|
757
|
+
}
|
|
758
|
+
}
|
|
759
|
+
}
|
|
760
|
+
return rows;
|
|
761
|
+
};
|
|
762
|
+
|
|
763
|
+
const countVisibleRowsForNode = (node: SDK.DOMModel.DOMNode): number => {
|
|
764
|
+
let rows = 1;
|
|
765
|
+
const isEditingAsHTML = input.multilineEditingNode === node ||
|
|
766
|
+
(input.nodeToEdit?.node === node && Boolean(input.nodeToEdit.isEditAsHTML));
|
|
767
|
+
const hasChildren =
|
|
768
|
+
!isEditingAsHTML && nodeHasVisibleChildren(node, input.rootDOMNode, input.maxTreeDepth, input.omitRootDOMNode);
|
|
769
|
+
if (hasChildren && isNodeExpanded(node, isEditingAsHTML)) {
|
|
770
|
+
rows += countAdoptedStyleSheetsRows(node);
|
|
771
|
+
const allVisibleChildren = getVisibleChildren(node, input.showComments ?? true);
|
|
772
|
+
const limit = input.expandedChildrenLimit ? input.expandedChildrenLimit(node) : InitialChildrenLimit;
|
|
773
|
+
const children = allVisibleChildren.slice(0, limit);
|
|
774
|
+
for (const child of children) {
|
|
775
|
+
rows += countVisibleRowsForNode(child);
|
|
776
|
+
}
|
|
777
|
+
if (allVisibleChildren.length > children.length) {
|
|
778
|
+
rows += 1;
|
|
779
|
+
}
|
|
780
|
+
if (node instanceof SDK.DOMModel.DOMDocument) {
|
|
781
|
+
rows += countTopLayerRows(node);
|
|
782
|
+
}
|
|
783
|
+
const tagName = node.nodeName().toLowerCase();
|
|
784
|
+
const needsClosingTag = node.nodeType() === Node.ELEMENT_NODE && !ForbiddenClosingTagElements.has(tagName) &&
|
|
785
|
+
!node.pseudoType() && (hasChildren || !ElementsTreeWidget.canShowInlineText(node));
|
|
786
|
+
if (needsClosingTag) {
|
|
787
|
+
rows += 1;
|
|
788
|
+
}
|
|
789
|
+
}
|
|
790
|
+
return rows;
|
|
791
|
+
};
|
|
792
|
+
|
|
793
|
+
const countAllVisibleRows = (): number => {
|
|
794
|
+
let totalRows = 0;
|
|
795
|
+
if (input.omitRootDOMNode && input.rootDOMNode) {
|
|
796
|
+
totalRows += countAdoptedStyleSheetsRows(input.rootDOMNode);
|
|
797
|
+
}
|
|
798
|
+
for (const node of rootNodes) {
|
|
799
|
+
totalRows += countVisibleRowsForNode(node);
|
|
800
|
+
}
|
|
801
|
+
if (input.omitRootDOMNode && input.rootDOMNode) {
|
|
802
|
+
const remaining = allRootNodes.length - rootNodes.length;
|
|
803
|
+
if (remaining > 0) {
|
|
804
|
+
totalRows += 1;
|
|
805
|
+
}
|
|
806
|
+
if (input.rootDOMNode instanceof SDK.DOMModel.DOMDocument) {
|
|
807
|
+
totalRows += countTopLayerRows(input.rootDOMNode);
|
|
808
|
+
}
|
|
809
|
+
}
|
|
810
|
+
return totalRows;
|
|
811
|
+
};
|
|
812
|
+
|
|
683
813
|
const renderNode = (node: SDK.DOMModel.DOMNode, depth = 0): Lit.LitTemplate => {
|
|
684
814
|
const isSelected = input.selectedNode === node;
|
|
685
815
|
const isOpeningHovered =
|
|
686
816
|
(input.currentHighlightedNode === node) || (input.hoveredNode === node && !input.hoveredClosingTag);
|
|
687
817
|
const isClosingHovered = input.hoveredNode === node && Boolean(input.hoveredClosingTag);
|
|
688
|
-
const isExpanded = Boolean(
|
|
689
|
-
(input.currentHighlightedNode && isAncestorOf(node, input.currentHighlightedNode)) ||
|
|
690
|
-
(input.isNodeExpanded ?
|
|
691
|
-
input.isNodeExpanded(node) :
|
|
692
|
-
(input.expandRoot &&
|
|
693
|
-
(node === input.rootDOMNode || (input.omitRootDOMNode && node.parentNode === input.rootDOMNode)))));
|
|
694
818
|
const isEditingAsHTML = input.multilineEditingNode === node ||
|
|
695
819
|
(input.nodeToEdit?.node === node && Boolean(input.nodeToEdit.isEditAsHTML));
|
|
696
820
|
const hasChildren =
|
|
697
821
|
!isEditingAsHTML && nodeHasVisibleChildren(node, input.rootDOMNode, input.maxTreeDepth, input.omitRootDOMNode);
|
|
698
|
-
const
|
|
699
|
-
|
|
700
|
-
|
|
822
|
+
const isNotCollapsible = node.nodeType() === Node.ELEMENT_NODE &&
|
|
823
|
+
node.parentNode?.nodeType() === Node.DOCUMENT_NODE && !node.parentNode.parentNode;
|
|
824
|
+
const isCollapsible = !isEditingAsHTML && !isNotCollapsible;
|
|
825
|
+
const isExpanded = isNodeExpanded(node, isEditingAsHTML);
|
|
701
826
|
const isExpandable = hasChildren && isCollapsible;
|
|
702
827
|
const allVisibleChildren = hasChildren ? getVisibleChildren(node, input.showComments ?? true) : [];
|
|
703
828
|
const limit = input.expandedChildrenLimit ? input.expandedChildrenLimit(node) : InitialChildrenLimit;
|
|
@@ -709,12 +834,12 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
709
834
|
|
|
710
835
|
const on = Lit.Directive.directive(Lit.CustomDirectives.InterceptBindingDirective);
|
|
711
836
|
|
|
712
|
-
const onSelect = (isClosingTag = false): void => {
|
|
713
|
-
input.onSelect?.(node, isClosingTag,
|
|
837
|
+
const onSelect = (isClosingTag = false, selectedByUser = false): void => {
|
|
838
|
+
input.onSelect?.(node, isClosingTag, selectedByUser);
|
|
714
839
|
};
|
|
715
840
|
|
|
716
841
|
const onExpand = (event: UI.TreeOutline.TreeViewElement.ExpandEvent): void => {
|
|
717
|
-
if (isEditingAsHTML) {
|
|
842
|
+
if (isEditingAsHTML || !isCollapsible) {
|
|
718
843
|
return;
|
|
719
844
|
}
|
|
720
845
|
input.onExpand?.(node, event.detail.expanded);
|
|
@@ -725,6 +850,7 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
725
850
|
const isDraggable = !input.disableEdits && Boolean(input.isValidDragSource?.(node));
|
|
726
851
|
|
|
727
852
|
const classes = classMap({
|
|
853
|
+
selected: isSelected && !input.selectedClosingTag,
|
|
728
854
|
hovered: isOpeningHovered,
|
|
729
855
|
'in-clipboard': Boolean(input.isNodeInClipboard?.(node)),
|
|
730
856
|
'elements-drag-over': isDragOver,
|
|
@@ -732,13 +858,19 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
732
858
|
});
|
|
733
859
|
|
|
734
860
|
const onOpeningMouseMove = (event: MouseEvent): void => {
|
|
735
|
-
event.
|
|
861
|
+
const currentTarget = event.currentTarget as Element | null;
|
|
862
|
+
if (currentTarget && (event.target as Element).closest('li[role="treeitem"]') !== currentTarget) {
|
|
863
|
+
return;
|
|
864
|
+
}
|
|
736
865
|
const showInfo = !UI.KeyboardShortcut.KeyboardShortcut.eventHasEitherCtrlOrMeta(event);
|
|
737
866
|
input.onHoverNode?.(node, showInfo, /* isClosingTag= */ false);
|
|
738
867
|
};
|
|
739
868
|
|
|
740
869
|
const onClosingMouseMove = (event: MouseEvent): void => {
|
|
741
|
-
event.
|
|
870
|
+
const currentTarget = event.currentTarget as Element | null;
|
|
871
|
+
if (currentTarget && (event.target as Element).closest('li[role="treeitem"]') !== currentTarget) {
|
|
872
|
+
return;
|
|
873
|
+
}
|
|
742
874
|
const showInfo = !UI.KeyboardShortcut.KeyboardShortcut.eventHasEitherCtrlOrMeta(event);
|
|
743
875
|
input.onHoverNode?.(node, showInfo, /* isClosingTag= */ true);
|
|
744
876
|
};
|
|
@@ -793,8 +925,8 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
793
925
|
style=${styleMap({'--indent': `${computeLeftIndent(depth, isExpandable)}px`})}
|
|
794
926
|
?open=${isExpanded && !isEditingAsHTML}
|
|
795
927
|
draggable=${isDraggable ? 'true' : 'false'}
|
|
796
|
-
@select=${on(() => onSelect(false))}
|
|
797
|
-
@expand=${onExpand}
|
|
928
|
+
@select=${on((event: UI.TreeOutline.TreeViewElement.SelectEvent) => onSelect(false, Boolean(event.detail?.selectedByUser)))}
|
|
929
|
+
@expand=${on(onExpand)}
|
|
798
930
|
@mousemove=${on(onOpeningMouseMove)}
|
|
799
931
|
@contextmenu=${on(onContextMenu)}
|
|
800
932
|
@dragstart=${on(onDragStart)}
|
|
@@ -823,6 +955,15 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
823
955
|
showAIButton: input.showAIButton ?? true,
|
|
824
956
|
initialEdit: input.nodeToEdit?.node === node ? input.nodeToEdit : null,
|
|
825
957
|
onInitialEditCompleted: input.onInitialEditCompleted,
|
|
958
|
+
attributeToHighlight:
|
|
959
|
+
input.attributeToHighlight?.node === node ? input.attributeToHighlight.attribute : null,
|
|
960
|
+
onAttributeHighlighted: input.onAttributeHighlighted,
|
|
961
|
+
adornersDirty: input.nodesWithDirtyAdorners?.has(node) ?? false,
|
|
962
|
+
adornersUpdateVersion: input.nodeAdornerVersions?.get(node) ?? 0,
|
|
963
|
+
popoverAdornerActive: Boolean(input.forceOpenPopovers?.has(node)),
|
|
964
|
+
onPopoverAdornerToggled: input.onPopoverAdornerToggled,
|
|
965
|
+
interestAdornerActive: Boolean(input.forceOpenInterests?.has(node)),
|
|
966
|
+
onInterestAdornerToggled: input.onInterestAdornerToggled,
|
|
826
967
|
revealInTopLayer: (n: SDK.DOMModel.DOMNode) => input.domTreeWidget?.revealInTopLayer(n),
|
|
827
968
|
setMultilineEditing: (multilineEditing, n) => input.domTreeWidget?.setMultilineEditing(multilineEditing, n ?? node),
|
|
828
969
|
visibleWidth: () => input.domTreeWidget?.visibleWidth ?? 0,
|
|
@@ -835,9 +976,9 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
835
976
|
return Promise.resolve();
|
|
836
977
|
},
|
|
837
978
|
isToggledToHidden: (n: SDK.DOMModel.DOMNode) => input.isToggledToHidden?.(n) ?? false,
|
|
838
|
-
showContextMenu: (event: Event
|
|
979
|
+
showContextMenu: (event: Event) => {
|
|
839
980
|
if (event instanceof MouseEvent) {
|
|
840
|
-
input.onContextMenu?.(node, event
|
|
981
|
+
input.onContextMenu?.(node, event);
|
|
841
982
|
}
|
|
842
983
|
},
|
|
843
984
|
updateRecord: input.updateRecordForNode?.(node) ?? null,
|
|
@@ -846,7 +987,7 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
846
987
|
<ul role="group">
|
|
847
988
|
${UI.TreeOutline.ifExpanded(html`
|
|
848
989
|
${node.adoptedStyleSheetsForNode.length > 0 ? renderAdoptedStyleSheets(node, depth + 1) : nothing}
|
|
849
|
-
${children.
|
|
990
|
+
${repeat(children, child => child.id, child => renderNode(child, depth + 1))}
|
|
850
991
|
${remainingChildrenCount > 0 ? html`
|
|
851
992
|
<li role="treeitem"
|
|
852
993
|
class="elements-tree-expand-all"
|
|
@@ -863,15 +1004,21 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
863
1004
|
</devtools-button>
|
|
864
1005
|
</li>
|
|
865
1006
|
` : nothing}
|
|
1007
|
+
${node.isInsertionPoint() ? node.distributedNodes().map(distributedNode => renderShortcut(distributedNode, depth + 1)) : nothing}
|
|
866
1008
|
${node instanceof SDK.DOMModel.DOMDocument ? renderTopLayerContainer(node, depth + 1) : nothing}
|
|
867
1009
|
${needsClosingTag ? html`
|
|
868
1010
|
<li role="treeitem"
|
|
869
1011
|
?selected=${isSelected && Boolean(input.selectedClosingTag)}
|
|
870
|
-
class=${classMap({
|
|
1012
|
+
class=${classMap({
|
|
1013
|
+
selected: isSelected && Boolean(input.selectedClosingTag),
|
|
1014
|
+
hovered: isClosingHovered,
|
|
1015
|
+
'elements-drag-over': isClosingTagDragOver,
|
|
1016
|
+
})}
|
|
871
1017
|
style=${styleMap({'--indent': `${computeLeftIndent(depth + 1, false)}px`})}
|
|
872
1018
|
draggable=${isDraggable ? 'true' : 'false'}
|
|
873
1019
|
jslog=${VisualLogging.treeItem().parent('elementsTreeOutline')}
|
|
874
|
-
@select=${on(() => onSelect(true))}
|
|
1020
|
+
@select=${on((event: UI.TreeOutline.TreeViewElement.SelectEvent) => onSelect(true, Boolean(event.detail?.selectedByUser)))}
|
|
1021
|
+
@contextmenu=${on(onContextMenu)}
|
|
875
1022
|
@mousemove=${on(onClosingMouseMove)}
|
|
876
1023
|
@dragstart=${on(onDragStart)}
|
|
877
1024
|
@dragover=${on(onClosingTagDragOver)}
|
|
@@ -889,9 +1036,9 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
889
1036
|
computeLeftIndent: computeLeftIndent(depth + 1, false),
|
|
890
1037
|
disableEdits: input.disableEdits ?? false,
|
|
891
1038
|
showAIButton: false,
|
|
892
|
-
showContextMenu: (event: Event
|
|
1039
|
+
showContextMenu: (event: Event) => {
|
|
893
1040
|
if (event instanceof MouseEvent) {
|
|
894
|
-
input.onContextMenu?.(node, event
|
|
1041
|
+
input.onContextMenu?.(node, event);
|
|
895
1042
|
}
|
|
896
1043
|
},
|
|
897
1044
|
updateRecord: input.updateRecordForNode?.(node) ?? null,
|
|
@@ -906,15 +1053,30 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
906
1053
|
// clang-format on
|
|
907
1054
|
};
|
|
908
1055
|
|
|
1056
|
+
const isSingleNode =
|
|
1057
|
+
Boolean(input.deindentSingleNode && rootNodes.length === 1 &&
|
|
1058
|
+
!nodeHasVisibleChildren(rootNodes[0], input.rootDOMNode, input.maxTreeDepth, input.omitRootDOMNode));
|
|
1059
|
+
const disclosureClasses = classMap({
|
|
1060
|
+
'elements-disclosure': true,
|
|
1061
|
+
'single-node': isSingleNode,
|
|
1062
|
+
'elements-tree-truncated': Boolean(input.maxRowsShown),
|
|
1063
|
+
});
|
|
1064
|
+
const disclosureStyles = styleMap({
|
|
1065
|
+
'--max-rows': input.maxRowsShown ? String(input.maxRowsShown) : null,
|
|
1066
|
+
});
|
|
1067
|
+
|
|
1068
|
+
const totalVisibleRows = input.maxRowsShown ? countAllVisibleRows() : 0;
|
|
1069
|
+
const truncatedLines = input.maxRowsShown ? Math.max(0, totalVisibleRows - input.maxRowsShown) : 0;
|
|
1070
|
+
|
|
909
1071
|
// clang-format off
|
|
910
1072
|
render(html`
|
|
911
1073
|
<style>${UI.inspectorCommonStyles}</style>
|
|
912
1074
|
<style>${elementsTreeOutlineStyles}</style>
|
|
913
1075
|
<style>${CodeHighlighter.codeHighlighterStyles}</style>
|
|
914
|
-
<div class
|
|
1076
|
+
<div class=${disclosureClasses} style=${disclosureStyles}>
|
|
915
1077
|
<devtools-tree
|
|
916
|
-
class="elements-tree-outline source-code ${input.wrap ? '' : 'elements-tree-nowrap'} ${input.hideGutter ? 'elements-hide-gutter' : ''}"
|
|
917
|
-
|
|
1078
|
+
class="elements-tree-outline source-code ${input.wrap ? '' : 'elements-tree-nowrap'} ${input.hideGutter ? 'elements-hide-gutter' : ''} ${isSingleNode ? 'single-node' : ''}"
|
|
1079
|
+
disclosure-class="elements-disclosure ${isSingleNode ? 'single-node' : ''} ${input.maxRowsShown ? 'elements-tree-truncated' : ''}"
|
|
918
1080
|
jslog=${VisualLogging.tree('elements')}
|
|
919
1081
|
?show-selection-on-keyboard-focus=${input.showSelectionOnKeyboardFocus}
|
|
920
1082
|
@enter=${(event: Event) => event.preventDefault()}
|
|
@@ -927,10 +1089,10 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
927
1089
|
<style>${UI.inspectorCommonStyles}</style>
|
|
928
1090
|
<style>${elementsTreeOutlineStyles}</style>
|
|
929
1091
|
<style>${CodeHighlighter.codeHighlighterStyles}</style>
|
|
930
|
-
<ul role="tree">
|
|
1092
|
+
<ul role="tree" class="elements-tree-outline source-code ${input.wrap ? '' : 'elements-tree-nowrap'} ${input.hideGutter ? 'elements-hide-gutter' : ''} ${isSingleNode ? 'single-node' : ''}" aria-label=${i18nString(UIStrings.pageDom)}>
|
|
931
1093
|
${input.omitRootDOMNode && input.rootDOMNode && input.rootDOMNode.adoptedStyleSheetsForNode.length > 0 ?
|
|
932
1094
|
renderAdoptedStyleSheets(input.rootDOMNode, 0) : nothing}
|
|
933
|
-
${rootNodes.
|
|
1095
|
+
${repeat(rootNodes, node => node.id, node => renderNode(node))}
|
|
934
1096
|
${input.omitRootDOMNode && input.rootDOMNode ? (() => {
|
|
935
1097
|
const remaining = allRootNodes.length - rootNodes.length;
|
|
936
1098
|
if (remaining <= 0) {
|
|
@@ -943,12 +1105,12 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
943
1105
|
style=${styleMap({'--indent': `${computeLeftIndent(0, false)}px`})}
|
|
944
1106
|
jslog=${VisualLogging.treeItem('show-all-nodes').parent('elementsTreeOutline')}>
|
|
945
1107
|
<devtools-button
|
|
946
|
-
|
|
947
|
-
|
|
948
|
-
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
|
|
1108
|
+
.variant=${Buttons.Button.Variant.OUTLINED}
|
|
1109
|
+
title=${i18nString(UIStrings.showAllNodesDMore, {PH1: remaining})}
|
|
1110
|
+
@click=${on((event: Event) => {
|
|
1111
|
+
event.stopPropagation();
|
|
1112
|
+
input.onExpandAllChildren?.(root);
|
|
1113
|
+
})}>
|
|
952
1114
|
${i18nString(UIStrings.showAllNodesDMore, {PH1: remaining})}
|
|
953
1115
|
</devtools-button>
|
|
954
1116
|
</li>
|
|
@@ -959,8 +1121,21 @@ export const DECLARATIVE_VIEW: View = (input: ViewInput, _output: ViewOutput, ta
|
|
|
959
1121
|
`}>
|
|
960
1122
|
</devtools-tree>
|
|
961
1123
|
</div>
|
|
1124
|
+
${truncatedLines > 0 ? html`
|
|
1125
|
+
<button
|
|
1126
|
+
type="button"
|
|
1127
|
+
class="elements-tree-show-all"
|
|
1128
|
+
jslog=${VisualLogging.action('show-all-nodes').track({click: true})}
|
|
1129
|
+
@click=${input.onClearMaxRows}>
|
|
1130
|
+
${i18nString(UIStrings.showAllLines, {PH1: truncatedLines})}
|
|
1131
|
+
</button>
|
|
1132
|
+
` : nothing}
|
|
962
1133
|
`, target);
|
|
963
1134
|
// clang-format on
|
|
1135
|
+
|
|
1136
|
+
if (input.nodesWithDirtyAdorners && input.nodesWithDirtyAdorners.size > 0) {
|
|
1137
|
+
input.onDirtyAdornersUpdated?.();
|
|
1138
|
+
}
|
|
964
1139
|
};
|
|
965
1140
|
|
|
966
1141
|
function getElementsTreeWidgetAndNode(element: Element): {node?: SDK.DOMModel.DOMNode, widget?: ElementsTreeWidget} {
|
|
@@ -971,10 +1146,14 @@ function getElementsTreeWidgetAndNode(element: Element): {node?: SDK.DOMModel.DO
|
|
|
971
1146
|
if (treeElement instanceof ElementsTreeElement) {
|
|
972
1147
|
return {node: treeElement.node(), widget: treeElement.widget};
|
|
973
1148
|
}
|
|
974
|
-
|
|
975
|
-
|
|
976
|
-
|
|
977
|
-
|
|
1149
|
+
const devtoolsWidget =
|
|
1150
|
+
current.querySelector(':scope > devtools-widget, :scope > .tree-element-title > devtools-widget');
|
|
1151
|
+
if (devtoolsWidget) {
|
|
1152
|
+
const widget = UI.Widget.Widget.get(devtoolsWidget);
|
|
1153
|
+
if (widget instanceof ElementsTreeWidget) {
|
|
1154
|
+
return {node: widget.node, widget};
|
|
1155
|
+
}
|
|
1156
|
+
}
|
|
978
1157
|
}
|
|
979
1158
|
current = current.parentElementOrShadowHost();
|
|
980
1159
|
}
|
|
@@ -989,6 +1168,8 @@ function getElementsTreeWidgetAndNode(element: Element): {node?: SDK.DOMModel.DO
|
|
|
989
1168
|
* to DOMTreeWidget.ts.
|
|
990
1169
|
*/
|
|
991
1170
|
export class DOMTreeWidget extends UI.Widget.Widget {
|
|
1171
|
+
static override readonly INJECT: readonly[typeof ChangeTracker.ChangeTracker.ChangeTracker] =
|
|
1172
|
+
[ChangeTracker.ChangeTracker.ChangeTracker] as const;
|
|
992
1173
|
omitRootDOMNode = false;
|
|
993
1174
|
selectEnabled = false;
|
|
994
1175
|
hideGutter = false;
|
|
@@ -1014,6 +1195,7 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1014
1195
|
#visibleWidth?: number;
|
|
1015
1196
|
#wrap = false;
|
|
1016
1197
|
#maxRows?: number;
|
|
1198
|
+
#changeTracker?: ChangeTracker.ChangeTracker.ChangeTracker;
|
|
1017
1199
|
|
|
1018
1200
|
// If maxRows is undefined, all rows are shown. If it is set to a number, only that many rows are shown.
|
|
1019
1201
|
set maxRows(maxRows: number|undefined) {
|
|
@@ -1045,9 +1227,11 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1045
1227
|
}
|
|
1046
1228
|
this.#expandedNodes.add(node);
|
|
1047
1229
|
const expandChildren = (): void => {
|
|
1048
|
-
|
|
1049
|
-
|
|
1050
|
-
|
|
1230
|
+
for (const child of node.children() ?? []) {
|
|
1231
|
+
const isNotCollapsible = child.nodeType() === Node.ELEMENT_NODE &&
|
|
1232
|
+
child.parentNode?.nodeType() === Node.DOCUMENT_NODE && !child.parentNode.parentNode;
|
|
1233
|
+
if (isNotCollapsible || (this.#expandRoot && this.omitRootDOMNode)) {
|
|
1234
|
+
this.setNodeExpanded(child, true);
|
|
1051
1235
|
}
|
|
1052
1236
|
}
|
|
1053
1237
|
};
|
|
@@ -1110,6 +1294,7 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1110
1294
|
|
|
1111
1295
|
set showComments(showComments: boolean) {
|
|
1112
1296
|
this.#showComments = showComments;
|
|
1297
|
+
this.#validateSelectedNode();
|
|
1113
1298
|
this.performUpdate();
|
|
1114
1299
|
}
|
|
1115
1300
|
|
|
@@ -1165,8 +1350,20 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1165
1350
|
};
|
|
1166
1351
|
#highlightThrottler = new Common.Throttler.Throttler(100);
|
|
1167
1352
|
|
|
1353
|
+
get changeTracker(): ChangeTracker.ChangeTracker.ChangeTracker|undefined {
|
|
1354
|
+
// The widget is also created without dependency injection (e.g. by
|
|
1355
|
+
// ElementsPanel), so the changeTracker can be empty, relying on the manual
|
|
1356
|
+
// resolution. Note that this only works once the widget is attached to the
|
|
1357
|
+
// DOM.
|
|
1358
|
+
this.#changeTracker ??=
|
|
1359
|
+
UI.Widget.lookupUniverseForElement(this.contentElement)?.get(ChangeTracker.ChangeTracker.ChangeTracker);
|
|
1360
|
+
return this.#changeTracker;
|
|
1361
|
+
}
|
|
1362
|
+
|
|
1168
1363
|
constructor(
|
|
1169
1364
|
element?: HTMLElement,
|
|
1365
|
+
[changeTracker]:
|
|
1366
|
+
UI.Widget.WidgetDependencies<typeof DOMTreeWidget>|[ChangeTracker.ChangeTracker.ChangeTracker?] = [],
|
|
1170
1367
|
view: View = DEFAULT_VIEW,
|
|
1171
1368
|
) {
|
|
1172
1369
|
super(element, {
|
|
@@ -1174,6 +1371,7 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1174
1371
|
delegatesFocus: false,
|
|
1175
1372
|
});
|
|
1176
1373
|
this.#view = view;
|
|
1374
|
+
this.#changeTracker = changeTracker;
|
|
1177
1375
|
this.#showHTMLCommentsSetting.addChangeListener(this.#onShowHTMLCommentsChange, this);
|
|
1178
1376
|
if (Common.Settings.Settings.instance().moduleSetting('highlight-node-on-hover-in-overlay').get()) {
|
|
1179
1377
|
SDK.TargetManager.TargetManager.instance().addModelListener(
|
|
@@ -1305,10 +1503,40 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1305
1503
|
this.#updateModifiedNodesSoon();
|
|
1306
1504
|
}
|
|
1307
1505
|
|
|
1506
|
+
#findNextNodeOnRemoval(node: SDK.DOMModel.DOMNode, parent: SDK.DOMModel.DOMNode|null): SDK.DOMModel.DOMNode|null {
|
|
1507
|
+
const visibleChildren = parent ? getVisibleChildren(parent, this.#showComments) : [];
|
|
1508
|
+
if (visibleChildren.length > 0) {
|
|
1509
|
+
let candidate: SDK.DOMModel.DOMNode|null = node.nextSibling;
|
|
1510
|
+
while (candidate) {
|
|
1511
|
+
if (visibleChildren.includes(candidate)) {
|
|
1512
|
+
return candidate;
|
|
1513
|
+
}
|
|
1514
|
+
candidate = candidate.nextSibling;
|
|
1515
|
+
}
|
|
1516
|
+
candidate = node.previousSibling;
|
|
1517
|
+
while (candidate) {
|
|
1518
|
+
if (visibleChildren.includes(candidate)) {
|
|
1519
|
+
return candidate;
|
|
1520
|
+
}
|
|
1521
|
+
candidate = candidate.previousSibling;
|
|
1522
|
+
}
|
|
1523
|
+
}
|
|
1524
|
+
if (parent) {
|
|
1525
|
+
if (parent.nodeType() === Node.DOCUMENT_NODE) {
|
|
1526
|
+
return parent.parentNode;
|
|
1527
|
+
}
|
|
1528
|
+
return parent;
|
|
1529
|
+
}
|
|
1530
|
+
return null;
|
|
1531
|
+
}
|
|
1532
|
+
|
|
1308
1533
|
#onNodeRemoved(
|
|
1309
1534
|
event: Common.EventTarget.EventTargetEvent<{node: SDK.DOMModel.DOMNode, parent: SDK.DOMModel.DOMNode}>): void {
|
|
1310
1535
|
const {node, parent} = event.data;
|
|
1311
1536
|
this.resetClipboardIfNeeded(node);
|
|
1537
|
+
if (this.#selectedDOMNode && (this.#selectedDOMNode === node || node.isAncestor(this.#selectedDOMNode))) {
|
|
1538
|
+
this.selectDOMNode(this.#findNextNodeOnRemoval(node, parent), true);
|
|
1539
|
+
}
|
|
1312
1540
|
if (parent) {
|
|
1313
1541
|
this.#addUpdateRecord(parent).nodeRemoved(node);
|
|
1314
1542
|
}
|
|
@@ -1359,8 +1587,12 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1359
1587
|
this.#updateModifiedNodesSoon();
|
|
1360
1588
|
}
|
|
1361
1589
|
|
|
1362
|
-
#onMarkersChanged(): void {
|
|
1363
|
-
|
|
1590
|
+
#onMarkersChanged(event: Common.EventTarget.EventTargetEvent<SDK.DOMModel.DOMNode>): void {
|
|
1591
|
+
const node = event.data;
|
|
1592
|
+
if (node) {
|
|
1593
|
+
this.#addUpdateRecord(node);
|
|
1594
|
+
}
|
|
1595
|
+
this.performUpdate();
|
|
1364
1596
|
}
|
|
1365
1597
|
|
|
1366
1598
|
updateModifiedNodes(): void {
|
|
@@ -1369,6 +1601,7 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1369
1601
|
this.#updateModifiedNodesTimeout = undefined;
|
|
1370
1602
|
}
|
|
1371
1603
|
if (this.#view === DECLARATIVE_VIEW) {
|
|
1604
|
+
this.#validateSelectedNode();
|
|
1372
1605
|
this.performUpdate();
|
|
1373
1606
|
return;
|
|
1374
1607
|
}
|
|
@@ -1389,9 +1622,17 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1389
1622
|
domModel.addEventListener(SDK.DOMModel.Events.DistributedNodesChanged, this.#onDistributedNodesChanged, this);
|
|
1390
1623
|
domModel.addEventListener(SDK.DOMModel.Events.DocumentURLChanged, this.#onDocumentURLChanged, this);
|
|
1391
1624
|
domModel.addEventListener(SDK.DOMModel.Events.AffectedByStartingStylesFlagUpdated, this.requestUpdate, this);
|
|
1625
|
+
const cssModel = domModel.target().model(SDK.CSSModel.CSSModel);
|
|
1626
|
+
if (cssModel) {
|
|
1627
|
+
cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetAdded, this.requestUpdate, this);
|
|
1628
|
+
}
|
|
1392
1629
|
}
|
|
1393
1630
|
|
|
1394
1631
|
#unwireDOMModel(domModel: SDK.DOMModel.DOMModel): void {
|
|
1632
|
+
const cssModel = domModel.target().model(SDK.CSSModel.CSSModel);
|
|
1633
|
+
if (cssModel) {
|
|
1634
|
+
cssModel.removeEventListener(SDK.CSSModel.Events.StyleSheetAdded, this.requestUpdate, this);
|
|
1635
|
+
}
|
|
1395
1636
|
domModel.removeEventListener(SDK.DOMModel.Events.DocumentUpdated, this.#onDocumentUpdated, this);
|
|
1396
1637
|
domModel.removeEventListener(SDK.DOMModel.Events.NodeInserted, this.#onNodeInserted, this);
|
|
1397
1638
|
domModel.removeEventListener(SDK.DOMModel.Events.NodeRemoved, this.#onNodeRemoved, this);
|
|
@@ -1410,6 +1651,7 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1410
1651
|
|
|
1411
1652
|
#onShowHTMLCommentsChange(): void {
|
|
1412
1653
|
this.#showComments = this.#showHTMLCommentsSetting.get();
|
|
1654
|
+
this.#validateSelectedNode();
|
|
1413
1655
|
const selectedNode = this.selectedDOMNode();
|
|
1414
1656
|
if (selectedNode && selectedNode.nodeType() === Node.COMMENT_NODE && !this.#showComments) {
|
|
1415
1657
|
this.selectDOMNode(selectedNode.parentNode);
|
|
@@ -1436,7 +1678,7 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1436
1678
|
}
|
|
1437
1679
|
|
|
1438
1680
|
selectDOMNode(node: SDK.DOMModel.DOMNode|SDK.DOMModel.AdoptedStyleSheet|null, focus?: boolean,
|
|
1439
|
-
isClosingTag
|
|
1681
|
+
isClosingTag?: boolean): void {
|
|
1440
1682
|
this.#imagePreviewPopover?.hide();
|
|
1441
1683
|
this.#issuePopoverHelper?.hidePopover();
|
|
1442
1684
|
if (node instanceof SDK.DOMModel.AdoptedStyleSheet) {
|
|
@@ -1445,9 +1687,9 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1445
1687
|
}
|
|
1446
1688
|
this.#selectedAdoptedStyleSheet = null;
|
|
1447
1689
|
if (this.#view === DECLARATIVE_VIEW) {
|
|
1448
|
-
this.#selectedClosingTag
|
|
1449
|
-
const isSameNode = this.#selectedDOMNode === node;
|
|
1690
|
+
const isSameNode = this.#selectedDOMNode === node && this.#selectedClosingTag === Boolean(isClosingTag);
|
|
1450
1691
|
this.#selectedDOMNode = node;
|
|
1692
|
+
this.#selectedClosingTag = Boolean(isClosingTag);
|
|
1451
1693
|
if (node) {
|
|
1452
1694
|
const ancestors: SDK.DOMModel.DOMNode[] = [];
|
|
1453
1695
|
for (let current: (SDK.DOMModel.DOMNode|null) = node.parentNode; current; current = current.parentNode) {
|
|
@@ -1481,13 +1723,18 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1481
1723
|
Common.EventTarget.EventTargetEvent<{node: SDK.DOMModel.DOMNode | null, focus: boolean}>);
|
|
1482
1724
|
}
|
|
1483
1725
|
this.performUpdate();
|
|
1726
|
+
if (focus) {
|
|
1727
|
+
this.focus();
|
|
1728
|
+
}
|
|
1484
1729
|
return;
|
|
1485
1730
|
}
|
|
1486
1731
|
this.#viewOutput?.elementsTreeOutline?.selectDOMNode(node, focus);
|
|
1487
1732
|
}
|
|
1488
1733
|
|
|
1489
1734
|
highlightNodeAttribute(node: SDK.DOMModel.DOMNode, attribute: string): void {
|
|
1490
|
-
this
|
|
1735
|
+
this.selectDOMNode(node);
|
|
1736
|
+
this.#attributeToHighlight = {node, attribute};
|
|
1737
|
+
this.performUpdate();
|
|
1491
1738
|
}
|
|
1492
1739
|
|
|
1493
1740
|
get wrap(): boolean {
|
|
@@ -1517,7 +1764,7 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1517
1764
|
if (this.#view === DECLARATIVE_VIEW) {
|
|
1518
1765
|
if (expanded) {
|
|
1519
1766
|
this.#expandedNodes.add(node);
|
|
1520
|
-
if (!node.children() && node.childNodeCount()) {
|
|
1767
|
+
if (!node.children() && (node.childNodeCount() || node.isIframe() || node.nodeType() === Node.DOCUMENT_NODE)) {
|
|
1521
1768
|
void node.getChildNodes(() => {
|
|
1522
1769
|
this.performUpdate();
|
|
1523
1770
|
});
|
|
@@ -1543,6 +1790,11 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1543
1790
|
|
|
1544
1791
|
isNodeExpanded(node: SDK.DOMModel.DOMNode): boolean {
|
|
1545
1792
|
if (this.#view === DECLARATIVE_VIEW) {
|
|
1793
|
+
const isNotCollapsible = node.nodeType() === Node.ELEMENT_NODE &&
|
|
1794
|
+
node.parentNode?.nodeType() === Node.DOCUMENT_NODE && !node.parentNode.parentNode;
|
|
1795
|
+
if (isNotCollapsible) {
|
|
1796
|
+
return true;
|
|
1797
|
+
}
|
|
1546
1798
|
return this.#expandedNodes.has(node);
|
|
1547
1799
|
}
|
|
1548
1800
|
return Boolean(this.#viewOutput.elementsTreeOutline?.findTreeElement(node)?.expanded);
|
|
@@ -1580,16 +1832,17 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1580
1832
|
return;
|
|
1581
1833
|
}
|
|
1582
1834
|
this.#expandedNodes.add(n);
|
|
1583
|
-
|
|
1584
|
-
|
|
1585
|
-
|
|
1586
|
-
void n.getChildNodes(() => resolve(n.children() ?? []));
|
|
1835
|
+
if (!n.children() && (n.childNodeCount() || n.isIframe() || n.nodeType() === Node.DOCUMENT_NODE)) {
|
|
1836
|
+
await new Promise<void>(resolve => {
|
|
1837
|
+
void n.getChildNodes(() => resolve());
|
|
1587
1838
|
});
|
|
1588
1839
|
}
|
|
1589
|
-
const
|
|
1590
|
-
|
|
1591
|
-
|
|
1592
|
-
|
|
1840
|
+
const visibleChildren = getVisibleChildren(n, this.#showComments);
|
|
1841
|
+
if (visibleChildren.length) {
|
|
1842
|
+
if (visibleChildren.length > this.expandedChildrenLimit(n)) {
|
|
1843
|
+
this.setExpandedChildrenLimit(n, visibleChildren.length);
|
|
1844
|
+
}
|
|
1845
|
+
await Promise.all(visibleChildren.map(child => expand(child, depth + 1)));
|
|
1593
1846
|
}
|
|
1594
1847
|
};
|
|
1595
1848
|
await expand(node, 0);
|
|
@@ -1619,12 +1872,11 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1619
1872
|
treeElement?.collapseChildren();
|
|
1620
1873
|
}
|
|
1621
1874
|
|
|
1622
|
-
showContextMenu(node: SDK.DOMModel.DOMNode, event: MouseEvent
|
|
1623
|
-
widget?: ElementsTreeWidget): Promise<UI.ContextMenu.ContextMenu|undefined> {
|
|
1875
|
+
showContextMenu(node: SDK.DOMModel.DOMNode, event: MouseEvent): Promise<UI.ContextMenu.ContextMenu|undefined> {
|
|
1624
1876
|
if (!this.#enableContextMenu) {
|
|
1625
1877
|
return Promise.resolve(undefined);
|
|
1626
1878
|
}
|
|
1627
|
-
return showContextMenu(this, node, event
|
|
1879
|
+
return showContextMenu(this, node, event);
|
|
1628
1880
|
}
|
|
1629
1881
|
|
|
1630
1882
|
/**
|
|
@@ -1646,16 +1898,21 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1646
1898
|
treeElementForNode(node: SDK.DOMModel.DOMNode): ElementsTreeElement|null {
|
|
1647
1899
|
return this.#viewOutput.elementsTreeOutline?.findTreeElement(node) || null;
|
|
1648
1900
|
}
|
|
1649
|
-
|
|
1650
1901
|
#hoveredDOMNode: SDK.DOMModel.DOMNode|null = null;
|
|
1651
1902
|
#hoveredClosingTag = false;
|
|
1652
1903
|
#selectedClosingTag = false;
|
|
1653
1904
|
#searchMatchNode: SDK.DOMModel.DOMNode|null = null;
|
|
1654
1905
|
#searchMatchQuery: string|null = null;
|
|
1655
1906
|
#nodeToEdit: ({node: SDK.DOMModel.DOMNode}&InitialEditState)|null = null;
|
|
1907
|
+
#attributeToHighlight: {node: SDK.DOMModel.DOMNode, attribute: string}|null = null;
|
|
1908
|
+
#nodesWithDirtyAdorners = new Set<SDK.DOMModel.DOMNode>();
|
|
1909
|
+
#nodeAdornerVersions = new WeakMap<SDK.DOMModel.DOMNode, number>();
|
|
1910
|
+
#forceOpenPopovers = new WeakSet<SDK.DOMModel.DOMNode>();
|
|
1911
|
+
#forceOpenInterests = new WeakSet<SDK.DOMModel.DOMNode>();
|
|
1656
1912
|
#draggedNode: SDK.DOMModel.DOMNode|null = null;
|
|
1657
1913
|
#draggedNodeWasExpanded = false;
|
|
1658
1914
|
#dragOverNode: {node: SDK.DOMModel.DOMNode, isClosingTag: boolean}|null = null;
|
|
1915
|
+
#isFocusing = false;
|
|
1659
1916
|
|
|
1660
1917
|
hoveredDOMNode(): SDK.DOMModel.DOMNode|null {
|
|
1661
1918
|
if (this.#view === DECLARATIVE_VIEW) {
|
|
@@ -1705,11 +1962,75 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1705
1962
|
}
|
|
1706
1963
|
}
|
|
1707
1964
|
|
|
1965
|
+
#findValidSelectedNode(selectedNode: SDK.DOMModel.DOMNode): SDK.DOMModel.DOMNode|null {
|
|
1966
|
+
if (!this.#rootDOMNode) {
|
|
1967
|
+
return null;
|
|
1968
|
+
}
|
|
1969
|
+
if (selectedNode === this.#rootDOMNode) {
|
|
1970
|
+
return selectedNode;
|
|
1971
|
+
}
|
|
1972
|
+
let current: SDK.DOMModel.DOMNode|null = selectedNode;
|
|
1973
|
+
let fallback: SDK.DOMModel.DOMNode|null = null;
|
|
1974
|
+
while (current && current !== this.#rootDOMNode) {
|
|
1975
|
+
const parent: SDK.DOMModel.DOMNode|null = current.parentNode;
|
|
1976
|
+
if (!parent) {
|
|
1977
|
+
return fallback ?? this.#rootDOMNode;
|
|
1978
|
+
}
|
|
1979
|
+
if (parent.children() !== null || parent.childNodeCount() === 0 || parent.isIframe()) {
|
|
1980
|
+
const visibleChildren = getVisibleChildren(parent, this.#showComments);
|
|
1981
|
+
if (!visibleChildren.includes(current)) {
|
|
1982
|
+
let sibling: SDK.DOMModel.DOMNode|null = null;
|
|
1983
|
+
let candidate: SDK.DOMModel.DOMNode|null = current.nextSibling;
|
|
1984
|
+
while (candidate) {
|
|
1985
|
+
if (visibleChildren.includes(candidate)) {
|
|
1986
|
+
sibling = candidate;
|
|
1987
|
+
break;
|
|
1988
|
+
}
|
|
1989
|
+
candidate = candidate.nextSibling;
|
|
1990
|
+
}
|
|
1991
|
+
if (!sibling) {
|
|
1992
|
+
candidate = current.previousSibling;
|
|
1993
|
+
while (candidate) {
|
|
1994
|
+
if (visibleChildren.includes(candidate)) {
|
|
1995
|
+
sibling = candidate;
|
|
1996
|
+
break;
|
|
1997
|
+
}
|
|
1998
|
+
candidate = candidate.previousSibling;
|
|
1999
|
+
}
|
|
2000
|
+
}
|
|
2001
|
+
if (sibling) {
|
|
2002
|
+
return this.#findValidSelectedNode(sibling);
|
|
2003
|
+
}
|
|
2004
|
+
return this.#findValidSelectedNode(parent);
|
|
2005
|
+
}
|
|
2006
|
+
}
|
|
2007
|
+
fallback = parent;
|
|
2008
|
+
current = parent;
|
|
2009
|
+
}
|
|
2010
|
+
return current === this.#rootDOMNode ? selectedNode : (fallback ?? this.#rootDOMNode);
|
|
2011
|
+
}
|
|
2012
|
+
|
|
2013
|
+
#validateSelectedNode(): void {
|
|
2014
|
+
if (!this.#selectedDOMNode) {
|
|
2015
|
+
return;
|
|
2016
|
+
}
|
|
2017
|
+
const validNode = this.#findValidSelectedNode(this.#selectedDOMNode);
|
|
2018
|
+
if (validNode !== this.#selectedDOMNode) {
|
|
2019
|
+
this.#selectedDOMNode = validNode;
|
|
2020
|
+
this.#selectedClosingTag = false;
|
|
2021
|
+
this.#clearHighlightedNode();
|
|
2022
|
+
this.onSelectedNodeChanged(
|
|
2023
|
+
{data: {node: validNode, focus: false}} as
|
|
2024
|
+
Common.EventTarget.EventTargetEvent<{node: SDK.DOMModel.DOMNode | null, focus: boolean}>);
|
|
2025
|
+
}
|
|
2026
|
+
}
|
|
2027
|
+
|
|
1708
2028
|
override performUpdate(): void {
|
|
1709
2029
|
if (this.#updateModifiedNodesTimeout) {
|
|
1710
2030
|
clearTimeout(this.#updateModifiedNodesTimeout);
|
|
1711
2031
|
this.#updateModifiedNodesTimeout = undefined;
|
|
1712
2032
|
}
|
|
2033
|
+
this.#validateSelectedNode();
|
|
1713
2034
|
const firstRender = !this.#viewOutput.elementsTreeOutline;
|
|
1714
2035
|
const updatedNodes = this.#view === DECLARATIVE_VIEW ? [...this.#updateRecords.keys()] : [];
|
|
1715
2036
|
this.#view({
|
|
@@ -1728,6 +2049,9 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1728
2049
|
visible: this.#visible,
|
|
1729
2050
|
wrap: this.#wrap,
|
|
1730
2051
|
maxRowsShown: this.#maxRows,
|
|
2052
|
+
onClearMaxRows: () => {
|
|
2053
|
+
this.maxRows = undefined;
|
|
2054
|
+
},
|
|
1731
2055
|
showSelectionOnKeyboardFocus: this.showSelectionOnKeyboardFocus,
|
|
1732
2056
|
preventTabOrder: this.preventTabOrder,
|
|
1733
2057
|
deindentSingleNode: this.deindentSingleNode,
|
|
@@ -1757,13 +2081,16 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1757
2081
|
this.setHoveredNode(null);
|
|
1758
2082
|
},
|
|
1759
2083
|
onSelect: (node: SDK.DOMModel.DOMNode, isClosingTag = false, selectedByUser?: boolean) => {
|
|
2084
|
+
if (!selectedByUser) {
|
|
2085
|
+
return;
|
|
2086
|
+
}
|
|
1760
2087
|
this.selectDOMNode(node, selectedByUser, isClosingTag);
|
|
1761
2088
|
},
|
|
1762
2089
|
onExpand: (node: SDK.DOMModel.DOMNode, expanded: boolean) => {
|
|
1763
2090
|
this.setNodeExpanded(node, expanded);
|
|
1764
2091
|
},
|
|
1765
|
-
onContextMenu: (node: SDK.DOMModel.DOMNode, event: MouseEvent
|
|
1766
|
-
void this.showContextMenu(node, event
|
|
2092
|
+
onContextMenu: (node: SDK.DOMModel.DOMNode, event: MouseEvent) => {
|
|
2093
|
+
void this.showContextMenu(node, event);
|
|
1767
2094
|
},
|
|
1768
2095
|
onToggleHideElement: (node: SDK.DOMModel.DOMNode) => {
|
|
1769
2096
|
this.toggleHideElement(node);
|
|
@@ -1797,6 +2124,33 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1797
2124
|
onInitialEditCompleted: () => {
|
|
1798
2125
|
this.#nodeToEdit = null;
|
|
1799
2126
|
},
|
|
2127
|
+
attributeToHighlight: this.#attributeToHighlight,
|
|
2128
|
+
onAttributeHighlighted: () => {
|
|
2129
|
+
this.#attributeToHighlight = null;
|
|
2130
|
+
},
|
|
2131
|
+
nodesWithDirtyAdorners: this.#nodesWithDirtyAdorners,
|
|
2132
|
+
nodeAdornerVersions: this.#nodeAdornerVersions,
|
|
2133
|
+
onDirtyAdornersUpdated: () => {
|
|
2134
|
+
this.#nodesWithDirtyAdorners.clear();
|
|
2135
|
+
},
|
|
2136
|
+
forceOpenPopovers: this.#forceOpenPopovers,
|
|
2137
|
+
onPopoverAdornerToggled: (node: SDK.DOMModel.DOMNode, active: boolean) => {
|
|
2138
|
+
if (active) {
|
|
2139
|
+
this.#forceOpenPopovers.add(node);
|
|
2140
|
+
} else {
|
|
2141
|
+
this.#forceOpenPopovers.delete(node);
|
|
2142
|
+
}
|
|
2143
|
+
this.performUpdate();
|
|
2144
|
+
},
|
|
2145
|
+
forceOpenInterests: this.#forceOpenInterests,
|
|
2146
|
+
onInterestAdornerToggled: (node: SDK.DOMModel.DOMNode, active: boolean) => {
|
|
2147
|
+
if (active) {
|
|
2148
|
+
this.#forceOpenInterests.add(node);
|
|
2149
|
+
} else {
|
|
2150
|
+
this.#forceOpenInterests.delete(node);
|
|
2151
|
+
}
|
|
2152
|
+
this.performUpdate();
|
|
2153
|
+
},
|
|
1800
2154
|
multilineEditingNode: this.#multilineEditingNode,
|
|
1801
2155
|
dragOverNode: this.#dragOverNode,
|
|
1802
2156
|
isValidDragSource: (node: SDK.DOMModel.DOMNode) => this.isValidDragSource(node),
|
|
@@ -1933,6 +2287,20 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1933
2287
|
* FIXME: which node is selected should be part of the view input.
|
|
1934
2288
|
*/
|
|
1935
2289
|
selectDOMNodeWithoutReveal(node: SDK.DOMModel.DOMNode): void {
|
|
2290
|
+
if (this.#view === DECLARATIVE_VIEW) {
|
|
2291
|
+
const isSameNode = this.#selectedDOMNode === node && !this.#selectedClosingTag;
|
|
2292
|
+
if (isSameNode) {
|
|
2293
|
+
return;
|
|
2294
|
+
}
|
|
2295
|
+
this.#selectedDOMNode = node;
|
|
2296
|
+
this.#selectedClosingTag = false;
|
|
2297
|
+
this.#clearHighlightedNode();
|
|
2298
|
+
this.onSelectedNodeChanged(
|
|
2299
|
+
{data: {node, focus: false}} as
|
|
2300
|
+
Common.EventTarget.EventTargetEvent<{node: SDK.DOMModel.DOMNode | null, focus: boolean}>);
|
|
2301
|
+
this.performUpdate();
|
|
2302
|
+
return;
|
|
2303
|
+
}
|
|
1936
2304
|
this.#viewOutput.elementsTreeOutline?.findTreeElement(node)?.select();
|
|
1937
2305
|
}
|
|
1938
2306
|
|
|
@@ -1940,8 +2308,10 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1940
2308
|
* FIXME: adorners should be part of the view input.
|
|
1941
2309
|
*/
|
|
1942
2310
|
updateNodeAdorners(node: SDK.DOMModel.DOMNode): void {
|
|
1943
|
-
|
|
1944
|
-
|
|
2311
|
+
this.#nodesWithDirtyAdorners.add(node);
|
|
2312
|
+
const version = (this.#nodeAdornerVersions.get(node) ?? 0) + 1;
|
|
2313
|
+
this.#nodeAdornerVersions.set(node, version);
|
|
2314
|
+
this.performUpdate();
|
|
1945
2315
|
}
|
|
1946
2316
|
|
|
1947
2317
|
highlightMatch(node: SDK.DOMModel.DOMNode, query?: string): void {
|
|
@@ -1963,13 +2333,16 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1963
2333
|
}
|
|
1964
2334
|
|
|
1965
2335
|
toggleHideElement(node: SDK.DOMModel.DOMNode): void {
|
|
2336
|
+
const changeTracker = this.changeTracker;
|
|
2337
|
+
Elements.DOMChanges.trackVisibilityToggle(changeTracker, node, buildChangeSelector(changeTracker, node),
|
|
2338
|
+
!this.isToggledToHidden(node));
|
|
1966
2339
|
void node.toggleHideElement();
|
|
1967
2340
|
}
|
|
1968
2341
|
|
|
1969
2342
|
async removeNode(node: SDK.DOMModel.DOMNode): Promise<void> {
|
|
1970
2343
|
if (this.isToggledToHidden(node)) {
|
|
1971
2344
|
// Unhide the node before removing. This avoids inconsistent state if the node is restored via undo.
|
|
1972
|
-
|
|
2345
|
+
await node.toggleHideElement();
|
|
1973
2346
|
}
|
|
1974
2347
|
if (node.pseudoType()) {
|
|
1975
2348
|
return;
|
|
@@ -1977,7 +2350,14 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
1977
2350
|
if (!node.parentNode || node.parentNode.nodeType() === Node.DOCUMENT_NODE) {
|
|
1978
2351
|
return;
|
|
1979
2352
|
}
|
|
1980
|
-
|
|
2353
|
+
// The selector has to be resolved before the node is detached from the tree.
|
|
2354
|
+
const changeTracker = this.changeTracker;
|
|
2355
|
+
const selector = buildChangeSelector(changeTracker, node);
|
|
2356
|
+
await node.removeNode((err: string|null) => {
|
|
2357
|
+
if (!err) {
|
|
2358
|
+
Elements.DOMChanges.trackNodeRemoval(changeTracker, node, selector);
|
|
2359
|
+
}
|
|
2360
|
+
});
|
|
1981
2361
|
}
|
|
1982
2362
|
|
|
1983
2363
|
isToggledToHidden(node: SDK.DOMModel.DOMNode): boolean {
|
|
@@ -2089,7 +2469,14 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
2089
2469
|
}
|
|
2090
2470
|
|
|
2091
2471
|
duplicateNode(node: SDK.DOMModel.DOMNode): void {
|
|
2092
|
-
void node.duplicate()
|
|
2472
|
+
void node.duplicate().then(({error, node: newNode}) => {
|
|
2473
|
+
if (!error) {
|
|
2474
|
+
const duplicatedNode = newNode ?? node;
|
|
2475
|
+
const changeTracker = this.changeTracker;
|
|
2476
|
+
Elements.DOMChanges.trackNodeDuplication(changeTracker, duplicatedNode,
|
|
2477
|
+
buildChangeSelector(changeTracker, duplicatedNode));
|
|
2478
|
+
}
|
|
2479
|
+
});
|
|
2093
2480
|
}
|
|
2094
2481
|
|
|
2095
2482
|
nodeBeingDragged(): SDK.DOMModel.DOMNode|null {
|
|
@@ -2227,8 +2614,14 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
2227
2614
|
return;
|
|
2228
2615
|
}
|
|
2229
2616
|
const wasExpanded = this.#draggedNodeWasExpanded;
|
|
2230
|
-
draggedNode.moveTo(parentNode, anchorNode,
|
|
2231
|
-
|
|
2617
|
+
draggedNode.moveTo(parentNode, anchorNode, (error, newNode) => {
|
|
2618
|
+
if (!error) {
|
|
2619
|
+
const movedNode = newNode ?? draggedNode;
|
|
2620
|
+
const changeTracker = this.changeTracker;
|
|
2621
|
+
Elements.DOMChanges.trackNodeDrop(changeTracker, movedNode, buildChangeSelector(changeTracker, movedNode));
|
|
2622
|
+
}
|
|
2623
|
+
this.selectNodeAfterEdit(wasExpanded, error, newNode);
|
|
2624
|
+
});
|
|
2232
2625
|
}
|
|
2233
2626
|
|
|
2234
2627
|
selectNodeAfterEdit(wasExpanded: boolean, error: string|null, newNode: SDK.DOMModel.DOMNode|null,
|
|
@@ -2351,7 +2744,26 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
2351
2744
|
this.performUpdate();
|
|
2352
2745
|
}
|
|
2353
2746
|
|
|
2354
|
-
|
|
2747
|
+
addNewAttribute(node: SDK.DOMModel.DOMNode): void {
|
|
2748
|
+
if (UI.UIUtils.isEditing()) {
|
|
2749
|
+
return;
|
|
2750
|
+
}
|
|
2751
|
+
if (node.nodeType() !== Node.ELEMENT_NODE || node.isShadowRoot() || node.ancestorUserAgentShadowRoot()) {
|
|
2752
|
+
return;
|
|
2753
|
+
}
|
|
2754
|
+
this.#nodeToEdit = {node, isNewAttribute: true};
|
|
2755
|
+
this.performUpdate();
|
|
2756
|
+
}
|
|
2757
|
+
|
|
2758
|
+
startEditingTextNode(node: SDK.DOMModel.DOMNode): void {
|
|
2759
|
+
if (UI.UIUtils.isEditing()) {
|
|
2760
|
+
return;
|
|
2761
|
+
}
|
|
2762
|
+
this.#nodeToEdit = {node, isTextNode: true};
|
|
2763
|
+
this.performUpdate();
|
|
2764
|
+
}
|
|
2765
|
+
|
|
2766
|
+
startEditing(node: SDK.DOMModel.DOMNode, attributeName?: string): void {
|
|
2355
2767
|
if (UI.UIUtils.isEditing()) {
|
|
2356
2768
|
return;
|
|
2357
2769
|
}
|
|
@@ -2360,11 +2772,15 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
2360
2772
|
if (node.isShadowRoot() || node.ancestorUserAgentShadowRoot()) {
|
|
2361
2773
|
return;
|
|
2362
2774
|
}
|
|
2363
|
-
|
|
2364
|
-
|
|
2365
|
-
this.#nodeToEdit = {node, attributeName: attributes[0].name};
|
|
2775
|
+
if (attributeName) {
|
|
2776
|
+
this.#nodeToEdit = {node, attributeName};
|
|
2366
2777
|
} else {
|
|
2367
|
-
|
|
2778
|
+
const attributes = node.attributes();
|
|
2779
|
+
if (attributes.length > 0) {
|
|
2780
|
+
this.#nodeToEdit = {node, attributeName: attributes[0].name};
|
|
2781
|
+
} else {
|
|
2782
|
+
this.#nodeToEdit = {node, isNewAttribute: true};
|
|
2783
|
+
}
|
|
2368
2784
|
}
|
|
2369
2785
|
this.performUpdate();
|
|
2370
2786
|
} else if (nodeType === Node.TEXT_NODE) {
|
|
@@ -2389,6 +2805,12 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
2389
2805
|
const wasExpanded = this.isNodeExpanded(node);
|
|
2390
2806
|
if (event.key === 'ArrowUp' && node.previousSibling) {
|
|
2391
2807
|
node.moveTo(node.parentNode, node.previousSibling, (error, newNode) => {
|
|
2808
|
+
if (!error) {
|
|
2809
|
+
const movedNode = newNode ?? node;
|
|
2810
|
+
const changeTracker = this.changeTracker;
|
|
2811
|
+
Elements.DOMChanges.trackNodeMove(changeTracker, movedNode, buildChangeSelector(changeTracker, movedNode),
|
|
2812
|
+
/* directionUp= */ true);
|
|
2813
|
+
}
|
|
2392
2814
|
this.selectNodeAfterEdit(wasExpanded, error, newNode);
|
|
2393
2815
|
});
|
|
2394
2816
|
event.consume(true);
|
|
@@ -2396,6 +2818,12 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
2396
2818
|
}
|
|
2397
2819
|
if (event.key === 'ArrowDown' && node.nextSibling) {
|
|
2398
2820
|
node.moveTo(node.parentNode, node.nextSibling.nextSibling, (error, newNode) => {
|
|
2821
|
+
if (!error) {
|
|
2822
|
+
const movedNode = newNode ?? node;
|
|
2823
|
+
const changeTracker = this.changeTracker;
|
|
2824
|
+
Elements.DOMChanges.trackNodeMove(changeTracker, movedNode, buildChangeSelector(changeTracker, movedNode),
|
|
2825
|
+
/* directionUp= */ false);
|
|
2826
|
+
}
|
|
2399
2827
|
this.selectNodeAfterEdit(wasExpanded, error, newNode);
|
|
2400
2828
|
});
|
|
2401
2829
|
event.consume(true);
|
|
@@ -2554,11 +2982,28 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
2554
2982
|
return;
|
|
2555
2983
|
}
|
|
2556
2984
|
const wasExpanded = this.isNodeExpanded(this.#clipboardData.node);
|
|
2985
|
+
const clipboardNode = this.#clipboardData.node;
|
|
2557
2986
|
if (this.#clipboardData.isCut) {
|
|
2558
|
-
|
|
2987
|
+
clipboardNode.moveTo(targetNode, null, (error, newNode) => {
|
|
2988
|
+
if (!error) {
|
|
2989
|
+
const movedNode = newNode ?? clipboardNode;
|
|
2990
|
+
const changeTracker = this.changeTracker;
|
|
2991
|
+
Elements.DOMChanges.trackNodePaste(changeTracker, movedNode, buildChangeSelector(changeTracker, movedNode),
|
|
2992
|
+
/* isCut= */ true);
|
|
2993
|
+
}
|
|
2994
|
+
this.selectNodeAfterEdit(wasExpanded, error, newNode);
|
|
2995
|
+
});
|
|
2559
2996
|
this.setClipboardData(null);
|
|
2560
2997
|
} else {
|
|
2561
|
-
|
|
2998
|
+
clipboardNode.copyTo(targetNode, null, (error, newNode) => {
|
|
2999
|
+
if (!error) {
|
|
3000
|
+
const addedNode = newNode ?? clipboardNode;
|
|
3001
|
+
const changeTracker = this.changeTracker;
|
|
3002
|
+
Elements.DOMChanges.trackNodePaste(changeTracker, addedNode, buildChangeSelector(changeTracker, addedNode),
|
|
3003
|
+
/* isCut= */ false);
|
|
3004
|
+
}
|
|
3005
|
+
this.selectNodeAfterEdit(wasExpanded, error, newNode);
|
|
3006
|
+
});
|
|
2562
3007
|
}
|
|
2563
3008
|
}
|
|
2564
3009
|
|
|
@@ -2621,8 +3066,20 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
2621
3066
|
}
|
|
2622
3067
|
|
|
2623
3068
|
override focus(): void {
|
|
2624
|
-
|
|
2625
|
-
|
|
3069
|
+
if (this.#isFocusing) {
|
|
3070
|
+
return;
|
|
3071
|
+
}
|
|
3072
|
+
this.#isFocusing = true;
|
|
3073
|
+
try {
|
|
3074
|
+
super.focus();
|
|
3075
|
+
if (this.#view === DECLARATIVE_VIEW) {
|
|
3076
|
+
this.contentElement.querySelector('devtools-tree')?.focus();
|
|
3077
|
+
} else {
|
|
3078
|
+
this.#viewOutput.elementsTreeOutline?.focus();
|
|
3079
|
+
}
|
|
3080
|
+
} finally {
|
|
3081
|
+
this.#isFocusing = false;
|
|
3082
|
+
}
|
|
2626
3083
|
}
|
|
2627
3084
|
|
|
2628
3085
|
override wasShown(): void {
|
|
@@ -2640,6 +3097,7 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
2640
3097
|
}
|
|
2641
3098
|
if (this.#view === DECLARATIVE_VIEW) {
|
|
2642
3099
|
this.#updateRecords.clear();
|
|
3100
|
+
return;
|
|
2643
3101
|
}
|
|
2644
3102
|
this.performUpdate();
|
|
2645
3103
|
}
|
|
@@ -2654,6 +3112,7 @@ export class DOMTreeWidget extends UI.Widget.Widget {
|
|
|
2654
3112
|
}
|
|
2655
3113
|
if (this.#view === DECLARATIVE_VIEW) {
|
|
2656
3114
|
this.#updateRecords.clear();
|
|
3115
|
+
return;
|
|
2657
3116
|
}
|
|
2658
3117
|
this.performUpdate();
|
|
2659
3118
|
}
|