From 6389368eef3754673df550c6a7ec06dde0aae0a3 Mon Sep 17 00:00:00 2001 From: layershifter Date: Sun, 30 Sep 2018 12:19:31 +0300 Subject: [PATCH 1/2] fix(customPropTypes): allow to pass a function to itemShorthand --- src/lib/customPropTypes.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/customPropTypes.js b/src/lib/customPropTypes.js index 403becac79..7272b03b51 100644 --- a/src/lib/customPropTypes.js +++ b/src/lib/customPropTypes.js @@ -8,7 +8,9 @@ const typeOf = (...args) => Object.prototype.toString.call(...args) * Ensure a component can render as a give prop value. */ export const as = (...args) => - PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.string, PropTypes.symbol])(...args) + PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.string, PropTypes.symbol])( + ...args, + ) /** * Ensure a prop is a valid DOM node. @@ -245,8 +247,7 @@ export const givenProps = (propsShape, validator) => (props, propName, component if (error) { // poor mans shallow pretty print, prevents JSON circular reference errors - const prettyProps = `{ ${_ - .keys(_.pick(_.keys(propsShape), props)) + const prettyProps = `{ ${_.keys(_.pick(_.keys(propsShape), props)) .map((key) => { const val = props[key] let renderedValue = val @@ -340,6 +341,7 @@ export const itemShorthand = (...args) => every([ disallow(['children']), PropTypes.oneOfType([ + PropTypes.func, PropTypes.node, PropTypes.object, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.node, PropTypes.object])), From f022fe2f84fd967da4c1077bca64ad0b611426d9 Mon Sep 17 00:00:00 2001 From: layershifter Date: Sun, 30 Sep 2018 13:17:48 +0300 Subject: [PATCH 2/2] fix(customPropTypes): allow to pass a function to itemShorthand, update typings --- index.d.ts | 2 +- src/addons/Confirm/Confirm.d.ts | 2 +- src/addons/Pagination/Pagination.d.ts | 2 +- src/collections/Breadcrumb/Breadcrumb.d.ts | 2 +- .../Breadcrumb/BreadcrumbDivider.d.ts | 2 +- .../Breadcrumb/BreadcrumbSection.d.ts | 2 +- src/collections/Form/FormButton.d.ts | 2 +- src/collections/Form/FormField.d.ts | 2 +- src/collections/Form/FormGroup.d.ts | 2 +- src/collections/Form/FormInput.d.ts | 2 +- src/collections/Grid/Grid.d.ts | 2 +- src/collections/Grid/GridColumn.d.ts | 2 +- src/collections/Grid/GridRow.d.ts | 2 +- src/collections/Menu/Menu.d.ts | 2 +- src/collections/Menu/MenuHeader.d.ts | 2 +- src/collections/Menu/MenuItem.d.ts | 2 +- src/collections/Menu/MenuMenu.d.ts | 2 +- src/collections/Message/Message.d.ts | 2 +- src/collections/Message/MessageContent.d.ts | 2 +- src/collections/Message/MessageHeader.d.ts | 2 +- src/collections/Message/MessageItem.d.ts | 2 +- src/collections/Message/MessageList.d.ts | 2 +- src/collections/Table/Table.d.ts | 2 +- src/collections/Table/TableCell.d.ts | 2 +- src/collections/Table/TableHeader.d.ts | 2 +- src/collections/Table/TableRow.d.ts | 2 +- src/elements/Button/Button.d.ts | 5 +++-- src/elements/Button/ButtonContent.d.ts | 2 +- src/elements/Button/ButtonGroup.d.ts | 2 +- src/elements/Container/Container.d.ts | 2 +- src/elements/Divider/Divider.d.ts | 2 +- src/elements/Header/Header.d.ts | 2 +- src/elements/Header/HeaderContent.d.ts | 2 +- src/elements/Header/HeaderSubheader.d.ts | 2 +- src/elements/Icon/Icon.d.ts | 2 +- src/elements/Icon/IconGroup.d.ts | 2 +- src/elements/Image/Image.d.ts | 2 +- src/elements/Image/ImageGroup.d.ts | 2 +- src/elements/Input/Input.d.ts | 2 +- src/elements/Label/Label.d.ts | 2 +- src/elements/Label/LabelDetail.d.ts | 2 +- src/elements/Label/LabelGroup.d.ts | 2 +- src/elements/List/List.d.ts | 2 +- src/elements/List/ListContent.d.ts | 2 +- src/elements/List/ListDescription.d.ts | 2 +- src/elements/List/ListHeader.d.ts | 2 +- src/elements/List/ListIcon.d.ts | 2 +- src/elements/List/ListItem.d.ts | 2 +- src/elements/List/ListList.d.ts | 2 +- src/elements/Loader/Loader.d.ts | 2 +- src/elements/Rail/Rail.d.ts | 2 +- src/elements/Reveal/Reveal.d.ts | 2 +- src/elements/Reveal/RevealContent.d.ts | 2 +- src/elements/Segment/Segment.d.ts | 2 +- src/elements/Segment/SegmentGroup.d.ts | 2 +- src/elements/Step/Step.d.ts | 2 +- src/elements/Step/StepContent.d.ts | 2 +- src/elements/Step/StepDescription.d.ts | 2 +- src/elements/Step/StepGroup.d.ts | 2 +- src/elements/Step/StepTitle.d.ts | 2 +- src/{index.d.ts => generic.d.ts} | 13 +++++++++-- src/modules/Accordion/AccordionAccordion.d.ts | 2 +- src/modules/Accordion/AccordionContent.d.ts | 2 +- src/modules/Accordion/AccordionPanel.d.ts | 2 +- src/modules/Accordion/AccordionTitle.d.ts | 2 +- src/modules/Checkbox/Checkbox.d.ts | 2 +- src/modules/Dimmer/DimmerDimmable.d.ts | 2 +- src/modules/Dimmer/DimmerInner.d.ts | 2 +- src/modules/Dropdown/DropdownHeader.d.ts | 2 +- src/modules/Dropdown/DropdownItem.d.ts | 2 +- src/modules/Dropdown/DropdownMenu.d.ts | 2 +- src/modules/Embed/Embed.d.ts | 2 +- src/modules/Modal/Modal.d.ts | 2 +- src/modules/Modal/ModalActions.d.ts | 2 +- src/modules/Modal/ModalContent.d.ts | 2 +- src/modules/Modal/ModalDescription.d.ts | 2 +- src/modules/Modal/ModalHeader.d.ts | 2 +- src/modules/Popup/Popup.d.ts | 2 +- src/modules/Popup/PopupContent.d.ts | 2 +- src/modules/Popup/PopupHeader.d.ts | 2 +- src/modules/Progress/Progress.d.ts | 2 +- src/modules/Search/Search.d.ts | 2 +- src/modules/Search/SearchCategory.d.ts | 2 +- src/modules/Search/SearchResult.d.ts | 2 +- src/modules/Search/SearchResults.d.ts | 2 +- src/modules/Sidebar/Sidebar.d.ts | 2 +- src/modules/Sidebar/SidebarPushable.d.ts | 2 +- src/modules/Sidebar/SidebarPusher.d.ts | 2 +- src/modules/Tab/Tab.d.ts | 2 +- src/modules/Tab/TabPane.d.ts | 2 +- src/modules/Transition/Transition.d.ts | 2 +- src/modules/Transition/TransitionGroup.d.ts | 2 +- src/views/Advertisement/Advertisement.d.ts | 2 +- src/views/Card/Card.d.ts | 2 +- src/views/Card/CardContent.d.ts | 2 +- src/views/Card/CardDescription.d.ts | 2 +- src/views/Card/CardGroup.d.ts | 6 ++++- src/views/Card/CardHeader.d.ts | 2 +- src/views/Card/CardMeta.d.ts | 2 +- src/views/Comment/Comment.d.ts | 2 +- src/views/Comment/CommentAction.d.ts | 2 +- src/views/Comment/CommentActions.d.ts | 2 +- src/views/Comment/CommentAuthor.d.ts | 2 +- src/views/Comment/CommentContent.d.ts | 2 +- src/views/Comment/CommentGroup.d.ts | 2 +- src/views/Comment/CommentMetadata.d.ts | 2 +- src/views/Comment/CommentText.d.ts | 2 +- src/views/Feed/Feed.d.ts | 2 +- src/views/Feed/FeedContent.d.ts | 2 +- src/views/Feed/FeedDate.d.ts | 2 +- src/views/Feed/FeedEvent.d.ts | 2 +- src/views/Feed/FeedExtra.d.ts | 6 ++++- src/views/Feed/FeedLabel.d.ts | 2 +- src/views/Feed/FeedLike.d.ts | 2 +- src/views/Feed/FeedMeta.d.ts | 2 +- src/views/Feed/FeedSummary.d.ts | 2 +- src/views/Feed/FeedUser.d.ts | 2 +- src/views/Item/Item.d.ts | 2 +- src/views/Item/ItemContent.d.ts | 6 ++++- src/views/Item/ItemDescription.d.ts | 2 +- src/views/Item/ItemExtra.d.ts | 2 +- src/views/Item/ItemGroup.d.ts | 2 +- src/views/Item/ItemHeader.d.ts | 2 +- src/views/Item/ItemMeta.d.ts | 2 +- src/views/Statistic/Statistic.d.ts | 2 +- src/views/Statistic/StatisticGroup.d.ts | 2 +- src/views/Statistic/StatisticLabel.d.ts | 2 +- src/views/Statistic/StatisticValue.d.ts | 2 +- test/typings.tsx | 22 +++++++++++++++---- tsconfig.json | 7 ++++-- 130 files changed, 175 insertions(+), 136 deletions(-) rename src/{index.d.ts => generic.d.ts} (99%) diff --git a/index.d.ts b/index.d.ts index 29f879e6c8..d734f41b91 100644 --- a/index.d.ts +++ b/index.d.ts @@ -369,7 +369,7 @@ export { } from './dist/commonjs/elements/Step/StepTitle' // Generics -export * from './dist/commonjs' +export * from './src/generic' // Modules export { diff --git a/src/addons/Confirm/Confirm.d.ts b/src/addons/Confirm/Confirm.d.ts index 7569063165..96e9812452 100644 --- a/src/addons/Confirm/Confirm.d.ts +++ b/src/addons/Confirm/Confirm.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../..' +import { SemanticShorthandItem } from '../../generic' import { ButtonProps } from '../../elements/Button' import { StrictModalProps } from '../../modules/Modal' import { ModalContentProps } from '../../modules/Modal/ModalContent' diff --git a/src/addons/Pagination/Pagination.d.ts b/src/addons/Pagination/Pagination.d.ts index 55e868c293..4d21a5474e 100644 --- a/src/addons/Pagination/Pagination.d.ts +++ b/src/addons/Pagination/Pagination.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../..' +import { SemanticShorthandItem } from '../../generic' import { default as PaginationItem, PaginationItemProps } from './PaginationItem' export interface PaginationProps extends StrictPaginationProps { diff --git a/src/collections/Breadcrumb/Breadcrumb.d.ts b/src/collections/Breadcrumb/Breadcrumb.d.ts index c434e973a0..e6164ee127 100644 --- a/src/collections/Breadcrumb/Breadcrumb.d.ts +++ b/src/collections/Breadcrumb/Breadcrumb.d.ts @@ -4,7 +4,7 @@ import { SemanticShorthandCollection, SemanticShorthandContent, SemanticShorthandItem, -} from '../..' +} from '../../generic' import { IconProps } from '../../elements/Icon' import BreadcrumbDivider from './BreadcrumbDivider' import { default as BreadcrumbSection, BreadcrumbSectionProps } from './BreadcrumbSection' diff --git a/src/collections/Breadcrumb/BreadcrumbDivider.d.ts b/src/collections/Breadcrumb/BreadcrumbDivider.d.ts index bd0fe39b3f..6c7569bfcb 100644 --- a/src/collections/Breadcrumb/BreadcrumbDivider.d.ts +++ b/src/collections/Breadcrumb/BreadcrumbDivider.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { IconProps } from '../../elements/Icon' export interface BreadcrumbDividerProps extends StrictBreadcrumbDividerProps { diff --git a/src/collections/Breadcrumb/BreadcrumbSection.d.ts b/src/collections/Breadcrumb/BreadcrumbSection.d.ts index 2de959d2f2..5e5fe3e57f 100644 --- a/src/collections/Breadcrumb/BreadcrumbSection.d.ts +++ b/src/collections/Breadcrumb/BreadcrumbSection.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface BreadcrumbSectionProps extends StrictBreadcrumbSectionProps { [key: string]: any diff --git a/src/collections/Form/FormButton.d.ts b/src/collections/Form/FormButton.d.ts index 796b2e9a93..4233790de5 100644 --- a/src/collections/Form/FormButton.d.ts +++ b/src/collections/Form/FormButton.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../..' +import { SemanticShorthandItem } from '../../generic' import { StrictButtonProps } from '../../elements/Button' import { LabelProps } from '../../elements/Label' import { StrictFormFieldProps } from './FormField' diff --git a/src/collections/Form/FormField.d.ts b/src/collections/Form/FormField.d.ts index ac79a94ee6..fce8bcd99c 100644 --- a/src/collections/Form/FormField.d.ts +++ b/src/collections/Form/FormField.d.ts @@ -4,7 +4,7 @@ import { SemanticShorthandContent, SemanticShorthandItem, SemanticWIDTHS, -} from '../..' +} from '../../generic' export interface FormFieldProps extends StrictFormFieldProps { [key: string]: any diff --git a/src/collections/Form/FormGroup.d.ts b/src/collections/Form/FormGroup.d.ts index 806f305e6a..9da27f9f70 100644 --- a/src/collections/Form/FormGroup.d.ts +++ b/src/collections/Form/FormGroup.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticWIDTHS } from '../..' +import { SemanticWIDTHS } from '../../generic' export interface FormGroupProps extends StrictFormGroupProps { [key: string]: any diff --git a/src/collections/Form/FormInput.d.ts b/src/collections/Form/FormInput.d.ts index 614d528ba7..da0cbbec8e 100644 --- a/src/collections/Form/FormInput.d.ts +++ b/src/collections/Form/FormInput.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../..' +import { SemanticShorthandItem } from '../../generic' import { LabelProps } from '../../elements/Label' import { StrictInputProps } from '../../elements/Input' import { StrictFormFieldProps } from './FormField' diff --git a/src/collections/Grid/Grid.d.ts b/src/collections/Grid/Grid.d.ts index 76ff0d1cd5..c9e166376f 100644 --- a/src/collections/Grid/Grid.d.ts +++ b/src/collections/Grid/Grid.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticTEXTALIGNMENTS, SemanticVERTICALALIGNMENTS, SemanticWIDTHS } from '../..' +import { SemanticTEXTALIGNMENTS, SemanticVERTICALALIGNMENTS, SemanticWIDTHS } from '../../generic' import GridColumn from './GridColumn' import GridRow from './GridRow' diff --git a/src/collections/Grid/GridColumn.d.ts b/src/collections/Grid/GridColumn.d.ts index 76bfccaf07..2d074b0e80 100644 --- a/src/collections/Grid/GridColumn.d.ts +++ b/src/collections/Grid/GridColumn.d.ts @@ -5,7 +5,7 @@ import { SemanticTEXTALIGNMENTS, SemanticVERTICALALIGNMENTS, SemanticWIDTHS, -} from '../..' +} from '../../generic' export type GridOnlyProp = | string diff --git a/src/collections/Grid/GridRow.d.ts b/src/collections/Grid/GridRow.d.ts index f762d6b86a..820c715f3c 100644 --- a/src/collections/Grid/GridRow.d.ts +++ b/src/collections/Grid/GridRow.d.ts @@ -5,7 +5,7 @@ import { SemanticTEXTALIGNMENTS, SemanticVERTICALALIGNMENTS, SemanticWIDTHS, -} from '../..' +} from '../../generic' import { GridReversedProp } from './Grid' import { GridOnlyProp } from './GridColumn' diff --git a/src/collections/Menu/Menu.d.ts b/src/collections/Menu/Menu.d.ts index 8a32619875..91fa59928e 100644 --- a/src/collections/Menu/Menu.d.ts +++ b/src/collections/Menu/Menu.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticCOLORS, SemanticShorthandCollection, SemanticWIDTHS } from '../..' +import { SemanticCOLORS, SemanticShorthandCollection, SemanticWIDTHS } from '../../generic' import MenuHeader from './MenuHeader' import { default as MenuItem, MenuItemProps } from './MenuItem' import MenuMenu from './MenuMenu' diff --git a/src/collections/Menu/MenuHeader.d.ts b/src/collections/Menu/MenuHeader.d.ts index a158b74292..183e7b84ea 100644 --- a/src/collections/Menu/MenuHeader.d.ts +++ b/src/collections/Menu/MenuHeader.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface MenuHeaderProps extends StrictMenuHeaderProps { [key: string]: any diff --git a/src/collections/Menu/MenuItem.d.ts b/src/collections/Menu/MenuItem.d.ts index 3accd279f0..3dcd252987 100644 --- a/src/collections/Menu/MenuItem.d.ts +++ b/src/collections/Menu/MenuItem.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticCOLORS, SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticCOLORS, SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { IconProps } from '../../elements/Icon' export interface MenuItemProps extends StrictMenuItemProps { diff --git a/src/collections/Menu/MenuMenu.d.ts b/src/collections/Menu/MenuMenu.d.ts index b1cb162a01..c53d76d40d 100644 --- a/src/collections/Menu/MenuMenu.d.ts +++ b/src/collections/Menu/MenuMenu.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface MenuMenuProps extends StrictMenuMenuProps { [key: string]: any diff --git a/src/collections/Message/Message.d.ts b/src/collections/Message/Message.d.ts index ff775bd1f8..ee919724b3 100644 --- a/src/collections/Message/Message.d.ts +++ b/src/collections/Message/Message.d.ts @@ -5,7 +5,7 @@ import { SemanticShorthandCollection, SemanticShorthandContent, SemanticShorthandItem, -} from '../..' +} from '../../generic' import MessageContent from './MessageContent' import { default as MessageHeader, MessageHeaderProps } from './MessageHeader' import { default as MessageItem, MessageItemProps } from './MessageItem' diff --git a/src/collections/Message/MessageContent.d.ts b/src/collections/Message/MessageContent.d.ts index 11b7677081..627e94e107 100644 --- a/src/collections/Message/MessageContent.d.ts +++ b/src/collections/Message/MessageContent.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface MessageContentProps extends StrictMessageContentProps { [key: string]: any diff --git a/src/collections/Message/MessageHeader.d.ts b/src/collections/Message/MessageHeader.d.ts index 70b7181295..c6af3b97f6 100644 --- a/src/collections/Message/MessageHeader.d.ts +++ b/src/collections/Message/MessageHeader.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface MessageHeaderProps extends StrictMessageHeaderProps { [key: string]: any diff --git a/src/collections/Message/MessageItem.d.ts b/src/collections/Message/MessageItem.d.ts index 54b74ea2ed..c38a0a1e74 100644 --- a/src/collections/Message/MessageItem.d.ts +++ b/src/collections/Message/MessageItem.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface MessageItemProps extends StrictMessageItemProps { [key: string]: any diff --git a/src/collections/Message/MessageList.d.ts b/src/collections/Message/MessageList.d.ts index 9ea5c63a09..c6b7edc2fd 100644 --- a/src/collections/Message/MessageList.d.ts +++ b/src/collections/Message/MessageList.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandCollection } from '../..' +import { SemanticShorthandCollection } from '../../generic' import { MessageItemProps } from './MessageItem' export interface MessageListProps extends StrictMessageListProps { diff --git a/src/collections/Table/Table.d.ts b/src/collections/Table/Table.d.ts index d2dc302df1..fd74ea5d75 100644 --- a/src/collections/Table/Table.d.ts +++ b/src/collections/Table/Table.d.ts @@ -5,7 +5,7 @@ import { SemanticShorthandItem, SemanticVERTICALALIGNMENTS, SemanticWIDTHS, -} from '../..' +} from '../../generic' import TableBody from './TableBody' import TableCell from './TableCell' import TableFooter from './TableFooter' diff --git a/src/collections/Table/TableCell.d.ts b/src/collections/Table/TableCell.d.ts index 06a67035f9..ab085781ef 100644 --- a/src/collections/Table/TableCell.d.ts +++ b/src/collections/Table/TableCell.d.ts @@ -5,7 +5,7 @@ import { SemanticShorthandItem, SemanticVERTICALALIGNMENTS, SemanticWIDTHS, -} from '../..' +} from '../../generic' import { IconProps } from '../../elements/Icon' export interface TableCellProps extends StrictTableCellProps { diff --git a/src/collections/Table/TableHeader.d.ts b/src/collections/Table/TableHeader.d.ts index 0fcfdfe78e..66c314a680 100644 --- a/src/collections/Table/TableHeader.d.ts +++ b/src/collections/Table/TableHeader.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface TableHeaderProps extends StrictTableHeaderProps { [key: string]: any diff --git a/src/collections/Table/TableRow.d.ts b/src/collections/Table/TableRow.d.ts index 9dcf5661c4..19f4b8f4cb 100644 --- a/src/collections/Table/TableRow.d.ts +++ b/src/collections/Table/TableRow.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandCollection, SemanticVERTICALALIGNMENTS } from '../..' +import { SemanticShorthandCollection, SemanticVERTICALALIGNMENTS } from '../../generic' import { TableCellProps } from './TableCell' export interface TableRowProps extends StrictTableRowProps { diff --git a/src/elements/Button/Button.d.ts b/src/elements/Button/Button.d.ts index d630bda033..a0dedcf973 100644 --- a/src/elements/Button/Button.d.ts +++ b/src/elements/Button/Button.d.ts @@ -6,7 +6,8 @@ import { SemanticShorthandContent, SemanticShorthandItem, SemanticSIZES, -} from '../..' +} from '../../generic' +import { IconProps } from '../Icon' import { LabelProps } from '../Label' import ButtonContent from './ButtonContent' import ButtonGroup from './ButtonGroup' @@ -68,7 +69,7 @@ export interface StrictButtonProps { fluid?: boolean /** Add an Icon by name, props object, or pass an . */ - icon?: any + icon?: boolean | SemanticShorthandItem /** A button can be formatted to appear on dark backgrounds. */ inverted?: boolean diff --git a/src/elements/Button/ButtonContent.d.ts b/src/elements/Button/ButtonContent.d.ts index 144a187bd8..e9999c9c4e 100644 --- a/src/elements/Button/ButtonContent.d.ts +++ b/src/elements/Button/ButtonContent.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ButtonContentProps extends StrictButtonContentProps { [key: string]: any diff --git a/src/elements/Button/ButtonGroup.d.ts b/src/elements/Button/ButtonGroup.d.ts index bc9cb10432..f8950cabca 100644 --- a/src/elements/Button/ButtonGroup.d.ts +++ b/src/elements/Button/ButtonGroup.d.ts @@ -7,7 +7,7 @@ import { SemanticShorthandCollection, SemanticSIZES, SemanticWIDTHS, -} from '../..' +} from '../../generic' import { ButtonProps } from './Button' export interface ButtonGroupProps extends StrictButtonGroupProps { diff --git a/src/elements/Container/Container.d.ts b/src/elements/Container/Container.d.ts index 74917e5a4b..676918cab3 100644 --- a/src/elements/Container/Container.d.ts +++ b/src/elements/Container/Container.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticTEXTALIGNMENTS } from '../..' +import { SemanticShorthandContent, SemanticTEXTALIGNMENTS } from '../../generic' export interface ContainerProps extends StrictContainerProps { [key: string]: any diff --git a/src/elements/Divider/Divider.d.ts b/src/elements/Divider/Divider.d.ts index 205a7a01d8..01995a2e58 100644 --- a/src/elements/Divider/Divider.d.ts +++ b/src/elements/Divider/Divider.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface DividerProps extends StrictDividerProps { [key: string]: any diff --git a/src/elements/Header/Header.d.ts b/src/elements/Header/Header.d.ts index a75746a864..917a4a6de9 100644 --- a/src/elements/Header/Header.d.ts +++ b/src/elements/Header/Header.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticCOLORS, SemanticFLOATS, SemanticTEXTALIGNMENTS } from '../..' +import { SemanticCOLORS, SemanticFLOATS, SemanticTEXTALIGNMENTS } from '../../generic' import HeaderContent from './HeaderContent' import HeaderSubHeader from './HeaderSubheader' diff --git a/src/elements/Header/HeaderContent.d.ts b/src/elements/Header/HeaderContent.d.ts index 9c37e3743c..b101213d85 100644 --- a/src/elements/Header/HeaderContent.d.ts +++ b/src/elements/Header/HeaderContent.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface HeaderContentProps extends StrictHeaderContentProps { [key: string]: any diff --git a/src/elements/Header/HeaderSubheader.d.ts b/src/elements/Header/HeaderSubheader.d.ts index f21fd04c4f..d9cb9c283c 100644 --- a/src/elements/Header/HeaderSubheader.d.ts +++ b/src/elements/Header/HeaderSubheader.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface HeaderSubheaderProps extends StrictHeaderSubheaderProps { [key: string]: any diff --git a/src/elements/Icon/Icon.d.ts b/src/elements/Icon/Icon.d.ts index f812e0ded3..487f4c90ed 100644 --- a/src/elements/Icon/Icon.d.ts +++ b/src/elements/Icon/Icon.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticCOLORS, SemanticICONS } from '../..' +import { SemanticCOLORS, SemanticICONS } from '../../generic' import IconGroup from './IconGroup' export type IconSizeProp = 'mini' | 'tiny' | 'small' | 'large' | 'big' | 'huge' | 'massive' diff --git a/src/elements/Icon/IconGroup.d.ts b/src/elements/Icon/IconGroup.d.ts index 1f25e6f65d..7b0c66e01f 100644 --- a/src/elements/Icon/IconGroup.d.ts +++ b/src/elements/Icon/IconGroup.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' import { IconSizeProp } from './Icon' export interface IconGroupProps extends StrictIconGroupProps { diff --git a/src/elements/Image/Image.d.ts b/src/elements/Image/Image.d.ts index 855454bfa4..a22b90afe3 100644 --- a/src/elements/Image/Image.d.ts +++ b/src/elements/Image/Image.d.ts @@ -7,7 +7,7 @@ import { SemanticSIZES, SemanticVERTICALALIGNMENTS, SemanticWIDTHS, -} from '../..' +} from '../../generic' import { DimmerProps } from '../../modules/Dimmer' import { LabelProps } from '../Label' import ImageGroup from './ImageGroup' diff --git a/src/elements/Image/ImageGroup.d.ts b/src/elements/Image/ImageGroup.d.ts index a75a569470..eeb058141d 100644 --- a/src/elements/Image/ImageGroup.d.ts +++ b/src/elements/Image/ImageGroup.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticSIZES, SemanticShorthandContent } from '../..' +import { SemanticSIZES, SemanticShorthandContent } from '../../generic' export interface ImageGroupProps extends StrictImageGroupProps { [key: string]: any diff --git a/src/elements/Input/Input.d.ts b/src/elements/Input/Input.d.ts index cef2f66c1b..c387aa88d6 100644 --- a/src/elements/Input/Input.d.ts +++ b/src/elements/Input/Input.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { HtmlInputrops, SemanticShorthandItem, SemanticSIZES } from '../..' +import { HtmlInputrops, SemanticShorthandItem, SemanticSIZES } from '../../generic' import { LabelProps } from '../Label' export interface InputProps extends StrictInputProps { diff --git a/src/elements/Label/Label.d.ts b/src/elements/Label/Label.d.ts index 6a60e18772..7aeb0a035d 100644 --- a/src/elements/Label/Label.d.ts +++ b/src/elements/Label/Label.d.ts @@ -5,7 +5,7 @@ import { SemanticShorthandContent, SemanticShorthandItem, SemanticSIZES, -} from '../..' +} from '../../generic' import { IconProps } from '../Icon' import { default as LabelDetail, LabelDetailProps } from './LabelDetail' import LabelGroup from './LabelGroup' diff --git a/src/elements/Label/LabelDetail.d.ts b/src/elements/Label/LabelDetail.d.ts index b2c55da851..f290108ef0 100644 --- a/src/elements/Label/LabelDetail.d.ts +++ b/src/elements/Label/LabelDetail.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface LabelDetailProps extends StrictLabelDetailProps { [key: string]: any diff --git a/src/elements/Label/LabelGroup.d.ts b/src/elements/Label/LabelGroup.d.ts index 26b62cadd5..4f31acf456 100644 --- a/src/elements/Label/LabelGroup.d.ts +++ b/src/elements/Label/LabelGroup.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticCOLORS, SemanticShorthandContent, SemanticSIZES } from '../..' +import { SemanticCOLORS, SemanticShorthandContent, SemanticSIZES } from '../../generic' export interface LabelGroupProps extends StrictLabelGroupProps { [key: string]: any diff --git a/src/elements/List/List.d.ts b/src/elements/List/List.d.ts index 255cac3b05..986e1b41d7 100644 --- a/src/elements/List/List.d.ts +++ b/src/elements/List/List.d.ts @@ -6,7 +6,7 @@ import { SemanticShorthandContent, SemanticSIZES, SemanticVERTICALALIGNMENTS, -} from '../..' +} from '../../generic' import ListContent from './ListContent' import ListDescription from './ListDescription' import ListHeader from './ListHeader' diff --git a/src/elements/List/ListContent.d.ts b/src/elements/List/ListContent.d.ts index 1d5acb1f5f..db69e63109 100644 --- a/src/elements/List/ListContent.d.ts +++ b/src/elements/List/ListContent.d.ts @@ -5,7 +5,7 @@ import { SemanticShorthandContent, SemanticShorthandItem, SemanticVERTICALALIGNMENTS, -} from '../..' +} from '../../generic' import { ListDescriptionProps } from './ListDescription' import { ListHeaderProps } from './ListHeader' diff --git a/src/elements/List/ListDescription.d.ts b/src/elements/List/ListDescription.d.ts index dc377f0bc7..d3c8b91d5e 100644 --- a/src/elements/List/ListDescription.d.ts +++ b/src/elements/List/ListDescription.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ListDescriptionProps extends StrictListDescriptionProps { [key: string]: any diff --git a/src/elements/List/ListHeader.d.ts b/src/elements/List/ListHeader.d.ts index 57184e1545..aa9b98b94d 100644 --- a/src/elements/List/ListHeader.d.ts +++ b/src/elements/List/ListHeader.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ListHeaderProps extends StrictListHeaderProps { [key: string]: any diff --git a/src/elements/List/ListIcon.d.ts b/src/elements/List/ListIcon.d.ts index bcee4e2de2..88c127fe1e 100644 --- a/src/elements/List/ListIcon.d.ts +++ b/src/elements/List/ListIcon.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticVERTICALALIGNMENTS } from '../..' +import { SemanticVERTICALALIGNMENTS } from '../../generic' import { StrictIconProps } from '../Icon' export interface ListIconProps extends StrictListIconProps { diff --git a/src/elements/List/ListItem.d.ts b/src/elements/List/ListItem.d.ts index a222351c61..f408f3783a 100644 --- a/src/elements/List/ListItem.d.ts +++ b/src/elements/List/ListItem.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../..' +import { SemanticShorthandItem } from '../../generic' import { ImageProps } from '../Image' import { ListContentProps } from './ListContent' import { ListDescriptionProps } from './ListDescription' diff --git a/src/elements/List/ListList.d.ts b/src/elements/List/ListList.d.ts index 1f11308851..6bfae39a17 100644 --- a/src/elements/List/ListList.d.ts +++ b/src/elements/List/ListList.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ListListProps extends StrictListListProps { [key: string]: any diff --git a/src/elements/Loader/Loader.d.ts b/src/elements/Loader/Loader.d.ts index 8868a39c57..221632ef19 100644 --- a/src/elements/Loader/Loader.d.ts +++ b/src/elements/Loader/Loader.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticSIZES } from '../..' +import { SemanticShorthandContent, SemanticSIZES } from '../../generic' export interface LoaderProps extends StrictLoaderProps { [key: string]: any diff --git a/src/elements/Rail/Rail.d.ts b/src/elements/Rail/Rail.d.ts index e1e2d95f0b..d8f1e04063 100644 --- a/src/elements/Rail/Rail.d.ts +++ b/src/elements/Rail/Rail.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticFLOATS, SemanticShorthandContent } from '../..' +import { SemanticFLOATS, SemanticShorthandContent } from '../../generic' export interface RailProps extends StrictRailProps { [key: string]: any diff --git a/src/elements/Reveal/Reveal.d.ts b/src/elements/Reveal/Reveal.d.ts index 296af0aa15..9933a98c92 100644 --- a/src/elements/Reveal/Reveal.d.ts +++ b/src/elements/Reveal/Reveal.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' import RevealContent from './RevealContent' export interface RevealProps extends StrictRevealProps { diff --git a/src/elements/Reveal/RevealContent.d.ts b/src/elements/Reveal/RevealContent.d.ts index 4303d0083d..fae5b6234a 100644 --- a/src/elements/Reveal/RevealContent.d.ts +++ b/src/elements/Reveal/RevealContent.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface RevealContentProps extends StrictRevealContentProps { [key: string]: any diff --git a/src/elements/Segment/Segment.d.ts b/src/elements/Segment/Segment.d.ts index c6af3a9556..bebf952f84 100644 --- a/src/elements/Segment/Segment.d.ts +++ b/src/elements/Segment/Segment.d.ts @@ -5,7 +5,7 @@ import { SemanticFLOATS, SemanticShorthandContent, SemanticTEXTALIGNMENTS, -} from '../..' +} from '../../generic' import SegmentGroup from './SegmentGroup' export type SegmentSizeProp = 'mini' | 'tiny' | 'small' | 'large' | 'big' | 'huge' | 'massive' diff --git a/src/elements/Segment/SegmentGroup.d.ts b/src/elements/Segment/SegmentGroup.d.ts index bdde560abf..718cf1c933 100644 --- a/src/elements/Segment/SegmentGroup.d.ts +++ b/src/elements/Segment/SegmentGroup.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' import { SegmentSizeProp } from './Segment' export interface SegmentGroupProps extends StrictSegmentGroupProps { diff --git a/src/elements/Step/Step.d.ts b/src/elements/Step/Step.d.ts index d60d390890..5c57ec56be 100644 --- a/src/elements/Step/Step.d.ts +++ b/src/elements/Step/Step.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { IconProps } from '../Icon' import StepContent from './StepContent' import { default as StepDescription, StepDescriptionProps } from './StepDescription' diff --git a/src/elements/Step/StepContent.d.ts b/src/elements/Step/StepContent.d.ts index 5952fdfcd2..a275468ed4 100644 --- a/src/elements/Step/StepContent.d.ts +++ b/src/elements/Step/StepContent.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem, SemanticShorthandContent } from '../..' +import { SemanticShorthandItem, SemanticShorthandContent } from '../../generic' import { StepDescriptionProps } from './StepDescription' import { StepTitleProps } from './StepTitle' diff --git a/src/elements/Step/StepDescription.d.ts b/src/elements/Step/StepDescription.d.ts index c8d2a9bea1..5b60ca1624 100644 --- a/src/elements/Step/StepDescription.d.ts +++ b/src/elements/Step/StepDescription.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface StepDescriptionProps extends StrictStepDescriptionProps { [key: string]: any diff --git a/src/elements/Step/StepGroup.d.ts b/src/elements/Step/StepGroup.d.ts index f653b2ca82..9984be7005 100644 --- a/src/elements/Step/StepGroup.d.ts +++ b/src/elements/Step/StepGroup.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandCollection, SemanticShorthandContent, SemanticWIDTHS } from '../..' +import { SemanticShorthandCollection, SemanticShorthandContent } from '../../generic' import { StepProps } from './Step' export interface StepGroupProps extends StrictStepGroupProps { diff --git a/src/elements/Step/StepTitle.d.ts b/src/elements/Step/StepTitle.d.ts index 85b2f6ccc7..81a7911573 100644 --- a/src/elements/Step/StepTitle.d.ts +++ b/src/elements/Step/StepTitle.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface StepTitleProps extends StrictStepTitleProps { [key: string]: any diff --git a/src/index.d.ts b/src/generic.d.ts similarity index 99% rename from src/index.d.ts rename to src/generic.d.ts index f185d513e9..f7173155d9 100644 --- a/src/index.d.ts +++ b/src/generic.d.ts @@ -56,9 +56,18 @@ export interface StrictHtmlSpanProps { // Types // ====================================================== -export type SemanticShorthandCollection = SemanticShorthandItem[] +export type SemanticShorthandItemFunc = ( + component: React.ComponentType, + props: TProps, + children?: React.ReactChildren, +) => React.ReactElement | null + +export type SemanticShorthandCollection = SemanticShorthandItem[] export type SemanticShorthandContent = React.ReactNode -export type SemanticShorthandItem = React.ReactNode | T +export type SemanticShorthandItem = + | React.ReactNode + | TProps + | SemanticShorthandItemFunc // ====================================================== // Styling diff --git a/src/modules/Accordion/AccordionAccordion.d.ts b/src/modules/Accordion/AccordionAccordion.d.ts index f773ff304a..766dbfdda4 100644 --- a/src/modules/Accordion/AccordionAccordion.d.ts +++ b/src/modules/Accordion/AccordionAccordion.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandCollection, SemanticShorthandItem } from '../../' +import { SemanticShorthandCollection } from '../../generic' import { AccordionPanelProps } from './AccordionPanel' import { AccordionTitleProps } from './AccordionTitle' diff --git a/src/modules/Accordion/AccordionContent.d.ts b/src/modules/Accordion/AccordionContent.d.ts index c7ad084ff8..04de6c9c1f 100644 --- a/src/modules/Accordion/AccordionContent.d.ts +++ b/src/modules/Accordion/AccordionContent.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface AccordionContentProps extends StrictAccordionContentProps { [key: string]: any diff --git a/src/modules/Accordion/AccordionPanel.d.ts b/src/modules/Accordion/AccordionPanel.d.ts index 8a1f55344b..0e81975f33 100644 --- a/src/modules/Accordion/AccordionPanel.d.ts +++ b/src/modules/Accordion/AccordionPanel.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../../' +import { SemanticShorthandItem } from '../../generic' import { AccordionContentProps } from './AccordionContent' import { AccordionTitleProps } from './AccordionTitle' diff --git a/src/modules/Accordion/AccordionTitle.d.ts b/src/modules/Accordion/AccordionTitle.d.ts index 96ba084ddf..b7aff437b0 100644 --- a/src/modules/Accordion/AccordionTitle.d.ts +++ b/src/modules/Accordion/AccordionTitle.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface AccordionTitleProps extends StrictAccordionTitleProps { [key: string]: any diff --git a/src/modules/Checkbox/Checkbox.d.ts b/src/modules/Checkbox/Checkbox.d.ts index 4362c809b2..5a2305faf7 100644 --- a/src/modules/Checkbox/Checkbox.d.ts +++ b/src/modules/Checkbox/Checkbox.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { HtmlLabelProps, SemanticShorthandItem } from '../..' +import { HtmlLabelProps, SemanticShorthandItem } from '../../generic' export interface CheckboxProps extends StrictCheckboxProps { [key: string]: any diff --git a/src/modules/Dimmer/DimmerDimmable.d.ts b/src/modules/Dimmer/DimmerDimmable.d.ts index d326badddc..3f12e19471 100644 --- a/src/modules/Dimmer/DimmerDimmable.d.ts +++ b/src/modules/Dimmer/DimmerDimmable.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface DimmerDimmableProps extends StrictDimmerDimmableProps { [key: string]: any diff --git a/src/modules/Dimmer/DimmerInner.d.ts b/src/modules/Dimmer/DimmerInner.d.ts index f77aadd721..a9ccf29e3a 100644 --- a/src/modules/Dimmer/DimmerInner.d.ts +++ b/src/modules/Dimmer/DimmerInner.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface DimmerInnerProps extends StrictDimmerInnerProps { [key: string]: any diff --git a/src/modules/Dropdown/DropdownHeader.d.ts b/src/modules/Dropdown/DropdownHeader.d.ts index 1d486317c9..10a4a8e6aa 100644 --- a/src/modules/Dropdown/DropdownHeader.d.ts +++ b/src/modules/Dropdown/DropdownHeader.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { IconProps } from '../../elements/Icon' export interface DropdownHeaderProps extends StrictDropdownHeaderProps { diff --git a/src/modules/Dropdown/DropdownItem.d.ts b/src/modules/Dropdown/DropdownItem.d.ts index 15cd6be986..11609fbf44 100644 --- a/src/modules/Dropdown/DropdownItem.d.ts +++ b/src/modules/Dropdown/DropdownItem.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { HtmlSpanProps, SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { HtmlSpanProps, SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { FlagProps } from '../../elements/Flag' import { IconProps } from '../../elements/Icon' import { ImageProps } from '../../elements/Image' diff --git a/src/modules/Dropdown/DropdownMenu.d.ts b/src/modules/Dropdown/DropdownMenu.d.ts index 8749d7582b..e4f68001b0 100644 --- a/src/modules/Dropdown/DropdownMenu.d.ts +++ b/src/modules/Dropdown/DropdownMenu.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface DropdownMenuProps extends StrictDropdownMenuProps { [key: string]: any diff --git a/src/modules/Embed/Embed.d.ts b/src/modules/Embed/Embed.d.ts index 34710a1586..7d96c4f698 100644 --- a/src/modules/Embed/Embed.d.ts +++ b/src/modules/Embed/Embed.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { HtmlIframeProps, SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { HtmlIframeProps, SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { IconProps } from '../../elements/Icon' export interface EmbedProps extends StrictEmbedProps { diff --git a/src/modules/Modal/Modal.d.ts b/src/modules/Modal/Modal.d.ts index f7799be52b..1153d9d2a6 100644 --- a/src/modules/Modal/Modal.d.ts +++ b/src/modules/Modal/Modal.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../..' +import { SemanticShorthandItem } from '../../generic' import { StrictPortalProps } from '../../addons/Portal' import { default as ModalActions, ModalActionsProps } from './ModalActions' import { default as ModalContent, ModalContentProps } from './ModalContent' diff --git a/src/modules/Modal/ModalActions.d.ts b/src/modules/Modal/ModalActions.d.ts index 0fba672261..ed051e53c0 100644 --- a/src/modules/Modal/ModalActions.d.ts +++ b/src/modules/Modal/ModalActions.d.ts @@ -1,7 +1,7 @@ import * as React from 'react' import { ButtonProps } from '../../elements/Button' -import { SemanticShorthandCollection, SemanticShorthandContent } from '../..' +import { SemanticShorthandCollection, SemanticShorthandContent } from '../../generic' export interface ModalActionsProps extends StrictModalActionsProps { [key: string]: any diff --git a/src/modules/Modal/ModalContent.d.ts b/src/modules/Modal/ModalContent.d.ts index 8eb70a249f..4028680564 100644 --- a/src/modules/Modal/ModalContent.d.ts +++ b/src/modules/Modal/ModalContent.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ModalContentProps extends StrictModalContentProps { [key: string]: any diff --git a/src/modules/Modal/ModalDescription.d.ts b/src/modules/Modal/ModalDescription.d.ts index e320bd5697..e4c0e1b938 100644 --- a/src/modules/Modal/ModalDescription.d.ts +++ b/src/modules/Modal/ModalDescription.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ModalDescriptionProps extends StrictModalDescriptionProps { [key: string]: any diff --git a/src/modules/Modal/ModalHeader.d.ts b/src/modules/Modal/ModalHeader.d.ts index 52be2957eb..89c3d5ef61 100644 --- a/src/modules/Modal/ModalHeader.d.ts +++ b/src/modules/Modal/ModalHeader.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ModalHeaderProps extends StrictModalHeaderProps { [key: string]: any diff --git a/src/modules/Popup/Popup.d.ts b/src/modules/Popup/Popup.d.ts index a50b8a4663..0817e25c37 100644 --- a/src/modules/Popup/Popup.d.ts +++ b/src/modules/Popup/Popup.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../..' +import { SemanticShorthandItem } from '../../generic' import { StrictPortalProps } from '../../addons/Portal' import { default as PopupContent, PopupContentProps } from './PopupContent' import { default as PopupHeader, PopupHeaderProps } from './PopupHeader' diff --git a/src/modules/Popup/PopupContent.d.ts b/src/modules/Popup/PopupContent.d.ts index 1efb1dc06b..4298111f7e 100644 --- a/src/modules/Popup/PopupContent.d.ts +++ b/src/modules/Popup/PopupContent.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface PopupContentProps extends StrictPopupContentProps { [key: string]: any diff --git a/src/modules/Popup/PopupHeader.d.ts b/src/modules/Popup/PopupHeader.d.ts index 0c2b453bd8..1d7d91ffe1 100644 --- a/src/modules/Popup/PopupHeader.d.ts +++ b/src/modules/Popup/PopupHeader.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface PopupHeaderProps extends StrictPopupHeaderProps { [key: string]: any diff --git a/src/modules/Progress/Progress.d.ts b/src/modules/Progress/Progress.d.ts index 287c75c1d8..dcb10459b6 100644 --- a/src/modules/Progress/Progress.d.ts +++ b/src/modules/Progress/Progress.d.ts @@ -4,7 +4,7 @@ import { SemanticCOLORS, SemanticShorthandContent, SemanticShorthandItem, -} from '../..' +} from '../../generic' export interface ProgressProps extends StrictProgressProps { [key: string]: any diff --git a/src/modules/Search/Search.d.ts b/src/modules/Search/Search.d.ts index 09259615e8..b955d49879 100644 --- a/src/modules/Search/Search.d.ts +++ b/src/modules/Search/Search.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../..' +import { SemanticShorthandItem } from '../../generic' import { InputProps } from '../../elements/Input' import { default as SearchCategory, SearchCategoryProps } from './SearchCategory' import { default as SearchResult, SearchResultProps } from './SearchResult' diff --git a/src/modules/Search/SearchCategory.d.ts b/src/modules/Search/SearchCategory.d.ts index 45b962ab27..4fb80873af 100644 --- a/src/modules/Search/SearchCategory.d.ts +++ b/src/modules/Search/SearchCategory.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' import SearchResult from './SearchResult' export interface SearchCategoryProps extends StrictSearchCategoryProps { diff --git a/src/modules/Search/SearchResult.d.ts b/src/modules/Search/SearchResult.d.ts index 252c6788d0..99efdf3785 100644 --- a/src/modules/Search/SearchResult.d.ts +++ b/src/modules/Search/SearchResult.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface SearchResultProps extends StrictSearchResultProps { [key: string]: any diff --git a/src/modules/Search/SearchResults.d.ts b/src/modules/Search/SearchResults.d.ts index 26a0eef962..33b6cd7564 100644 --- a/src/modules/Search/SearchResults.d.ts +++ b/src/modules/Search/SearchResults.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface SearchResultsProps extends StrictSearchResultsProps { [key: string]: any diff --git a/src/modules/Sidebar/Sidebar.d.ts b/src/modules/Sidebar/Sidebar.d.ts index fd39355d77..63c0d779c7 100644 --- a/src/modules/Sidebar/Sidebar.d.ts +++ b/src/modules/Sidebar/Sidebar.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' import SidebarPushable from './SidebarPushable' import SidebarPusher from './SidebarPusher' diff --git a/src/modules/Sidebar/SidebarPushable.d.ts b/src/modules/Sidebar/SidebarPushable.d.ts index d862fab8e5..bd7fedfa99 100644 --- a/src/modules/Sidebar/SidebarPushable.d.ts +++ b/src/modules/Sidebar/SidebarPushable.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface SidebarPushableProps extends StrictSidebarPushableProps { [key: string]: any diff --git a/src/modules/Sidebar/SidebarPusher.d.ts b/src/modules/Sidebar/SidebarPusher.d.ts index 30491bfa19..306be4bde6 100644 --- a/src/modules/Sidebar/SidebarPusher.d.ts +++ b/src/modules/Sidebar/SidebarPusher.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface SidebarPusherProps extends StrictSidebarPusherProps { [key: string]: any diff --git a/src/modules/Tab/Tab.d.ts b/src/modules/Tab/Tab.d.ts index 9bf17aca4d..8e85cb5173 100644 --- a/src/modules/Tab/Tab.d.ts +++ b/src/modules/Tab/Tab.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../..' +import { SemanticShorthandItem } from '../../generic' import { default as TabPane, TabPaneProps } from './TabPane' export interface TabProps extends StrictTabProps { diff --git a/src/modules/Tab/TabPane.d.ts b/src/modules/Tab/TabPane.d.ts index acc44a1c17..7115c8e165 100644 --- a/src/modules/Tab/TabPane.d.ts +++ b/src/modules/Tab/TabPane.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface TabPaneProps extends StrictTabPaneProps { [key: string]: any diff --git a/src/modules/Transition/Transition.d.ts b/src/modules/Transition/Transition.d.ts index c67d800fe1..0fc6db273c 100644 --- a/src/modules/Transition/Transition.d.ts +++ b/src/modules/Transition/Transition.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticTRANSITIONS } from '../../' +import { SemanticTRANSITIONS } from '../../generic' import TransitionGroup from './TransitionGroup' export type TRANSITION_STATUSES = 'ENTERED' | 'ENTERING' | 'EXITED' | 'EXITING' | 'UNMOUNTED' diff --git a/src/modules/Transition/TransitionGroup.d.ts b/src/modules/Transition/TransitionGroup.d.ts index 0dfaa8fffa..edf817765b 100644 --- a/src/modules/Transition/TransitionGroup.d.ts +++ b/src/modules/Transition/TransitionGroup.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticTRANSITIONS } from '../../' +import { SemanticTRANSITIONS } from '../../generic' import { TransitionPropDuration } from './Transition' export interface TransitionGroupProps extends StrictTransitionGroupProps { diff --git a/src/views/Advertisement/Advertisement.d.ts b/src/views/Advertisement/Advertisement.d.ts index 87b12201b8..cb7c315200 100644 --- a/src/views/Advertisement/Advertisement.d.ts +++ b/src/views/Advertisement/Advertisement.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface AdvertisementProps extends StrictAdvertisementProps { [key: string]: any diff --git a/src/views/Card/Card.d.ts b/src/views/Card/Card.d.ts index 9415c8dacf..3153695e7c 100644 --- a/src/views/Card/Card.d.ts +++ b/src/views/Card/Card.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticCOLORS, SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticCOLORS, SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { ImageProps } from '../../elements/Image' import CardContent from './CardContent' import { default as CardDescription, CardDescriptionProps } from './CardDescription' diff --git a/src/views/Card/CardContent.d.ts b/src/views/Card/CardContent.d.ts index 9932025938..fe62e09cd6 100644 --- a/src/views/Card/CardContent.d.ts +++ b/src/views/Card/CardContent.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { CardDescriptionProps } from './CardDescription' import { CardHeaderProps } from './CardHeader' import { CardMetaProps } from './CardMeta' diff --git a/src/views/Card/CardDescription.d.ts b/src/views/Card/CardDescription.d.ts index 0b3c340ae1..af9cb19f24 100644 --- a/src/views/Card/CardDescription.d.ts +++ b/src/views/Card/CardDescription.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface CardDescriptionProps extends StrictCardDescriptionProps { [key: string]: any diff --git a/src/views/Card/CardGroup.d.ts b/src/views/Card/CardGroup.d.ts index 629dc90a87..723959a364 100644 --- a/src/views/Card/CardGroup.d.ts +++ b/src/views/Card/CardGroup.d.ts @@ -1,6 +1,10 @@ import * as React from 'react' -import { SemanticShorthandCollection, SemanticShorthandContent, SemanticWIDTHS } from '../..' +import { + SemanticShorthandCollection, + SemanticShorthandContent, + SemanticWIDTHS, +} from '../../generic' import { CardProps } from './Card' export interface CardGroupProps extends StrictCardGroupProps { diff --git a/src/views/Card/CardHeader.d.ts b/src/views/Card/CardHeader.d.ts index 153aa37be4..03b27c22c7 100644 --- a/src/views/Card/CardHeader.d.ts +++ b/src/views/Card/CardHeader.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface CardHeaderProps extends StrictCardHeaderProps { [key: string]: any diff --git a/src/views/Card/CardMeta.d.ts b/src/views/Card/CardMeta.d.ts index 86f595cc3e..48105abbdc 100644 --- a/src/views/Card/CardMeta.d.ts +++ b/src/views/Card/CardMeta.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface CardMetaProps extends StrictCardMetaProps { [key: string]: any diff --git a/src/views/Comment/Comment.d.ts b/src/views/Comment/Comment.d.ts index 00c749784a..2b0485c98d 100644 --- a/src/views/Comment/Comment.d.ts +++ b/src/views/Comment/Comment.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' import CommentAction from './CommentAction' import CommentActions from './CommentActions' import CommentAuthor from './CommentAuthor' diff --git a/src/views/Comment/CommentAction.d.ts b/src/views/Comment/CommentAction.d.ts index 74f503e8f8..2027be1fb8 100644 --- a/src/views/Comment/CommentAction.d.ts +++ b/src/views/Comment/CommentAction.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface CommentActionProps extends StrictCommentActionProps { [key: string]: any diff --git a/src/views/Comment/CommentActions.d.ts b/src/views/Comment/CommentActions.d.ts index 7a466902e6..04ec3c1eba 100644 --- a/src/views/Comment/CommentActions.d.ts +++ b/src/views/Comment/CommentActions.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface CommentActionsProps extends StrictCommentActionsProps { [key: string]: any diff --git a/src/views/Comment/CommentAuthor.d.ts b/src/views/Comment/CommentAuthor.d.ts index 1f0a0fbfde..0e923eee23 100644 --- a/src/views/Comment/CommentAuthor.d.ts +++ b/src/views/Comment/CommentAuthor.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface CommentAuthorProps extends StrictCommentAuthorProps { [key: string]: any diff --git a/src/views/Comment/CommentContent.d.ts b/src/views/Comment/CommentContent.d.ts index 2743cbfa52..294210eea8 100644 --- a/src/views/Comment/CommentContent.d.ts +++ b/src/views/Comment/CommentContent.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface CommentContentProps extends StrictCommentContentProps { [key: string]: any diff --git a/src/views/Comment/CommentGroup.d.ts b/src/views/Comment/CommentGroup.d.ts index 930d86be1e..e2a37691ae 100644 --- a/src/views/Comment/CommentGroup.d.ts +++ b/src/views/Comment/CommentGroup.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface CommentGroupProps extends StrictCommentGroupProps { [key: string]: any diff --git a/src/views/Comment/CommentMetadata.d.ts b/src/views/Comment/CommentMetadata.d.ts index 60c94586c6..1078818ecb 100644 --- a/src/views/Comment/CommentMetadata.d.ts +++ b/src/views/Comment/CommentMetadata.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface CommentMetadataProps extends StrictCommentMetadataProps { [key: string]: any diff --git a/src/views/Comment/CommentText.d.ts b/src/views/Comment/CommentText.d.ts index 812808f6b6..752775d87e 100644 --- a/src/views/Comment/CommentText.d.ts +++ b/src/views/Comment/CommentText.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface CommentTextProps extends StrictCommentTextProps { [key: string]: any diff --git a/src/views/Feed/Feed.d.ts b/src/views/Feed/Feed.d.ts index 8e50321967..a2b1be6353 100644 --- a/src/views/Feed/Feed.d.ts +++ b/src/views/Feed/Feed.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandCollection } from '../..' +import { SemanticShorthandCollection } from '../../generic' import FeedContent from './FeedContent' import FeedDate from './FeedDate' import { default as FeedEvent, FeedEventProps } from './FeedEvent' diff --git a/src/views/Feed/FeedContent.d.ts b/src/views/Feed/FeedContent.d.ts index 120013ba06..e8234f5d87 100644 --- a/src/views/Feed/FeedContent.d.ts +++ b/src/views/Feed/FeedContent.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { FeedDateProps } from './FeedDate' import { FeedExtraProps } from './FeedExtra' import { FeedMetaProps } from './FeedMeta' diff --git a/src/views/Feed/FeedDate.d.ts b/src/views/Feed/FeedDate.d.ts index 227bb39073..c02c4e79ae 100644 --- a/src/views/Feed/FeedDate.d.ts +++ b/src/views/Feed/FeedDate.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface FeedDateProps extends StrictFeedDateProps { [key: string]: any diff --git a/src/views/Feed/FeedEvent.d.ts b/src/views/Feed/FeedEvent.d.ts index 2d9b55899c..3beca2f0c5 100644 --- a/src/views/Feed/FeedEvent.d.ts +++ b/src/views/Feed/FeedEvent.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandItem } from '../..' +import { SemanticShorthandItem } from '../../generic' import { FeedContentProps } from './FeedContent' import { FeedDateProps } from './FeedDate' import { FeedLabelProps } from './FeedLabel' diff --git a/src/views/Feed/FeedExtra.d.ts b/src/views/Feed/FeedExtra.d.ts index 01af0bce03..d364371ad9 100644 --- a/src/views/Feed/FeedExtra.d.ts +++ b/src/views/Feed/FeedExtra.d.ts @@ -1,5 +1,9 @@ import * as React from 'react' -import { HtmlImageProps, SemanticShorthandContent, SemanticShorthandCollection } from '../..' +import { + HtmlImageProps, + SemanticShorthandContent, + SemanticShorthandCollection, +} from '../../generic' export interface FeedExtraProps extends StrictFeedExtraProps { [key: string]: any diff --git a/src/views/Feed/FeedLabel.d.ts b/src/views/Feed/FeedLabel.d.ts index 2c87d00079..a7ffe695a0 100644 --- a/src/views/Feed/FeedLabel.d.ts +++ b/src/views/Feed/FeedLabel.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { HtmlImageProps, SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { HtmlImageProps, SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { IconProps } from '../../elements/Icon' export interface FeedLabelProps extends StrictFeedLabelProps { diff --git a/src/views/Feed/FeedLike.d.ts b/src/views/Feed/FeedLike.d.ts index a24cb8c6ff..f18a43184c 100644 --- a/src/views/Feed/FeedLike.d.ts +++ b/src/views/Feed/FeedLike.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { IconProps } from '../../elements/Icon' export interface FeedLikeProps extends StrictFeedLikeProps { diff --git a/src/views/Feed/FeedMeta.d.ts b/src/views/Feed/FeedMeta.d.ts index 1c31ca9eac..a6f5bbbbeb 100644 --- a/src/views/Feed/FeedMeta.d.ts +++ b/src/views/Feed/FeedMeta.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { FeedLikeProps } from './FeedLike' export interface FeedMetaProps extends StrictFeedMetaProps { diff --git a/src/views/Feed/FeedSummary.d.ts b/src/views/Feed/FeedSummary.d.ts index 21ccd19c9b..b6bd32ad6b 100644 --- a/src/views/Feed/FeedSummary.d.ts +++ b/src/views/Feed/FeedSummary.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import { FeedDateProps } from './FeedDate' import { FeedUserProps } from './FeedUser' diff --git a/src/views/Feed/FeedUser.d.ts b/src/views/Feed/FeedUser.d.ts index 7330a22c59..882b1840e1 100644 --- a/src/views/Feed/FeedUser.d.ts +++ b/src/views/Feed/FeedUser.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface FeedUserProps extends StrictFeedUserProps { [key: string]: any diff --git a/src/views/Item/Item.d.ts b/src/views/Item/Item.d.ts index e760d70f58..7972d3623f 100644 --- a/src/views/Item/Item.d.ts +++ b/src/views/Item/Item.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticShorthandItem } from '../..' +import { SemanticShorthandContent, SemanticShorthandItem } from '../../generic' import ItemContent from './ItemContent' import { default as ItemDescription, ItemDescriptionProps } from './ItemDescription' import { default as ItemExtra, ItemExtraProps } from './ItemExtra' diff --git a/src/views/Item/ItemContent.d.ts b/src/views/Item/ItemContent.d.ts index dd7fa3207b..91701e823e 100644 --- a/src/views/Item/ItemContent.d.ts +++ b/src/views/Item/ItemContent.d.ts @@ -1,6 +1,10 @@ import * as React from 'react' -import { SemanticShorthandContent, SemanticShorthandItem, SemanticVERTICALALIGNMENTS } from '../..' +import { + SemanticShorthandContent, + SemanticShorthandItem, + SemanticVERTICALALIGNMENTS, +} from '../../generic' import { ItemDescriptionProps } from './ItemDescription' import { ItemExtraProps } from './ItemExtra' import { ItemHeaderProps } from './ItemHeader' diff --git a/src/views/Item/ItemDescription.d.ts b/src/views/Item/ItemDescription.d.ts index 13104074ac..4c2cda5dce 100644 --- a/src/views/Item/ItemDescription.d.ts +++ b/src/views/Item/ItemDescription.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ItemDescriptionProps extends StrictItemDescriptionProps { [key: string]: any diff --git a/src/views/Item/ItemExtra.d.ts b/src/views/Item/ItemExtra.d.ts index cb5e0fe6a4..a24379b30a 100644 --- a/src/views/Item/ItemExtra.d.ts +++ b/src/views/Item/ItemExtra.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ItemExtraProps extends StrictItemExtraProps { [key: string]: any diff --git a/src/views/Item/ItemGroup.d.ts b/src/views/Item/ItemGroup.d.ts index 4f0d93adb1..9ccd28767b 100644 --- a/src/views/Item/ItemGroup.d.ts +++ b/src/views/Item/ItemGroup.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticShorthandCollection, SemanticShorthandContent } from '../..' +import { SemanticShorthandCollection, SemanticShorthandContent } from '../../generic' import { ItemProps } from './Item' export interface ItemGroupProps extends StrictItemGroupProps { diff --git a/src/views/Item/ItemHeader.d.ts b/src/views/Item/ItemHeader.d.ts index 5daf540db7..7e0ba4fa3e 100644 --- a/src/views/Item/ItemHeader.d.ts +++ b/src/views/Item/ItemHeader.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ItemHeaderProps extends StrictItemHeaderProps { [key: string]: any diff --git a/src/views/Item/ItemMeta.d.ts b/src/views/Item/ItemMeta.d.ts index 82bd5eee15..6b47fb20ae 100644 --- a/src/views/Item/ItemMeta.d.ts +++ b/src/views/Item/ItemMeta.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface ItemMetaProps extends StrictItemMetaProps { [key: string]: any diff --git a/src/views/Statistic/Statistic.d.ts b/src/views/Statistic/Statistic.d.ts index d410bccd7d..dae6e2fecf 100644 --- a/src/views/Statistic/Statistic.d.ts +++ b/src/views/Statistic/Statistic.d.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { SemanticCOLORS, SemanticFLOATS, SemanticShorthandContent } from '../..' +import { SemanticCOLORS, SemanticFLOATS, SemanticShorthandContent } from '../../generic' import StatisticGroup from './StatisticGroup' import StatisticLabel from './StatisticLabel' import StatisticValue from './StatisticValue' diff --git a/src/views/Statistic/StatisticGroup.d.ts b/src/views/Statistic/StatisticGroup.d.ts index 18e6a05ea7..b84ce0bbd4 100644 --- a/src/views/Statistic/StatisticGroup.d.ts +++ b/src/views/Statistic/StatisticGroup.d.ts @@ -5,7 +5,7 @@ import { SemanticShorthandCollection, SemanticShorthandContent, SemanticWIDTHS, -} from '../..' +} from '../../generic' import { StatisticProps, StatisticSizeProp } from './Statistic' export interface StatisticGroupProps extends StrictStatisticGroupProps { diff --git a/src/views/Statistic/StatisticLabel.d.ts b/src/views/Statistic/StatisticLabel.d.ts index b05e3f5ba1..30128fdbc0 100644 --- a/src/views/Statistic/StatisticLabel.d.ts +++ b/src/views/Statistic/StatisticLabel.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface StatisticLabelProps extends StrictStatisticLabelProps { [key: string]: any diff --git a/src/views/Statistic/StatisticValue.d.ts b/src/views/Statistic/StatisticValue.d.ts index 28c446725d..238eb61006 100644 --- a/src/views/Statistic/StatisticValue.d.ts +++ b/src/views/Statistic/StatisticValue.d.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { SemanticShorthandContent } from '../..' +import { SemanticShorthandContent } from '../../generic' export interface StatisticValueProps extends StrictStatisticValueProps { [key: string]: any diff --git a/test/typings.tsx b/test/typings.tsx index c0d264a783..d65220cce2 100644 --- a/test/typings.tsx +++ b/test/typings.tsx @@ -1,9 +1,23 @@ import * as React from 'react' -import { Button, Dropdown } from '../' +import { Button, Dropdown } from '../index' -const Test = () =>