diff --git a/doczrc.js b/doczrc.js index 235454f5..15e7559e 100644 --- a/doczrc.js +++ b/doczrc.js @@ -1,5 +1,7 @@ const path = require("path"); +const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin"); + // https://www.docz.site/documentation/project-configuration export default { base: "/rbx", @@ -15,6 +17,9 @@ export default { indexHtml: "src/__docs__/index.html", modifyBundlerConfig: config => { config.resolve.alias["src"] = path.join(__dirname, "./src"); + config.resolve.plugins = [ + new TsconfigPathsPlugin({ configFile: "./tsconfig.json" }), + ]; config.entry.app.push("src/index.sass"); config.module.rules.push({ diff --git a/package-lock.json b/package-lock.json index 07056641..8d26e961 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1458,6 +1458,12 @@ "parse5": "^4.0.0" } }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "@types/node": { "version": "10.12.18", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz", @@ -15745,6 +15751,53 @@ } } }, + "tsconfig-paths": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.7.0.tgz", + "integrity": "sha512-7iE+Q/2E1lgvxD+c0Ot+GFFmgmfIjt/zCayyruXkXQ84BLT85gHXy0WSoQSiuFX9+d+keE/jiON7notV74ZY+A==", + "dev": true, + "requires": { + "@types/json5": "^0.0.29", + "deepmerge": "^2.0.1", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "deepmerge": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", + "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==", + "dev": true + }, + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "tsconfig-paths-webpack-plugin": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz", + "integrity": "sha512-S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g==", + "dev": true, + "requires": { + "chalk": "^2.3.0", + "enhanced-resolve": "^4.0.0", + "tsconfig-paths": "^3.4.0" + } + }, "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", diff --git a/package.json b/package.json index b8eeb86a..50c20d2b 100644 --- a/package.json +++ b/package.json @@ -81,6 +81,7 @@ "style-loader": "^0.23.1", "ts-jest": "^23.10.5", "ts-node": "^7.0.1", + "tsconfig-paths-webpack-plugin": "^3.2.0", "tslib": "^1.9.3", "tslint": "^5.11.0", "tslint-config-prettier": "^1.17.0", diff --git a/src/__docs__/components/simple-props-table.tsx b/src/__docs__/components/simple-props-table.tsx index c39af677..2ff85110 100644 --- a/src/__docs__/components/simple-props-table.tsx +++ b/src/__docs__/components/simple-props-table.tsx @@ -2,7 +2,7 @@ import { withMDXComponents } from "@mdx-js/tag/dist/mdx-provider"; import React from "react"; -import { HelpersProps } from "src/base"; +import { HelpersProps } from "src/base/helpers"; import { Table } from "src/elements"; const lexSortObj = (obj: { [K: string]: T }) => @@ -92,13 +92,13 @@ export class BaseSimplePropsTable extends React.Component< )} ); - } + }; private readonly renderCellName = (name: string) => ( {name} - ) + ); private readonly renderCellRequired = (required: PropDoc["required"]) => { const props: { @@ -110,7 +110,7 @@ export class BaseSimplePropsTable extends React.Component< }; return ; - } + }; private readonly renderCellType = ( typeName: PropDoc["typeName"], @@ -131,7 +131,7 @@ export class BaseSimplePropsTable extends React.Component< {typeNode} ); - } + }; private readonly renderCellDescription = ( description: PropDoc["description"], @@ -143,7 +143,7 @@ export class BaseSimplePropsTable extends React.Component< } return {description}; - } + }; private readonly renderCellDefaultValue = ( defaultValue: PropDoc["defaultValue"], @@ -165,7 +165,7 @@ export class BaseSimplePropsTable extends React.Component< {stringDefaultValue} ); - } + }; private readonly renderRow = (name: string, propDoc: PropDoc) => { return ( @@ -177,7 +177,7 @@ export class BaseSimplePropsTable extends React.Component< {this.renderCellDescription(propDoc.description)} ); - } + }; } // tslint:disable-next-line: no-unsafe-any diff --git a/src/__tests__/__snapshots__/index.test.ts.snap b/src/__tests__/__snapshots__/index.test.ts.snap index d37ba229..6eb8d5f7 100644 --- a/src/__tests__/__snapshots__/index.test.ts.snap +++ b/src/__tests__/__snapshots__/index.test.ts.snap @@ -1309,6 +1309,5 @@ Object { "render": [Function], }, "forwardRefAs": [Function], - "makeRootValidatingTransform": [Function], } `; diff --git a/src/base/index.ts b/src/base/index.ts index dd86462f..0761920d 100644 --- a/src/base/index.ts +++ b/src/base/index.ts @@ -1,3 +1,2 @@ export { forwardRefAs } from "./exotic"; export { Generic } from "./generic"; -export { HelpersProps, makeRootValidatingTransform } from "./helpers"; diff --git a/src/components/breadcrumb/breadcrumb-item.tsx b/src/components/breadcrumb/breadcrumb-item.tsx index 2b4f0e48..3fb896dd 100644 --- a/src/components/breadcrumb/breadcrumb-item.tsx +++ b/src/components/breadcrumb/breadcrumb-item.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export interface BreadcrumbItemModifierProps { active?: boolean; diff --git a/src/components/breadcrumb/breadcrumb.tsx b/src/components/breadcrumb/breadcrumb.tsx index e8114e68..a05b84b0 100644 --- a/src/components/breadcrumb/breadcrumb.tsx +++ b/src/components/breadcrumb/breadcrumb.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; import { BreadcrumbItem } from "./breadcrumb-item"; diff --git a/src/components/card/card-content.tsx b/src/components/card/card-content.tsx index f15b47be..eee69520 100644 --- a/src/components/card/card-content.tsx +++ b/src/components/card/card-content.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type CardContentProps = HelpersProps; diff --git a/src/components/card/card-footer-item.tsx b/src/components/card/card-footer-item.tsx index 3265cfa9..c176c79d 100644 --- a/src/components/card/card-footer-item.tsx +++ b/src/components/card/card-footer-item.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type CardFooterItemProps = HelpersProps; diff --git a/src/components/card/card-footer.tsx b/src/components/card/card-footer.tsx index a3ddcda2..9d76434c 100644 --- a/src/components/card/card-footer.tsx +++ b/src/components/card/card-footer.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { CardFooterItem } from "./card-footer-item"; export type CardFooterProps = HelpersProps; diff --git a/src/components/card/card-header-icon.tsx b/src/components/card/card-header-icon.tsx index 7e2e5063..bc5e2a98 100644 --- a/src/components/card/card-header-icon.tsx +++ b/src/components/card/card-header-icon.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type CardHeaderIconProps = HelpersProps; diff --git a/src/components/card/card-header-title.tsx b/src/components/card/card-header-title.tsx index 6811c8c5..12c3f848 100644 --- a/src/components/card/card-header-title.tsx +++ b/src/components/card/card-header-title.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/components/card/card-header.tsx b/src/components/card/card-header.tsx index 434cfac8..f1f58ce9 100644 --- a/src/components/card/card-header.tsx +++ b/src/components/card/card-header.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { CardHeaderIcon } from "./card-header-icon"; import { CardHeaderTitle } from "./card-header-title"; diff --git a/src/components/card/card-image.tsx b/src/components/card/card-image.tsx index 8c23111b..c0872bd3 100644 --- a/src/components/card/card-image.tsx +++ b/src/components/card/card-image.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type CardImageProps = HelpersProps; diff --git a/src/components/card/card.tsx b/src/components/card/card.tsx index e6104742..6527c9d0 100644 --- a/src/components/card/card.tsx +++ b/src/components/card/card.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { CardContent } from "./card-content"; import { CardFooter } from "./card-footer"; import { CardHeader } from "./card-header"; diff --git a/src/components/dropdown/dropdown-container.tsx b/src/components/dropdown/dropdown-container.tsx index b4d1cd4c..55ce821a 100644 --- a/src/components/dropdown/dropdown-container.tsx +++ b/src/components/dropdown/dropdown-container.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { Generic, HelpersProps } from "../../base"; +import { Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { combineRefs, tuple } from "../../utils"; import { DropdownContext } from "./dropdown-context"; diff --git a/src/components/dropdown/dropdown-content.tsx b/src/components/dropdown/dropdown-content.tsx index aba0570b..2dde5287 100644 --- a/src/components/dropdown/dropdown-content.tsx +++ b/src/components/dropdown/dropdown-content.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type DropdownContentProps = HelpersProps; diff --git a/src/components/dropdown/dropdown-divider.tsx b/src/components/dropdown/dropdown-divider.tsx index 7764ccd3..c99fbec9 100644 --- a/src/components/dropdown/dropdown-divider.tsx +++ b/src/components/dropdown/dropdown-divider.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type DropdownDividerProps = HelpersProps; diff --git a/src/components/dropdown/dropdown-item.tsx b/src/components/dropdown/dropdown-item.tsx index d2392fdf..3d847fe0 100644 --- a/src/components/dropdown/dropdown-item.tsx +++ b/src/components/dropdown/dropdown-item.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { DropdownContext, DropdownContextValue } from "./dropdown-context"; export type DropdownItemModifierProps = Partial<{ diff --git a/src/components/dropdown/dropdown-menu.tsx b/src/components/dropdown/dropdown-menu.tsx index c715418f..5bfd24f3 100644 --- a/src/components/dropdown/dropdown-menu.tsx +++ b/src/components/dropdown/dropdown-menu.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type DropdownMenuProps = HelpersProps; diff --git a/src/components/dropdown/dropdown-trigger.tsx b/src/components/dropdown/dropdown-trigger.tsx index b0303e3e..de517da7 100644 --- a/src/components/dropdown/dropdown-trigger.tsx +++ b/src/components/dropdown/dropdown-trigger.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { DropdownContext, DropdownContextValue } from "./dropdown-context"; export type DropdownTriggerModifierProps = Partial<{ diff --git a/src/components/level/level-item.tsx b/src/components/level/level-item.tsx index a472a5dd..b5fec2dd 100644 --- a/src/components/level/level-item.tsx +++ b/src/components/level/level-item.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/components/level/level.tsx b/src/components/level/level.tsx index fb46fd4a..f6d184e3 100644 --- a/src/components/level/level.tsx +++ b/src/components/level/level.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { LevelItem } from "./level-item"; diff --git a/src/components/list/list-item.tsx b/src/components/list/list-item.tsx index 0c517fba..fa895d1b 100644 --- a/src/components/list/list-item.tsx +++ b/src/components/list/list-item.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type ListItemModifierProps = Partial<{ active: boolean; diff --git a/src/components/list/list.tsx b/src/components/list/list.tsx index 98ad98aa..8174cd92 100644 --- a/src/components/list/list.tsx +++ b/src/components/list/list.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { ListItem } from "./list-item"; export type ListProps = HelpersProps; diff --git a/src/components/media/media-item.tsx b/src/components/media/media-item.tsx index 5395da75..66070261 100644 --- a/src/components/media/media-item.tsx +++ b/src/components/media/media-item.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/components/media/media.tsx b/src/components/media/media.tsx index 266ba995..4f7e331f 100644 --- a/src/components/media/media.tsx +++ b/src/components/media/media.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { MediaItem } from "./media-item"; export type MediaProps = HelpersProps; diff --git a/src/components/menu/menu-label.tsx b/src/components/menu/menu-label.tsx index b1894bee..66d8ecd6 100644 --- a/src/components/menu/menu-label.tsx +++ b/src/components/menu/menu-label.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type MenuLabelProps = HelpersProps; diff --git a/src/components/menu/menu-list-item.tsx b/src/components/menu/menu-list-item.tsx index 8c2f4678..63753dab 100644 --- a/src/components/menu/menu-list-item.tsx +++ b/src/components/menu/menu-list-item.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type MenuListItemModifierProps = Partial<{ active: boolean; diff --git a/src/components/menu/menu-list.tsx b/src/components/menu/menu-list.tsx index 3453f81e..d05f96d8 100644 --- a/src/components/menu/menu-list.tsx +++ b/src/components/menu/menu-list.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { MenuListItem } from "./menu-list-item"; export type MenuListProps = HelpersProps; diff --git a/src/components/menu/menu.tsx b/src/components/menu/menu.tsx index 0119773f..4263ede3 100644 --- a/src/components/menu/menu.tsx +++ b/src/components/menu/menu.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { MenuLabel } from "./menu-label"; import { MenuList } from "./menu-list"; diff --git a/src/components/message/message-body.tsx b/src/components/message/message-body.tsx index 83813bc7..db233cbf 100644 --- a/src/components/message/message-body.tsx +++ b/src/components/message/message-body.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type MessageBodyProps = HelpersProps; diff --git a/src/components/message/message-header.tsx b/src/components/message/message-header.tsx index d0d93b16..87a7d257 100644 --- a/src/components/message/message-header.tsx +++ b/src/components/message/message-header.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type MessageHeaderProps = HelpersProps; diff --git a/src/components/message/message.tsx b/src/components/message/message.tsx index dec99e3b..2b22cf9e 100644 --- a/src/components/message/message.tsx +++ b/src/components/message/message.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/components/modal/modal-background.tsx b/src/components/modal/modal-background.tsx index 16bf03d4..393f465c 100644 --- a/src/components/modal/modal-background.tsx +++ b/src/components/modal/modal-background.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { ModalContext, ModalContextValue } from "./modal-context"; export type ModalBackgroundModifierProps = Partial<{ diff --git a/src/components/modal/modal-card-body.tsx b/src/components/modal/modal-card-body.tsx index ac8cd66f..ebe0d247 100644 --- a/src/components/modal/modal-card-body.tsx +++ b/src/components/modal/modal-card-body.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type ModalCardBodyProps = HelpersProps; diff --git a/src/components/modal/modal-card-foot.tsx b/src/components/modal/modal-card-foot.tsx index 12f3d9a6..ddf537fc 100644 --- a/src/components/modal/modal-card-foot.tsx +++ b/src/components/modal/modal-card-foot.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type ModalCardFootProps = HelpersProps; diff --git a/src/components/modal/modal-card-head.tsx b/src/components/modal/modal-card-head.tsx index f16514b7..a8f9c348 100644 --- a/src/components/modal/modal-card-head.tsx +++ b/src/components/modal/modal-card-head.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Delete } from "../../elements"; import { ModalContext, ModalContextValue } from "./modal-context"; diff --git a/src/components/modal/modal-card-title.tsx b/src/components/modal/modal-card-title.tsx index 3f72f34d..29c4d6af 100644 --- a/src/components/modal/modal-card-title.tsx +++ b/src/components/modal/modal-card-title.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type ModalCardTitleProps = HelpersProps; diff --git a/src/components/modal/modal-card.tsx b/src/components/modal/modal-card.tsx index 2735c46d..10f5f7cf 100644 --- a/src/components/modal/modal-card.tsx +++ b/src/components/modal/modal-card.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { ModalCardBody } from "./modal-card-body"; import { ModalCardFoot } from "./modal-card-foot"; import { ModalCardHead } from "./modal-card-head"; diff --git a/src/components/modal/modal-close.tsx b/src/components/modal/modal-close.tsx index 61373e37..3ee342e4 100644 --- a/src/components/modal/modal-close.tsx +++ b/src/components/modal/modal-close.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { ModalContext, ModalContextValue } from "./modal-context"; export type ModalCloseModifierProps = Partial<{ diff --git a/src/components/modal/modal-content.tsx b/src/components/modal/modal-content.tsx index 65b58292..279ea8b8 100644 --- a/src/components/modal/modal-content.tsx +++ b/src/components/modal/modal-content.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type ModalContentProps = HelpersProps; diff --git a/src/components/navbar/navbar-brand.tsx b/src/components/navbar/navbar-brand.tsx index 2c56613d..93d0cb45 100644 --- a/src/components/navbar/navbar-brand.tsx +++ b/src/components/navbar/navbar-brand.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type NavbarBrandProps = HelpersProps; diff --git a/src/components/navbar/navbar-burger.tsx b/src/components/navbar/navbar-burger.tsx index 9d775985..698bb081 100644 --- a/src/components/navbar/navbar-burger.tsx +++ b/src/components/navbar/navbar-burger.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { NavbarContext, NavbarContextValue } from "./navbar-context"; export type NavbarBurgerModifierProps = Partial<{ diff --git a/src/components/navbar/navbar-container.tsx b/src/components/navbar/navbar-container.tsx index 6af39b69..118832dc 100644 --- a/src/components/navbar/navbar-container.tsx +++ b/src/components/navbar/navbar-container.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { Generic, HelpersProps } from "../../base"; +import { Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { canUseDOM, tuple } from "../../utils"; diff --git a/src/components/navbar/navbar-divider.tsx b/src/components/navbar/navbar-divider.tsx index 71cce4c4..3177a260 100644 --- a/src/components/navbar/navbar-divider.tsx +++ b/src/components/navbar/navbar-divider.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type NavbarDividerProps = HelpersProps; diff --git a/src/components/navbar/navbar-dropdown.tsx b/src/components/navbar/navbar-dropdown.tsx index 0652c81e..a0af75c7 100644 --- a/src/components/navbar/navbar-dropdown.tsx +++ b/src/components/navbar/navbar-dropdown.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/components/navbar/navbar-item-container.tsx b/src/components/navbar/navbar-item-container.tsx index b622f3ff..9291ec8b 100644 --- a/src/components/navbar/navbar-item-container.tsx +++ b/src/components/navbar/navbar-item-container.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { Generic, HelpersProps } from "../../base"; +import { Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { combineRefs } from "../../utils"; import { NavbarItemContext, diff --git a/src/components/navbar/navbar-link.tsx b/src/components/navbar/navbar-link.tsx index 49fcb0f5..ee293f7c 100644 --- a/src/components/navbar/navbar-link.tsx +++ b/src/components/navbar/navbar-link.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { NavbarItemContext, NavbarItemContextValue, diff --git a/src/components/navbar/navbar-menu.tsx b/src/components/navbar/navbar-menu.tsx index ba56dc6e..6e900aa2 100644 --- a/src/components/navbar/navbar-menu.tsx +++ b/src/components/navbar/navbar-menu.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { NavbarContext } from "./navbar-context"; export type NavbarMenuProps = HelpersProps; diff --git a/src/components/navbar/navbar-segment.tsx b/src/components/navbar/navbar-segment.tsx index 436a2d79..385442a2 100644 --- a/src/components/navbar/navbar-segment.tsx +++ b/src/components/navbar/navbar-segment.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/components/pagination/pagination-ellipsis.tsx b/src/components/pagination/pagination-ellipsis.tsx index 49b4bc7d..84975d47 100644 --- a/src/components/pagination/pagination-ellipsis.tsx +++ b/src/components/pagination/pagination-ellipsis.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type PaginationEllipsisProps = HelpersProps; diff --git a/src/components/pagination/pagination-link.tsx b/src/components/pagination/pagination-link.tsx index a39f3f13..92c5328f 100644 --- a/src/components/pagination/pagination-link.tsx +++ b/src/components/pagination/pagination-link.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type PaginationLinkModifiers = Partial<{ current: boolean; diff --git a/src/components/pagination/pagination-list.tsx b/src/components/pagination/pagination-list.tsx index e1b28fac..377d3df6 100644 --- a/src/components/pagination/pagination-list.tsx +++ b/src/components/pagination/pagination-list.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type PaginationListProps = HelpersProps; diff --git a/src/components/pagination/pagination-step.tsx b/src/components/pagination/pagination-step.tsx index 74407e35..ead2104e 100644 --- a/src/components/pagination/pagination-step.tsx +++ b/src/components/pagination/pagination-step.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/components/pagination/pagination.tsx b/src/components/pagination/pagination.tsx index 75d9d72c..2e72b5f3 100644 --- a/src/components/pagination/pagination.tsx +++ b/src/components/pagination/pagination.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; import { PaginationEllipsis } from "./pagination-ellipsis"; diff --git a/src/components/panel/panel-block.tsx b/src/components/panel/panel-block.tsx index 196ea36e..9e8e32cd 100644 --- a/src/components/panel/panel-block.tsx +++ b/src/components/panel/panel-block.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type PanelBlockModifierProps = Partial<{ active: boolean; diff --git a/src/components/panel/panel-heading.tsx b/src/components/panel/panel-heading.tsx index 2e9420e8..e91052f1 100644 --- a/src/components/panel/panel-heading.tsx +++ b/src/components/panel/panel-heading.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type PanelHeadingProps = HelpersProps; diff --git a/src/components/panel/panel-icon.tsx b/src/components/panel/panel-icon.tsx index 9a6ba5b6..ca34f11a 100644 --- a/src/components/panel/panel-icon.tsx +++ b/src/components/panel/panel-icon.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type PanelIconProps = HelpersProps; diff --git a/src/components/panel/panel-tab-group.tsx b/src/components/panel/panel-tab-group.tsx index 1362f544..d89ebd9e 100644 --- a/src/components/panel/panel-tab-group.tsx +++ b/src/components/panel/panel-tab-group.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type PanelTabGroupProps = HelpersProps; diff --git a/src/components/panel/panel-tab.tsx b/src/components/panel/panel-tab.tsx index 6d50d0ae..8411b3ce 100644 --- a/src/components/panel/panel-tab.tsx +++ b/src/components/panel/panel-tab.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { PanelTabGroup } from "./panel-tab-group"; export type PanelTabModifierProps = Partial<{ diff --git a/src/components/panel/panel.tsx b/src/components/panel/panel.tsx index bcfc222a..df700a3b 100644 --- a/src/components/panel/panel.tsx +++ b/src/components/panel/panel.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { PanelBlock } from "./panel-block"; import { PanelHeading } from "./panel-heading"; import { PanelIcon } from "./panel-icon"; diff --git a/src/components/tab/tab-group.tsx b/src/components/tab/tab-group.tsx index 2f39fe34..067b6e46 100644 --- a/src/components/tab/tab-group.tsx +++ b/src/components/tab/tab-group.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/components/tab/tab.tsx b/src/components/tab/tab.tsx index d534bd11..c1b98149 100644 --- a/src/components/tab/tab.tsx +++ b/src/components/tab/tab.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { TabGroup } from "./tab-group"; export type TabModifierProps = Partial<{ diff --git a/src/elements/box/box.tsx b/src/elements/box/box.tsx index 971f6bb2..624ca9f8 100644 --- a/src/elements/box/box.tsx +++ b/src/elements/box/box.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type BoxProps = HelpersProps; diff --git a/src/elements/button/button-group.tsx b/src/elements/button/button-group.tsx index 05eb0650..3d59a5fd 100644 --- a/src/elements/button/button-group.tsx +++ b/src/elements/button/button-group.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/button/button.tsx b/src/elements/button/button.tsx index fe84ac77..fe2a32b9 100644 --- a/src/elements/button/button.tsx +++ b/src/elements/button/button.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/container/container.tsx b/src/elements/container/container.tsx index d6945738..f1c8348b 100644 --- a/src/elements/container/container.tsx +++ b/src/elements/container/container.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; export type ContainerModifierProps = Partial<{ diff --git a/src/elements/content/content-ordered-list-item.tsx b/src/elements/content/content-ordered-list-item.tsx index bbbbab33..504ede4f 100644 --- a/src/elements/content/content-ordered-list-item.tsx +++ b/src/elements/content/content-ordered-list-item.tsx @@ -1,6 +1,7 @@ import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type ContentOrderedListItemProps = HelpersProps; diff --git a/src/elements/content/content-ordered-list.tsx b/src/elements/content/content-ordered-list.tsx index 73bbba94..0811b3ab 100644 --- a/src/elements/content/content-ordered-list.tsx +++ b/src/elements/content/content-ordered-list.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; import { ContentOrderedListItem } from "./content-ordered-list-item"; diff --git a/src/elements/content/content.tsx b/src/elements/content/content.tsx index b6fedfa2..9eb697ee 100644 --- a/src/elements/content/content.tsx +++ b/src/elements/content/content.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; import { ContentOrderedList } from "./content-ordered-list"; diff --git a/src/elements/form/checkbox.tsx b/src/elements/form/checkbox.tsx index 4682168e..29e4dee8 100644 --- a/src/elements/form/checkbox.tsx +++ b/src/elements/form/checkbox.tsx @@ -1,6 +1,7 @@ import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type CheckboxProps = HelpersProps; diff --git a/src/elements/form/control.tsx b/src/elements/form/control.tsx index 8efd3cc1..e4dec768 100644 --- a/src/elements/form/control.tsx +++ b/src/elements/form/control.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/form/field-body.tsx b/src/elements/form/field-body.tsx index 4ca61da2..cac339d9 100644 --- a/src/elements/form/field-body.tsx +++ b/src/elements/form/field-body.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type FieldBodyProps = HelpersProps; diff --git a/src/elements/form/field-label.tsx b/src/elements/form/field-label.tsx index 50e0e989..74874c87 100644 --- a/src/elements/form/field-label.tsx +++ b/src/elements/form/field-label.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/form/field.tsx b/src/elements/form/field.tsx index b8cce0cf..fa500f49 100644 --- a/src/elements/form/field.tsx +++ b/src/elements/form/field.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; import { FieldBody } from "./field-body"; diff --git a/src/elements/form/file-cta.tsx b/src/elements/form/file-cta.tsx index 17d80cd9..c98bb6c4 100644 --- a/src/elements/form/file-cta.tsx +++ b/src/elements/form/file-cta.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type FileCTAProps = HelpersProps; diff --git a/src/elements/form/file-icon.tsx b/src/elements/form/file-icon.tsx index e767fed5..a228c1a5 100644 --- a/src/elements/form/file-icon.tsx +++ b/src/elements/form/file-icon.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type FileIconProps = HelpersProps; diff --git a/src/elements/form/file-input.tsx b/src/elements/form/file-input.tsx index 5611b016..f8aea342 100644 --- a/src/elements/form/file-input.tsx +++ b/src/elements/form/file-input.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type FileInputProps = HelpersProps; diff --git a/src/elements/form/file-label.tsx b/src/elements/form/file-label.tsx index c1240bb2..55b7124f 100644 --- a/src/elements/form/file-label.tsx +++ b/src/elements/form/file-label.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type FileLabelProps = HelpersProps; diff --git a/src/elements/form/file-name.tsx b/src/elements/form/file-name.tsx index b6bd9f4a..a79128c9 100644 --- a/src/elements/form/file-name.tsx +++ b/src/elements/form/file-name.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type FileNameProps = HelpersProps; diff --git a/src/elements/form/file.tsx b/src/elements/form/file.tsx index 7653c4ee..d4604bcc 100644 --- a/src/elements/form/file.tsx +++ b/src/elements/form/file.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/form/help.tsx b/src/elements/form/help.tsx index 21ca65a4..e0d943d6 100644 --- a/src/elements/form/help.tsx +++ b/src/elements/form/help.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; export type HelpModifierProps = Partial<{ diff --git a/src/elements/form/input.tsx b/src/elements/form/input.tsx index a9808c69..4a2e6692 100644 --- a/src/elements/form/input.tsx +++ b/src/elements/form/input.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/form/label.tsx b/src/elements/form/label.tsx index 73fe4270..7fe5c3e5 100644 --- a/src/elements/form/label.tsx +++ b/src/elements/form/label.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; import { Checkbox } from "./checkbox"; diff --git a/src/elements/form/radio.tsx b/src/elements/form/radio.tsx index d60ab975..f871a74a 100644 --- a/src/elements/form/radio.tsx +++ b/src/elements/form/radio.tsx @@ -1,6 +1,7 @@ import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type RadioProps = HelpersProps; diff --git a/src/elements/form/select-option.tsx b/src/elements/form/select-option.tsx index c6175a25..92f640c0 100644 --- a/src/elements/form/select-option.tsx +++ b/src/elements/form/select-option.tsx @@ -1,6 +1,7 @@ import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type SelectOptionProps = HelpersProps; diff --git a/src/elements/form/select.tsx b/src/elements/form/select.tsx index 67dd408c..a32e2458 100644 --- a/src/elements/form/select.tsx +++ b/src/elements/form/select.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/form/textarea.tsx b/src/elements/form/textarea.tsx index b28eb3d8..bdc3f8ea 100644 --- a/src/elements/form/textarea.tsx +++ b/src/elements/form/textarea.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/icon/icon.tsx b/src/elements/icon/icon.tsx index a5f6c6e6..336e4a18 100644 --- a/src/elements/icon/icon.tsx +++ b/src/elements/icon/icon.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/image/image-container.tsx b/src/elements/image/image-container.tsx index 6f4ba871..a29a461b 100644 --- a/src/elements/image/image-container.tsx +++ b/src/elements/image/image-container.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/image/image.tsx b/src/elements/image/image.tsx index 1a03a86a..7eff5ede 100644 --- a/src/elements/image/image.tsx +++ b/src/elements/image/image.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { ImageContainer } from "./image-container"; export type ImageModifierProps = Partial<{ diff --git a/src/elements/notification/notification.tsx b/src/elements/notification/notification.tsx index 0ff4939c..1820f143 100644 --- a/src/elements/notification/notification.tsx +++ b/src/elements/notification/notification.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; export type NotificationModifierProps = Partial<{ diff --git a/src/elements/other/block.tsx b/src/elements/other/block.tsx index 08d35375..94225703 100644 --- a/src/elements/other/block.tsx +++ b/src/elements/other/block.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type BlockProps = HelpersProps; diff --git a/src/elements/other/delete.tsx b/src/elements/other/delete.tsx index 90d21a9b..9e09aa3f 100644 --- a/src/elements/other/delete.tsx +++ b/src/elements/other/delete.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/other/heading.tsx b/src/elements/other/heading.tsx index 894dc520..a643b254 100644 --- a/src/elements/other/heading.tsx +++ b/src/elements/other/heading.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type HeadingProps = HelpersProps; diff --git a/src/elements/other/highlight.tsx b/src/elements/other/highlight.tsx index c5e40daa..af40211c 100644 --- a/src/elements/other/highlight.tsx +++ b/src/elements/other/highlight.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type HighlightProps = HelpersProps; diff --git a/src/elements/other/loader.tsx b/src/elements/other/loader.tsx index 2121af36..9f830937 100644 --- a/src/elements/other/loader.tsx +++ b/src/elements/other/loader.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type LoaderProps = HelpersProps; diff --git a/src/elements/other/numeric.tsx b/src/elements/other/numeric.tsx index 112ba954..12426722 100644 --- a/src/elements/other/numeric.tsx +++ b/src/elements/other/numeric.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type NumericProps = HelpersProps; diff --git a/src/elements/progress/progress.tsx b/src/elements/progress/progress.tsx index 66db5b86..b263f211 100644 --- a/src/elements/progress/progress.tsx +++ b/src/elements/progress/progress.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/table/table-body.tsx b/src/elements/table/table-body.tsx index cb05d2a4..15b78df7 100644 --- a/src/elements/table/table-body.tsx +++ b/src/elements/table/table-body.tsx @@ -1,6 +1,7 @@ import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type TableBodyProps = HelpersProps; diff --git a/src/elements/table/table-cell.tsx b/src/elements/table/table-cell.tsx index de1029d2..a494ae68 100644 --- a/src/elements/table/table-cell.tsx +++ b/src/elements/table/table-cell.tsx @@ -1,6 +1,7 @@ import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type TableCellProps = HelpersProps; diff --git a/src/elements/table/table-foot.tsx b/src/elements/table/table-foot.tsx index 09b06126..7874af44 100644 --- a/src/elements/table/table-foot.tsx +++ b/src/elements/table/table-foot.tsx @@ -1,6 +1,7 @@ import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type TableFootProps = HelpersProps; diff --git a/src/elements/table/table-head.tsx b/src/elements/table/table-head.tsx index 06ba7bb6..e30ddcb9 100644 --- a/src/elements/table/table-head.tsx +++ b/src/elements/table/table-head.tsx @@ -1,6 +1,7 @@ import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type TableHeadProps = HelpersProps; diff --git a/src/elements/table/table-heading.tsx b/src/elements/table/table-heading.tsx index 3b7f2ba2..c94e7bd9 100644 --- a/src/elements/table/table-heading.tsx +++ b/src/elements/table/table-heading.tsx @@ -1,6 +1,7 @@ import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type TableHeadingProps = HelpersProps; diff --git a/src/elements/table/table-row.tsx b/src/elements/table/table-row.tsx index e5608ac6..844645c0 100644 --- a/src/elements/table/table-row.tsx +++ b/src/elements/table/table-row.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type TableRowHelperProps = Partial<{ selected: boolean; diff --git a/src/elements/table/table.tsx b/src/elements/table/table.tsx index 87d02a3d..424c167a 100644 --- a/src/elements/table/table.tsx +++ b/src/elements/table/table.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { TableBody } from "./table-body"; import { TableCell } from "./table-cell"; import { TableFoot } from "./table-foot"; diff --git a/src/elements/tag/tag-group.tsx b/src/elements/tag/tag-group.tsx index 32fed446..4eb71dec 100644 --- a/src/elements/tag/tag-group.tsx +++ b/src/elements/tag/tag-group.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type TagGroupModifierProps = Partial<{ gapless: boolean; diff --git a/src/elements/tag/tag.tsx b/src/elements/tag/tag.tsx index 6f1729d0..ef79eafd 100644 --- a/src/elements/tag/tag.tsx +++ b/src/elements/tag/tag.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/elements/title/title.tsx b/src/elements/title/title.tsx index 1f2562a0..f5355e2d 100644 --- a/src/elements/title/title.tsx +++ b/src/elements/title/title.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/grid/columns/column-group.tsx b/src/grid/columns/column-group.tsx index 2ab53607..1c2f8b59 100644 --- a/src/grid/columns/column-group.tsx +++ b/src/grid/columns/column-group.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { DEFAULTS, Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/grid/columns/column.tsx b/src/grid/columns/column.tsx index bcc2e32b..856cdaee 100644 --- a/src/grid/columns/column.tsx +++ b/src/grid/columns/column.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { DEFAULTS, Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/grid/tiles/tile.tsx b/src/grid/tiles/tile.tsx index 7061e46a..d8a4eefe 100644 --- a/src/grid/tiles/tile.tsx +++ b/src/grid/tiles/tile.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/layout/footer/footer.tsx b/src/layout/footer/footer.tsx index 023c2da6..faad53d3 100644 --- a/src/layout/footer/footer.tsx +++ b/src/layout/footer/footer.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type FooterProps = HelpersProps; diff --git a/src/layout/hero/hero-body.tsx b/src/layout/hero/hero-body.tsx index 945ad314..06acb5c1 100644 --- a/src/layout/hero/hero-body.tsx +++ b/src/layout/hero/hero-body.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type HeroBodyProps = HelpersProps; diff --git a/src/layout/hero/hero-foot.tsx b/src/layout/hero/hero-foot.tsx index 56f75f66..3d700e47 100644 --- a/src/layout/hero/hero-foot.tsx +++ b/src/layout/hero/hero-foot.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type HeroFootProps = HelpersProps; diff --git a/src/layout/hero/hero-head.tsx b/src/layout/hero/hero-head.tsx index b337ff5c..24d341a1 100644 --- a/src/layout/hero/hero-head.tsx +++ b/src/layout/hero/hero-head.tsx @@ -1,7 +1,8 @@ import classNames from "classnames"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; export type HeroHeadProps = HelpersProps; diff --git a/src/layout/hero/hero.tsx b/src/layout/hero/hero.tsx index 7070db92..f3070f79 100644 --- a/src/layout/hero/hero.tsx +++ b/src/layout/hero/hero.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Variables } from "../../base/helpers/variables"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/src/layout/section/section.tsx b/src/layout/section/section.tsx index d92a2df0..702cb25a 100644 --- a/src/layout/section/section.tsx +++ b/src/layout/section/section.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import PropTypes from "prop-types"; import React from "react"; -import { forwardRefAs, Generic, HelpersProps } from "../../base"; +import { forwardRefAs, Generic } from "../../base"; +import { HelpersProps } from "../../base/helpers"; import { Prefer } from "../../types"; import { tuple } from "../../utils"; diff --git a/tsconfig.json b/tsconfig.json index 3af11977..47b07c38 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,6 +5,7 @@ "esModuleInterop": true, "jsx": "react", "importHelpers": true, + "isolatedModules": true, "lib": ["es6", "dom"], "moduleResolution": "node", "noErrorTruncation": false,