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

[Toolbar] Add Toolbar components #1349

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

[Toolbar] Add Toolbar components #1349

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a77bb6d
Add Toolbar components
mj12albert Dec 4, 2024
75f8b42
Make ToggleGroup work in Toolbar
mj12albert Jan 8, 2025
a4439fa
Add toolbar button
mj12albert Jan 8, 2025
fd31187
Enable toggling focuseableWhenDisabled on toolbar buttons
mj12albert Jan 13, 2025
e2bc95d
Update demo
mj12albert Jan 27, 2025
a492b65
Add toolbar link
mj12albert Jan 27, 2025
0fdc446
Add cols prop
mj12albert Jan 27, 2025
abc4b42
Fix registering ToolbarLink as composite item
mj12albert Jan 27, 2025
6ee1ccb
Allow Composite to override tabIndex in useButton
mj12albert Feb 3, 2025
0e93632
Generate docs
mj12albert Feb 3, 2025
209a996
Add ToolbarSeparator
mj12albert Feb 6, 2025
2ee9e9a
Update experiments
mj12albert Feb 6, 2025
5fe85d2
Add settings to experiments
mj12albert Feb 6, 2025
4e49528
Fix disabled states
mj12albert Feb 7, 2025
090aee3
Don't set native disabled attr if useButton is a composite item
mj12albert Feb 7, 2025
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
Prev Previous commit
Don't set native disabled attr if useButton is a composite item
  • Loading branch information
@mj12albert
mj12albert committed Feb 7, 2025
commit 090aee31a12a09a2284464766861c94e6cc677b5
2 changes: 1 addition & 1 deletion packages/react/src/use-button/useButton.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function useButton(parameters: useButton.Parameters = {}): useButton.Retu
if (elementName === 'BUTTON' || elementName === 'INPUT') {
if (focusableWhenDisabled) {
additionalProps['aria-disabled'] = disabled;
} else {
} else if (!isCompositeItem) {
additionalProps.disabled = disabled;
}
} else if (elementName !== '') {
Expand Down