Skip to content

Commit

Permalink
Merge branch 'main' into size-prop-codemod
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored May 3, 2021
2 parents 363453d + 92900da commit 2fda605
Show file tree
Hide file tree
Showing 104 changed files with 451 additions and 392 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.
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.
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 codemods/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"react"
],
"dependencies": {
"@babel/preset-env": "^7.12.13",
"@babel/preset-env": "^7.14.0",
"jscodeshift": "^0.12.0"
}
}
18 changes: 9 additions & 9 deletions config/jest-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
"react"
],
"dependencies": {
"@babel/core": "^7.10.0",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-export-default-from": "^7.7.4",
"@babel/plugin-proposal-export-namespace-from": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.10.0",
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@babel/core": "^7.14.0",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-export-default-from": "^7.12.13",
"@babel/plugin-proposal-export-namespace-from": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"accessibility-checker": "^3.1.1",
"axe-core": "^4.1.1",
"babel-jest": "^26.0.1",
"babel-jest": "^26.6.3",
"chalk": "^4.1.0",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
Expand Down
4 changes: 2 additions & 2 deletions config/storybook-preset-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"react-dom": "^16.8.6 || ^17.0.1"
},
"dependencies": {
"@babel/cli": "^7.12.10",
"@babel/core": "^7.12.10",
"@babel/cli": "^7.13.16",
"@babel/core": "^7.14.0",
"@storybook/addon-actions": "^5.3.19",
"@storybook/addon-docs": "^5.3.19",
"@storybook/addon-knobs": "^5.3.19",
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
"react-test-renderer": "~16.9.0"
},
"devDependencies": {
"@babel/core": "^7.10.0",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-export-default-from": "^7.7.4",
"@babel/plugin-proposal-export-namespace-from": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.10.0",
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@babel/core": "^7.14.0",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-export-default-from": "^7.12.13",
"@babel/plugin-proposal-export-namespace-from": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"@carbon/cli": "workspace:packages/cli",
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
"carbon-components-react": "^7.34.0"
},
"devDependencies": {
"@babel/core": "^7.13.14",
"@babel/core": "^7.14.0",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-export-default-from": "^7.12.13",
"@babel/plugin-proposal-export-namespace-from": "^7.12.13",
"@babel/plugin-transform-react-constant-elements": "^7.13.13",
"@babel/preset-env": "^7.13.12",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"access": "public"
},
"dependencies": {
"@babel/core": "^7.12.13",
"@babel/core": "^7.14.0",
"@carbon/cli-reporter": "^10.4.0",
"@octokit/plugin-retry": "^3.0.7",
"@octokit/plugin-throttling": "^2.6.0",
Expand Down
22 changes: 10 additions & 12 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
"semantic-release": "semantic-release"
},
"resolutions": {
"babel-core": "7.0.0-bridge.0",
"freshy": ">= 1.0.3"
},
"dependencies": {
Expand All @@ -76,14 +75,14 @@
"warning": "^3.0.0"
},
"devDependencies": {
"@babel/core": "^7.10.0",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-object-rest-spread": "^7.10.0",
"@babel/plugin-transform-modules-umd": "^7.9.0",
"@babel/plugin-transform-runtime": "^7.10.0",
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@babel/core": "^7.14.0",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-object-rest-spread": "^7.13.8",
"@babel/plugin-transform-modules-umd": "^7.14.0",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"@carbon/cli": "^10.22.0",
"@carbon/elements": "^10.33.0",
"@carbon/icons-handlebars": "^10.31.0",
Expand All @@ -97,11 +96,10 @@
"@rollup/plugin-virtual": "^2.0.3",
"adaro": "1.0.4",
"autoprefixer": "^9.7.4",
"babel-core": "^7.0.0-bridge.0",
"babel-loader": "^8.1.0",
"babel-loader": "^8.2.2",
"babel-plugin-dev-expression": "^0.2.2",
"babel-plugin-istanbul": "^6.0.0",
"babel-plugin-rewire": "^1.1.0",
"babel-plugin-rewire": "^1.2.0",
"bluebird": "~3.1.1",
"browser-sync": "^2.26.3",
"browserslist-config-carbon": "^10.6.1",
Expand Down
11 changes: 11 additions & 0 deletions packages/components/src/components/tooltip/_tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,8 @@
}

