dnrops
/
Tokamak
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rendering of spacers after DOMRenderer.update is called (#410) 

`DOMRenderer.mount` contains code which can be necessary to properly render spacers. However, `update` can overwrite what this code does, leading to the problem described in #395.

This PR modifies `update` to fix this issue.
This commit is contained in:
ezraberch 2021-06-15 17:59:33 -04:00 committed by GitHub
parent 5926e9f182
commit 3302a5163c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Sources/TokamakDOM/DOMRenderer.swift
View File

@ -95,6 +95,16 @@ final class DOMRenderer: Renderer {
) { scheduler.schedule(options: nil, $0) }
}
private func fixSpacers(host: MountedHost, target: JSObject) {
let fillAxes = host.view.fillAxes
if fillAxes.contains(.horizontal) {
target.style.object!.width = "100%"
}
if fillAxes.contains(.vertical) {
target.style.object!.height = "100%"
}
}
public func mountTarget(
before sibling: DOMNode?,
to parent: DOMNode,
@ -136,13 +146,7 @@ final class DOMRenderer: Renderer {
guard let resultingNode = maybeNode else { return nil }
let fillAxes = host.view.fillAxes
if fillAxes.contains(.horizontal) {
resultingNode.style.object!.width = "100%"
}
if fillAxes.contains(.vertical) {
resultingNode.style.object!.height = "100%"
}
fixSpacers(host: host, target: resultingNode)
if let dynamicHTML = anyHTML as? AnyDynamicHTML {
return DOMNode(host.view, resultingNode, dynamicHTML.listeners)
@ -156,6 +160,8 @@ final class DOMRenderer: Renderer {
else { return }
html.update(dom: target)
fixSpacers(host: host, target: target.ref)
}
func unmount(