Skip to content

Commit 70653ba

Browse files
committed
fix pr comments
1 parent 4ebf50e commit 70653ba

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

packages/@glimmer/runtime/lib/vm/element-builder.ts

+10-14
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ export class NewElementBuilder implements ElementBuilder {
8484
[CURSOR_STACK] = new Stack<Cursor>();
8585
private modifierStack = new Stack<Nullable<ModifierInstance[]>>();
8686
private blockStack = new Stack<LiveBlock>();
87-
private htmlElementsState = new Set();
8887

8988
static forInitialRender(env: Environment, cursor: CursorImpl) {
9089
return new this(env, cursor.element, cursor.nextSibling).initialize();
@@ -207,15 +206,6 @@ export class NewElementBuilder implements ElementBuilder {
207206
}
208207

209208
closeElement(): Nullable<ModifierInstance[]> {
210-
if (this.htmlElementsState.has(this.element)) {
211-
this.htmlElementsState.delete(this.element);
212-
const element = this.element;
213-
this.env.debugRenderTree?.didRender(element, {
214-
parentElement: () => (element as any).parentElement,
215-
firstNode: () => element,
216-
lastNode: () => element,
217-
});
218-
}
219209
this.willCloseElement();
220210
this.popElement();
221211
return this.popModifiers();
@@ -260,10 +250,7 @@ export class NewElementBuilder implements ElementBuilder {
260250
this.modifierStack.push(modifiers);
261251
if (this.env.debugRenderTree) {
262252
modifiers = modifiers || [];
263-
const shouldAddHtmlElement =
264-
modifiers.length || (globalThis as any).ENV_DEBUG_RENDER_TREE_ALL_ELEMENTS;
265-
if (shouldAddHtmlElement) {
266-
this.htmlElementsState.add(this.element);
253+
if (modifiers.length) {
267254
this.env.debugRenderTree?.create(this.element, {
268255
type: 'html-element',
269256
name: this.element.tagName.toLowerCase(),
@@ -308,6 +295,15 @@ export class NewElementBuilder implements ElementBuilder {
308295
lastNode: () => element,
309296
});
310297
}
298+
299+
if (modifiers.length) {
300+
const element = this.element;
301+
this.env.debugRenderTree?.didRender(element, {
302+
parentElement: () => (element as any).parentElement,
303+
firstNode: () => element,
304+
lastNode: () => element,
305+
});
306+
}
311307
}
312308
}
313309

0 commit comments

Comments
 (0)