forked from dotnet/blazor
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Eliminate wrapper elements (dotnet#602)
* Factor out all DOM-structure modifying code into an abstraction. Currently, implementation is still backed by the same underlying DOM APIs * Implement LogicalElement properly (store hierarchy in own property; use comment nodes as containers) * In LogicalElement, be explicit about unsupported scenarios * Update E2E tests to stop assuming existence of wrapper elements * Where supported, store private properties using opaque symbols as keys
- Loading branch information
1 parent
0f0664e
commit 9adc0ed
Showing
4 changed files
with
195 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
148 changes: 148 additions & 0 deletions
148
src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/LogicalElements.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| /* | ||
| A LogicalElement plays the same role as an Element instance from the point of view of the | ||
| API consumer. Inserting and removing logical elements updates the browser DOM just the same. | ||
| The difference is that, unlike regular DOM mutation APIs, the LogicalElement APIs don't use | ||
| the underlying DOM structure as the data storage for the element hierarchy. Instead, the | ||
| LogicalElement APIs take care of tracking hierarchical relationships separately. The point | ||
| of this is to permit a logical tree structure in which parent/child relationships don't | ||
| have to be materialized in terms of DOM element parent/child relationships. And the reason | ||
| why we want that is so that hierarchies of Blazor components can be tracked even when those | ||
| components' render output need not be a single literal DOM element. | ||
| Consumers of the API don't need to know about the implementation, but how it's done is: | ||
| - Each LogicalElement is materialized in the DOM as either: | ||
| - A Node instance, for actual Node instances inserted using 'insertLogicalChild' or | ||
| for Element instances promoted to LogicalElement via 'toLogicalElement' | ||
| - A Comment instance, for 'logical container' instances inserted using 'createAndInsertLogicalContainer' | ||
| - Then, on that instance (i.e., the Node or Comment), we store an array of 'logical children' | ||
| instances, e.g., | ||
| [firstChild, secondChild, thirdChild, ...] | ||
| ... plus we store a reference to the 'logical parent' (if any) | ||
| - The 'logical children' array means we can look up in O(1): | ||
| - The number of logical children (not currently implemented because not required, but trivial) | ||
| - The logical child at any given index | ||
| - Whenever a logical child is added or removed, we update the parent's array of logical children | ||
| */ | ||
|
|
||
| const logicalChildrenPropname = createSymbolOrFallback('_blazorLogicalChildren'); | ||
| const logicalParentPropname = createSymbolOrFallback('_blazorLogicalParent'); | ||
|
|
||
| export function toLogicalElement(element: Element) { | ||
| if (element.childNodes.length > 0) { | ||
| throw new Error('New logical elements must start empty'); | ||
| } | ||
|
|
||
| element[logicalChildrenPropname] = []; | ||
| return element as any as LogicalElement; | ||
| } | ||
|
|
||
| export function createAndInsertLogicalContainer(parent: LogicalElement, childIndex: number): LogicalElement { | ||
| const containerElement = document.createComment('!'); | ||
| insertLogicalChild(containerElement, parent, childIndex); | ||
| return containerElement as any as LogicalElement; | ||
| } | ||
|
|
||
| export function insertLogicalChild(child: Node, parent: LogicalElement, childIndex: number) { | ||
| const childAsLogicalElement = child as any as LogicalElement; | ||
| if (child instanceof Comment) { | ||
| const existingGrandchildren = getLogicalChildrenArray(childAsLogicalElement); | ||
| if (existingGrandchildren && getLogicalChildrenArray(childAsLogicalElement).length > 0) { | ||
| // There's nothing to stop us implementing support for this scenario, and it's not difficult | ||
| // (after inserting 'child' itself, also iterate through its logical children and physically | ||
| // put them as following-siblings in the DOM). However there's no scenario that requires it | ||
| // presently, so if we did implement it there'd be no good way to have tests for it. | ||
| throw new Error('Not implemented: inserting non-empty logical container'); | ||
| } | ||
| } | ||
|
|
||
| if (getLogicalParent(childAsLogicalElement)) { | ||
| // Likewise, we could easily support this scenario too (in this 'if' block, just splice | ||
| // out 'child' from the logical children array of its previous logical parent by using | ||
| // Array.prototype.indexOf to determine its previous sibling index). | ||
| // But again, since there's not currently any scenario that would use it, we would not | ||
| // have any test coverage for such an implementation. | ||
| throw new Error('Not implemented: moving existing logical children'); | ||
| } | ||
|
|
||
| const newSiblings = getLogicalChildrenArray(parent); | ||
| const newPhysicalParent = getClosestDomElement(parent); | ||
| if (childIndex < newSiblings.length) { | ||
| newPhysicalParent.insertBefore(child, newSiblings[childIndex] as any as Node); | ||
| newSiblings.splice(childIndex, 0, childAsLogicalElement); | ||
| } else { | ||
| if (parent instanceof Comment) { | ||
| const parentLogicalNextSibling = getLogicalNextSibling(parent); | ||
| if (parentLogicalNextSibling) { | ||
| newPhysicalParent.insertBefore(child, parentLogicalNextSibling as any as Node); | ||
| } else { | ||
| newPhysicalParent.appendChild(child); | ||
| } | ||
| } else { | ||
| newPhysicalParent.appendChild(child); | ||
| } | ||
|
|
||
| newSiblings.push(childAsLogicalElement); | ||
| } | ||
|
|
||
| childAsLogicalElement[logicalParentPropname] = parent; | ||
| if (!(logicalChildrenPropname in childAsLogicalElement)) { | ||
| childAsLogicalElement[logicalChildrenPropname] = []; | ||
| } | ||
| } | ||
|
|
||
| export function removeLogicalChild(parent: LogicalElement, childIndex: number) { | ||
| const childrenArray = getLogicalChildrenArray(parent); | ||
| const childToRemove = childrenArray.splice(childIndex, 1)[0]; | ||
|
|
||
| // If it's a logical container, also remove its descendants | ||
| if (childToRemove instanceof Comment) { | ||
| const grandchildrenArray = getLogicalChildrenArray(childToRemove); | ||
| while (grandchildrenArray.length > 0) { | ||
| removeLogicalChild(childToRemove, 0); | ||
| } | ||
| } | ||
|
|
||
| // Finally, remove the node itself | ||
| const domNodeToRemove = childToRemove as any as Node; | ||
| domNodeToRemove.parentNode!.removeChild(domNodeToRemove); | ||
| } | ||
|
|
||
| export function getLogicalParent(element: LogicalElement): LogicalElement | null { | ||
| return (element[logicalParentPropname] as LogicalElement) || null; | ||
| } | ||
|
|
||
| export function getLogicalChild(parent: LogicalElement, childIndex: number): LogicalElement { | ||
| return getLogicalChildrenArray(parent)[childIndex]; | ||
| } | ||
|
|
||
| export function isSvgElement(element: LogicalElement) { | ||
| return getClosestDomElement(element).namespaceURI === 'http://www.w3.org/2000/svg'; | ||
| } | ||
|
|
||
| function getLogicalChildrenArray(element: LogicalElement) { | ||
| return element[logicalChildrenPropname] as LogicalElement[]; | ||
| } | ||
|
|
||
| function getLogicalNextSibling(element: LogicalElement): LogicalElement | null { | ||
| const siblings = getLogicalChildrenArray(getLogicalParent(element)!); | ||
| const siblingIndex = Array.prototype.indexOf.call(siblings, element); | ||
| return siblings[siblingIndex + 1] || null; | ||
| } | ||
|
|
||
| function getClosestDomElement(logicalElement: LogicalElement) { | ||
| if (logicalElement instanceof Element) { | ||
| return logicalElement; | ||
| } else if (logicalElement instanceof Comment) { | ||
| return logicalElement.parentNode! as Element; | ||
| } else { | ||
| throw new Error('Not a valid logical element'); | ||
| } | ||
| } | ||
|
|
||
| function createSymbolOrFallback(fallback: string): symbol | string { | ||
| return typeof Symbol === 'function' ? Symbol() : fallback; | ||
| } | ||
|
|
||
| // Nominal type to represent a logical element without needing to allocate any object for instances | ||
| export interface LogicalElement { LogicalElement__DO_NOT_IMPLEMENT: any }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.