&[data-floating-menu-direction='left'] {
margin-left: calc(#{$spacing-03} * -1);

.#{$prefix}--tooltip__caret {
top: 50%;
// left position has an additional space between caret and tooltip
Expand All @@ -510,6 +512,8 @@
}

&[data-floating-menu-direction='top'] {
margin-top: calc(#{$spacing-03} * -1);

.#{$prefix}--tooltip__caret {
top: auto;
bottom: calc(#{$caret-size * (-1)} + 1px);
Expand All @@ -518,13 +522,19 @@
}

&[data-floating-menu-direction='right'] {
margin-left: $spacing-03;

.#{$prefix}--tooltip__caret {
top: 50%;
right: auto;
left: calc(#{$caret-size * (-1)} + 1px);
transform: rotate(270deg) translate(50%, -50%);
}
}

&[data-floating-menu-direction='bottom'] {
margin-top: $spacing-03;
}
}

.#{$prefix}--tooltip__heading {
Expand All @@ -535,6 +545,7 @@

.#{$prefix}--tooltip--shown {
display: block;
margin-top: 0;
}

// Tooltip Definition
Expand Down
4 changes: 2 additions & 2 deletions packages/feature-flags/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"watch": "yarn clean && node tasks/build.js && rollup -c -w"
},
"devDependencies": {
"@babel/generator": "^7.10.2",
"@babel/generator": "^7.14.0",
"@babel/template": "^7.12.13",
"@babel/types": "^7.10.2",
"@babel/types": "^7.14.0",
"@carbon/scss-generator": "^10.13.0",
"change-case": "^4.1.2",
"fs-extra": "^9.0.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/icon-build-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "^7.12.13",
"@babel/generator": "^7.13.9",
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/core": "^7.14.0",
"@babel/generator": "^7.14.0",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"@babel/template": "^7.12.13",
"@babel/types": "^7.13.14",
"@babel/types": "^7.14.0",
"@carbon/cli-reporter": "^10.4.0",
"@carbon/icon-helpers": "^10.16.0",
"@rollup/plugin-babel": "^5.2.2",
Expand Down
27 changes: 13 additions & 14 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@
"window-or-global": "^1.0.1"
},
"devDependencies": {
"@babel/cli": "^7.10.0",
"@babel/core": "^7.10.0",
"@babel/plugin-external-helpers": "^7.7.4",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-export-default-from": "^7.7.4",
"@babel/plugin-proposal-export-namespace-from": "^7.7.4",
"@babel/plugin-syntax-dynamic-import": "^7.7.4",
"@babel/plugin-syntax-import-meta": "^7.7.4",
"@babel/plugin-transform-object-assign": "^7.7.4",
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/cli": "^7.13.16",
"@babel/core": "^7.14.0",
"@babel/plugin-external-helpers": "^7.12.13",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-export-default-from": "^7.12.13",
"@babel/plugin-proposal-export-namespace-from": "^7.12.13",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/plugin-transform-object-assign": "^7.12.13",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"@carbon/test-utils": "^10.15.0",
"@percy/storybook": "^3.3.1",
"@rollup/plugin-babel": "^5.2.2",
Expand All @@ -84,11 +84,10 @@
"@storybook/react": "^5.3.19",
"@storybook/source-loader": "^5.3.19",
"@storybook/theming": "^6.1.18",
"babel-core": "^7.0.0-bridge.0",
"babel-loader": "^8.1.0",
"babel-loader": "^8.2.2",
"babel-plugin-dev-expression": "^0.2.2",
"babel-plugin-react-docgen": "^4.2.1",
"babel-plugin-transform-inline-environment-variables": "^0.4.0",
"babel-plugin-transform-inline-environment-variables": "^0.4.3",
"browserslist-config-carbon": "^10.6.1",
"carbon-components": "^10.34.0",
"carbon-icons": "^7.0.5",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/Tooltip/Tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ class Tooltip extends Component {
handleEscKeyPress = (event) => {
const { open } = this.isControlled ? this.props : this.state;
if (open && keyDownMatch(event, [keys.Escape])) {
event.stopPropagation();
return this._handleUserInputOpenClose(event, { open: false });
}
};
Expand Down
1 change: 0 additions & 1 deletion packages/react/src/internal/FloatingMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@ class FloatingMenu extends React.Component {
...styles,
...positioningStyle,
position: 'absolute',
margin: 0,
opacity: 1,
},
});
Expand Down
3 changes: 2 additions & 1 deletion packages/sketch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@
"skpm:link": "skpm-link"
},
"dependencies": {
"@babel/polyfill": "^7.8.7",
"@carbon/colors": "^10.24.0",
"@carbon/icon-helpers": "^10.16.0",
"@carbon/icons": "^10.31.0",
"@carbon/themes": "^10.33.0",
"@carbon/type": "^10.27.0",
"@skpm/builder": "^0.7.0",
"color-string": "^1.5.3",
"core-js": "^3.11.1",
"regenerator-runtime": "^0.13.7",
"skpm": "^1.2.0"
},
"devDependencies": {
Expand Down
3 changes: 2 additions & 1 deletion packages/sketch/src/commands/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
* LICENSE file in the root directory of this source tree.
*/

import '@babel/polyfill';
import 'core-js/stable';
import 'regenerator-runtime/runtime';

// We export all commands through one entrypoint to prevent build errors
// triggered by having separate entrypoints. Most notably we would encounter
Expand Down
Loading

0 comments on commit 2fda605

Please sign in to comment.