Merge pull request mui#2063 from pandaiolo/node-props

Changing propType from string to node on components
tyfoo · Nov 5, 2015 · 47bf496 · 47bf496
2 parents 7df3a99 + 2b1e062
commit 47bf496
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/docs/src/app/components/pages/components/grid-list.jsx b/docs/src/app/components/pages/components/grid-list.jsx
@@ -50,7 +50,7 @@ class GridListPage extends React.Component {
         infoArray: [
           {
             name: 'title',
-            type: 'string',
+            type: 'node',
             header: 'optional',
             desc: 'Title to be displayed on tile.',
           },

diff --git a/docs/src/app/components/pages/components/lists.jsx b/docs/src/app/components/pages/components/lists.jsx
@@ -55,7 +55,7 @@ export default class ListsPage extends React.Component {
           },
           {
             name: 'subheader',
-            type: 'string',
+            type: 'node',
             header: 'optional',
             desc: 'The subheader string that will be displayed at the top of the list.',
           },

diff --git a/docs/src/app/components/pages/components/switches.jsx b/docs/src/app/components/pages/components/switches.jsx
@@ -55,7 +55,7 @@ export default class SwitchesPage extends React.Component {
         },
         {
           name: 'label',
-          type: 'string',
+          type: 'node',
           header: 'optional',
           desc: 'The text that is displayed beside the checkbox.',
         },
@@ -130,7 +130,7 @@ export default class SwitchesPage extends React.Component {
         },
         {
           name: 'label',
-          type: 'string',
+          type: 'node',
           header: 'optional',
           desc: 'The text that is displayed beside the radio button.',
         },
@@ -252,7 +252,7 @@ export default class SwitchesPage extends React.Component {
         },
         {
           name: 'label',
-          type: 'string',
+          type: 'node',
           header: 'optional',
           desc: 'The text that is displayed beside the toggle switch.',
         },

diff --git a/src/card/card-title.jsx b/src/card/card-title.jsx
@@ -38,10 +38,10 @@ const CardTitle = React.createClass({
   },
 
   propTypes: {
-    title: React.PropTypes.string,
+    title: React.PropTypes.node,
     titleColor: React.PropTypes.string,
     titleStyle: React.PropTypes.object,
-    subtitle: React.PropTypes.string,
+    subtitle: React.PropTypes.node,
     subtitleColor: React.PropTypes.string,
     subtitleStyle: React.PropTypes.object,
     expandable: React.PropTypes.bool,

diff --git a/src/enhanced-switch.jsx b/src/enhanced-switch.jsx
@@ -45,7 +45,7 @@ const EnhancedSwitch = React.createClass({
       labelStyle: React.PropTypes.object,
       name: React.PropTypes.string,
       value: React.PropTypes.string,
-      label: React.PropTypes.string,
+      label: React.PropTypes.node,
       onSwitch: React.PropTypes.func,
       required: React.PropTypes.bool,
       disabled: React.PropTypes.bool,

diff --git a/src/grid-list/grid-tile.jsx b/src/grid-list/grid-tile.jsx
@@ -13,7 +13,7 @@ const GridTile = React.createClass({
   },
 
   propTypes: {
-    title: React.PropTypes.string,
+    title: React.PropTypes.node,
     subtitle: React.PropTypes.node,
     titlePosition: React.PropTypes.oneOf(['top', 'bottom']),
     titleBackground: React.PropTypes.string,

diff --git a/src/lists/list.jsx b/src/lists/list.jsx
@@ -17,7 +17,7 @@ const List = React.createClass({
 
   propTypes: {
     insetSubheader: React.PropTypes.bool,
-    subheader: React.PropTypes.string,
+    subheader: React.PropTypes.node,
     subheaderStyle: React.PropTypes.object,
     zDepth: PropTypes.zDepth,
   },