Skip to content

Commit

Permalink
Merge fc9ce99 into 6268407
Browse files Browse the repository at this point in the history
  • Loading branch information
greg-a-smith committed Jan 16, 2019
2 parents 6268407 + fc9ce99 commit 33f5efb
Show file tree
Hide file tree
Showing 110 changed files with 184 additions and 308 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ rules:
react/sort-prop-types: [2, { 'callbacksLast' : true, 'ignoreCase' : true, 'requiredFirst' : true, } ]
semi-spacing: 2
semi: 2
#sort-imports: [2, { 'ignoreCase': true, 'ignoreMemberSort': false, 'memberSyntaxSortOrder': ['none', 'single', 'multiple', 'all'] }]
sort-imports: [2, { 'ignoreCase': true, 'ignoreMemberSort': false, 'memberSyntaxSortOrder': ['none', 'single', 'multiple', 'all'] }]
space-before-blocks: 2
space-before-function-paren: [2, 'never']
space-infix-ops: 2
Expand Down
4 changes: 2 additions & 2 deletions src/ActionBar/ActionBar.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { ActionBar, ActionBarBack, ActionBarHeader, ActionBarActions, Button, Popover, Menu, MenuList, MenuItem } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { ActionBar, ActionBarActions, ActionBarBack, ActionBarHeader, Button, Menu, MenuItem, MenuList, Popover } from '../';
import { Description, DocsText, DocsTile, Header, Import, Properties, Separator } from '../_playground';

export const ActionBarComponent = () => {
const actionBarBackBtnCode = `<ActionBar>
Expand Down
2 changes: 1 addition & 1 deletion src/ActionBar/ActionBar.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';

export const ActionBar = ({ mobile, width, children, className, ...props }) => {

Expand Down
4 changes: 2 additions & 2 deletions src/ActionBar/ActionBar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import React from 'react';
import renderer from 'react-test-renderer';
import {
ActionBar,
ActionBarActions,
ActionBarBack,
ActionBarHeader,
ActionBarActions
ActionBarHeader
} from './ActionBar';

describe('<ActionBar />', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/Alert/Alert.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Alert, Icon } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';
import { Description, DocsText, DocsTile, Header, Import, Playground, Properties, Separator } from '../_playground';

export const AlertComponent = () => {
const defaultAlertCode = '<Alert dismissable link="#" linkText="link">Default alert with a </Alert>';
Expand Down
2 changes: 1 addition & 1 deletion src/Alert/Alert.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import React, { Component } from 'react';

export class Alert extends Component {
constructor(props) {
Expand Down
2 changes: 1 addition & 1 deletion src/Alert/Alert.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Alert } from './Alert';
import React from 'react';
import renderer from 'react-test-renderer';
import { mount, shallow } from 'enzyme';
import { Alert } from './Alert';

describe('<Alert />', () => {
const basicAlert = (
Expand Down
4 changes: 2 additions & 2 deletions src/Badge/Badge.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Badge, Label, Status, Counter, Button } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';
import { Badge, Button, Counter, Label, Status } from '../';
import { Description, DocsText, DocsTile, Header, Import, Playground, Properties, Separator } from '../_playground';

export const BadgeComponent = () => {
const defaultBadgeCode = `<Badge>Default</Badge>
Expand Down
2 changes: 1 addition & 1 deletion src/Badge/Badge.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';

export const Badge = ({ type, modifier, children, className, ...props }) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/Badge/Badge.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mount } from 'enzyme';
import React from 'react';
import renderer from 'react-test-renderer';
import { Badge, Label, Status, Counter } from './Badge';
import { Badge, Counter, Label, Status } from './Badge';

describe('<Badge />', () => {
const defaultBadge = <Badge>Default</Badge>;
Expand Down
2 changes: 1 addition & 1 deletion src/Breadcrumb/Breadcrumb.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Breadcrumb, BreadcrumbItem } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import } from '../_playground';
import { Description, DocsText, DocsTile, Header, Import, Separator } from '../_playground';

export const BreadcrumbComponent = () => {
const breadcrumbHrefCode = `<Breadcrumb>
Expand Down
2 changes: 1 addition & 1 deletion src/Breadcrumb/Breadcrumb.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import { BrowserRouter, Link } from 'react-router-dom';

export const Breadcrumb = props => {
Expand Down
2 changes: 1 addition & 1 deletion src/Breadcrumb/Breadcrumb.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { MemoryRouter } from 'react-router-dom';
import { mount } from 'enzyme';
import React from 'react';
import renderer from 'react-test-renderer';
import { MemoryRouter } from 'react-router-dom';
import { Breadcrumb, BreadcrumbItem } from './Breadcrumb';

describe('<Breadcrumb />', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/Button/Button.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Button, ButtonGroup } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';
import { Description, DocsText, DocsTile, Header, Import, Playground, Properties, Separator } from '../_playground';

export const ButtonComponent = () => {
const buttonOptionsCode = `<Button option="emphasized" onClick={() => clickBtnHandler('Emphasized')}>
Expand Down
2 changes: 1 addition & 1 deletion src/Button/Button.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';

export const Button = ({
option,
Expand Down
4 changes: 2 additions & 2 deletions src/Calendar/Calendar.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Calendar } from '../';
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import {Calendar} from '../';
import { Description, DocsText, DocsTile, Header, Import, Properties, Separator } from '../_playground';

export const CalendarComponent = () => {

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

export class Calendar extends Component {

Expand Down
2 changes: 1 addition & 1 deletion src/Calendar/Calendar.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Calendar } from '../Calendar/Calendar';
import { mount } from 'enzyme';
import React from 'react';
import { Calendar } from '../Calendar/Calendar';

describe('<Calendar />', () => {
const mockOnChange = jest.fn();
Expand Down
4 changes: 2 additions & 2 deletions src/ComboboxInput/ComboboxInput.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Import, Properties } from '../_playground';
import { Menu, MenuItem, MenuList, ComboboxInput } from '../';
import { ComboboxInput, Menu, MenuItem, MenuList } from '../';
import { DocsText, DocsTile, Header, Import, Properties, Separator } from '../_playground';

export const ComboboxInputComponent = () => {
const comboboxInputCode = `<ComboboxInput
Expand Down
4 changes: 2 additions & 2 deletions src/ComboboxInput/ComboboxInput.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Popover } from '../Popover/Popover';
import PropTypes from 'prop-types';
import React from 'react';

// ------------------------------------------- Combobox Input ------------------------------------------
export const ComboboxInput = ({ placeholder, menu, compact, className, ...props }) => {
Expand Down
2 changes: 1 addition & 1 deletion src/ComboboxInput/ComboboxInput.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ComboboxInput } from './ComboboxInput';
import { mount } from 'enzyme';
import React from 'react';
import renderer from 'react-test-renderer';
import { ComboboxInput } from './ComboboxInput';
import { Menu, MenuItem, MenuList } from '../Menu/Menu';

describe('<ComboboxInput />', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/ContextualMenu/ContextualMenu.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description } from '../_playground';
import { Popover, Button, Menu, MenuList, MenuItem } from '../';
import { Button, Menu, MenuItem, MenuList, Popover } from '../';
import { Description, DocsText, DocsTile, Header, Separator } from '../_playground';

export const ContextualMenuComponent = () => {
const contextualMenuIconCode = `<Popover
Expand Down
4 changes: 2 additions & 2 deletions src/DatePicker/DatePicker.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { DatePicker } from '../';
import React from 'react';
import { Description, DocsText, DocsTile, Header, Import, Properties, Separator } from '../_playground';

export const DatePickerComponent = () => {
const defaultDatePickerCode = `<DatePicker disableBeforeDate={new Date(2018, 11, 24, 0, 0, 0, 0)} disableWeekends={true} />
Expand Down
4 changes: 2 additions & 2 deletions src/DatePicker/DatePicker.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Calendar } from '../Calendar/Calendar';
import PropTypes from 'prop-types';
import React, { Component } from 'react';

export class DatePicker extends Component {
constructor(props) {
Expand Down
2 changes: 1 addition & 1 deletion src/DatePicker/DatePicker.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DatePicker } from '../DatePicker/DatePicker';
import { mount } from 'enzyme';
import React from 'react';
import { DatePicker } from '../DatePicker/DatePicker';

describe('<DatePicker />', () => {
const defaultDatePicker = <DatePicker />;
Expand Down
4 changes: 2 additions & 2 deletions src/Dropdown/Dropdown.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { Dropdown, Popover, Button, Menu, MenuList, MenuItem } from '../';
import { Button, Dropdown, Menu, MenuItem, MenuList, Popover } from '../';
import { Description, DocsText, DocsTile, Header, Import, Properties, Separator } from '../_playground';

export const DropdownComponent = () => {
const defaultDropdownCode = `<Dropdown>
Expand Down
2 changes: 1 addition & 1 deletion src/Dropdown/Dropdown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';

export const Dropdown = props => {
const { standard, children, className } = props;
Expand Down
6 changes: 3 additions & 3 deletions src/Dropdown/Dropdown.test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import renderer from 'react-test-renderer';
import { Button } from '../Button/Button';
import { Dropdown } from './Dropdown';
import { Popover } from '../Popover/Popover';
import React from 'react';
import renderer from 'react-test-renderer';
import { Menu, MenuItem, MenuList } from '../Menu/Menu';
import { Button } from '../Button/Button';

describe('<Dropdown />', () => {
const defaultMenu = (
Expand Down
15 changes: 2 additions & 13 deletions src/Forms/Forms.Component.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
import React from 'react';
import {
FormSet,
FormItem,
FormLabel,
FormInput,
FormRadio,
FormTextarea,
FormMessage,
FormSelect,
FormFieldset,
FormLegend
} from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { Description, DocsText, DocsTile, Header, Import, Properties, Separator } from '../_playground';
import { FormFieldset, FormInput, FormItem, FormLabel, FormLegend, FormMessage, FormRadio, FormSelect, FormSet, FormTextarea} from '../';

export const FormsComponent = () => {
const inputsCode = `<FormSet>
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/Forms.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import React, { Component } from 'react';

// ------------------------------------------------- Form Set -----------------------------------------------
export const FormSet = ({ children, className }) => {
Expand Down
13 changes: 1 addition & 12 deletions src/Forms/Forms.test.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
import { mount } from 'enzyme';
import React from 'react';
import renderer from 'react-test-renderer';
import {
FormFieldset,
FormInput,
FormItem,
FormLabel,
FormLegend,
FormMessage,
FormRadio,
FormSelect,
FormSet,
FormTextarea
} from './Forms';
import { FormFieldset, FormInput, FormItem, FormLabel, FormLegend, FormMessage, FormRadio, FormSelect, FormSet, FormTextarea} from './Forms';

describe('<Forms />', () => {
const formInput = (
Expand Down
13 changes: 2 additions & 11 deletions src/Icon/Icon.Component.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
import React from 'react';
import { Icon } from '../';
import {
DocsTile,
DocsText,
Separator,
Header,
Description,
Import,
Properties,
Playground
} from '../_playground';
import React from 'react';
import { Description, DocsText, DocsTile, Header, Import, Playground, Properties, Separator } from '../_playground';

export const IconComponent = () => {
const iconsCode = `<Icon glyph="cart" size="s" />
Expand Down
2 changes: 1 addition & 1 deletion src/Icon/Icon.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';

export const Icon = ({ glyph, size, clickHandler, className, ...props }) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/Icon/Icon.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Icon } from './Icon';
import React from 'react';
import renderer from 'react-test-renderer';
import { mount, shallow } from 'enzyme';
import { Icon } from './Icon';

describe('<Icon />', () => {
const mockOnClick = jest.fn();
Expand Down
4 changes: 2 additions & 2 deletions src/Identifier/Identifier.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Identifier } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';
import React from 'react';
import { Description, DocsText, DocsTile, Header, Import, Playground, Properties, Separator } from '../_playground';


export const IdentifierComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/Identifier/Identifier.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';

export const Identifier = ({ glyph, size, modifier, color, label, backgroundImageUrl, children, className, ...props }) => {
const styles = {
Expand Down
2 changes: 1 addition & 1 deletion src/Identifier/Identifier.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Identifier } from './Identifier';
import { mount } from 'enzyme';
import React from 'react';
import renderer from 'react-test-renderer';
import { Identifier } from './Identifier';

describe('<Identifier />', () => {
const defaultIcon = <Identifier glyph='washing-machine' size='s' />;
Expand Down
4 changes: 2 additions & 2 deletions src/Image/Image.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Image } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';
import React from 'react';
import { Description, DocsText, DocsTile, Header, Import, Playground, Properties, Separator } from '../_playground';

export const ImageComponent = () => {
const sizesImageCode = `<Image size="s" photo="https://placeimg.com/400/400/nature"></Image>
Expand Down
2 changes: 1 addition & 1 deletion src/Image/Image.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';

export const Image = ({ size, type, photo, className, ...props }) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/Image/Image.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Image } from './Image';
import { mount } from 'enzyme';
import React from 'react';
import renderer from 'react-test-renderer';
import { Image } from './Image';

describe('<Image />', () => {
const image = (
Expand Down
4 changes: 2 additions & 2 deletions src/InlineHelp/InlineHelp.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { InlineHelp } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import React from 'react';
import { Description, DocsText, DocsTile, Header, Import, Properties, Separator } from '../_playground';


export const InlineHelpComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/InlineHelp/InlineHelp.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';

export const InlineHelp = ({ text, placement, className, ...props }) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/InlineHelp/InlineHelp.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { InlineHelp } from './InlineHelp';
import { mount } from 'enzyme';
import React from 'react';
import renderer from 'react-test-renderer';
import { InlineHelp } from './InlineHelp';

describe('<InlineHelp />', () => {
const defaultInlineHelp = (
Expand Down
Loading

0 comments on commit 33f5efb

Please sign in to comment.