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

Remove Mbx prefix #28

Merged
merged 1 commit into from
Aug 3, 2018
Merged
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
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

## HEAD

- Add **MbxButton** component.
- Add **MbxIconText** component.
- Add **MbxUnderlineTabs** component.
- Add **Button** component.
- Add **IconText** component.
- Add **UnderlineTabs** component.
- **PopoverTrigger**
- If the trigger responds to focus but not click, and you focus the trigger *first* and *then* click, that click *closes* the popover instead of leaving it open even after you move the mouse away.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ exports[`Link with outline and icon text, extra padding renders as expected 1`]
href="#"
onClick={[MockFunction]}
>
<MbxIconText
<IconText
iconBefore="bug"
spacing="small"
>
Go do things
</MbxIconText>
</IconText>
</a>
`;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react';
import safeSpy from '../../../test-utils/safe-spy';
import MbxButton from '../mbx-button';
import MbxIconText from '../../mbx-icon-text';
import Button from '../button';
import IconText from '../../icon-text';

const testCases = {};

testCases.primary = {
description: 'Primary',
component: MbxButton,
component: Button,
props: {
children: 'Primary',
onClick: safeSpy()
Expand All @@ -16,7 +16,7 @@ testCases.primary = {

testCases.secondary = {
description: 'Secondary',
component: MbxButton,
component: Button,
props: {
children: 'Secondary',
variant: 'secondary',
Expand All @@ -26,7 +26,7 @@ testCases.secondary = {

testCases.discouraging = {
description: 'Discouraging',
component: MbxButton,
component: Button,
props: {
children: 'Discouraging',
variant: 'discouraging',
Expand All @@ -36,7 +36,7 @@ testCases.discouraging = {

testCases.destructive = {
description: 'Destructive',
component: MbxButton,
component: Button,
props: {
children: 'Destructive',
variant: 'destructive',
Expand All @@ -46,7 +46,7 @@ testCases.destructive = {

testCases.appPrimary = {
description: 'AppPrimary',
component: MbxButton,
component: Button,
props: {
children: 'AppPrimary',
variant: 'appPrimary',
Expand All @@ -56,7 +56,7 @@ testCases.appPrimary = {

testCases.appSecondary = {
description: 'AppSecondary',
component: MbxButton,
component: Button,
props: {
children: 'AppSecondary',
variant: 'appSecondary',
Expand All @@ -66,9 +66,9 @@ testCases.appSecondary = {

testCases.linkOutlinePadding = {
description: 'Link with outline and icon text, extra padding',
component: MbxButton,
component: Button,
props: {
children: <MbxIconText iconBefore="bug">Go do things</MbxIconText>,
children: <IconText iconBefore="bug">Go do things</IconText>,
href: '#',
onClick: safeSpy(),
outline: true,
Expand All @@ -78,7 +78,7 @@ testCases.linkOutlinePadding = {

testCases.fullWidthPurple = {
description: 'Full width, alternate color',
component: MbxButton,
component: Button,
props: {
children: 'Here we are',
color: 'purple',
Expand All @@ -89,7 +89,7 @@ testCases.fullWidthPurple = {
testCases.weird = {
description:
'Div styled like a medium destructive button with some extended props and transformed classes',
component: MbxButton,
component: Button,
props: {
children: 'Save',
size: 'medium',
Expand All @@ -106,7 +106,7 @@ testCases.weird = {

testCases.disabled = {
description: 'Disabled',
component: MbxButton,
component: Button,
props: {
children: 'Oops',
disabled: true
Expand All @@ -115,7 +115,7 @@ testCases.disabled = {

testCases.disabledSecondary = {
description: 'Disabled secondary',
component: MbxButton,
component: Button,
props: {
children: 'Oops',
disabled: true,
Expand All @@ -126,7 +126,7 @@ testCases.disabledSecondary = {

testCases.disabledSpecial = {
description: 'Disabled appPrimary with color',
component: MbxButton,
component: Button,
props: {
children: 'Oops',
variant: 'appPrimary',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';

import { shallow } from 'enzyme';

import { testCases } from './mbx-button-test-cases';
import { testCases } from './button-test-cases';

describe(testCases.primary.description, () => {
let testCase;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ const propNames = [
* render a different element altogether.)
*
* If you'd like to put an icon before or after the text of your button,
* use [MbxIconText](#mbxicontext) for the content.
* use [IconText](#mbxicontext) for the content.
*
* Any props you provide other than those documented here are passed through
* directly to the element itself. This can be useful if you want to disable
* the button, assign an ID for testing, add an ARIA attribute, toss in some
* custom style properties, etc.
*/
class MbxButton extends React.Component {
class Button extends React.Component {
render() {
const props = applyVariant(this.props);

Expand Down Expand Up @@ -151,11 +151,11 @@ function applyVariant(props) {
}
}

MbxButton.propTypes = {
Button.propTypes = {
/**
* The button's content. A string is recommended, but you can put an element
* in here if you think that's right. If you do, it should be inline-level,
* using `<span>`s instead of `<div>`s. ([MbxIconText](#mbxicontext) is
* using `<span>`s instead of `<div>`s. ([IconText](#mbxicontext) is
* inline-level.)
*/
children: PropTypes.node.isRequired,
Expand Down Expand Up @@ -245,10 +245,10 @@ MbxButton.propTypes = {
component: PropTypes.oneOfType([PropTypes.func, PropTypes.string])
};

MbxButton.defaultProps = {
Button.defaultProps = {
variant: 'primary',
block: false,
transformClasses: x => x
};

export default MbxButton;
export default Button;
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,39 @@
All the standard variants.
*/
import React from 'react';
import MbxButton from '../mbx-button';
import Button from '../button';

export default class Example extends React.Component {
render() {
return (
<div>
<div className="my6">
<MbxButton onClick={noop}>Primary</MbxButton>
<Button onClick={noop}>Primary</Button>
</div>
<div className="my6">
<MbxButton variant="secondary" onClick={noop}>
<Button variant="secondary" onClick={noop}>
Secondary
</MbxButton>
</Button>
</div>
<div className="my6">
<MbxButton variant="discouraging" onClick={noop}>
<Button variant="discouraging" onClick={noop}>
Discouraging
</MbxButton>
</Button>
</div>
<div className="my6">
<MbxButton variant="destructive" onClick={noop}>
<Button variant="destructive" onClick={noop}>
Destructive
</MbxButton>
</Button>
</div>
<div className="my6">
<MbxButton variant="appPrimary" onClick={noop}>
<Button variant="appPrimary" onClick={noop}>
AppPrimary
</MbxButton>
</Button>
</div>
<div className="my6">
<MbxButton variant="appSecondary" onClick={noop}>
<Button variant="appSecondary" onClick={noop}>
AppSecondary
</MbxButton>
</Button>
</div>
</div>
);
Expand Down
16 changes: 16 additions & 0 deletions src/components/button/examples/button-b.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
A slightly wider, outlined button with an alternate color, using [IconText](#mbxicontext) to prefix the text with an icon.
*/
import React from 'react';
import Button from '../button';
import IconText from '../../icon-text';

export default class Example extends React.Component {
render() {
return (
<Button onClick={() => {}} width="large" outline={true} color="purple">
<IconText iconBefore="floppy">Save your map</IconText>
</Button>
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ The additional prop `data-test` is passed on directly to the `<a>`.
Also, `transformClasses` is used to add the drop-shadow class.
*/
import React from 'react';
import MbxButton from '../mbx-button';
import Button from '../button';

export default class Example extends React.Component {
render() {
const btnClasses = variantClasses => {
return `${variantClasses} shadow-darken25`;
};
return (
<div id="mbx-button-c">
<MbxButton
href="#mbx-button-c"
<div id="button-c">
<Button
href="#button-c"
size="medium"
data-test="link-to-c"
transformClasses={btnClasses}
>
You are here
</MbxButton>
</Button>
</div>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,59 +5,59 @@ wrapper container with an Assembly width class.
Sometimes, for example, you might want a column or row of equal-width buttons.
*/
import React from 'react';
import MbxButton from '../mbx-button';
import Button from '../button';

export default class Example extends React.Component {
render() {
return (
<div>
<div className="mb24 flex-parent">
<div className="flex-child w120 mr12">
<MbxButton size="medium" width="full" onClick={noop}>
<Button size="medium" width="full" onClick={noop}>
Door
</MbxButton>
</Button>
</div>
<div className="flex-child w120 mr12">
<MbxButton size="medium" width="full" onClick={noop}>
<Button size="medium" width="full" onClick={noop}>
Dog
</MbxButton>
</Button>
</div>
<div className="flex-child w120 mr12">
<MbxButton size="medium" width="full" onClick={noop}>
<Button size="medium" width="full" onClick={noop}>
Dash
</MbxButton>
</Button>
</div>
</div>
<div className="w60">
<div className="my3">
<MbxButton
<Button
variant="secondary"
size="medium"
width="full"
onClick={noop}
>
A
</MbxButton>
</Button>
</div>
<div className="my3">
<MbxButton
<Button
variant="secondary"
size="medium"
width="full"
onClick={noop}
>
B
</MbxButton>
</Button>
</div>
<div className="my3">
<MbxButton
<Button
variant="secondary"
size="medium"
width="full"
onClick={noop}
>
C
</MbxButton>
</Button>
</div>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/components/button/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import main from './button';

export default main;
Loading