Skip to content

Commit

Permalink
Merge branch 'master' into data-table-docs-playground
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Sep 17, 2020
2 parents b19e83c + 4673aaf commit 1010647
Show file tree
Hide file tree
Showing 102 changed files with 1,598 additions and 148 deletions.
2 changes: 1 addition & 1 deletion config/stylelint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "stylelint-config-carbon",
"description": "Stylelint configuration for Carbon",
"version": "1.0.0",
"version": "1.1.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": "https://github.com/carbon-design-system/carbon/tree/master/config/stylelint-config-carbon",
Expand Down
8 changes: 4 additions & 4 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "10.20.0-rc.0",
"version": "10.20.0",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -79,9 +79,9 @@
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@carbon/elements": "^10.19.0-rc.0",
"@carbon/icons-handlebars": "^10.17.0",
"@carbon/icons-react": "^10.17.0",
"@carbon/elements": "^10.19.0",
"@carbon/icons-handlebars": "^10.18.0",
"@carbon/icons-react": "^10.18.0",
"@carbon/test-utils": "^10.11.0",
"@frctl/fractal": "^1.1.0",
"adaro": "1.0.4",
Expand Down
8 changes: 4 additions & 4 deletions packages/elements/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/elements",
"description": "A collection of design elements in code for the IBM Design Language",
"version": "10.19.0-rc.0",
"version": "10.19.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -33,12 +33,12 @@
"dependencies": {
"@carbon/colors": "^10.13.0",
"@carbon/grid": "^10.15.0",
"@carbon/icons": "^10.17.0",
"@carbon/icons": "^10.18.0",
"@carbon/import-once": "^10.3.0",
"@carbon/layout": "^10.13.0",
"@carbon/motion": "^10.9.0",
"@carbon/themes": "^10.19.0-rc.0",
"@carbon/type": "^10.16.0-rc.0"
"@carbon/themes": "^10.19.0",
"@carbon/type": "^10.16.0"
},
"devDependencies": {
"@carbon/bundler": "^10.9.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/icons-handlebars/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-handlebars",
"description": "Handlebars helpers for IBM Design Language icons in digital and software products using the Carbon Design System",
"version": "10.17.0",
"version": "10.18.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/icons-handlebars",
Expand All @@ -23,7 +23,7 @@
},
"dependencies": {
"@carbon/icon-helpers": "^10.9.0",
"@carbon/icons": "^10.17.0"
"@carbon/icons": "^10.18.0"
},
"devDependencies": {
"handlebars": "^4.0.12"
Expand Down
4 changes: 2 additions & 2 deletions packages/icons-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-react",
"description": "React components for icons in digital and software products using the Carbon Design System",
"version": "10.17.0",
"version": "10.18.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.11.0",
"@carbon/icons": "^10.17.0"
"@carbon/icons": "^10.18.0"
},
"sideEffects": false
}
4 changes: 2 additions & 2 deletions packages/icons-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-vue",
"description": "Vue components for icons in digital and software products using the Carbon Design System",
"version": "10.17.0",
"version": "10.18.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand All @@ -28,7 +28,7 @@
},
"devDependencies": {
"@carbon/cli-reporter": "^10.3.0",
"@carbon/icons": "^10.17.0",
"@carbon/icons": "^10.18.0",
"fs-extra": "^8.1.0",
"prettier": "^2.1.0",
"rimraf": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Icons in Carbon are provided through a variety of packages, often specific for
the framework that will use them. Currently, we support the following packages
for various frameworks:

- [Angular](../icons-angular)
- [Angular](https://github.com/carbon-design-system/carbon-icons-angular)
- [React](../icons-react)
- [Vue](../icons-vue)

Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons",
"description": "Icons for digital and software products using the Carbon Design System",
"version": "10.17.0",
"version": "10.18.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
14 changes: 13 additions & 1 deletion packages/icons/src/svg/32/repeat--one.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion packages/icons/src/svg/32/repeat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions packages/react-hooks/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/react-hooks",
"private": true,
"version": "10.14.0-rc.0",
"version": "10.14.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,7 +39,7 @@
"autoprefixer": "^9.7.4",
"babel-loader": "^8.1.0",
"browserslist-config-carbon": "^10.5.0",
"carbon-components": "^10.20.0-rc.0",
"carbon-components": "^10.20.0",
"css-loader": "^3.4.2",
"node-sass": "^4.13.1",
"postcss-loader": "^3.0.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5839,14 +5839,14 @@ Map {
},
"labelA": Object {
"isRequired": true,
"type": "string",
"type": "node",
},
"labelB": Object {
"isRequired": true,
"type": "string",
"type": "node",
},
"labelText": Object {
"type": "string",
"type": "node",
},
"onChange": Object {
"type": "func",
Expand Down Expand Up @@ -5883,14 +5883,14 @@ Map {
},
"labelA": Object {
"isRequired": true,
"type": "string",
"type": "node",
},
"labelB": Object {
"isRequired": true,
"type": "string",
"type": "node",
},
"labelText": Object {
"type": "string",
"type": "node",
},
"onChange": Object {
"type": "func",
Expand Down
6 changes: 3 additions & 3 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components-react",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "7.20.0-rc.0",
"version": "7.20.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,7 +39,7 @@
"react-dom": "^16.8.6"
},
"dependencies": {
"@carbon/icons-react": "^10.17.0",
"@carbon/icons-react": "^10.18.0",
"classnames": "2.2.6",
"downshift": "5.2.1",
"flatpickr": "4.6.1",
Expand Down Expand Up @@ -84,7 +84,7 @@
"babel-plugin-react-docgen": "^4.0.0",
"babel-plugin-transform-inline-environment-variables": "^0.4.0",
"browserslist-config-carbon": "^10.5.0",
"carbon-components": "^10.20.0-rc.0",
"carbon-components": "^10.20.0",
"carbon-icons": "^7.0.5",
"chalk": "^2.3.0",
"cli-table": "^0.3.0",
Expand Down
10 changes: 8 additions & 2 deletions packages/react/src/components/Accordion/Accordion.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import { Accordion, AccordionItem, AccordionSkeleton } from '../Accordion';

# Accordion

[Source code](https://github.com/carbon-design-system/carbon/tree/master/packages/react/src/components/Accordion)
 | 
[Usage guidelines](https://www.carbondesignsystem.com/components/accordion/usage)
 | 
[Accessibility](https://www.carbondesignsystem.com/components/accordion/accessibility)

<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

Expand Down Expand Up @@ -149,6 +155,6 @@ or screen reader.

## Feedback

Help us improve this component by providing feedback, asking questions, and
leaving any other comments on
Help us improve this component by providing feedback, asking questions on Slack,
or updating this file on
[GitHub](https://github.com/carbon-design-system/carbon/edit/master/packages/react/src/components/Accordion/Accordion.mdx).
26 changes: 20 additions & 6 deletions packages/react/src/components/Breadcrumb/Breadcrumb.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import { Breadcrumb, BreadcrumbItem, BreadcrumbSkeleton } from '../Breadcrumb';

# Breadcrumb

[Source code](https://github.com/carbon-design-system/carbon/tree/master/packages/react/src/components/Breadcrumb)
&nbsp;|&nbsp;
[Usage guidelines](https://www.carbondesignsystem.com/components/breadcrumb/usage)
&nbsp;|&nbsp;
[Accessibility](https://www.carbondesignsystem.com/components/breadcrumb/accessibility)

## Table of Contents

- [Overview](#overview)
Expand All @@ -13,15 +19,20 @@ import { Breadcrumb, BreadcrumbItem, BreadcrumbSkeleton } from '../Breadcrumb';

## Overview

You can build a breadcrumb using a combination of the `Breadcrumb` and `BreadcrumbItem` components. The `Breadcrumb` component accepts a list of `BreadcrumbItem` components as `children` and each `BreadcrumbItem` is responsible for displaying the page links in the hierarchy.
You can build a breadcrumb using a combination of the `Breadcrumb` and
`BreadcrumbItem` components. The `Breadcrumb` component accepts a list of
`BreadcrumbItem` components as `children` and each `BreadcrumbItem` is
responsible for displaying the page links in the hierarchy.

<Preview>
<Story id="breadcrumb--breadcrumb" />
</Preview>

## Skeleton state

You can use the `BreadcrumbSkeleton` component to render a skeleton variant of a breadcrumb. This is useful to display while content in your breadcrumb is being fetched from an external resource like an API.
You can use the `BreadcrumbSkeleton` component to render a skeleton variant of a
breadcrumb. This is useful to display while content in your breadcrumb is being
fetched from an external resource like an API.

<Preview>
<Story id="breadcrumb--skeleton" />
Expand All @@ -33,7 +44,8 @@ You can use the `BreadcrumbSkeleton` component to render a skeleton variant of a

### Breadcrumb noTrailingSlash

You can use the `noTrailingSlash` prop to omit the slash from the end of the current page.
You can use the `noTrailingSlash` prop to omit the slash from the end of the
current page.

```jsx
<Breadcrumb noTrailingSlash>
Expand All @@ -45,7 +57,8 @@ You can use the `noTrailingSlash` prop to omit the slash from the end of the cur

### BreadcrumbItem isCurrentPage

You can use the `isCurrentPage` prop on a `BreadcrumbItem` to represent the current page.
You can use the `isCurrentPage` prop on a `BreadcrumbItem` to represent the
current page.

```jsx
<Breadcrumb>
Expand All @@ -59,5 +72,6 @@ You can use the `isCurrentPage` prop on a `BreadcrumbItem` to represent the curr

## Feedback

Help us improve this component by providing feedback through, asking questions on Slack,or updating this file on GitHub
[GitHub](https://github.com/carbon-design-system/carbon/edit/master/packages/react/src/components/Breadcrumb/Breadcrumb.mdx).
Help us improve this component by providing feedback, asking questions on Slack,
or updating this file on
[GitHub](https://github.com/carbon-design-system/carbon/edit/master/packages/react/src/components/Breadcrumb/Breadcrumb.mdx).
14 changes: 11 additions & 3 deletions packages/react/src/components/Button/Button.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@ import { Add16, Delete16 } from '@carbon/icons-react';

# Button

[Source code](https://github.com/carbon-design-system/carbon/tree/master/packages/react/src/components/Button)
&nbsp;|&nbsp;
[Usage guidelines](https://www.carbondesignsystem.com/components/button/usage)
&nbsp;|&nbsp;
[Accessibility](https://www.carbondesignsystem.com/components/button/accessibility)

## Table of Contents

<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->


- [Overview](#overview)
- [Icon-only Buttons](#icon-only-buttons)
- [Set of Buttons](#set-of-buttons)
Expand Down Expand Up @@ -315,5 +322,6 @@ By passing in `stacked` to the `ButtonSet` component, you can arrange your two

## Feedback

Help us improve these docs by
[editing this file on GitHub](https://github.com/carbon-design-system/carbon/edit/master/packages/react/src/components/Accordion/Accordion.stories.mdx)
Help us improve this component by providing feedback, asking questions on Slack,
or updating this file on
[GitHub](https://github.com/carbon-design-system/carbon/edit/master/packages/react/src/components/Button/Button.mdx)
Loading

0 comments on commit 1010647

Please sign in to comment.