Remove context-pure mixin

src/SelectField/SelectField.jsx

@@ -2,7 +2,6 @@ import React from 'react';
 import TextField from '../text-field';
 import DropDownMenu from '../DropDownMenu';
 import getMuiTheme from '../styles/getMuiTheme';
-import ContextPure from '../mixins/context-pure';
 
 function getStyles(props) {
   return {
@@ -142,19 +141,6 @@ const SelectField = React.createClass({
     muiTheme: React.PropTypes.object,
   },
 
-  mixins: [
-    ContextPure,
-  ],
-
-  statics: {
-    getChildrenClasses() {
-      return [
-        TextField,
-        DropDownMenu,
-      ];
-    },
-  },
-
   getDefaultProps() {
     return {
       autoWidth: false,

src/TextField/TextField.jsx

@@ -6,7 +6,6 @@ import Transitions from '../styles/transitions';
 import UniqueId from '../utils/unique-id';
 import EnhancedTextarea from '../enhanced-textarea';
 import getMuiTheme from '../styles/getMuiTheme';
-import ContextPure from '../mixins/context-pure';
 import TextFieldHint from './TextFieldHint';
 import TextFieldLabel from './TextFieldLabel';
 import TextFieldUnderline from './TextFieldUnderline';
@@ -186,31 +185,9 @@ const TextField = React.createClass({
   },
 
   mixins: [
-    ContextPure,
     StylePropable,
   ],
 
-  statics: {
-    getRelevantContextKeys(muiTheme) {
-      const textFieldTheme = muiTheme.textField;
-
-      return {
-        floatingLabelColor: textFieldTheme.floatingLabelColor,
-        focusColor: textFieldTheme.focusColor,
-        textColor: textFieldTheme.textColor,
-        disabledTextColor: textFieldTheme.disabledTextColor,
-        backgroundColor: textFieldTheme.backgroundColor,
-        hintColor: textFieldTheme.hintColor,
-        errorColor: textFieldTheme.errorColor,
-      };
-    },
-    getChildrenClasses() {
-      return [
-        EnhancedTextarea,
-      ];
-    },
-  },
-
   getDefaultProps() {
     return {
       disabled: false,
@@ -268,14 +245,16 @@ const TextField = React.createClass({
   getStyles() {
     const props = this.props;
     const {
-      floatingLabelColor,
-      focusColor,
-      textColor,
-      disabledTextColor,
-      backgroundColor,
-      hintColor,
-      errorColor,
-    } = this.constructor.getRelevantContextKeys(this.state.muiTheme);
+      textField: {
+        floatingLabelColor,
+        focusColor,
+        textColor,
+        disabledTextColor,
+        backgroundColor,
+        hintColor,
+        errorColor,
+      },
+    } = this.state.muiTheme;
 
     const styles = {
       root: {

src/buttons/flat-button-label.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import ContextPure from '../mixins/context-pure';
 import getMuiTheme from '../styles/getMuiTheme';
 
 function getStyles(props, state) {
@@ -35,18 +34,6 @@ const FlatButtonLabel = React.createClass({
     muiTheme: React.PropTypes.object,
   },
 
-  mixins: [
-    ContextPure,
-  ],
-
-  statics: {
-    getRelevantContextKeys(muiTheme) {
-      return {
-        spacingDesktopGutterLess: muiTheme.rawTheme.spacing.desktopGutterLess,
-      };
-    },
-  },
-
   getInitialState() {
     return {
       muiTheme: this.context.muiTheme || getMuiTheme(),

src/card/card-expandable.jsx

@@ -3,7 +3,6 @@ import OpenIcon from '../svg-icons/hardware/keyboard-arrow-up';
 import CloseIcon from '../svg-icons/hardware/keyboard-arrow-down';
 import IconButton from '../icon-button';
 import getMuiTheme from '../styles/getMuiTheme';
-import ContextPure from '../mixins/context-pure';
 
 function getStyles() {
   return {
@@ -37,18 +36,6 @@ const CardExpandable = React.createClass({
     muiTheme: React.PropTypes.object,
   },
 
-  mixins: [
-    ContextPure,
-  ],
-
-  statics: {
-    getChildrenClasses() {
-      return [
-        IconButton,
-      ];
-    },
-  },
-
   getInitialState() {
     return {
       muiTheme: this.context.muiTheme || getMuiTheme(),

src/date-picker/date-picker-dialog.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import ContextPure from '../mixins/context-pure';
 import EventListener from 'react-event-listener';
 import KeyCode from '../utils/key-code';
 import Calendar from './calendar';
@@ -42,24 +41,6 @@ const DatePickerDialog = React.createClass({
     muiTheme: React.PropTypes.object,
   },
 
-  mixins: [
-    ContextPure,
-  ],
-
-  statics: {
-    getRelevantContextKeys(muiTheme) {
-      return {
-        calendarTextColor: muiTheme.datePicker.calendarTextColor,
-      };
-    },
-    getChildrenClasses() {
-      return [
-        Calendar,
-        Dialog,
-      ];
-    },
-  },
-
   getDefaultProps: function() {
     return {
       DateTimeFormat: DateTime.DateTimeFormat,
@@ -148,7 +129,7 @@ const DatePickerDialog = React.createClass({
 
     const {
       calendarTextColor,
-    } = this.constructor.getRelevantContextKeys(this.state.muiTheme);
+    } = this.state.muiTheme.datePicker;
 
     const styles = {
       root: {

src/flat-button.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import ContextPure from './mixins/context-pure';
 import Transitions from './styles/transitions';
 import Children from './utils/children';
 import ColorManipulator from './utils/color-manipulator';
@@ -122,41 +121,10 @@ const FlatButton = React.createClass({
     muiTheme: React.PropTypes.object,
   },
 
-  //for passing default theme context to children
   childContextTypes: {
     muiTheme: React.PropTypes.object,
   },
 
-  mixins: [
-    ContextPure,
-  ],
-
-  statics: {
-    getRelevantContextKeys(muiTheme) {
-      const buttonTheme = muiTheme.button;
-      const flatButtonTheme = muiTheme.flatButton;
-
-      return {
-        buttonColor: flatButtonTheme.color,
-        buttonFilterColor: flatButtonTheme.buttonFilterColor,
-        buttonHeight: buttonTheme.height,
-        buttonMinWidth: buttonTheme.minWidth,
-        disabledTextColor: flatButtonTheme.disabledTextColor,
-        primaryTextColor: flatButtonTheme.primaryTextColor,
-        secondaryTextColor: flatButtonTheme.secondaryTextColor,
-        textColor: flatButtonTheme.textColor,
-        textTransform: flatButtonTheme.textTransform ? flatButtonTheme.textTransform :
-                      (buttonTheme.textTransform ? buttonTheme.textTransform : 'uppercase'),
-      };
-    },
-    getChildrenClasses() {
-      return [
-        EnhancedButton,
-        FlatButtonLabel,
-      ];
-    },
-  },
-
   getDefaultProps() {
     return {
       disabled: false,
@@ -186,11 +154,10 @@ const FlatButton = React.createClass({
     };
   },
 
-  //to update theme inside state whenever a new theme is passed down
-  //from the parent / owner using context
   componentWillReceiveProps(nextProps, nextContext) {
-    const newMuiTheme = nextContext.muiTheme ? nextContext.muiTheme : this.state.muiTheme;
-    this.setState({muiTheme: newMuiTheme});
+    this.setState({
+      muiTheme: nextContext.muiTheme || this.state.muiTheme,
+    });
   },
 
   _handleKeyboardFocus(e, isKeyboardFocused) {
@@ -232,17 +199,23 @@ const FlatButton = React.createClass({
     } = this.props;
 
     const {
-      buttonColor,
-      buttonHeight,
-      buttonMinWidth,
-      disabledTextColor,
-      buttonFilterColor,
-      primaryTextColor,
-      secondaryTextColor,
-      textColor,
-      textTransform,
-    } = this.constructor.getRelevantContextKeys(this.state.muiTheme);
-
+      button: {
+        height: buttonHeight,
+        minWidth: buttonMinWidth,
+        textTransform: buttonTextTransform,
+      },
+      flatButton: {
+        buttonFilterColor,
+        color: buttonColor,
+        disabledTextColor,
+        fontSize,
+        fontWeight,
+        primaryTextColor,
+        secondaryTextColor,
+        textColor,
+        textTransform = buttonTextTransform || 'uppercase',
+      },
+    } = this.state.muiTheme;
     const defaultTextColor = disabled ? disabledTextColor :
       primary ? primaryTextColor :
       secondary ? secondaryTextColor :
@@ -254,8 +227,6 @@ const FlatButton = React.createClass({
     const buttonRippleColor = rippleColor || defaultRippleColor;
     const buttonBackgroundColor = backgroundColor || buttonColor;
     const hovered = (this.state.hovered || this.state.isKeyboardFocused) && !disabled;
-    const fontSize = this.state.muiTheme.flatButton.fontSize;
-    const fontWeight = this.state.muiTheme.flatButton.fontWeight;
 
     const mergedRootStyles = Object.assign({}, {
       color: defaultTextColor,

src/icon-button.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import ContextPure from './mixins/context-pure';
 import Transitions from './styles/transitions';
 import PropTypes from './utils/prop-types';
 import EnhancedButton from './enhanced-button';
@@ -132,36 +131,10 @@ const IconButton = React.createClass({
     muiTheme: React.PropTypes.object,
   },
 
-  //for passing default theme context to children
   childContextTypes: {
     muiTheme: React.PropTypes.object,
   },
 
-  mixins: [
-    ContextPure,
-  ],
-
-  statics: {
-    getRelevantContextKeys(muiTheme) {
-      const spacing = muiTheme.rawTheme.spacing;
-      const palette = muiTheme.rawTheme.palette;
-
-      return {
-        iconSize: spacing.iconSize,
-        textColor: palette.textColor,
-        disabledColor: palette.disabledColor,
-      };
-    },
-
-    getChildrenClasses() {
-      return [
-        EnhancedButton,
-        FontIcon,
-        Tooltip,
-      ];
-    },
-  },
-
   getDefaultProps() {
     return {
       disabled: false,