Skip to content

Commit

Permalink
Merge branch 'master' into chore/update-netlify-preview
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Jan 31, 2020
2 parents fadd64c + 90900d2 commit 98d3797
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 39 deletions.
2 changes: 0 additions & 2 deletions packages/bundler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"@babel/core": "^7.7.7",
"@babel/preset-env": "^7.7.7",
"@carbon/cli-reporter": "10.3.0",
"@commitlint/parse": "^8.1.0",
"@commitlint/parse": "^8.3.4",
"autoprefixer": "^9.7.4",
"babel-plugin-macros": "^2.4.2",
Expand All @@ -41,7 +40,6 @@
"inquirer": "^6.5.0",
"klaw-sync": "^6.0.0",
"markdown-toc": "^1.2.0",
"node-sass": "^4.9.4",
"node-sass": "^4.13.1",
"postcss": "^7.0.26",
"postcss-discard-comments": "^4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/changelog.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

'use strict';

const parse = require('@commitlint/parse');
const { default: parse } = require('@commitlint/parse');
const execa = require('execa');

// We keep a list of commits that are process-oriented that we never want to
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/workspace.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const packagePaths = fs
.readdirSync(PACKAGES_DIR)
.filter(basename => {
const filename = path.join(PACKAGES_DIR, basename);
if (!denylist.has(filename)) {
if (denylist.has(filename)) {
return false;
}

Expand Down
16 changes: 4 additions & 12 deletions packages/components/docs/sass.md
Original file line number Diff line number Diff line change
Expand Up @@ -6395,7 +6395,6 @@ $text-02: if(
- [modal [mixin]](#modal-mixin)
- [overflow-menu [mixin]](#overflow-menu-mixin)
- [pagination [mixin]](#pagination-mixin)
- [search [mixin]](#search-mixin)
- [tabs [mixin]](#tabs-mixin)
- [toggle [mixin]](#toggle-mixin)
- [toolbar [mixin]](#toolbar-mixin)
Expand Down Expand Up @@ -6568,6 +6567,7 @@ $icon-02: if(
- [file-uploader [mixin]](#file-uploader-mixin)
- [listbox [mixin]](#listbox-mixin)
- [overflow-menu [mixin]](#overflow-menu-mixin)
- [search [mixin]](#search-mixin)
- [text-input [mixin]](#text-input-mixin)
- [tile [mixin]](#tile-mixin)
- [tooltip--icon--legacy [mixin]](#tooltip--icon--legacy-mixin)
Expand Down Expand Up @@ -15060,7 +15060,7 @@ Data table core styles
padding-bottom: 0;
}

th.#{$prefix}--table-column-checkbox:hover {
.#{$prefix}--date-table tbody th.#{$prefix}--table-column-checkbox:hover {
background: $data-table-column-hover;
}

Expand Down Expand Up @@ -16797,13 +16797,6 @@ Dropdown styles

.#{$prefix}--dropdown--inline .#{$prefix}--dropdown-link {
font-weight: normal;
margin-right: $carbon--spacing-04;
margin-left: rem(10px);

&:focus {
margin: 0;
padding-left: rem(10px);
}
}

.#{$prefix}--dropdown--show-selected .#{$prefix}--dropdown--selected {
Expand Down Expand Up @@ -20934,8 +20927,7 @@ Search styles
width: rem(16px);
top: 50%;
transform: translateY(-50%);
// Ensure clear icon is rendered in Firefox (#1127)
fill: $text-02;
fill: $icon-02;
pointer-events: none;
}

Expand Down Expand Up @@ -21083,7 +21075,7 @@ Search styles
- [ui-04 [variable]](#ui-04-variable)
- [text-05 [variable]](#text-05-variable)
- [field-02 [variable]](#field-02-variable)
- [text-02 [variable]](#text-02-variable)
- [icon-02 [variable]](#icon-02-variable)
- [carbon--spacing-01 [variable]](#carbon--spacing-01-variable)
- [icon-01 [variable]](#icon-01-variable)
- [hover-field [variable]](#hover-field-variable)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
padding-bottom: 0;
}

th.#{$prefix}--table-column-checkbox:hover {
.#{$prefix}--date-table tbody th.#{$prefix}--table-column-checkbox:hover {
background: $data-table-column-hover;
}

Expand Down
7 changes: 0 additions & 7 deletions packages/components/src/components/dropdown/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -399,13 +399,6 @@

.#{$prefix}--dropdown--inline .#{$prefix}--dropdown-link {
font-weight: normal;
margin-right: $carbon--spacing-04;
margin-left: rem(10px);

&:focus {
margin: 0;
padding-left: rem(10px);
}
}

.#{$prefix}--dropdown--show-selected .#{$prefix}--dropdown--selected {
Expand Down
3 changes: 1 addition & 2 deletions packages/components/src/components/search/_search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@
width: rem(16px);
top: 50%;
transform: translateY(-50%);
// Ensure clear icon is rendered in Firefox (#1127)
fill: $text-02;
fill: $icon-02;
pointer-events: none;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default props => (
title="DataTable"
description="With toolbar"
{...getTableContainerProps()}>
<TableToolbar>
<TableToolbar aria-label="data table toolbar">
<TableToolbarContent>
<TableToolbarSearch onChange={onInputChange} />
<TableToolbarMenu>
Expand Down
8 changes: 2 additions & 6 deletions packages/react/src/components/Tab/Tab-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@ describe('Tab', () => {
);
});

it('renders <li> with [role="presentation"]', () => {
expect(wrapper.props().role).toEqual('presentation');
});

it('renders <a> with [role="tab"]', () => {
expect(wrapper.find('a').props().role).toEqual('tab');
it('renders <li> with [role="tab"]', () => {
expect(wrapper.props().role).toEqual('tab');
});

it('renders <a> with tabindex set to 0', () => {
Expand Down
10 changes: 4 additions & 6 deletions packages/react/src/components/Tab/Tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,7 @@ export default class Tab extends React.Component {
id,
className: `${prefix}--tabs__nav-link`,
href,
role: 'tab',
tabIndex: !disabled ? tabIndex : -1,
['aria-selected']: selected,
['aria-disabled']: disabled,
['aria-controls']: id && `${id}__panel`,
ref: e => {
this.tabAnchor = e;
},
Expand All @@ -164,8 +160,10 @@ export default class Tab extends React.Component {
handleTabKeyDown(index, evt);
onKeyDown(evt);
}}
role="presentation"
selected={selected}>
role="tab"
aria-selected={selected}
aria-disabled={disabled}
aria-controls={`${id}__panel`}>
{renderAnchor ? (
renderAnchor(anchorProps)
) : (
Expand Down

0 comments on commit 98d3797

Please sign in to comment.