Skip to content

Commit

Permalink
Merge branch 'main' into 18005-add-decorator-in-dataTable
Browse files Browse the repository at this point in the history
  • Loading branch information
preetibansalui authored Jan 2, 2025
2 parents ff2e40c + 7b6d921 commit 5fb4244
Show file tree
Hide file tree
Showing 59 changed files with 224 additions and 206 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion config/jest-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "jest-config-carbon",
"private": true,
"description": "Jest configuration and preset for Carbon",
"version": "1.16.0",
"version": "1.17.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions examples/class-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "class-prefix",
"private": true,
"version": "0.69.0",
"version": "0.70.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.72.0",
"@carbon/react": "^1.73.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.74.0",
"version": "0.75.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.71.0"
"@carbon/styles": "^1.72.0-rc.0"
}
}
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "custom-theme",
"private": true,
"version": "0.70.0",
"version": "0.71.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.72.0",
"@carbon/react": "^1.73.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/id-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "id-prefix",
"private": true,
"version": "0.69.0",
"version": "0.70.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.72.0",
"@carbon/react": "^1.73.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
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.70.0",
"version": "0.71.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.72.0",
"@carbon/react": "^1.73.0-rc.0",
"next": "14.1.1",
"react": "18.2.0",
"react-dom": "18.2.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.72.0",
"version": "0.73.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.72.0",
"@carbon/react": "^1.73.0-rc.0",
"next": "14.1.1",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/v10-token-compat-in-v11/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "v10-token-compat-in-v11",
"private": true,
"version": "0.70.0",
"version": "0.71.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.72.0",
"@carbon/react": "^1.73.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "vite",
"private": true,
"version": "0.70.0",
"version": "0.71.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.72.0",
"@carbon/react": "^1.73.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.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
Expand Up @@ -2,7 +2,7 @@
"name": "carbon-components-react",
"private": true,
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences. This package reached end of support on September 30, 2024 and will not receive any more updates.",
"version": "8.72.0",
"version": "8.73.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -43,8 +43,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.72.0",
"@carbon/styles": "^1.71.0",
"@carbon/react": "^1.73.0-rc.0",
"@carbon/styles": "^1.72.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "carbon-components",
"private": true,
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences. This package reached end of support on September 30, 2024 and will not receive any more updates.",
"version": "11.71.0",
"version": "11.72.0-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -44,7 +44,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.71.0",
"@carbon/styles": "^1.72.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
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": "11.57.0",
"version": "11.58.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,12 +39,12 @@
},
"dependencies": {
"@carbon/colors": "^11.28.0",
"@carbon/grid": "^11.29.0",
"@carbon/grid": "^11.30.0-rc.0",
"@carbon/icons": "^11.53.0",
"@carbon/layout": "^11.28.0",
"@carbon/motion": "^11.24.0",
"@carbon/themes": "^11.43.0",
"@carbon/type": "^11.33.0",
"@carbon/themes": "^11.44.0-rc.0",
"@carbon/type": "^11.34.0-rc.0",
"@ibm/telemetry-js": "^1.5.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/grid",
"description": "Grid for digital and software products using the Carbon Design System",
"version": "11.29.0",
"version": "11.30.0-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions packages/pictograms-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/pictograms-react",
"description": "React components for pictograms in digital and software products using the Carbon Design System",
"version": "11.69.0",
"version": "11.70.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -45,7 +45,7 @@
},
"devDependencies": {
"@carbon/icon-build-helpers": "^1.32.0",
"@carbon/pictograms": "^12.43.0",
"@carbon/pictograms": "^12.44.0-rc.0",
"rimraf": "^6.0.0"
},
"sideEffects": false
Expand Down
2 changes: 1 addition & 1 deletion packages/pictograms/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/pictograms",
"description": "Pictograms for digital and software products using the Carbon Design System",
"version": "12.43.0",
"version": "12.44.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
8 changes: 4 additions & 4 deletions packages/react/code-connect/DatePicker/DatePicker.figma.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ figma.connect(
readOnly: figma.enum('State', {
'Read-only': true,
}),
// hideLabel: figma.boolean('Show label ', { // extra space after label in Figma property name causing code connect to break
// true: false,
// false: true,
// }),
hideLabel: figma.boolean('Show label', {
true: false,
false: true,
}),
},
example: ({ ...props }) => (
<DatePicker type="simple">
Expand Down
2 changes: 1 addition & 1 deletion packages/react/code-connect/UIShell/Header.figma.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import figma from '@figma/code-connect';

figma.connect(
Header,
'https://www.figma.com/design/YAnB1jKx0yCUL29j6uSLpg/(v11)-All-themes---Carbon-Design-System?node-id=2213-17092&t=A3oys5odsvKkcDFA-4',
'https://www.figma.com/design/YAnB1jKx0yCUL29j6uSLpg/(v11)-Carbon-Design-System?node-id=92123-1663&t=UFUf7yvv8SJyoEK1-4',
{
props: {
prefix: figma.boolean('Site prefix', {
Expand Down
8 changes: 4 additions & 4 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.72.0",
"version": "1.73.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -52,7 +52,7 @@
"@carbon/feature-flags": "^0.24.0",
"@carbon/icons-react": "^11.53.0",
"@carbon/layout": "^11.28.0",
"@carbon/styles": "^1.71.0",
"@carbon/styles": "^1.72.0-rc.0",
"@floating-ui/react": "^0.26.0",
"@ibm/telemetry-js": "^1.5.0",
"classnames": "2.5.1",
Expand All @@ -78,8 +78,8 @@
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@carbon/test-utils": "^10.34.0",
"@carbon/themes": "^11.43.0",
"@figma/code-connect": "^1.2.2",
"@carbon/themes": "^11.44.0-rc.0",
"@figma/code-connect": "^1.2.4",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-commonjs": "^28.0.0",
"@rollup/plugin-node-resolve": "^15.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/styles",
"description": "Styles for the Carbon Design System",
"version": "1.71.0",
"version": "1.72.0-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -42,11 +42,11 @@
"dependencies": {
"@carbon/colors": "^11.28.0",
"@carbon/feature-flags": "^0.24.0",
"@carbon/grid": "^11.29.0",
"@carbon/grid": "^11.30.0-rc.0",
"@carbon/layout": "^11.28.0",
"@carbon/motion": "^11.24.0",
"@carbon/themes": "^11.43.0",
"@carbon/type": "^11.33.0",
"@carbon/themes": "^11.44.0-rc.0",
"@carbon/type": "^11.34.0-rc.0",
"@ibm/plex": "6.0.0-next.6",
"@ibm/plex-mono": "0.0.3-alpha.0",
"@ibm/plex-sans": "0.0.3-alpha.0",
Expand Down
7 changes: 5 additions & 2 deletions packages/styles/scss/components/tile/_tile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@use '../../type' as *;
@use '../../utilities/ai-gradient' as *;
@use '../../utilities/button-reset';
@use '../../utilities/convert';
@use '../../utilities/component-reset';
@use '../../utilities/focus-outline' as *;
@use '../../utilities/high-contrast-mode' as *;
Expand Down Expand Up @@ -131,8 +132,10 @@ $-icon-container-size: calc(#{layout.density('padding-inline')} * 2 + 1rem);
.#{$prefix}--tile--clickable.#{$prefix}--link--disabled
.#{$prefix}--tile--disabled-icon {
position: absolute;
inset-block-end: layout.density('padding-inline');
inset-inline-end: layout.density('padding-inline');
block-size: convert.to-rem(20px);
inline-size: convert.to-rem(20px);
inset-block-end: convert.to-rem(12px);
inset-inline-end: convert.to-rem(12px);
}

.#{$prefix}--tile--clickable .#{$prefix}--tile--icon {
Expand Down
4 changes: 2 additions & 2 deletions packages/themes/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/themes",
"description": "Themes for applying color in the Carbon Design System",
"version": "11.43.0",
"version": "11.44.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@carbon/colors": "^11.28.0",
"@carbon/layout": "^11.28.0",
"@carbon/type": "^11.33.0",
"@carbon/type": "^11.34.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"color": "^4.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/type/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/type",
"description": "Typography for digital and software products using the Carbon Design System",
"version": "11.33.0",
"version": "11.34.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -40,7 +40,7 @@
"postinstall": "ibmtelemetry --config=telemetry.yml"
},
"dependencies": {
"@carbon/grid": "^11.29.0",
"@carbon/grid": "^11.30.0-rc.0",
"@carbon/layout": "^11.28.0",
"@ibm/telemetry-js": "^1.5.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/upgrade/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/upgrade",
"description": "A tool for upgrading Carbon versions",
"version": "11.21.0",
"version": "11.22.0-rc.0",
"license": "Apache-2.0",
"bin": {
"carbon-upgrade": "./bin/carbon-upgrade.js"
Expand Down
Loading

0 comments on commit 5fb4244

Please sign in to comment.