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

fix(components): Fix 'Tap to click' behavior on macOS with Edge/Chrome for Accordion and Tab #2725

Merged
merged 6 commits into from May 24, 2024
Merged

fix(components): Fix 'Tap to click' behavior on macOS with Edge/Chrome for Accordion and Tab #2725

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7bbc117
fix(components): fix 'Tap to click' behavior on macOS
ericfabreu Apr 15, 2024
d33f7c3
Add change file for accordion, menu, and tabs
ericfabreu Apr 16, 2024
c55031d
Remove 'fix(components)' from the .changeset file
ericfabreu Apr 16, 2024
67a97c9
Merge branch 'main' into fix/macos_tap
ericfabreu Apr 22, 2024
5b048cc
fix(components): undo dropdown change now that it's no longer applicable
ericfabreu Apr 22, 2024
87d991e
fix(components): update changeset file now that we are no longer modi…
ericfabreu Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/slimy-ways-repair.md
View file
Open in desktop
@@ -0,0 +1,7 @@
---
"@nextui-org/accordion": patch
"@nextui-org/menu": patch
"@nextui-org/tabs": patch
---

fix(components): Fix 'Tap to click' behavior on macOS for Accordion, Tab, and Dropdown
ericfabreu marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 3 additions & 2 deletions packages/components/accordion/src/use-accordion-item.ts
View file
Open in desktop
Expand Up @@ -170,8 +170,9 @@ export function useAccordionItem<T extends object = {}>(props: UseAccordionItemP
otherProps.onBlur,
item.props?.onBlur,
),
...mergeProps(buttonProps, hoverProps, pressProps, props),
onClick: chain(pressProps.onClick, onClick),
...mergeProps(buttonProps, hoverProps, pressProps, props, {
onClick: chain(pressProps.onClick, onClick),
}),
};
};

Expand Down
2 changes: 1 addition & 1 deletion packages/components/menu/src/use-menu-item.ts
View file
Open in desktop
Expand Up @@ -125,6 +125,7 @@ export function useMenuItem<T extends object>(originalProps: UseMenuItemProps<T>
enabled: shouldFilterDOMProps,
}),
props,
{onClick: chain(pressProps.onClick, onClick)},
),
"data-focus": dataAttr(isFocused),
"data-selectable": dataAttr(isSelectable),
Expand All @@ -134,7 +135,6 @@ export function useMenuItem<T extends object>(originalProps: UseMenuItemProps<T>
"data-pressed": dataAttr(isPressed),
"data-focus-visible": dataAttr(isFocusVisible),
className: slots.base({class: clsx(baseStyles, props.className)}),
onClick: chain(pressProps.onClick, onClick),
});

const getLabelProps: PropGetter = (props = {}) => ({
Expand Down
2 changes: 1 addition & 1 deletion packages/components/tabs/src/tab.tsx
View file
Open in desktop
Expand Up @@ -111,11 +111,11 @@ const Tab = forwardRef<"button", TabItemProps>((props, ref) => {
enabled: shouldFilterDOMProps,
omitPropNames: new Set(["title"]),
}),
{onClick: handleClick},
)}
className={slots.tab?.({class: tabStyles})}
title={otherProps?.titleValue}
type={Component === "button" ? "button" : undefined}
onClick={handleClick}
>
{isSelected && !disableAnimation && !disableCursorAnimation && isMounted ? (
<LazyMotion features={domMax}>
Expand Down