Skip to content

Commit

Permalink
Merge branch 'main' into emotion/forms
Browse files Browse the repository at this point in the history
  • Loading branch information
cee-chen committed Jun 6, 2024
2 parents 1780a0d + c0148bf commit 5ee7347
Show file tree
Hide file tree
Showing 133 changed files with 35,525 additions and 24,904 deletions.
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ node_modules

# Global log files
npm-debug.log
yarn-error.log

# IDE-specific files
.idea
Expand All @@ -24,3 +23,13 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# Yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
yarn-error.log
894 changes: 894 additions & 0 deletions .yarn/releases/yarn-4.2.2.cjs

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.2.2.cjs

nmHoistingLimits: workspaces

18 changes: 7 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
"workspaces": {
"packages": [
"packages/*"
],
"nohoist": [
"**/eslint-plugin-local",
"**/eslint-plugin-local/**",
"**/stylelint",
"**/stylelint/**"
]
},
"scripts": {
Expand All @@ -31,9 +25,11 @@
"pre-push": "^0.1.4"
},
"resolutions": {
"**/prismjs": "1.27.0",
"**/react": "^18",
"**/@types/react": "^18",
"react-focus-lock": "2.9.5"
}
"prismjs": "1.27.0",
"react": "^18",
"@types/react": "^18",
"react-focus-lock": "2.9.5",
"@babel/core": "^7.21.8"
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"homepage": "https://github.com/elastic/eui/blob/main/packages/eslint-plugin",
"peerDependencies": {
"eslint": ">=5, <7"
"eslint": ">=5 <7"
},
"devDependencies": {
"@babel/core": "^7.6.0",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions packages/eui/.storybook/loki.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ export const LOKI_SELECTORS = {
* Portal element content selector
*/
portal: '[data-euiportal="true"]',
/**
* Body selector
* TODO: remove when LOKI_SELECTORS.portal selector works as expected again
*/
body: 'body',
} as const;

/**
Expand Down
8 changes: 8 additions & 0 deletions packages/eui/changelogs/CHANGELOG_2024.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## [`v94.6.0`](https://github.com/elastic/eui/releases/v94.6.0)

- Updated `EuiComboBox` to support rendering `option.append` and `option.prepend` in group labels ([#7800](https://github.com/elastic/eui/pull/7800))

**Accessibility**

- Improved the accessibility experience of `EuiBetaBadge` ([#7805](https://github.com/elastic/eui/pull/7805))

## [`v94.5.2`](https://github.com/elastic/eui/releases/v94.5.2)

**Bug fixes**
Expand Down
4 changes: 4 additions & 0 deletions packages/eui/changelogs/upcoming/7682.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**Breaking changes**

- Removed deprecated `EUI_CHARTS_THEME_DARK`, `EUI_CHARTS_THEME_LIGHT` and `EUI_SPARKLINE_THEME_PARTIAL` exports

4 changes: 4 additions & 0 deletions packages/eui/changelogs/upcoming/7793.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**Bug fixes**

- Fixed an `EuiDataGrid` visual bug when using `lineCount` row heights where the clamped text was still visible for some font sizes

3 changes: 3 additions & 0 deletions packages/eui/changelogs/upcoming/7806.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Bug fixes**

- Fixed `EuiSearchBar`'s filter configs to always respect `autoClose: false`
3 changes: 3 additions & 0 deletions packages/eui/changelogs/upcoming/7808.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Breaking changes**

- Removed deprecated `euiPalettePositive` and `euiPaletteNegative`. Use `euiPaletteGreen` and `euiPaletteRed` instead
3 changes: 3 additions & 0 deletions packages/eui/changelogs/upcoming/7814.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Breaking changes**

- Removed `type="inList"` from `EuiCheckbox`. Simply omit passing a `label` prop to render this style of checkbox
56 changes: 28 additions & 28 deletions packages/eui/i18ntokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,14 +851,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 335,
"line": 339,
"column": 12,
"index": 9517
"index": 9584
},
"end": {
"line": 338,
"line": 342,
"column": 14,
"index": 9640
"index": 9707
}
},
"filepath": "src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx"
Expand All @@ -869,14 +869,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 348,
"line": 352,
"column": 16,
"index": 10079
"index": 10146
},
"end": {
"line": 352,
"line": 356,
"column": 18,
"index": 10310
"index": 10377
}
},
"filepath": "src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx"
Expand All @@ -887,14 +887,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 367,
"line": 371,
"column": 16,
"index": 10739
"index": 10806
},
"end": {
"line": 373,
"line": 377,
"column": 18,
"index": 11012
"index": 11079
}
},
"filepath": "src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx"
Expand All @@ -905,14 +905,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 402,
"line": 406,
"column": 20,
"index": 12003
"index": 12070
},
"end": {
"line": 408,
"line": 412,
"column": 22,
"index": 12301
"index": 12368
}
},
"filepath": "src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx"
Expand All @@ -923,14 +923,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 419,
"line": 423,
"column": 12,
"index": 12505
"index": 12572
},
"end": {
"line": 423,
"line": 427,
"column": 14,
"index": 12726
"index": 12793
}
},
"filepath": "src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx"
Expand All @@ -941,14 +941,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 430,
"line": 434,
"column": 10,
"index": 12845
"index": 12912
},
"end": {
"line": 433,
"line": 437,
"column": 12,
"index": 12985
"index": 13052
}
},
"filepath": "src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx"
Expand All @@ -959,14 +959,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 439,
"line": 443,
"column": 10,
"index": 13098
"index": 13165
},
"end": {
"line": 442,
"line": 446,
"column": 12,
"index": 13241
"index": 13308
}
},
"filepath": "src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx"
Expand Down
3 changes: 2 additions & 1 deletion packages/eui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@elastic/eui",
"description": "Elastic UI Component Library",
"version": "94.5.2",
"version": "94.6.0",
"license": "SEE LICENSE IN LICENSE.txt",
"main": "lib",
"module": "es",
Expand Down Expand Up @@ -143,6 +143,7 @@
"@types/testing-library__jest-dom": "^5.14.3",
"@types/url-parse": "^1.4.8",
"@types/uuid": "^8.3.0",
"@types/vfile-message": "^2.0.0",
"@typescript-eslint/eslint-plugin": "^5.59.7",
"@typescript-eslint/parser": "^5.59.7",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
Expand Down
22 changes: 0 additions & 22 deletions packages/eui/scripts/compile-eui.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const IGNORE_TESTENV = [
];
const IGNORE_PACKAGES = [
'**/react-datepicker/test/**/*.js',
'**/themes/charts/themes.ts',
];

