dillon1000/react

Commit

Fix Merging `propTypes`, `contextTypes`, and `childContextTypes`

This fixes merging of `propTypes`, `contextTypes`, and `childContextTypes` so that we actually merge (instead of only taking the component or last mixin).
Browse files
Tim Yung authored 02de96f012cc535659eb26b79b9827d6e1f7eb7d Parent e92ce38
Changed paths2 files
First-parent comparison
M src/core/ReactCompositeComponent.js ModifiedM src/core/__tests__/ReactCompositeComponentMixin-test.js Modified
Patch

Files changed

Rendering syntax-highlighted changes…