Fix regression in 4.6.2 related to recycled component DOM not being t…

…reated as first render.
preactjs · Apr 19, 2016 · a4ca187 · a4ca187
1 parent cc6f10f
commit a4ca187
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/component.js b/src/component.js
@@ -17,7 +17,7 @@ export default function Component(props, context) {
 	/** @private */
 	this._dirty = this._disableRendering = false;
 	/** @public */
-	this.prevState = this.prevProps = this.prevContext = this.base = this._parentComponent = this._component = this.__ref = this.__key = this._linkedStates = this._renderCallbacks = null;
+	this.prevState = this.prevProps = this.prevContext = this.base = this.nextBase = this._parentComponent = this._component = this.__ref = this.__key = this._linkedStates = this._renderCallbacks = null;
 	/** @public */
 	this.context = context || {};
 	/** @type {object} */

diff --git a/src/vdom/component-recycler.js b/src/vdom/component-recycler.js
@@ -22,7 +22,7 @@ export function createComponent(ctor, props, context) {
 		if (c.constructor===ctor) {
 			list.splice(i, 1);
 			let inst = new ctor(props, context);
-			inst.base = c.base;
+			inst.nextBase = c.base;
 			return inst;
 		}
 	}

diff --git a/src/vdom/component.js b/src/vdom/component.js
@@ -137,7 +137,7 @@ export function renderComponent(component, opts) {
 			base = inst.base;
 		}
 		else {
-			let cbase = component.base;
+			let cbase = component.base || component.nextBase;
 
 			// destroy high order component link
 			toUnmount = component._component;