Skip to content
This repository has been archived by the owner on Oct 19, 2021. It is now read-only.

Commit

Permalink
fix(Button): add disabled state for other nodes (#2067)
Browse files Browse the repository at this point in the history
* fix(Button): add disabled state for other nodes

* chore: bump carbon-components version

* docs(Button): incorporate button set wrapper
  • Loading branch information
emyarod authored and laurenmrice committed Mar 20, 2019
1 parent 9e59584 commit 7e0005d
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 6 deletions.
Binary file removed .yarn-offline-mirror/carbon-components-9.85.6.tgz
Binary file not shown.
Binary file added .yarn-offline-mirror/carbon-components-9.86.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
"babel-plugin-dev-expression": "^0.2.1",
"babel-plugin-react-docgen": "^2.0.0",
"bowser": "^1.6.1",
"carbon-components": "^9.85.6",
"carbon-components": "^9.86.0",
"carbon-icons": "^7.0.5",
"chalk": "^2.3.0",
"cli-table": "^0.3.0",
Expand Down
5 changes: 4 additions & 1 deletion src/components/Button/Button-story.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ import React from 'react';
import { storiesOf } from '@storybook/react';
import { action } from '@storybook/addon-actions';
import { withKnobs, boolean, select, text } from '@storybook/addon-knobs';
import { settings } from 'carbon-components';
import { iconAddSolid, iconSearch } from 'carbon-icons';
import AddFilled16 from '@carbon/icons-react/lib/add--filled/16';
import Search16 from '@carbon/icons-react/lib/search/16';
import Button from '../Button';
import ButtonSkeleton from '../Button/Button.Skeleton';
import { breakingChangesX, componentsX } from '../../internal/FeatureFlags';

const { prefix } = settings;

const icons = {
None: 'None',
};
Expand Down Expand Up @@ -157,7 +160,7 @@ storiesOf('Buttons', module)
() => {
const setProps = props.set();
return (
<div>
<div className={`${prefix}--btn-set`}>
<Button kind="secondary" {...setProps}>
Secondary button
</Button>
Expand Down
1 change: 1 addition & 0 deletions src/components/Button/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const Button = React.forwardRef(
[`${prefix}--btn--ghost`]: kind === 'ghost',
[`${prefix}--btn--danger--primary`]: kind === 'danger--primary',
[`${prefix}--btn--tertiary`]: kind === 'tertiary',
[`${prefix}--btn--disabled`]: disabled,
});

const commonProps = {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3158,10 +3158,10 @@ capture-stack-trace@^1.0.0:
resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==

carbon-components@^9.85.6:
version "9.85.6"
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-9.85.6.tgz#f3c16252b804c18db66dc9fcf0a9a41c4c901623"
integrity sha512-r7EwqFlbhhq91QVdFgnXO7erEB3fNfdqysZ6+8OPZxxmNyPrIHTzFdSUu3/KBNz1AFGiUHpiK0VrYijAWCasGw==
carbon-components@^9.86.0:
version "9.86.0"
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-9.86.0.tgz#339dcccd819011f1e8a11ea200b987012d644b3b"
integrity sha512-djcXph5ij0XXRRroV6J+yFxDcXxP0MRyMys3GTU21IV6cGoeHwbgPGVQEdFmx++OuerBR7lx5FPPVtqhgQxr2w==
dependencies:
carbon-icons "^7.0.7"
flatpickr "4.5.7"
Expand Down

0 comments on commit 7e0005d

Please sign in to comment.