function compileLib() {
Expand Down Expand Up @@ -207,27 +206,6 @@ function compileBundle() {
}
);
console.log(chalk.green('✔ Finished test utils files'));

console.log('Building chart theme module...');
execSync('webpack --config=src/themes/charts/webpack.config.js', {
stdio: 'inherit',
});
dtsGenerator({
prefix: '',
out: 'dist/eui_charts_theme.d.ts',
baseDir: path.resolve(__dirname, '..', 'src/themes/charts/'),
files: ['themes.ts'],
resolveModuleId() {
return '@elastic/eui/dist/eui_charts_theme';
},
resolveModuleImport(params) {
if (params.importedModuleId === '../../components/common') {
return '@elastic/eui/src/components/common';
}
return null;
},
});
console.log(chalk.green('✔ Finished chart theme module'));
}

compileLib();
Expand Down
1 change: 0 additions & 1 deletion packages/eui/scripts/dtsgenerator.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ const generator = dtsGenerator({
'**/*.stories.{ts,tsx}',
'**/*.mock.{ts,tsx}',
'**/__mocks__/*',
'src/themes/charts/*', // A separate d.ts file is generated for the charts theme file
'src/test/**/*', // Separate d.ts files are generated for test utils
'src-docs/**/*', // Don't include src-docs
'**/*.mdx', // Don't include storybook mdx files
Expand Down
4 changes: 1 addition & 3 deletions packages/eui/scripts/jest/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ const config = {
'^.+\\.(js|tsx?)$': 'babel-jest',
},
snapshotSerializers: [
// enzyme-to-json is installed in the root node_modules and needs
// an exact path to be provided here
'<rootDir>/../../node_modules/enzyme-to-json/serializer',
'<rootDir>/node_modules/enzyme-to-json/serializer',
'<rootDir>/scripts/jest/setup/emotion',
],
// react version and user permissions aware cache directory
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"euiVersions": [
"94.6.0",
"94.5.2",
"94.5.1",
"94.5.0",
Expand Down
Loading

0 comments on commit 5ee7347

Please sign in to comment.