Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Components: upgrade Ariakit to latest #62947

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
eb40b5f
Upgrade Ariakit to latest.
DaniGuardiola Apr 23, 2024
19a95b2
Revert.
DaniGuardiola Apr 23, 2024
e3cfd44
Upgrade in the right package and upgrade "test' too.
DaniGuardiola Apr 23, 2024
430522f
Merge branch 'trunk' of https://github.com/WordPress/gutenberg into u…
DaniGuardiola Jun 27, 2024
50258f0
Upgrade to latest.
DaniGuardiola Jul 1, 2024
79fa288
Pin on v0.3.13 for now.
DaniGuardiola Jul 2, 2024
179f374
Tweaks on two tests.
DaniGuardiola Jul 2, 2024
89f4f17
Merge branch 'trunk' of https://github.com/WordPress/gutenberg into u…
DaniGuardiola Jul 2, 2024
cf493d7
Merge branch 'trunk' of https://github.com/WordPress/gutenberg into u…
DaniGuardiola Jul 15, 2024
aebd132
Merge branch 'trunk' of https://github.com/WordPress/gutenberg into u…
DaniGuardiola Jul 25, 2024
0c64d63
Replace render method with Ariakit's in custom select control (v1).
DaniGuardiola Jul 25, 2024
3be0bc2
Replace render method with Ariakit's in tabs.
DaniGuardiola Jul 25, 2024
68afa3c
Temporarily copy render utility to repo to experiment with it.
DaniGuardiola Jul 25, 2024
bac4026
Add rerender support to `render`.
DaniGuardiola Jul 25, 2024
11a2492
Updated Tabs tests to use new re-render API.
DaniGuardiola Jul 25, 2024
f8ada30
Revert manual fixes and fix one of the test files.
DaniGuardiola Jul 25, 2024
375c5ca
Fix test file by switching to Ariakit's render utility.
DaniGuardiola Jul 25, 2024
3e8fa49
Remove accidentally pushed code (oops).
DaniGuardiola Jul 25, 2024
f4f5cb9
Fix remaining custom-select-control (v1) tests.
DaniGuardiola Jul 25, 2024
38383d1
Fix remaining font-size-picker tests.
DaniGuardiola Jul 25, 2024
ba36ad0
Upgrade `@ariakit/test` to latest.
DaniGuardiola Jul 25, 2024
b6627b1
Upgrade to 0.3.14
DaniGuardiola Jul 25, 2024
7e7cb32
Upgrade to 0.4.0
DaniGuardiola Jul 25, 2024
49a959f
Fix CustomSelectControl tests
tyxla Jul 26, 2024
4c022ed
Revert "Fix CustomSelectControl tests"
DaniGuardiola Jul 26, 2024
30a8c1f
Added TODO notes to Tooltip tests.
DaniGuardiola Jul 26, 2024
1637baa
Added TODO notes to CustomSelectControl v2 tests and styles.
DaniGuardiola Jul 26, 2024
28307fe
Added TODO notes to ToggleGroupControl tests.
DaniGuardiola Jul 26, 2024
ee85f1a
Added TODO notes to DropdownMenu v2 tests and styles.
DaniGuardiola Jul 26, 2024
246c6dd
Added TODO notes to CustomSelectControl tests.
DaniGuardiola Jul 26, 2024
114badd
Added TODO notes to Composite (legacy) tests.
DaniGuardiola Jul 26, 2024
6679cc6
Fixed all issues and updated snapshots.
DaniGuardiola Jul 26, 2024
d2e08e3
Upgrade to 0.4.1
DaniGuardiola Jul 26, 2024
31ad777
Undo temporary hack.
DaniGuardiola Jul 26, 2024
bbfb8b1
Upgrade to 0.4.2
DaniGuardiola Jul 26, 2024
2355a34
Upgrade to 0.4.3
DaniGuardiola Jul 26, 2024
91b4b66
Upgrade to 0.4.4
DaniGuardiola Jul 26, 2024
d1aab2c
Upgrade to 0.4.5
DaniGuardiola Jul 26, 2024
6ed775d
Upgrade to 0.4.6
DaniGuardiola Jul 26, 2024
3e90c1b
Temporarily revert all deps changes
DaniGuardiola Jul 26, 2024
bbd1f11
Merge branch 'trunk' of https://github.com/WordPress/gutenberg into u…
DaniGuardiola Jul 26, 2024
157479d
Restore from latest trunk
DaniGuardiola Jul 26, 2024
c32b9a0
Upgrade to 0.4.7 (and 0.3.16 for ariakit/test) cleanly
DaniGuardiola Jul 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
219 changes: 119 additions & 100 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"@actions/core": "1.9.1",
"@actions/github": "5.0.0",
"@apidevtools/json-schema-ref-parser": "11.6.4",
"@ariakit/test": "^0.3.7",
"@ariakit/test": "0.3.16",
"@babel/core": "7.24.3",
"@babel/plugin-proposal-export-namespace-from": "7.18.9",
"@babel/plugin-syntax-jsx": "7.24.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ exports[`ColorPaletteControl matches the snapshot 1`] = `
aria-label="Color: red"
aria-selected="true"
class="components-button components-circular-option-picker__option"
data-active-item=""
data-active-item="true"
id="components-circular-option-picker-0-0"
role="option"
style="background-color: rgb(255, 0, 0); color: rgb(255, 0, 0);"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/**
* External dependencies
*/
import { render, screen } from '@testing-library/react';
import { screen } from '@testing-library/react';
import { render } from '@ariakit/test/react';

/**
* Internal dependencies
Expand All @@ -12,7 +13,7 @@ const noop = () => {};

describe( 'ColorPaletteControl', () => {
it( 'renders tabs if it is possible to select a color and a gradient rendering a color picker at the start', async () => {
render(
await render(
<ColorGradientControl
label="Test Color Gradient"
colorValue="#f00"
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
"types": "build-types",
"dependencies": {
"@ariakit/react": "^0.3.12",
"@ariakit/react": "0.4.7",
"@babel/runtime": "^7.16.0",
"@emotion/cache": "^11.7.1",
"@emotion/css": "^11.7.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/composite/legacy/test/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async function renderAndValidate( ...args: Parameters< typeof render > ) {
const activeButton = queryByAttribute(
'data-active-item',
view.baseElement,
''
'true'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the new render function, could we actually remove the renderAndValidate utility in this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially!

);
expect( activeButton ).not.toBeNull();
} );
Expand Down
Loading
Loading