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.

Sign up for GitHub

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

Jump to bottom

Upgrade Reakit to version 1.0.0-rc.0 #21300

Merged
merged 4 commits into from
Mar 31, 2020
Merged

Upgrade Reakit to version 1.0.0-rc.0 #21300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b45859e
Upgrade Reakit to version 1.0.0-rc.0
diegohaz Mar 31, 2020
2aeb309
Add comment on ToolbarContainer
diegohaz Mar 31, 2020
6648901
Re-install reakit
diegohaz Mar 31, 2020
5222a46
Merge branch 'master' into update/upgrade-reakit
diegohaz Mar 31, 2020
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
56 changes: 33 additions & 23 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion packages/components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"re-resizable": "^6.0.0",
"react-dates": "^17.1.1",
"react-spring": "^8.0.20",
"reakit": "^1.0.0-beta.12",
"reakit": "^1.0.0-rc.0",
"rememo": "^3.0.0",
"tinycolor2": "^1.4.1",
"uuid": "^3.3.2"
Expand Down
4 changes: 3 additions & 1 deletion packages/components/src/toolbar/toolbar-container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ import ToolbarContext from '../toolbar-context';

function ToolbarContainer( { accessibilityLabel, ...props }, ref ) {
// https://reakit.io/docs/basic-concepts/#state-hooks
const toolbarState = useToolbarState( { loop: true } );
// Passing baseId for server side rendering (which includes snapshots)
// If an id prop is passed to Toolbar, toolbar items will use it as a base for their ids
const toolbarState = useToolbarState( { loop: true, baseId: props.id } );
Copy link
Member

Choose a reason for hiding this comment

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

Nice addition 👍


return (
// This will provide state for `ToolbarButton`'s
Expand Down
17 changes: 17 additions & 0 deletions storybook/test/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8183,6 +8183,9 @@ exports[`Storyshots Components/Toolbar Default 1`] = `
aria-orientation="horizontal"
className="components-accessible-toolbar"
id="options-toolbar"
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
role="toolbar"
>
<div
Expand All @@ -8196,6 +8199,7 @@ exports[`Storyshots Components/Toolbar Default 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
Expand Down Expand Up @@ -8233,6 +8237,7 @@ exports[`Storyshots Components/Toolbar Default 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
Expand Down Expand Up @@ -8264,6 +8269,7 @@ exports[`Storyshots Components/Toolbar Default 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
tabIndex={-1}
type="button"
Expand All @@ -8279,6 +8285,7 @@ exports[`Storyshots Components/Toolbar Default 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
Expand Down Expand Up @@ -8307,6 +8314,7 @@ exports[`Storyshots Components/Toolbar Default 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
Expand Down Expand Up @@ -8335,6 +8343,7 @@ exports[`Storyshots Components/Toolbar Default 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
Expand Down Expand Up @@ -8368,6 +8377,7 @@ exports[`Storyshots Components/Toolbar Default 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
Expand All @@ -8389,6 +8399,7 @@ exports[`Storyshots Components/Toolbar Default 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
Expand Down Expand Up @@ -8419,6 +8430,9 @@ exports[`Storyshots Components/Toolbar Without Group 1`] = `
aria-orientation="horizontal"
className="components-accessible-toolbar"
id="options-toolbar-without-group"
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
role="toolbar"
>
<button
Expand All @@ -8430,6 +8444,7 @@ exports[`Storyshots Components/Toolbar Without Group 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
Expand Down Expand Up @@ -8458,6 +8473,7 @@ exports[`Storyshots Components/Toolbar Without Group 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
Expand Down Expand Up @@ -8486,6 +8502,7 @@ exports[`Storyshots Components/Toolbar Without Group 1`] = `
onClick={[Function]}
onFocus={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
Expand Down