stardust - npm Package Compare versions

Comparing version 0.42.1 to 0.42.2

dist/elements/Header/Header.js

@@ -54,2 +54,3 @@ 'use strict';
   var className = props.className;
+  var subheader = props.subheader;
 
@@ -65,3 +66,3 @@
       ElementType,
-      _extends({ className: classes }, rest),
+      _extends({}, rest, { className: classes }),
       (0, _factories.createIcon)(icon),
@@ -72,3 +73,4 @@ content && _react2.default.createElement(
         content
-      )
+      ),
+      subheader && _react2.default.createElement(_HeaderSubheader2.default, { content: subheader })
     );
@@ -80,13 +82,23 @@ }
       ElementType,
-      _extends({ className: classes }, rest),
+      _extends({}, rest, { className: classes }),
       (0, _factories.createImage)(image),
       ' ',
-      content
+      content,
+      subheader && _react2.default.createElement(_HeaderSubheader2.default, { content: subheader })
     );
   }
 
+  if (children) {
+    return _react2.default.createElement(
+      ElementType,
+      _extends({}, rest, { className: classes }),
+      children
+    );
+  }
+
   return _react2.default.createElement(
     ElementType,
     _extends({}, rest, { className: classes }),
-    children || content
+    content,
+    subheader && _react2.default.createElement(_HeaderSubheader2.default, { content: subheader })
   );
@@ -153,2 +165,5 @@ }
 
+  /** Shorthand for the Header.Subheader component. Mutually exclusive with children */
+  subheader: _lib.customPropTypes.every([_lib.customPropTypes.disallow(['children']), _react.PropTypes.string]),
+
   /** Align header content */
@@ -155,0 +170,0 @@ textAlign: _react.PropTypes.oneOf(Header._meta.props.textAlign)

dist/elements/Header/HeaderSubheader.js

@@ -9,2 +9,6 @@ 'use strict';
 
+var _classnames = require('classnames');
+
+var _classnames2 = _interopRequireDefault(_classnames);
+
 var _react = require('react');
@@ -14,6 +18,2 @@
 
-var _classnames = require('classnames');
-
-var _classnames2 = _interopRequireDefault(_classnames);
-
 var _lib = require('../../lib');
@@ -26,2 +26,3 @@
   var className = props.className;
+  var content = props.content;
 
@@ -35,3 +36,3 @@ var classes = (0, _classnames2.default)('sub header', className);
     _extends({ className: classes }, rest),
-    children
+    children || content
   );
@@ -50,9 +51,12 @@ }
 
-  /** Primary content of the HeaderSubheader */
-  children: _react.PropTypes.node,
+  /** Primary content of the HeaderSubheader. Mutually exclusive with content */
+  children: _lib.customPropTypes.every([_lib.customPropTypes.disallow(['content']), _react.PropTypes.node]),
 
   /** Classes to add to the subheader className. */
-  className: _react.PropTypes.string
+  className: _react.PropTypes.string,
+
+  /** Shorthand for primary content. Mutually exclusive with children */
+  content: _lib.customPropTypes.every([_lib.customPropTypes.disallow(['children']), _react.PropTypes.string])
 };
 
 exports.default = HeaderSubheader;

package.json

 {
   "name": "stardust",
-  "version": "0.42.1",
+  "version": "0.42.2",
   "description": "The official Semantic-UI-React integration.",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

src/elements/Header/Header.js

@@ -25,3 +25,3 @@ import _ from 'lodash'
     color, content, dividing, block, attached, floated, inverted, disabled, sub, size, textAlign,
-    icon, image, children, className,
+    icon, image, children, className, subheader,
   } = props
@@ -51,5 +51,6 @@
     return (
-      <ElementType className={classes} {...rest}>
+      <ElementType {...rest} className={classes}>
         {createIcon(icon)}
         {content && <HeaderContent>{content}</HeaderContent>}
+        {subheader && <HeaderSubheader content={subheader} />}
       </ElementType>
@@ -61,4 +62,5 @@ )
     return (
-      <ElementType className={classes} {...rest}>
+      <ElementType {...rest} className={classes}>
         {createImage(image)} {content}
+        {subheader && <HeaderSubheader content={subheader} />}
       </ElementType>
@@ -68,3 +70,16 @@ )
 
-  return <ElementType {...rest} className={classes}>{children || content}</ElementType>
+  if (children) {
+    return (
+      <ElementType {...rest} className={classes}>
+        {children}
+      </ElementType>
+    )
+  }
+
+  return (
+    <ElementType {...rest} className={classes}>
+      {content}
+      {subheader && <HeaderSubheader content={subheader} />}
+    </ElementType>
+  )
 }
@@ -163,2 +178,8 @@
 
+  /** Shorthand for the Header.Subheader component. Mutually exclusive with children */
+  subheader: customPropTypes.every([
+    customPropTypes.disallow(['children']),
+    PropTypes.string,
+  ]),
+
   /** Align header content */
@@ -165,0 +186,0 @@ textAlign: PropTypes.oneOf(Header._meta.props.textAlign),

src/elements/Header/HeaderSubheader.js

@@ -0,7 +1,13 @@
+import cx from 'classnames'
 import React, { PropTypes } from 'react'
-import cx from 'classnames'
-import { getElementType, getUnhandledProps, META } from '../../lib'
 
+import {
+  customPropTypes,
+  getElementType,
+  getUnhandledProps,
+  META,
+} from '../../lib'
+
 function HeaderSubheader(props) {
-  const { children, className } = props
+  const { children, className, content } = props
   const classes = cx('sub header', className)
@@ -13,3 +19,3 @@ const rest = getUnhandledProps(HeaderSubheader, props)
     <ElementType className={classes} {...rest}>
-      {children}
+      {children || content}
     </ElementType>
@@ -32,9 +38,18 @@ )
 
-  /** Primary content of the HeaderSubheader */
-  children: PropTypes.node,
+  /** Primary content of the HeaderSubheader. Mutually exclusive with content */
+  children: customPropTypes.every([
+    customPropTypes.disallow(['content']),
+    PropTypes.node,
+  ]),
 
   /** Classes to add to the subheader className. */
   className: PropTypes.string,
+
+  /** Shorthand for primary content. Mutually exclusive with children */
+  content: customPropTypes.every([
+    customPropTypes.disallow(['children']),
+    PropTypes.string,
+  ]),
 }
 
 export default HeaderSubheader

No alert changes

Improved metrics

Total package byte prevSize

809673

increased by0.37%

Lines of code

18026

increased by0.27%

No dependency changes