From 2290392937a9555bc04baf6d444c12735ddde330 Mon Sep 17 00:00:00 2001 From: Jeff Carbonella Date: Tue, 4 Oct 2016 22:54:40 -0400 Subject: [PATCH] Rename shorthand proptypes --- src/collections/Breadcrumb/Breadcrumb.js | 6 +++--- src/collections/Breadcrumb/BreadcrumbDivider.js | 2 +- src/collections/Menu/Menu.js | 2 +- src/collections/Menu/MenuHeader.js | 2 +- src/collections/Menu/MenuItem.js | 2 +- src/collections/Message/Message.js | 8 ++++---- src/collections/Table/Table.js | 4 ++-- src/collections/Table/TableCell.js | 4 ++-- src/collections/Table/TableRow.js | 2 +- src/elements/Button/Button.js | 2 +- src/elements/Header/Header.js | 8 ++++---- src/elements/Header/HeaderSubheader.js | 2 +- src/elements/Image/Image.js | 2 +- src/elements/Input/Input.js | 8 ++++---- src/elements/Label/Label.js | 8 ++++---- src/elements/Label/LabelDetail.js | 2 +- src/elements/Loader/Loader.js | 2 +- src/elements/Step/Step.js | 6 +++--- src/elements/Step/StepContent.js | 4 ++-- src/elements/Step/StepDescription.js | 2 +- src/elements/Step/StepGroup.js | 2 +- src/elements/Step/StepTitle.js | 2 +- src/lib/customPropTypes.js | 12 ++++++------ src/modules/Dropdown/DropdownHeader.js | 4 ++-- src/modules/Dropdown/DropdownItem.js | 4 ++-- src/views/Card/Card.js | 10 +++++----- src/views/Card/CardContent.js | 6 +++--- src/views/Card/CardDescription.js | 2 +- src/views/Card/CardGroup.js | 2 +- src/views/Card/CardHeader.js | 2 +- src/views/Card/CardMeta.js | 2 +- src/views/Feed/Feed.js | 2 +- src/views/Feed/FeedContent.js | 10 +++++----- src/views/Feed/FeedDate.js | 2 +- src/views/Feed/FeedEvent.js | 4 ++-- src/views/Feed/FeedExtra.js | 4 ++-- src/views/Feed/FeedLabel.js | 6 +++--- src/views/Feed/FeedLike.js | 4 ++-- src/views/Feed/FeedMeta.js | 4 ++-- src/views/Feed/FeedSummary.js | 6 +++--- src/views/Feed/FeedUser.js | 2 +- src/views/Item/Item.js | 12 ++++++------ src/views/Item/ItemContent.js | 10 +++++----- src/views/Item/ItemDescription.js | 2 +- src/views/Item/ItemExtra.js | 2 +- src/views/Item/ItemGroup.js | 2 +- src/views/Item/ItemHeader.js | 2 +- src/views/Item/ItemMeta.js | 2 +- src/views/Statistic/Statistic.js | 4 ++-- src/views/Statistic/StatisticGroup.js | 2 +- src/views/Statistic/StatisticLabel.js | 2 +- src/views/Statistic/StatisticValue.js | 2 +- 52 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/collections/Breadcrumb/Breadcrumb.js b/src/collections/Breadcrumb/Breadcrumb.js index 7de9ac1230..3a158bafb6 100644 --- a/src/collections/Breadcrumb/Breadcrumb.js +++ b/src/collections/Breadcrumb/Breadcrumb.js @@ -66,18 +66,18 @@ Breadcrumb.propTypes = { /** Shorthand for primary content of the Breadcrumb.Divider. */ divider: customPropTypes.every([ customPropTypes.disallow(['icon']), - customPropTypes.content, + customPropTypes.contentShorthand, ]), /** For use with the sections prop. Render as an `Icon` component with `divider` class instead of a `div` in * Breadcrumb.Divider. */ icon: customPropTypes.every([ customPropTypes.disallow(['divider']), - customPropTypes.item, + customPropTypes.itemShorthand, ]), /** Shorthand array of props for Breadcrumb.Section. */ - sections: customPropTypes.items, + sections: customPropTypes.itemsShorthand, /** Size of Breadcrumb */ size: PropTypes.oneOf(Breadcrumb._meta.props.size), diff --git a/src/collections/Breadcrumb/BreadcrumbDivider.js b/src/collections/Breadcrumb/BreadcrumbDivider.js index 1554236075..3d4a660913 100644 --- a/src/collections/Breadcrumb/BreadcrumbDivider.js +++ b/src/collections/Breadcrumb/BreadcrumbDivider.js @@ -40,7 +40,7 @@ BreadcrumbDivider.propTypes = { className: PropTypes.string, /** Render as an `Icon` component with `divider` class instead of a `div`. */ - icon: customPropTypes.item, + icon: customPropTypes.itemShorthand, } export default BreadcrumbDivider diff --git a/src/collections/Menu/Menu.js b/src/collections/Menu/Menu.js index b56b534a34..47dbda6424 100644 --- a/src/collections/Menu/Menu.js +++ b/src/collections/Menu/Menu.js @@ -91,7 +91,7 @@ class Menu extends Component { inverted: PropTypes.bool, /** Shorthand array of props for Menu. */ - items: customPropTypes.items, + items: customPropTypes.itemsShorthand, /** onClick handler for MenuItem. Mutually exclusive with children. */ onItemClick: customPropTypes.every([ diff --git a/src/collections/Menu/MenuHeader.js b/src/collections/Menu/MenuHeader.js index 53d3e56017..8921829c25 100644 --- a/src/collections/Menu/MenuHeader.js +++ b/src/collections/Menu/MenuHeader.js @@ -34,7 +34,7 @@ MenuHeader.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default MenuHeader diff --git a/src/collections/Menu/MenuItem.js b/src/collections/Menu/MenuItem.js index dfc1684334..1616355459 100644 --- a/src/collections/Menu/MenuItem.js +++ b/src/collections/Menu/MenuItem.js @@ -42,7 +42,7 @@ export default class MenuItem extends Component { color: PropTypes.oneOf(_meta.props.color), /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** A menu item or menu can remove element padding, vertically or horizontally. */ fitted: PropTypes.oneOfType([ diff --git a/src/collections/Message/Message.js b/src/collections/Message/Message.js index 9ed3ef60d9..e721937ad6 100644 --- a/src/collections/Message/Message.js +++ b/src/collections/Message/Message.js @@ -116,19 +116,19 @@ Message.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** Shorthand for MessageHeader. */ - header: customPropTypes.item, + header: customPropTypes.itemShorthand, /** A message can contain an icon. */ icon: PropTypes.oneOfType([ PropTypes.bool, - customPropTypes.item, + customPropTypes.itemShorthand, ]), /** Array of string items for the MessageList. Mutually exclusive with children. */ - list: customPropTypes.items, + list: customPropTypes.itemsShorthand, /** * A message that the user can choose to hide. diff --git a/src/collections/Table/Table.js b/src/collections/Table/Table.js index c1f5c314c9..eb95133e2e 100644 --- a/src/collections/Table/Table.js +++ b/src/collections/Table/Table.js @@ -158,10 +158,10 @@ Table.propTypes = { fixed: PropTypes.bool, /** Shorthand for a TableRow to be placed within Table.Footer. */ - footerRow: customPropTypes.collection, + footerRow: customPropTypes.collectionShorthand, /** Shorthand for a TableRow to be placed within Table.Header. */ - headerRow: customPropTypes.collection, + headerRow: customPropTypes.collectionShorthand, /** A table's colors can be inverted. */ inverted: PropTypes.bool, diff --git a/src/collections/Table/TableCell.js b/src/collections/Table/TableCell.js index bbc008ea55..06e34784b3 100644 --- a/src/collections/Table/TableCell.js +++ b/src/collections/Table/TableCell.js @@ -95,7 +95,7 @@ TableCell.propTypes = { collapsing: PropTypes.bool, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** A cell can be disabled. */ disabled: PropTypes.bool, @@ -104,7 +104,7 @@ TableCell.propTypes = { error: PropTypes.bool, /** Add an Icon by name, props object, or pass an */ - icon: customPropTypes.item, + icon: customPropTypes.itemShorthand, /** A cell may let a user know whether a value is bad. */ negative: PropTypes.bool, diff --git a/src/collections/Table/TableRow.js b/src/collections/Table/TableRow.js index 6ab3497f8e..42298ff5ff 100644 --- a/src/collections/Table/TableRow.js +++ b/src/collections/Table/TableRow.js @@ -82,7 +82,7 @@ TableRow.propTypes = { cellAs: customPropTypes.as, /** Shorthand array of props for TableCell. */ - cells: customPropTypes.items, + cells: customPropTypes.itemsShorthand, /** Primary content. */ children: PropTypes.node, diff --git a/src/elements/Button/Button.js b/src/elements/Button/Button.js index 17b1c45602..534dfc4f64 100644 --- a/src/elements/Button/Button.js +++ b/src/elements/Button/Button.js @@ -182,7 +182,7 @@ Button.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** A button can have different colors */ color: PropTypes.oneOf(Button._meta.props.color), diff --git a/src/elements/Header/Header.js b/src/elements/Header/Header.js index de0897d484..344ddae026 100644 --- a/src/elements/Header/Header.js +++ b/src/elements/Header/Header.js @@ -97,14 +97,14 @@ Header.propTypes = { children: PropTypes.node, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** Add an icon by icon name or pass an */ icon: customPropTypes.every([ customPropTypes.disallow(['image']), PropTypes.oneOfType([ PropTypes.bool, - customPropTypes.item, + customPropTypes.itemShorthand, ]), ]), @@ -113,7 +113,7 @@ Header.propTypes = { customPropTypes.disallow(['icon']), PropTypes.oneOfType([ PropTypes.bool, - customPropTypes.item, + customPropTypes.itemShorthand, ]), ]), @@ -148,7 +148,7 @@ Header.propTypes = { size: PropTypes.oneOf(Header._meta.props.size), /** Shorthand for Header.Subheader. */ - subheader: customPropTypes.item, + subheader: customPropTypes.itemShorthand, /** Align header content */ textAlign: PropTypes.oneOf(Header._meta.props.textAlign), diff --git a/src/elements/Header/HeaderSubheader.js b/src/elements/Header/HeaderSubheader.js index c4ede43525..9f79bb936b 100644 --- a/src/elements/Header/HeaderSubheader.js +++ b/src/elements/Header/HeaderSubheader.js @@ -34,7 +34,7 @@ HeaderSubheader.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default HeaderSubheader diff --git a/src/elements/Image/Image.js b/src/elements/Image/Image.js index 41d562b712..85c2a0ed18 100644 --- a/src/elements/Image/Image.js +++ b/src/elements/Image/Image.js @@ -146,7 +146,7 @@ Image.propTypes = { inline: PropTypes.bool, /** Shorthand for Label. */ - label: customPropTypes.item, + label: customPropTypes.itemShorthand, /** An image may appear rounded or circular */ shape: PropTypes.oneOf(Image._meta.props.shape), diff --git a/src/elements/Input/Input.js b/src/elements/Input/Input.js index 45e1d7720d..cb6d6613b6 100644 --- a/src/elements/Input/Input.js +++ b/src/elements/Input/Input.js @@ -145,7 +145,7 @@ Input.propTypes = { /** An Input can be formatted to alert the user to an action they may perform */ action: PropTypes.oneOfType([ PropTypes.bool, - customPropTypes.item, + customPropTypes.itemShorthand, ]), /** An action can appear along side an Input on the left or right */ @@ -172,7 +172,7 @@ Input.propTypes = { /** Optional Icon to display inside the Input */ icon: PropTypes.oneOfType([ PropTypes.bool, - customPropTypes.item, + customPropTypes.itemShorthand, ]), /** An Icon can appear inside an Input on the left or right */ @@ -182,10 +182,10 @@ Input.propTypes = { inverted: PropTypes.bool, /** Shorthand for creating the HTML Input */ - input: customPropTypes.item, + input: customPropTypes.itemShorthand, /** Optional Label to display along side the Input */ - label: customPropTypes.item, + label: customPropTypes.itemShorthand, /** A Label can appear outside an Input on the left or right */ labelPosition: PropTypes.oneOf(Input._meta.props.labelPosition), diff --git a/src/elements/Label/Label.js b/src/elements/Label/Label.js index 61832ab028..2235a87382 100644 --- a/src/elements/Label/Label.js +++ b/src/elements/Label/Label.js @@ -59,7 +59,7 @@ export default class Label extends Component { color: PropTypes.oneOf(_meta.props.color), /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** A label can position itself in the corner of an element. */ corner: PropTypes.oneOfType([ @@ -68,7 +68,7 @@ export default class Label extends Component { ]), /** Shorthand for LabelDetail. */ - detail: customPropTypes.item, + detail: customPropTypes.itemShorthand, /** Formats the label as a dot. */ empty: customPropTypes.every([ @@ -83,12 +83,12 @@ export default class Label extends Component { horizontal: PropTypes.bool, /** Shorthand for Icon. */ - icon: customPropTypes.item, + icon: customPropTypes.itemShorthand, /** A label can be formatted to emphasize an image or prop can be used as shorthand for Image. */ image: PropTypes.oneOfType([ PropTypes.bool, - customPropTypes.item, + customPropTypes.itemShorthand, ]), /** A label can point to content next to it. */ diff --git a/src/elements/Label/LabelDetail.js b/src/elements/Label/LabelDetail.js index 39aa49592a..440d26fc07 100644 --- a/src/elements/Label/LabelDetail.js +++ b/src/elements/Label/LabelDetail.js @@ -34,7 +34,7 @@ LabelDetail.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default LabelDetail diff --git a/src/elements/Loader/Loader.js b/src/elements/Loader/Loader.js index 385ec023e9..13404b202b 100644 --- a/src/elements/Loader/Loader.js +++ b/src/elements/Loader/Loader.js @@ -72,7 +72,7 @@ Loader.propTypes = { size: PropTypes.oneOf(Loader._meta.props.size), /** Shorthand for primary content. */ - text: customPropTypes.content, + text: customPropTypes.contentShorthand, } export default Loader diff --git a/src/elements/Step/Step.js b/src/elements/Step/Step.js index 2f04036147..91c63209c5 100644 --- a/src/elements/Step/Step.js +++ b/src/elements/Step/Step.js @@ -36,13 +36,13 @@ export default class Step extends Component { completed: PropTypes.bool, /** Shorthand for StepDescription. */ - description: customPropTypes.item, + description: customPropTypes.itemShorthand, /** Show that the Loader is inactive. */ disabled: PropTypes.bool, /** Shorthand for Icon. */ - icon: customPropTypes.item, + icon: customPropTypes.itemShorthand, /** A step can be link. */ link: PropTypes.bool, @@ -57,7 +57,7 @@ export default class Step extends Component { ordered: PropTypes.bool, /** Shorthand for StepTitle. */ - title: customPropTypes.item, + title: customPropTypes.itemShorthand, } static _meta = { diff --git a/src/elements/Step/StepContent.js b/src/elements/Step/StepContent.js index 9b573932ce..46dad8c182 100644 --- a/src/elements/Step/StepContent.js +++ b/src/elements/Step/StepContent.js @@ -46,10 +46,10 @@ StepContent.propTypes = { children: PropTypes.node, /** Shorthand for StepDescription. */ - description: customPropTypes.item, + description: customPropTypes.itemShorthand, /** Shorthand for StepTitle. */ - title: customPropTypes.item, + title: customPropTypes.itemShorthand, } export default StepContent diff --git a/src/elements/Step/StepDescription.js b/src/elements/Step/StepDescription.js index ee8b193621..f559c4ae56 100644 --- a/src/elements/Step/StepDescription.js +++ b/src/elements/Step/StepDescription.js @@ -34,7 +34,7 @@ StepDescription.propTypes = { children: PropTypes.node, /** Shorthand for primary content. */ - description: customPropTypes.content, + description: customPropTypes.contentShorthand, } export default StepDescription diff --git a/src/elements/Step/StepGroup.js b/src/elements/Step/StepGroup.js index 2b5d013ef9..b5a46e6ddf 100644 --- a/src/elements/Step/StepGroup.js +++ b/src/elements/Step/StepGroup.js @@ -64,7 +64,7 @@ StepGroup.propTypes = { fluid: PropTypes.bool, /** Shorthand array of props for Step. */ - items: customPropTypes.items, + items: customPropTypes.itemsShorthand, /** A step can show a ordered sequence of steps. */ ordered: PropTypes.bool, diff --git a/src/elements/Step/StepTitle.js b/src/elements/Step/StepTitle.js index f34e4e9433..1b03db3c55 100644 --- a/src/elements/Step/StepTitle.js +++ b/src/elements/Step/StepTitle.js @@ -34,7 +34,7 @@ StepTitle.propTypes = { children: PropTypes.node, /** Shorthand for primary content. */ - title: customPropTypes.content, + title: customPropTypes.contentShorthand, } export default StepTitle diff --git a/src/lib/customPropTypes.js b/src/lib/customPropTypes.js index 99e2848681..424faf29fe 100644 --- a/src/lib/customPropTypes.js +++ b/src/lib/customPropTypes.js @@ -183,7 +183,7 @@ export const demand = (requiredProps) => { /** * Ensure a component can render as a node passed as a prop value in place of children. */ -export const content = (...args) => every([ +export const contentShorthand = (...args) => every([ disallow(['children']), PropTypes.node, ])(...args) @@ -192,7 +192,7 @@ export const content = (...args) => every([ * Item shorthand is a description of a component that can be a literal, * a props object, or an element. */ -export const item = (...args) => every([ +export const itemShorthand = (...args) => every([ disallow(['children']), PropTypes.oneOfType([ PropTypes.element, @@ -203,11 +203,11 @@ export const item = (...args) => every([ ])(...args) /** - * ArrayOf shorthand ensures a prop is an array of item shorthand + * Items shorthand ensures a prop is an array of item shorthand. */ -export const items = (...args) => every([ +export const itemsShorthand = (...args) => every([ disallow(['children']), - PropTypes.arrayOf(item), + PropTypes.arrayOf(itemShorthand), ])(...args) /** @@ -217,7 +217,7 @@ export const items = (...args) => every([ export const collection = (...args) => every([ disallow(['children']), PropTypes.oneOfType([ - items, + itemsShorthand, PropTypes.element, PropTypes.object, ]), diff --git a/src/modules/Dropdown/DropdownHeader.js b/src/modules/Dropdown/DropdownHeader.js index aa23777376..6fdac7e3ea 100644 --- a/src/modules/Dropdown/DropdownHeader.js +++ b/src/modules/Dropdown/DropdownHeader.js @@ -44,10 +44,10 @@ DropdownHeader.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** Shorthand for Icon. */ - icon: customPropTypes.item, + icon: customPropTypes.itemShorthand, } export default DropdownHeader diff --git a/src/modules/Dropdown/DropdownItem.js b/src/modules/Dropdown/DropdownItem.js index 3889e5da7d..d312059b40 100644 --- a/src/modules/Dropdown/DropdownItem.js +++ b/src/modules/Dropdown/DropdownItem.js @@ -30,7 +30,7 @@ export default class DropdownItem extends Component { className: PropTypes.string, /** Additional text with less emphasis. */ - description: customPropTypes.item, + description: customPropTypes.itemShorthand, /** A dropdown item can be disabled. */ disabled: PropTypes.bool, @@ -45,7 +45,7 @@ export default class DropdownItem extends Component { selected: PropTypes.bool, /** Display text. */ - text: customPropTypes.content, + text: customPropTypes.contentShorthand, /** Stored value */ value: PropTypes.oneOfType([ diff --git a/src/views/Card/Card.js b/src/views/Card/Card.js index 7d419a0639..d56ac33744 100644 --- a/src/views/Card/Card.js +++ b/src/views/Card/Card.js @@ -46,25 +46,25 @@ export default class Card extends Component { color: PropTypes.oneOf(_meta.props.color), /** Shorthand for CardDescription. */ - description: customPropTypes.item, + description: customPropTypes.itemShorthand, /** Shorthand for primary content of CardContent. */ - extra: customPropTypes.content, + extra: customPropTypes.contentShorthand, /** A Card can be formatted to take up the width of its container. */ fluid: PropTypes.bool, /** Shorthand for CardHeader. */ - header: customPropTypes.item, + header: customPropTypes.itemShorthand, /** Render as an `a` tag instead of a `div` and adds the href attribute. */ href: PropTypes.string, /** A card can contain an Image component. */ - image: customPropTypes.item, + image: customPropTypes.itemShorthand, /** Shorthand for CardMeta. */ - meta: customPropTypes.item, + meta: customPropTypes.itemShorthand, /** Render as an `a` tag instead of a `div` and called with event on Card click. */ onClick: PropTypes.func, diff --git a/src/views/Card/CardContent.js b/src/views/Card/CardContent.js index 0cc247c7b9..1825cdee70 100644 --- a/src/views/Card/CardContent.js +++ b/src/views/Card/CardContent.js @@ -56,16 +56,16 @@ CardContent.propTypes = { className: PropTypes.string, /** Shorthand for CardDescription. */ - description: customPropTypes.item, + description: customPropTypes.itemShorthand, /** A card can contain extra content meant to be formatted separately from the main content */ extra: PropTypes.bool, /** Shorthand for CardHeader. */ - header: customPropTypes.item, + header: customPropTypes.itemShorthand, /** Shorthand for CardMeta. */ - meta: customPropTypes.item, + meta: customPropTypes.itemShorthand, } export default CardContent diff --git a/src/views/Card/CardDescription.js b/src/views/Card/CardDescription.js index bb8396df95..d6023e6b72 100644 --- a/src/views/Card/CardDescription.js +++ b/src/views/Card/CardDescription.js @@ -37,7 +37,7 @@ CardDescription.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default CardDescription diff --git a/src/views/Card/CardGroup.js b/src/views/Card/CardGroup.js index 559038c6f1..b112249b78 100644 --- a/src/views/Card/CardGroup.js +++ b/src/views/Card/CardGroup.js @@ -63,7 +63,7 @@ CardGroup.propTypes = { doubling: PropTypes.bool, /** Shorthand array of props for Card. */ - items: customPropTypes.items, + items: customPropTypes.itemsShorthand, /** A group of cards can set how many cards should exist in a row */ itemsPerRow: PropTypes.oneOf(CardGroup._meta.props.itemsPerRow), diff --git a/src/views/Card/CardHeader.js b/src/views/Card/CardHeader.js index e678ee3b35..1e58f23822 100644 --- a/src/views/Card/CardHeader.js +++ b/src/views/Card/CardHeader.js @@ -37,7 +37,7 @@ CardHeader.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default CardHeader diff --git a/src/views/Card/CardMeta.js b/src/views/Card/CardMeta.js index 02e581589c..5ff35a5b73 100644 --- a/src/views/Card/CardMeta.js +++ b/src/views/Card/CardMeta.js @@ -37,7 +37,7 @@ CardMeta.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default CardMeta diff --git a/src/views/Feed/Feed.js b/src/views/Feed/Feed.js index e059600c5c..366c8ae7fd 100644 --- a/src/views/Feed/Feed.js +++ b/src/views/Feed/Feed.js @@ -66,7 +66,7 @@ Feed.propTypes = { className: PropTypes.string, /** Shorthand array of props for FeedEvent. */ - events: customPropTypes.items, + events: customPropTypes.itemsShorthand, /** A feed can have different sizes. */ size: PropTypes.oneOf(Feed._meta.props.size), diff --git a/src/views/Feed/FeedContent.js b/src/views/Feed/FeedContent.js index 0d3b782839..c7b48385ec 100644 --- a/src/views/Feed/FeedContent.js +++ b/src/views/Feed/FeedContent.js @@ -52,22 +52,22 @@ FeedContent.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** An event can contain a date. */ - date: customPropTypes.item, + date: customPropTypes.itemShorthand, /** Shorthand for FeedExtra with images. */ extraImages: FeedExtra.propTypes.images, /** Shorthand for FeedExtra with text. */ - extraText: customPropTypes.item, + extraText: customPropTypes.itemShorthand, /** Shorthand for FeedMeta. */ - meta: customPropTypes.item, + meta: customPropTypes.itemShorthand, /** Shorthand for FeedSummary. */ - summary: customPropTypes.item, + summary: customPropTypes.itemShorthand, } export default FeedContent diff --git a/src/views/Feed/FeedDate.js b/src/views/Feed/FeedDate.js index 0408a6b1e3..1ad7139c5d 100644 --- a/src/views/Feed/FeedDate.js +++ b/src/views/Feed/FeedDate.js @@ -36,7 +36,7 @@ FeedDate.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default FeedDate diff --git a/src/views/Feed/FeedEvent.js b/src/views/Feed/FeedEvent.js index a49b87afb2..22352d7163 100644 --- a/src/views/Feed/FeedEvent.js +++ b/src/views/Feed/FeedEvent.js @@ -59,10 +59,10 @@ FeedEvent.propTypes = { extraText: FeedContent.propTypes.extraText, /** An event can contain icon label. */ - icon: customPropTypes.item, + icon: customPropTypes.itemShorthand, /** An event can contain image label. */ - image: customPropTypes.item, + image: customPropTypes.itemShorthand, /** Shorthand for FeedMeta. */ meta: FeedContent.propTypes.meta, diff --git a/src/views/Feed/FeedExtra.js b/src/views/Feed/FeedExtra.js index 1a4125eb9c..bbe91a20af 100644 --- a/src/views/Feed/FeedExtra.js +++ b/src/views/Feed/FeedExtra.js @@ -57,14 +57,14 @@ FeedExtra.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** An event can contain additional information like a set of images. */ images: customPropTypes.every([ customPropTypes.disallow(['text']), PropTypes.oneOfType([ PropTypes.bool, - customPropTypes.items, + customPropTypes.itemsShorthand, ]), ]), diff --git a/src/views/Feed/FeedLabel.js b/src/views/Feed/FeedLabel.js index 3c5617fcf9..146ec6e0ab 100644 --- a/src/views/Feed/FeedLabel.js +++ b/src/views/Feed/FeedLabel.js @@ -46,13 +46,13 @@ FeedLabel.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** An event can contain icon label. */ - icon: customPropTypes.item, + icon: customPropTypes.itemShorthand, /** An event can contain image label. */ - image: customPropTypes.item, + image: customPropTypes.itemShorthand, } export default FeedLabel diff --git a/src/views/Feed/FeedLike.js b/src/views/Feed/FeedLike.js index 5ba68f9bb8..fe3644b6e1 100644 --- a/src/views/Feed/FeedLike.js +++ b/src/views/Feed/FeedLike.js @@ -48,10 +48,10 @@ FeedLike.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** Shorthand for icon. Mutually exclusive with children. */ - icon: customPropTypes.item, + icon: customPropTypes.itemShorthand, } export default FeedLike diff --git a/src/views/Feed/FeedMeta.js b/src/views/Feed/FeedMeta.js index a11a476869..68c7ae1583 100644 --- a/src/views/Feed/FeedMeta.js +++ b/src/views/Feed/FeedMeta.js @@ -45,10 +45,10 @@ FeedMeta.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** Shorthand for FeedLike. */ - like: customPropTypes.item, + like: customPropTypes.itemShorthand, } export default FeedMeta diff --git a/src/views/Feed/FeedSummary.js b/src/views/Feed/FeedSummary.js index ee79a61ad3..7004bdd4b7 100644 --- a/src/views/Feed/FeedSummary.js +++ b/src/views/Feed/FeedSummary.js @@ -47,13 +47,13 @@ FeedSummary.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** Shorthand for FeedDate. */ - date: customPropTypes.item, + date: customPropTypes.itemShorthand, /** Shorthand for FeedUser. */ - user: customPropTypes.item, + user: customPropTypes.itemShorthand, } export default FeedSummary diff --git a/src/views/Feed/FeedUser.js b/src/views/Feed/FeedUser.js index 3a6b6ab297..e6c0a54078 100644 --- a/src/views/Feed/FeedUser.js +++ b/src/views/Feed/FeedUser.js @@ -34,7 +34,7 @@ FeedUser.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } FeedUser.defaultProps = { diff --git a/src/views/Item/Item.js b/src/views/Item/Item.js index ccc0b24fe3..6f72a691f7 100644 --- a/src/views/Item/Item.js +++ b/src/views/Item/Item.js @@ -68,22 +68,22 @@ Item.propTypes = { className: PropTypes.string, /** Shorthand for ItemContent component. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** Shorthand for ItemDescription component. */ - description: customPropTypes.item, + description: customPropTypes.itemShorthand, /** Shorthand for ItemExtra component. */ - extra: customPropTypes.item, + extra: customPropTypes.itemShorthand, /** Shorthand for ItemImage component. */ - image: customPropTypes.item, + image: customPropTypes.itemShorthand, /** Shorthand for ItemHeader component. */ - header: customPropTypes.item, + header: customPropTypes.itemShorthand, /** Shorthand for ItemMeta component. */ - meta: customPropTypes.item, + meta: customPropTypes.itemShorthand, } export default Item diff --git a/src/views/Item/ItemContent.js b/src/views/Item/ItemContent.js index 38a3c53926..80dd12850f 100644 --- a/src/views/Item/ItemContent.js +++ b/src/views/Item/ItemContent.js @@ -63,19 +63,19 @@ ItemContent.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, /** Shorthand for ItemDescription component. */ - description: customPropTypes.item, + description: customPropTypes.itemShorthand, /** Shorthand for ItemExtra component. */ - extra: customPropTypes.item, + extra: customPropTypes.itemShorthand, /** Shorthand for ItemHeader component. */ - header: customPropTypes.item, + header: customPropTypes.itemShorthand, /** Shorthand for ItemMeta component. */ - meta: customPropTypes.item, + meta: customPropTypes.itemShorthand, /** Content can specify its vertical alignment */ verticalAlign: PropTypes.oneOf(ItemContent._meta.props.verticalAlign), diff --git a/src/views/Item/ItemDescription.js b/src/views/Item/ItemDescription.js index e46dd8fda6..8c1bdbec27 100644 --- a/src/views/Item/ItemDescription.js +++ b/src/views/Item/ItemDescription.js @@ -37,7 +37,7 @@ ItemDescription.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default ItemDescription diff --git a/src/views/Item/ItemExtra.js b/src/views/Item/ItemExtra.js index d718ef5ead..507a9ee161 100644 --- a/src/views/Item/ItemExtra.js +++ b/src/views/Item/ItemExtra.js @@ -37,7 +37,7 @@ ItemExtra.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default ItemExtra diff --git a/src/views/Item/ItemGroup.js b/src/views/Item/ItemGroup.js index eaa820a4ff..bf96aff077 100644 --- a/src/views/Item/ItemGroup.js +++ b/src/views/Item/ItemGroup.js @@ -65,7 +65,7 @@ ItemGroup.propTypes = { divided: PropTypes.bool, /** Shorthand array of props for Item. */ - items: customPropTypes.items, + items: customPropTypes.itemsShorthand, /** An item can be formatted so that the entire contents link to another page. */ link: PropTypes.bool, diff --git a/src/views/Item/ItemHeader.js b/src/views/Item/ItemHeader.js index 2c917b22ea..78533fa765 100644 --- a/src/views/Item/ItemHeader.js +++ b/src/views/Item/ItemHeader.js @@ -37,7 +37,7 @@ ItemHeader.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default ItemHeader diff --git a/src/views/Item/ItemMeta.js b/src/views/Item/ItemMeta.js index e1e34afd0d..a9b7f7ba42 100644 --- a/src/views/Item/ItemMeta.js +++ b/src/views/Item/ItemMeta.js @@ -37,7 +37,7 @@ ItemMeta.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - content: customPropTypes.content, + content: customPropTypes.contentShorthand, } export default ItemMeta diff --git a/src/views/Statistic/Statistic.js b/src/views/Statistic/Statistic.js index 98adee0f39..e60016f8d9 100644 --- a/src/views/Statistic/Statistic.js +++ b/src/views/Statistic/Statistic.js @@ -75,7 +75,7 @@ Statistic.propTypes = { inverted: PropTypes.bool, /** Label content of the Statistic. */ - label: customPropTypes.content, + label: customPropTypes.contentShorthand, /** A statistic can vary in size. */ size: PropTypes.oneOf(Statistic._meta.props.size), @@ -84,7 +84,7 @@ Statistic.propTypes = { text: PropTypes.bool, /** Value content of the Statistic. */ - value: customPropTypes.content, + value: customPropTypes.contentShorthand, } Statistic.Group = StatisticGroup diff --git a/src/views/Statistic/StatisticGroup.js b/src/views/Statistic/StatisticGroup.js index d7e7595557..3cd8c3df23 100644 --- a/src/views/Statistic/StatisticGroup.js +++ b/src/views/Statistic/StatisticGroup.js @@ -59,7 +59,7 @@ StatisticGroup.propTypes = { horizontal: PropTypes.bool, /** Array of props for Statistic. */ - items: customPropTypes.items, + items: customPropTypes.itemsShorthand, /** A statistic group can have its items divided evenly. */ widths: PropTypes.oneOf(StatisticGroup._meta.props.widths), diff --git a/src/views/Statistic/StatisticLabel.js b/src/views/Statistic/StatisticLabel.js index 2ffb10c880..e73a1051c0 100644 --- a/src/views/Statistic/StatisticLabel.js +++ b/src/views/Statistic/StatisticLabel.js @@ -34,7 +34,7 @@ StatisticLabel.propTypes = { className: PropTypes.string, /** Shorthand for primary content. */ - label: customPropTypes.content, + label: customPropTypes.contentShorthand, } export default StatisticLabel diff --git a/src/views/Statistic/StatisticValue.js b/src/views/Statistic/StatisticValue.js index eaed017a38..20f1f82ed1 100644 --- a/src/views/Statistic/StatisticValue.js +++ b/src/views/Statistic/StatisticValue.js @@ -38,7 +38,7 @@ StatisticValue.propTypes = { text: PropTypes.bool, /** Primary content of the StatisticValue. Mutually exclusive with the children prop. */ - value: customPropTypes.content, + value: customPropTypes.contentShorthand, } export default StatisticValue