Avoid redraw after dom removal

Author: kfule

render/render.js

@@ -626,6 +626,7 @@ module.exports = function() {
 		if (typeof vnode.tag !== "string") {
 			if (vnode.instance != null) onremove(vnode.instance)
 		} else {
+			if (vnode.events != null) vnode.events._ = null
 			var children = vnode.children
 			if (Array.isArray(children)) {
 				for (var i = 0; i < children.length; i++) {
@@ -810,12 +811,12 @@ module.exports = function() {
 		var result
 		if (typeof handler === "function") result = handler.call(ev.currentTarget, ev)
 		else if (typeof handler.handleEvent === "function") handler.handleEvent(ev)
-		var eventRedraw = this._
-		if (eventRedraw) {
-			if (ev.redraw !== false) eventRedraw()
+		var self = this
+		if (self._ != null) {
+			if (ev.redraw !== false) (0, self._)()
 			if (result != null && typeof result.then === "function") {
 				Promise.resolve(result).then(function () {
-					if (ev.redraw !== false) eventRedraw()
+					if (self._ != null && ev.redraw !== false) (0, self._)()
 				})
 			}
 		}

render/tests/test-event.js

@@ -916,4 +916,48 @@ o.spec("event", function() {
 			})
 		})
 	})
+	o("avoid sync redraw after removal", function() {
+		var div = m("div", {onclick: function () {}})
+		var e = $window.document.createEvent("MouseEvents")
+		e.initEvent("click", true, true)
+
+		render(root, div)
+		// remove div
+		render(root, [])
+
+		div.dom.dispatchEvent(e)
+
+		o(redraw.callCount).equals(0)
+	})
+	o("avoid async redraw after removal", function(done) {
+		var thenCB
+		var div = m("div", {onclick: async function () {
+			await new Promise(function(resolve){thenCB = resolve})
+		}})
+		var e = $window.document.createEvent("MouseEvents")
+		e.initEvent("click", true, true)
+
+		render(root, div)
+		div.dom.dispatchEvent(e)
+
+		o(redraw.callCount).equals(1)
+		o(redraw.this).equals(undefined)
+		o(redraw.args.length).equals(0)
+
+		callAsync(function() {
+			// not resolved yet
+			o(redraw.callCount).equals(1)
+
+			// remove div
+			render(root, [])
+
+			// resolve
+			thenCB()
+			callAsync(function() {
+				o(redraw.callCount).equals(1)
+
+				done()
+			})
+		})
+	})
 })