Skip to content

Commit

Permalink
Merge branch 'main' into readonlyMultiSelect
Browse files Browse the repository at this point in the history
  • Loading branch information
tay1orjones authored Nov 8, 2022
2 parents 6b416c2 + a6650fd commit 847348a
Show file tree
Hide file tree
Showing 45 changed files with 1,048 additions and 57 deletions.
67 changes: 67 additions & 0 deletions e2e/components/FluidDatePicker/FluidDatePicker-test.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/**
* Copyright IBM Corp. 2022
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

const { expect, test } = require('@playwright/test');
const { themes } = require('../../test-utils/env');
const { snapshotStory, visitStory } = require('../../test-utils/storybook');

test.describe('FluidDatePicker', () => {
themes.forEach((theme) => {
test.describe(theme, () => {
test('fluid date picker (range) @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'FluidDatePicker',
id: 'experimental-unstable-fluiddatepicker--range-with-calendar',
theme,
});
});

test('fluid date picker (single) @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'FluidDatePicker',
id: 'experimental-unstable-fluiddatepicker--single',
theme,
});
});

test('fluid date picker (simple) @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'FluidDatePicker',
id: 'experimental-unstable-fluiddatepicker--simple',
theme,
});
});
});
});

test('accessibility-checker @avt', async ({ page }) => {
await visitStory(page, {
component: 'FluidDatePicker',
id: 'experimental-unstable-fluiddatepicker--range-with-calendar',
globals: {
theme: 'white',
},
});
await visitStory(page, {
component: 'FluidDatePicker',
id: 'experimental-unstable-fluiddatepicker--single',
globals: {
theme: 'white',
},
});
await visitStory(page, {
component: 'FluidDatePicker',
id: 'experimental-unstable-fluiddatepicker--simple',
globals: {
theme: 'white',
},
});
await expect(page).toHaveNoACViolations('FluidDatePicker');
});
});
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.20.0-rc.1",
"version": "0.20.0-rc.2",
"scripts": {
"develop": "vite"
},
"devDependencies": {
"vite": "^2.8.0"
},
"dependencies": {
"@carbon/styles": "^1.17.0-rc.1",
"@carbon/styles": "^1.17.0-rc.2",
"sass": "^1.51.0"
}
}
4 changes: 2 additions & 2 deletions examples/codesandbox-with-sass-compilation/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox-with-sass-compilation",
"version": "0.18.0-rc.1",
"version": "0.18.0-rc.2",
"private": true,
"dependencies": {
"@carbon/react": "^1.17.0-rc.1",
"@carbon/react": "^1.17.0-rc.2",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox",
"version": "0.18.0-rc.1",
"version": "0.18.0-rc.2",
"private": true,
"dependencies": {
"@carbon/react": "^1.17.0-rc.1",
"@carbon/react": "^1.17.0-rc.2",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "custom-theme",
"private": true,
"version": "0.15.0-rc.1",
"version": "0.15.0-rc.2",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.17.0-rc.1",
"@carbon/react": "^1.17.0-rc.2",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/incremental-migration/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "incremental-migration",
"private": true,
"version": "0.17.0-rc.1",
"version": "0.17.0-rc.2",
"scripts": {
"build": "next build",
"dev": "next dev",
Expand All @@ -13,7 +13,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.17.0-rc.1",
"@carbon/react": "^1.17.0-rc.2",
"carbon-components": "^10.57.0",
"carbon-components-react": "^7.57.0",
"carbon-icons": "^7.0.7",
Expand Down
4 changes: 2 additions & 2 deletions examples/light-dark-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-light-dark",
"private": true,
"version": "0.15.0-rc.1",
"version": "0.15.0-rc.2",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.17.0-rc.1",
"@carbon/react": "^1.17.0-rc.2",
"next": "12.1.4",
"react": "18.0.0",
"react-dom": "18.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-nextjs",
"private": true,
"version": "0.17.0-rc.1",
"version": "0.17.0-rc.2",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.17.0-rc.1",
"@carbon/react": "^1.17.0-rc.2",
"next": "12.1.4",
"react": "18.0.0",
"react-dom": "18.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "vite",
"private": true,
"version": "0.15.0-rc.1",
"version": "0.15.0-rc.2",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.17.0-rc.1",
"@carbon/react": "^1.17.0-rc.2",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/carbon-components-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": "8.17.0-rc.1",
"version": "8.17.0-rc.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,8 +39,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.17.0-rc.1",
"@carbon/styles": "^1.17.0-rc.1",
"@carbon/react": "^1.17.0-rc.2",
"@carbon/styles": "^1.17.0-rc.2",
"@carbon/telemetry": "0.1.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by carbon-components-react. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/fluid-date-picker/fluid-date-picker';
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by carbon-components-react. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/fluid-date-picker';
4 changes: 2 additions & 2 deletions packages/carbon-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": "11.17.0-rc.1",
"version": "11.17.0-rc.2",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -40,7 +40,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.17.0-rc.1",
"@carbon/styles": "^1.17.0-rc.2",
"@carbon/telemetry": "0.1.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by carbon-components. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/fluid-date-picker/fluid-date-picker';
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by carbon-components. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/fluid-date-picker';
41 changes: 40 additions & 1 deletion packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2367,6 +2367,12 @@ Map {
"inline": Object {
"type": "bool",
},
"invalid": Object {
"type": "bool",
},
"invalidText": Object {
"type": "node",
},
"light": [Function],
"locale": Object {
"args": Array [
Expand Down Expand Up @@ -2501,6 +2507,12 @@ Map {
],
"type": "oneOfType",
},
"warn": Object {
"type": "bool",
},
"warnText": Object {
"type": "node",
},
},
"render": [Function],
},
Expand Down Expand Up @@ -7639,7 +7651,6 @@ Map {
"TextArea" => Object {
"$$typeof": Symbol(react.forward_ref),
"defaultProps": Object {
"cols": 50,
"disabled": false,
"enableCounter": false,
"helperText": "",
Expand Down Expand Up @@ -9403,6 +9414,34 @@ Map {
},
},
},
"unstable__FluidDatePicker" => Object {
"$$typeof": Symbol(react.forward_ref),
"propTypes": Object {
"children": Object {
"type": "node",
},
"className": Object {
"type": "string",
},
"invalid": Object {
"type": "bool",
},
"invalidText": Object {
"type": "node",
},
"warn": Object {
"type": "bool",
},
"warnText": Object {
"type": "node",
},
},
"render": [Function],
},
"unstable__FluidDatePickerInput" => Object {
"$$typeof": Symbol(react.forward_ref),
"render": [Function],
},
"unstable__FluidDropdown" => Object {
"$$typeof": Symbol(react.forward_ref),
"propTypes": Object {
Expand Down
4 changes: 2 additions & 2 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/react",
"description": "React components for the Carbon Design System",
"version": "1.17.0-rc.1",
"version": "1.17.0-rc.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -46,7 +46,7 @@
"@carbon/feature-flags": "^0.9.0",
"@carbon/icons-react": "^11.10.0",
"@carbon/layout": "^11.7.0",
"@carbon/styles": "^1.17.0-rc.1",
"@carbon/styles": "^1.17.0-rc.2",
"@carbon/telemetry": "0.1.0",
"classnames": "2.3.2",
"copy-to-clipboard": "^3.3.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by @carbon/react. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/fluid-date-picker/fluid-date-picker';
9 changes: 9 additions & 0 deletions packages/react/scss/components/fluid-date-picker/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by @carbon/react. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/fluid-date-picker';
2 changes: 2 additions & 0 deletions packages/react/src/__tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ describe('Carbon Components React', () => {
"unstable_TextDirection",
"unstable__FluidComboBox",
"unstable__FluidComboBoxSkeleton",
"unstable__FluidDatePicker",
"unstable__FluidDatePickerInput",
"unstable__FluidDropdown",
"unstable__FluidDropdownSkeleton",
"unstable__FluidMultiSelect",
Expand Down
Loading

0 comments on commit 847348a

Please sign in to comment.