Skip to content

Commit

Permalink
Merge pull request #952 from carbon-design-system/dev
Browse files Browse the repository at this point in the history
chore: publish `v1.40.1`
  • Loading branch information
SimonFinney authored Apr 28, 2021
2 parents a035af2 + 262433c commit 3c503e1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .achecker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# optional - Specify the rule archive
# Default: latest
# Run `npx achecker archives` for a list of valid ruleArchive ids and policy ids
ruleArchive: latest
ruleArchive: 10Feb2021

# optional - Specify one or many policies to scan.
# i.e. For one policy use policies: IBM_Accessibility
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carbon/ibm-security",
"version": "1.40.0",
"version": "1.40.1-prerelease.1",
"description": "Carbon for IBM Security",
"license": "Apache-2.0",
"main": "lib/index.js",
Expand Down Expand Up @@ -36,7 +36,7 @@
"lint:scss": "yarn lint:scss:precommit '**/*.scss'",
"lint:scss:precommit": "stylelint --fix --ignore-path .gitignore",
"lint-staged": "lint-staged",
"postinstall": "npm_config_yes=true npx @carbon/[email protected] collect --install",
"postinstall": "carbon-telemetry collect --install",
"semantic-release": "semantic-release",
"start": "start-storybook -p 3000 -s public",
"test": "yarn jest spec --ci -i",
Expand All @@ -58,6 +58,7 @@
"@carbon/import-once": "10.5.0",
"@carbon/layout": "10.22.0",
"@carbon/motion": "10.15.0",
"@carbon/telemetry": "^0.0.0-alpha.6",
"@carbon/themes": "10.31.0",
"@carbon/type": "10.25.0",
"carbon-components": "10.32.0",
Expand Down
4 changes: 3 additions & 1 deletion src/components/TypeLayout/TypeLayout.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @file Type layout.
* @copyright IBM Security 2019 - 2020
* @copyright IBM Security 2019 - 2021
*/

import classnames from 'classnames';
Expand Down Expand Up @@ -59,6 +59,7 @@ const TypeLayoutBody = ({ children, className, ...other }) => (
const TypeLayoutCell = ({ children, className, ...other }) => (
<StructuredListCell
className={classnames(`${namespace}__cell`, className)}
tabIndex="-1"
{...other}
>
{children}
Expand All @@ -68,6 +69,7 @@ const TypeLayoutCell = ({ children, className, ...other }) => (
const TypeLayoutRow = ({ children, className, ...other }) => (
<StructuredListRow
className={classnames(`${namespace}__row`, className)}
role="row"
{...other}
>
{children}
Expand Down
8 changes: 3 additions & 5 deletions src/components/TypeLayout/__tests__/TypeLayout.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { render } from '@testing-library/react';
import React from 'react';

// import renderWithinLandmark from '../../../../config/jest/helpers/renderWithinLandmark';
import renderWithinLandmark from '../../../../config/jest/helpers/renderWithinLandmark';

import {
TypeLayout,
Expand All @@ -20,9 +20,7 @@ import { namespace } from '../TypeLayout';
const sizes = ['xs', 'sm', 'md', 'lg'];

describe('TypeLayout', () => {
// https://github.com/carbon-design-system/carbon/issues/1937

/* test('should have no Axe or DAP violations', async () => {
test('should have no Axe or DAP violations', async () => {
const { container } = renderWithinLandmark(
<TypeLayout>
<TypeLayoutBody>
Expand All @@ -39,7 +37,7 @@ describe('TypeLayout', () => {
);
await expect(container).toHaveNoAxeViolations();
await expect(container).toHaveNoDAPViolations('TypeLayout');
}); */
});

test('should add a custom class to each component', () => {
const { getByText } = render(
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2069,7 +2069,7 @@
resolved "https://registry.yarnpkg.com/@carbon/motion/-/motion-10.15.0.tgz#ddf38a5d4bf594abf0adb9302bb1101c5ae93346"
integrity sha512-hyGUNm+5TB9NlXgtbAmXlVN7ivjdBxoV8h/f+461eQ5BLiu/MibcLtTM3zeIypUYxd3PUNAx9DcMN12t/J3EpA==

"@carbon/[email protected]":
"@carbon/[email protected]", "@carbon/telemetry@^0.0.0-alpha.6":
version "0.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@carbon/telemetry/-/telemetry-0.0.0-alpha.6.tgz#1d11e64f310e98f32c3db0c55f02e047f2398087"
integrity sha512-DCE8ui/tFi+qvCH+mewbUbWzsiq5Ko3HU1lgrVbpjWv1LfswLKFmMg4Os+PmX6edYoBj39qVChJPeaN/UyfJDw==
Expand Down

0 comments on commit 3c503e1

Please sign in to comment.