From 0ad9d68c8102f336b4e721e30e06c40186e1880c Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Wed, 28 Jun 2017 11:26:09 +0200
Subject: [PATCH] fixes #35

---
 src/karax.nim | 39 ++++++++++++++++++++++++++++++---------
 src/kdom.nim  |  1 +
 src/vdom.nim  |  5 +++--
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/karax.nim b/src/karax.nim
index 0b1d8db..5ea7d62 100644
--- a/src/karax.nim
+++ b/src/karax.nim
@@ -48,8 +48,9 @@ template keyeventBody() =
   # Do not call redraw() here! That is already done
   # by ``karax.addEventHandler``.
 
-proc wrapEvent(d: Node; n: VNode; k: EventKind; action: EventHandler) =
-  proc stdWrapper(): (proc (ev: Event)) =
+proc wrapEvent(d: Node; n: VNode; k: EventKind;
+               action: EventHandler): NativeEventHandler =
+  proc stdWrapper(): NativeEventHandler =
     let action = action
     let n = n
     result = proc (ev: Event) =
@@ -57,13 +58,13 @@ proc wrapEvent(d: Node; n: VNode; k: EventKind; action: EventHandler) =
         keyeventBody()
       else: action(ev, n)
 
-  proc enterWrapper(): (proc (ev: Event)) =
+  proc enterWrapper(): NativeEventHandler =
     let action = action
     let n = n
     result = proc (ev: Event) =
       if ev.keyCode == 13: keyeventBody()
 
-  proc laterWrapper(): (proc (ev: Event)) =
+  proc laterWrapper(): NativeEventHandler =
     let action = action
     let n = n
     var timer: Timeout
@@ -74,11 +75,14 @@ proc wrapEvent(d: Node; n: VNode; k: EventKind; action: EventHandler) =
 
   case k
   of EventKind.onkeyuplater:
-    d.addEventListener("keyup", laterWrapper())
+    result = laterWrapper()
+    d.addEventListener("keyup", result)
   of EventKind.onkeyupenter:
-    d.addEventListener("keyup", enterWrapper())
+    result = enterWrapper()
+    d.addEventListener("keyup", result)
   else:
-    d.addEventListener(toEventName[k], stdWrapper())
+    result = stdWrapper()
+    d.addEventListener(toEventName[k], result)
 
 # --------------------- DOM diff -----------------------------------------
 
@@ -90,6 +94,11 @@ template detach(n: VNode) =
 template attach(n: VNode) =
   n.dom = result
 
+proc applyEvents(n: VNode; kxi: KaraxInstance) =
+  let dest = n.dom
+  for i in 0..<len(n.events):
+    n.events[i][2] = wrapEvent(dest, n, n.events[i][0], n.events[i][1])
+
 proc vnodeToDom(n: VNode; kxi: KaraxInstance): Node =
   if n.kind == VNodeKind.text:
     result = document.createTextNode(n.text)
@@ -132,8 +141,7 @@ proc vnodeToDom(n: VNode; kxi: KaraxInstance): Node =
   for k, v in attrs(n):
     if v != nil:
       result.setAttr(k, v)
-  for e, h in items(n.events):
-    wrapEvent(result, n, e, h)
+  applyEvents(n, kxi)
   if n == kxi.toFocusV and kxi.toFocus.isNil:
     kxi.toFocus = result
   if not n.style.isNil: applyStyle(result, n.style)
@@ -191,6 +199,17 @@ proc updateStyles(newNode, oldNode: VNode) =
     else: oldNode.dom.style = Style()
   oldNode.style = newNode.style
 
+proc mergeEvents(newNode, oldNode: VNode) =
+  let d = oldNode.dom
+  for i in 0..<oldNode.events.len:
+    let k = oldNode.events[i][0]
+    let name = case k
+               of EventKind.onkeyuplater, EventKind.onkeyupenter: cstring"keyup"
+               else: toEventName[k]
+    d.removeEventListener(name, oldNode.events[i][2])
+  shallowCopy(oldNode.events, newNode.events)
+  applyEvents(oldNode, kxi)
+
 proc printV(n: VNode; depth: cstring = "") =
   kout depth, cstring($n.kind), cstring"key ", n.key
   #for k, v in pairs(n.style):
@@ -240,6 +259,8 @@ proc diff(newNode, oldNode: VNode;parent, current: Node; patches: JSeq[Patch]):
   of identical, similar:
     newNode.dom = oldNode.dom
     if result == similar: updateStyles(newNode, oldNode)
+    if newNode.events.len != 0 or oldNode.events.len != 0:
+      mergeEvents(newNode, oldNode)
 
     let newLength = newNode.len
     var oldLength = oldNode.len
diff --git a/src/kdom.nim b/src/kdom.nim
index 6799976..106666c 100644
--- a/src/kdom.nim
+++ b/src/kdom.nim
@@ -483,6 +483,7 @@ proc clearTimeout*(t: Timeout) {.importc, nodecl.}
 
 # EventTarget "methods"
 proc addEventListener*(et: EventTarget, ev: cstring, cb: proc(ev: Event), useCapture: bool = false)
+proc removeEventListener*(et: EventTarget; ev: cstring; cb: proc(ev: Event))
 
 # Window "methods"
 proc alert*(w: Window, msg: cstring)
diff --git a/src/vdom.nim b/src/vdom.nim
index e3f74b5..b0f7293 100644
--- a/src/vdom.nim
+++ b/src/vdom.nim
@@ -104,6 +104,7 @@ buildLookupTables()
 
 type
   EventHandler* = proc (ev: Event; target: VNode) {.closure.}
+  NativeEventHandler* = proc (ev: Event) {.closure.}
   VKey* = int
 
   VNode* = ref object of RootObj
@@ -113,7 +114,7 @@ type
     kids: seq[VNode]
     # even index: key, odd index: value; done this way for memory efficiency:
     attrs: seq[cstring]
-    events*: seq[(EventKind, EventHandler)]
+    events*: seq[(EventKind, EventHandler, NativeEventHandler)]
     when false:
       hash*: Hash
       validHash*: bool
@@ -222,7 +223,7 @@ proc sameAttrs*(a, b: VNode): bool =
       if a.attrs[i] != b.attrs[i]: return false
 
 proc addEventListener*(n: VNode; event: EventKind; handler: EventHandler) =
-  n.events.add((event, handler))
+  n.events.add((event, handler, nil))
 
 template toStringAttr(field) =
   if n.field != nil: