Upgrade package.json deps, also fix css-layout now mutates vs returni…

…ng a new object
dlmanning · Sep 9, 2015 · 5159a7b · 5159a7b
1 parent 556f14b
commit 5159a7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -13,9 +13,11 @@
     "react": "0.14.0-alpha3"
   },
   "dependencies": {
-    "css-layout": "0.0.2",
-    "wolfy87-eventemitter": "^4.2.11",
-    "babel-runtime": "^5.1.11"
+    "babel-runtime": "^5.1.11",
+    "css-layout": "^1.0.0",
+    "webpack": "^1.12.1",
+    "webpack-dev-server": "^1.10.1",
+    "wolfy87-eventemitter": "^4.2.11"
   },
   "devDependencies": {
     "babel": "^5.1.11",

diff --git a/src/flex.jsx b/src/flex.jsx
@@ -2,7 +2,6 @@ import React from 'react';
 import EventEmitter from 'wolfy87-eventemitter';
 import computeLayout from 'css-layout';
 import isFlexBoxProperty from './flexbox-props';
-
 const { Component } = React;
 
 function setStyle (style = {}, styles, path = []) {
@@ -66,8 +65,8 @@ export class FlexContext extends Component {
   }
 
   computeLayoutAndBroadcastResults () {
-    const flexLayout = computeLayout(this.stylesRoot);
-    this.layoutNotifier.emit('layout-update', flexLayout);
+    computeLayout(this.stylesRoot);
+    this.layoutNotifier.emit('layout-update', this.stylesRoot);
   }
 
   componentWillMount () {
@@ -124,7 +123,7 @@ export const FlexBox = (Composed, componentStyles = {}) => class extends Compone
   }
 
   handleLayoutCalculation = layout => {
-    this.setState({ layout: this.getMyLayout(layout) });
+    this.setState({ layout: this.getMyLayout(layout).layout });
   }
 
   componentWillMount () {