Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Typescript #331

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { PureComponent } from 'react';

import {
AppRoot,
Button,
Expand Down
1 change: 1 addition & 0 deletions examples/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';

import App from './app';

const app = document.createElement('div');
Expand Down
1 change: 1 addition & 0 deletions examples/nav-items.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';

import { Nav, NavItem } from '../src/ts/';

const NavItems = ({ className }: { className?: string }) => (
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"postcss": "^5.2.18",
"postcss-loader": "^2.0.7",
"prettier": "^1.19.1",
"react-docgen-typescript": "^1.2.2",
"react-docgen-typescript": "^1.16.3",
"react-scripts-ts": "^2.17.0",
"react-styleguidist": "^7.2.1",
"react-test-renderer": "^15.5.4",
Expand All @@ -99,7 +99,7 @@
"tsify": "^3.0.4",
"tslint": "^5.8.0",
"tslint-config-dabapps": "github:dabapps/tslint-config-dabapps#v0.5.1",
"typescript": "^2.3.3",
"typescript": "^3.3.4000",
"webpack": "^3.7.1"
},
"peerDependencies": {
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/app/root.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import store, { StoreState } from '../../store';
import { ComponentProps } from '../../types';

Expand Down
1 change: 1 addition & 0 deletions src/ts/components/banners/banner.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface BannerProps extends ComponentProps, HTMLProps<HTMLElement> {
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/banners/cookie-banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as classNames from 'classnames';
import * as cookie from 'cookie';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';
import Banner from './banner';

Expand Down
1 change: 1 addition & 0 deletions src/ts/components/content/content-box-footer.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type ContentBoxFooterProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/content/content-box-header.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type ContentBoxHeaderProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/content/content-box.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type ContentBoxProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/content/section.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type SectionProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/forms/button.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface ButtonProps extends ComponentProps, HTMLProps<HTMLElement> {
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/forms/form-group.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface FormGroupProps extends ComponentProps, HTMLProps<HTMLElement> {
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/forms/input-group-addon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type InputGroupAddonProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/forms/input-group.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface InputGroupProps
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/grid/column.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';
import { isValidColumnNumber } from '../../utils';

Expand Down
1 change: 1 addition & 0 deletions src/ts/components/grid/container.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface ContainerProps extends ComponentProps, HTMLProps<HTMLElement> {
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/grid/row.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type RowProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/misc/alert.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type AlertProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/misc/anchor.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { getHref } from '../../utils';

export type AnchorProps = HTMLProps<HTMLAnchorElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/misc/badge.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type BadgeProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/misc/code-block.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ declare const hljs: void | IHighlightJS;
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';
import { formatCode } from '../../utils';

Expand Down
1 change: 1 addition & 0 deletions src/ts/components/misc/collapse.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { PureComponent } from 'react';

import { ComponentProps } from '../../types';

const ENOUGH_TIME_FOR_RERENDER = 50;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/misc/highlight.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';
import * as CSSTransitionGroup from 'react-transition-group/CSSTransitionGroup';

import { ComponentProps } from '../../types';

export interface HighlightProps extends ComponentProps, HTMLProps<HTMLElement> {
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/misc/spaced-group.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface SpacedGroupProps
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/misc/speech-bubble.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface SpeechBubbleProps
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/misc/well.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type WellProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/modals/modal-body.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type ModalBodyProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/modals/modal-close-icon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type ModalCloseIconProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/modals/modal-footer.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type ModalFooterProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/modals/modal-header.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type ModalHeaderProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/modals/modal.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface ModalProps extends ComponentProps, HTMLProps<HTMLDivElement> {
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/navigation/footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';
import * as ReactDOM from 'react-dom';

import store from '../../store';
import { ComponentProps } from '../../types';

Expand Down
1 change: 1 addition & 0 deletions src/ts/components/navigation/nav-bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';
import * as ReactDOM from 'react-dom';

import store from '../../store';
import { ComponentProps } from '../../types';
import { getScrollOffset } from '../../utils';
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/navigation/nav-item.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface NavItemProps extends ComponentProps, HTMLProps<HTMLElement> {
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/navigation/nav.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface NavProps extends ComponentProps, HTMLProps<HTMLElement> {}
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/navigation/side-bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';
import * as CSSTransitionGroup from 'react-transition-group/CSSTransitionGroup';

import { ComponentProps } from '../../types';

export interface SideBarProps extends HTMLProps<HTMLElement>, ComponentProps {
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/precomposed/input-with-prefix-suffix.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { PureComponent } from 'react';

import { ComponentProps } from '../../types';
import InputGroup from '../forms/input-group';
import InputGroupAddon from '../forms/input-group-addon';
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/prototyping/dab-ipsum.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { Component } from 'react';

import { generateIpsum } from '../../utils';
import { WORDS } from '../../words';

Expand Down
1 change: 1 addition & 0 deletions src/ts/components/tables/table-body.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type TableBodyProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/tables/table-cell.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { NBSP } from '../../constants';
import { BaseTableCellProps } from '../../types';
import { shouldNotBeRendered } from '../../utils';
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/tables/table-head.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type TableHeadProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/tables/table-header.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { NBSP } from '../../constants';
import { BaseTableCellProps } from '../../types';
import { shouldNotBeRendered } from '../../utils';
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/tables/table-row.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export type TableRowProps = ComponentProps & HTMLProps<HTMLElement>;
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/tables/table.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface TableProps extends ComponentProps, HTMLProps<HTMLElement> {
Expand Down
1 change: 1 addition & 0 deletions src/ts/components/tabs/tab.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as classNames from 'classnames';
import * as React from 'react';
import { HTMLProps, PureComponent } from 'react';

import { ComponentProps } from '../../types';

export interface TabProps extends ComponentProps, HTMLProps<HTMLElement> {
Expand Down
Loading