Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"classnames": "^2.2.5",
"keycoder": "^1.1.1",
"moment": "^2.13.0",
"prop-types": "^15.5.9",
"svg4everybody": "^2.0.3",
"uuid": "^2.0.2"
},
Expand Down Expand Up @@ -76,9 +77,9 @@
"jest": "^16.0.2",
"npm-run-all": "^4.0.1",
"power-assert": "^1.4.1",
"react": "^15.3.0",
"react": "^15.5.4",
"react-addons-test-utils": "^15.3.0",
"react-dom": "^15.3.0"
"react-dom": "^15.5.4"
},
"jest": {
"testRegex": "(/test/.*|\\.(test|spec))\\.js$",
Expand Down
4 changes: 3 additions & 1 deletion src/scripts/Badge.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';

import classnames from 'classnames';

const Badge = ({ children, type, label, ...props }) => {
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/BreadCrumbs.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';

export const Crumb = ({ className, href, children, ...props }) => {
Expand Down
4 changes: 3 additions & 1 deletion src/scripts/Button.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';

import classnames from 'classnames';
import Icon from './Icon';
import Spinner from './Spinner';
Expand Down
4 changes: 3 additions & 1 deletion src/scripts/ButtonGroup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import React, { PropTypes, Component, Children } from 'react';
import React, { Component, Children } from 'react';
import PropTypes from 'prop-types';

import classnames from 'classnames';
import DropdownButton from './DropdownButton';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Checkbox.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import FormElement from './FormElement';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/CheckboxGroup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import FormElement from './FormElement';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Container.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';

const Container = ({ className, size, align, children, ...props }) => {
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/DateInput.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import moment from 'moment';
import FormElement from './FormElement';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Datepicker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import moment from 'moment';
import Button from './Button';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/DropdownButton.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import Button from './Button';
import DropdownMenu from './DropdownMenu';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/DropdownMenu.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import Icon from './Icon';
import { PicklistItem } from './Picklist';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/FieldSet.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import FormElement from './FormElement';
import { uuid } from './util';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Form.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import FormElement from './FormElement';
import { uuid } from './util';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/FormElement.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { registerStyle } from './util';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Grid.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';

const Grid = ({ className, frame, vertical, children, tag, ...props }) => {
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Icon.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import svg4everybody from 'svg4everybody';
import { getAssetRoot } from './util';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Input.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import keycoder from 'keycoder';
import Icon from './Icon';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Lookup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import FormElement from './FormElement';
import Input from './Input';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/MediaObject.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';

import classNames from 'classnames';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Modal.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import Button from './Button';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Notification.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import Button from './Button';
import Icon from './Icon';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/PageHeader.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';

import classNames from 'classnames';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Picklist.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import FormElement from './FormElement';
import Icon from './Icon';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Pill.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';

import Icon from './Icon';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Popover.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { findDOMNode } from 'react-dom';
import { isElInChildren, cleanProps } from './util';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Radio.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';

const Radio = ({ className, label, name, value, checked, defaultChecked, ...props }) => {
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/RadioGroup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import FormElement from './FormElement';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/SalesPath.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import Icon from './Icon';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Select.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import FormElement from './FormElement';
import { uuid } from './util';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Spinner.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { registerStyle } from './util';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Table.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';

import Icon from './Icon';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Tabs.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { registerStyle } from './util';
import DropdownButton from './DropdownButton';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Text.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';

import classnames from 'classnames';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Textarea.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import FormElement from './FormElement';
import { uuid } from './util';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Toggle.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';

import FormElement from './FormElement';
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/Tree.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes, Children, cloneElement } from 'react';
import React, { Component, Children, cloneElement } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { cleanProps } from './util';

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/TreeNode.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import Button from './Button';
import Spinner from './Spinner';
Expand Down
Loading