Merge pull request #6 from developit/bug/contstructor-props

Pass `props` through Component constructors (fixes #5)
preactjs · Dec 3, 2015 · f6ffd61 · f6ffd61
2 parents eb0e740 + 26847d4
commit f6ffd61
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/preact.js b/src/preact.js
@@ -410,7 +410,7 @@ function renderComponent(component, opts) {
 			setComponentProps(inst, childProps, SYNC_RENDER);
 		}
 		else {
-			inst = componentRecycler.create(childComponent);
+			inst = componentRecycler.create(childComponent, childProps);
 			inst._parentComponent = component;
 			component._component = inst;
 			if (component.base) deepHook(inst, 'componentWillMount');
@@ -491,9 +491,8 @@ function buildComponentFromVNode(dom, vnode) {
  *	@private
  */
 function createComponentFromVNode(vnode) {
-	let component = componentRecycler.create(vnode.nodeName);
-
 	let props = getNodeProps(vnode);
+	let component = componentRecycler.create(vnode.nodeName, props);
 	setComponentProps(component, props, NO_RENDER);
 	renderComponent(component, DOM_RENDER);
 
@@ -835,7 +834,7 @@ let componentRecycler = {
 		else componentRecycler.components[name] = [component];
 	},
 
-	create(ctor) {
+	create(ctor, props) {
 		let list = componentRecycler.components[ctor.name];
 		if (list && list.length) {
 			for (let i=list.length; i--; ) {
@@ -844,7 +843,7 @@ let componentRecycler = {
 				}
 			}
 		}
-		return new ctor();
+		return new ctor(props);
 	}
 };
 

diff --git a/test/browser/render.js b/test/browser/render.js
@@ -174,8 +174,13 @@ describe('render()', () => {
 
 	it('should render components with props', () => {
 		const PROPS = { foo:'bar', onBaz:()=>{} };
+		let constructorProps;
 
 		class C2 extends Component {
+			constructor(props) {
+				super(props);
+				constructorProps = props;
+			}
 			render(props) {
 				return <div {...props} />;
 			}
@@ -184,6 +189,8 @@ describe('render()', () => {
 
 		render(<C2 {...PROPS} />, scratch);
 
+		expect(constructorProps).to.deep.equal(PROPS);
+
 		expect(C2.prototype.render)
 			.to.have.been.calledOnce
 			.and.to.have.been.calledWithMatch(PROPS, {})