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

different detach handling to make event handlers work better

Browse source
This commit is contained in:
Andreas Rumpf 2017-06-29 12:25:08 +02:00
commit 8e777a0c19
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/karax.nim
View file

@ -16,7 +16,7 @@ proc `key=`*(e: Node; x: VKey) {.importcpp: "#.karaxKey = #", nodecl.}
type type
PatchKind = enum PatchKind = enum
pkReplace, pkRemove, pkAppend, pkInsertBefore pkReplace, pkRemove, pkAppend, pkInsertBefore, pkDetach
Patch = object Patch = object
k: PatchKind k: PatchKind
parent, current: Node parent, current: Node
@ -99,10 +99,8 @@ proc wrapEvent(d: Node; n: VNode; k: EventKind;
# --------------------- DOM diff ----------------------------------------- # --------------------- DOM diff -----------------------------------------
template detach(n: VNode) = template detach(n: VNode) =
if n.kind == VNodeKind.component: addPatch(kxi, pkDetach, nil, nil, n)
let x = VComponent(n)
if x.onDetachImpl != nil: x.onDetachImpl(x)
n.dom = nil
template attach(n: VNode) = template attach(n: VNode) =
n.dom = result n.dom = result
@ -213,13 +211,12 @@ proc updateStyles(newNode, oldNode: VNode) =
proc mergeEvents(newNode, oldNode: VNode; kxi: KaraxInstance) = proc mergeEvents(newNode, oldNode: VNode; kxi: KaraxInstance) =
let d = oldNode.dom let d = oldNode.dom
if d != nil: for i in 0..<oldNode.events.len:
for i in 0..<oldNode.events.len: let k = oldNode.events[i][0]
let k = oldNode.events[i][0] let name = case k
let name = case k
of EventKind.onkeyuplater, EventKind.onkeyupenter: cstring"keyup" of EventKind.onkeyuplater, EventKind.onkeyupenter: cstring"keyup"
else: toEventName[k] else: toEventName[k]
d.removeEventListener(name, oldNode.events[i][2]) d.removeEventListener(name, oldNode.events[i][2])
shallowCopy(oldNode.events, newNode.events) shallowCopy(oldNode.events, newNode.events)
applyEvents(oldNode, kxi) applyEvents(oldNode, kxi)
@ -235,7 +232,7 @@ proc printV(n: VNode; depth: cstring = "") =
for i in 0 ..< n.len: for i in 0 ..< n.len:
printV(n[i], depth & " ") printV(n[i], depth & " ")
template addPatch(kxi: KaraxInstance; ka: PatchKind; parenta, currenta: Node; proc addPatch(kxi: KaraxInstance; ka: PatchKind; parenta, currenta: Node;
na: VNode) = na: VNode) =
let L = kxi.patchLen let L = kxi.patchLen
if L >= kxi.patches.len: if L >= kxi.patches.len:
@ -266,6 +263,12 @@ proc apply(kxi: KaraxInstance) =
of pkInsertBefore: of pkInsertBefore:
let nn = vnodeToDom(p.n, kxi) let nn = vnodeToDom(p.n, kxi)
p.parent.insertBefore(nn, p.current) p.parent.insertBefore(nn, p.current)
of pkDetach:
let n = p.n
if n.kind == VNodeKind.component:
let x = VComponent(n)
if x.onDetachImpl != nil: x.onDetachImpl(x)
n.dom = nil
kxi.patchLen = 0 kxi.patchLen = 0
proc diff(newNode, oldNode: VNode; parent, current: Node; kxi: KaraxInstance): EqResult = proc diff(newNode, oldNode: VNode; parent, current: Node; kxi: KaraxInstance): EqResult =
@ -273,6 +276,7 @@ proc diff(newNode, oldNode: VNode; parent, current: Node; kxi: KaraxInstance): E
case result case result
of identical, similar: of identical, similar:
newNode.dom = oldNode.dom newNode.dom = oldNode.dom
assert oldNode.dom != nil
if result == similar: updateStyles(newNode, oldNode) if result == similar: updateStyles(newNode, oldNode)
if newNode.events.len != 0 or oldNode.events.len != 0: if newNode.events.len != 0 or oldNode.events.len != 0:
mergeEvents(newNode, oldNode, kxi) mergeEvents(newNode, oldNode, kxi)
@ -280,9 +284,9 @@ proc diff(newNode, oldNode: VNode; parent, current: Node; kxi: KaraxInstance): E
# oldNode.dom.value = newNode.text # oldNode.dom.value = newNode.text
let newLength = newNode.len let newLength = newNode.len
var oldLength = oldNode.len let oldLength = oldNode.len
let minLength = min(newLength, oldLength)
if newLength == 0 and oldLength == 0: return result if newLength == 0 and oldLength == 0: return result
let minLength = min(newLength, oldLength)
assert oldNode.kind == newNode.kind assert oldNode.kind == newNode.kind
var commonPrefix = 0 var commonPrefix = 0