jyapayne/karax
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improvments to the new local diff algorithm

Browse source
This commit is contained in:
Andreas Rumpf 2017-08-28 11:29:12 +02:00
commit cb2dd6331d
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/karax.nim
View file

@ -182,7 +182,7 @@ proc same(n: VNode, e: Node; nesting = 0): bool =
for i in 0 ..< n.len: for i in 0 ..< n.len:
if not same(n[i], e[i], nesting+1): return false if not same(n[i], e[i], nesting+1): return false
else: else:
kout toTag[n.kind], e.nodename echo "VDOM: ", toTag[n.kind], " DOM: ", e.nodename
proc replaceById(id: cstring; newTree: Node) = proc replaceById(id: cstring; newTree: Node) =
let x = document.getElementById(id) let x = document.getElementById(id)
@ -334,7 +334,8 @@ proc applyPatch(kxi: KaraxInstance) =
if n.kind == VNodeKind.component: if n.kind == VNodeKind.component:
let x = VComponent(n) let x = VComponent(n)
if x.onDetachImpl != nil: x.onDetachImpl(x) if x.onDetachImpl != nil: x.onDetachImpl(x)
n.dom = nil # XXX for some reason this causes assertion errors otherwise:
if not kxi.surpressRedraws: n.dom = nil
kxi.patchLen = 0 kxi.patchLen = 0
for i in 0..<kxi.patchLenV: for i in 0..<kxi.patchLenV:
let p = kxi.patchesV[i] let p = kxi.patchesV[i]
@ -537,8 +538,11 @@ proc runIns*(kxi: KaraxInstance; parent, kid: VNode; position: int) =
proc runDiff*(kxi: KaraxInstance; oldNode, newNode: VNode) = proc runDiff*(kxi: KaraxInstance; oldNode, newNode: VNode) =
let olddom = oldNode.dom let olddom = oldNode.dom
doAssert olddom != nil doAssert olddom != nil
if diff(newNode, oldNode, nil, olddom, kxi) == usenewNode: discard diff(newNode, oldNode, nil, olddom, kxi)
takeOverFields(newNode, oldNode) # this is a bit nasty: Since we cannot patch the 'parent' of
# the current VNode (because we don't store it at all!), we
# need to override the fields individually:
takeOverFields(newNode, oldNode)
applyComponents(kxi) applyComponents(kxi)
applyPatch(kxi) applyPatch(kxi)
if kxi.currentTree == oldNode: if kxi.currentTree == oldNode: