diff --git a/.storybook/config.ts b/.storybook/config.ts index d4387529..0cfb14a9 100644 --- a/.storybook/config.ts +++ b/.storybook/config.ts @@ -93,7 +93,8 @@ configureViewport({ }); function loadStories() { - const req = require.context("../stories", true, /\.story\.tsx$/); + // const req = require.context("../stories", true, /\.story\.tsx$/); + const req = require.context("../stories/base", true, /\.story\.tsx$/); req.keys().forEach(filename => req(filename)); } diff --git a/package.json b/package.json index 97b30e72..e6e0b71a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rbx", - "version": "1.0.0-beta.4", + "version": "1.0.0-beta.5", "description": "The Comprehensive Bulma UI Framework for React", "main": "dist/bundle.cjs.js", "module": "dist/bundle.esm.js", @@ -15,6 +15,7 @@ "lint": "tslint --project .", "storybook:deploy": "storybook-to-ghpages", "storybook": "start-storybook -p 9001 -c .storybook", + "storybook:build": "build-storybook -c .storybook -o .out/storybook", "test:cov": "tslint --project . && jest --coverage", "test": "jest", "watch": "rollup -cw" diff --git a/src/base/exotic.ts b/src/base/exotic.ts index 843117fc..aaea780e 100644 --- a/src/base/exotic.ts +++ b/src/base/exotic.ts @@ -1,5 +1,7 @@ import React from "react"; +import { Prefer } from "../types"; + export interface ForwardRefAsExoticComponent< TOwnProps, TDefaultComponent extends React.ReactType diff --git a/src/base/helpers.ts b/src/base/helpers.ts index 77ea7a0a..4b14efed 100644 --- a/src/base/helpers.ts +++ b/src/base/helpers.ts @@ -1,6 +1,7 @@ import classNames from "classnames"; import PropTypes from "prop-types"; +import { Omit } from "../types"; import { tuple } from "../utils"; /** diff --git a/src/components/breadcrumb/breadcrumb.tsx b/src/components/breadcrumb/breadcrumb.tsx index 5c10a95c..ddbd3bc5 100644 --- a/src/components/breadcrumb/breadcrumb.tsx +++ b/src/components/breadcrumb/breadcrumb.tsx @@ -8,6 +8,7 @@ import { HelpersProps, transformHelpers, } from "../../base"; +import { Prefer } from "../../types"; import { tuple } from "../../utils"; import { BreadcrumbItem } from "./breadcrumb-item"; diff --git a/src/components/modal/modal-card.tsx b/src/components/modal/modal-card.tsx index bdb69caf..0b422742 100644 --- a/src/components/modal/modal-card.tsx +++ b/src/components/modal/modal-card.tsx @@ -7,6 +7,7 @@ import { HelpersProps, transformHelpers, } from "../../base"; +import { Prefer } from "../../types"; 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.tsx b/src/components/modal/modal.tsx index aac24e4c..65b8df8d 100644 --- a/src/components/modal/modal.tsx +++ b/src/components/modal/modal.tsx @@ -3,6 +3,7 @@ import React from "react"; import ReactDOM from "react-dom"; import { forwardRefAs } from "../../base"; +import { Omit } from "../../types"; import { canUseDOM } from "../../utils"; import { ModalBackground } from "./modal-background"; import { ModalCard } from "./modal-card"; diff --git a/src/components/navbar/navbar-brand.tsx b/src/components/navbar/navbar-brand.tsx index cf131987..6d57fe56 100644 --- a/src/components/navbar/navbar-brand.tsx +++ b/src/components/navbar/navbar-brand.tsx @@ -7,6 +7,7 @@ import { HelpersProps, transformHelpers, } from "../../base"; +import { Prefer } from "../../types"; export type NavbarBrandProps = Prefer< HelpersProps, diff --git a/src/components/navbar/navbar-divider.tsx b/src/components/navbar/navbar-divider.tsx index acda2915..02d33fa8 100644 --- a/src/components/navbar/navbar-divider.tsx +++ b/src/components/navbar/navbar-divider.tsx @@ -7,6 +7,7 @@ import { HelpersProps, transformHelpers, } from "../../base"; +import { Prefer } from "../../types"; export type NavbarDividerProps = Prefer< HelpersProps, diff --git a/src/components/navbar/navbar-menu.tsx b/src/components/navbar/navbar-menu.tsx index 81c0aef7..7fe3f9bb 100644 --- a/src/components/navbar/navbar-menu.tsx +++ b/src/components/navbar/navbar-menu.tsx @@ -7,6 +7,7 @@ import { HelpersProps, transformHelpers, } from "../../base"; +import { Prefer } from "../../types"; import { NavbarContext } from "./navbar-context"; export type NavbarMenuProps = Prefer< diff --git a/src/elements/content/content-ordered-list.tsx b/src/elements/content/content-ordered-list.tsx index 7bffdbf0..dccaf43c 100644 --- a/src/elements/content/content-ordered-list.tsx +++ b/src/elements/content/content-ordered-list.tsx @@ -8,6 +8,7 @@ import { HelpersProps, transformHelpers, } from "../../base"; +import { Omit, Prefer } from "../../types"; import { tuple } from "../../utils"; import { ContentOrderedListItem } from "./content-ordered-list-item"; diff --git a/src/elements/form/radio.tsx b/src/elements/form/radio.tsx index c0c1f32c..310d0a45 100644 --- a/src/elements/form/radio.tsx +++ b/src/elements/form/radio.tsx @@ -6,6 +6,7 @@ import { HelpersProps, transformHelpers, } from "../../base"; +import { Prefer } from "../../types"; export type RadioProps = Prefer< HelpersProps, diff --git a/src/elements/form/select.tsx b/src/elements/form/select.tsx index af9d87d2..9ac86301 100644 --- a/src/elements/form/select.tsx +++ b/src/elements/form/select.tsx @@ -6,6 +6,7 @@ import { HelpersProps, transformHelpers, } from "../../base"; +import { Prefer } from "../../types"; import { SelectContainer } from "./select-container"; import { SelectOption } from "./select-option"; diff --git a/src/elements/icon/icon.tsx b/src/elements/icon/icon.tsx index bd36998e..2246fcbc 100644 --- a/src/elements/icon/icon.tsx +++ b/src/elements/icon/icon.tsx @@ -9,6 +9,7 @@ import { transformHelpers, } from "../../base"; import { Colors, COLORS } from "../../base/helpers"; +import { Prefer } from "../../types"; import { tuple } from "../../utils"; export const ICON_ALIGNMENTS = tuple("left", "right"); diff --git a/src/globals.d.ts b/src/globals.d.ts deleted file mode 100644 index 6e8c0798..00000000 --- a/src/globals.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -type Lit = string | number | boolean | undefined | null | void | {}; -type Omit = Pick>; -type Prefer = P & Omit; diff --git a/src/types.ts b/src/types.ts new file mode 100644 index 00000000..910b9e61 --- /dev/null +++ b/src/types.ts @@ -0,0 +1,2 @@ +export type Omit = Pick>; +export type Prefer = P & Omit; diff --git a/src/utils.ts b/src/utils.ts index 1ea12993..416536ae 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -25,4 +25,6 @@ export const combineRefs = ( export const noop = () => {}; // tslint:disable-line:no-empty +export type Lit = string | number | boolean | undefined | null | void | {}; + export const tuple = (...args: T) => args;