Added flush to CWM and synthetic events

infernojs · May 28, 2017 · 03dc14b · 03dc14b
1 parent 27170e4
commit 03dc14b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/packages/inferno-component/src/index.ts b/packages/inferno-component/src/index.ts
@@ -15,6 +15,7 @@ import VNodeFlags from 'inferno-vnode-flags';
 /* Add ES6 component implementations for Inferno-core to use */
 options.component.create = createInstance;
 options.component.patch = patchComponent;
+options.component.flush = flushQueue;
 
 const handleInput = options.component.handleInput;
 let noOp = ERROR_MSG;
@@ -82,6 +83,7 @@ function createInstance(vNode: VNode, Component, props: Props, context: Object,
 	if (isFunction(instance.componentWillMount)) {
 		instance._blockRender = true;
 		instance.componentWillMount();
+		flushQueue();
 		instance._blockRender = false;
 	}
 

diff --git a/packages/inferno/src/DOM/events/delegation.ts b/packages/inferno/src/DOM/events/delegation.ts
@@ -1,4 +1,5 @@
-import { isBrowser } from 'inferno-shared';
+import { options } from './../../core/options';
+import { isBrowser, isFunction } from 'inferno-shared';
 
 const isiOS = isBrowser && !!navigator.platform && /iPad|iPhone|iPod/.test(navigator.platform);
 const delegatedEvents: Map<string, IDelegate> = new Map();
@@ -12,6 +13,8 @@ interface IEventData {
 	dom: Element;
 }
 
+const C = options.component;
+
 export function handleEvent(name, lastEvent, nextEvent, dom) {
 	let delegatedRoots = delegatedEvents.get(name);
 
@@ -53,6 +56,9 @@ function dispatchEvent(event, target, items, count: number, isClick: boolean, ev
 			eventsToTrigger(event);
 		}
 		if (event.cancelBubble) {
+			if (isFunction(C.flush)) {
+				C.flush();
+			}
 			return;
 		}
 	}
@@ -67,6 +73,8 @@ function dispatchEvent(event, target, items, count: number, isClick: boolean, ev
 		}
 
 		dispatchEvent(event, parentDom, items, count, isClick, eventData);
+	} else if (isFunction(C.flush)) {
+		C.flush();
 	}
 }
 

diff --git a/packages/inferno/src/core/options.ts b/packages/inferno/src/core/options.ts
@@ -17,6 +17,7 @@ export const options: {
 	createVNode: null|Function,
 	component: {
 		create: null|Function,
+		flush: null|Function,
 		handleInput: Function
 		patch: null|Function
 	},
@@ -31,6 +32,7 @@ export const options: {
 	beforeUnmount: null,
 	component: {
 		create: null,
+		flush: null,
 		handleInput: handleComponentInput,
 		patch: null
 	},