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(MenuItem): tooltip should on all item and not only on title #1914

Merged
merged 9 commits into from
Jan 29, 2024
Merged

fix(MenuItem): tooltip should on all item and not only on title #1914

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bbcd974
fix(MenuItem): tooltip should on all item and not only on title
YossiSaadi Jan 23, 2024
f598058
test(SplitButtonMenu): update snapshot to fit MenuItem change
YossiSaadi Jan 23, 2024
3288bc2
test(MenuItem): update snapshot and test to fit MenuItem change
YossiSaadi Jan 23, 2024
c2a4e89
test(Menu): update snapshot and test to fit MenuItem change
YossiSaadi Jan 23, 2024
a6a2587
fix(MenuItem): make Menu a relative-positioned
YossiSaadi Jan 23, 2024
af087b7
Merge branch 'master' into fix/yossi/MenuItem---tooltip-should-wrap-a…
talkor Jan 28, 2024
d2ab67c
test: add options to getByText util
talkor Jan 28, 2024
38fe139
test: fix menu interactions test to ignore hidden element
talkor Jan 28, 2024
12a42c3
refactor: rename
talkor Jan 29, 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
1 change: 1 addition & 0 deletions src/components/Menu/Menu/Menu.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.menu {
margin: unset;
padding: unset;
position: relative;
talkor marked this conversation as resolved.
Show resolved Hide resolved
}

.menu:focus {
Expand Down
14 changes: 14 additions & 0 deletions src/components/Menu/Menu/__tests__/__snapshots__/menu.jest.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ exports[`Snapshots renders correctly with children 1`] = `
>
item 1
</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>
item 1
</div>

<div
style={
Expand All @@ -64,6 +71,13 @@ exports[`Snapshots renders correctly with children 1`] = `
>
item 2
</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>
item 2
</div>

<div
style={
Expand Down
7 changes: 7 additions & 0 deletions src/components/Menu/MenuItem/MenuItem.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,10 @@
flex-grow: 1;
padding-block: 1px;
}

.hiddenTitle {
width: 100%;
position: absolute;
left: 0;
opacity: 0;
}
6 changes: 4 additions & 2 deletions src/components/Menu/MenuItem/MenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,15 @@ const MenuItem: VibeComponent<MenuItemProps> & {
content={shouldShowTooltip ? finalTooltipContent : null}
position={tooltipPosition}
showDelay={tooltipShowDelay}
// Tooltip should be on a whole MenuItem, but it's a breaking change - should be fixed in the next major and then this can be removed
moveBy={icon && tooltipPosition === Tooltip.positions.LEFT ? { main: 30 } : undefined}
{...tooltipProps}
>
<div ref={titleRef} className={styles.title}>
{title}
</div>
{/* Tooltip should be on a whole MenuItem, but it's a breaking change (tooltip adds span) - should be fixed in the next major and then this div be removed */}
<div className={styles.hiddenTitle} aria-hidden tabIndex={-1}>
{title}
</div>
</Tooltip>
{label && <Label kind={Label.kinds.LINE} text={label} />}
{renderSubMenuIconIfNeeded()}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Menu/MenuItem/__tests__/MenuItem.jest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ describe("<MenuItem />", () => {
});

it("should be able to render menu item text", async () => {
const { getByText } = render(<MenuItem title={title} />);
const menuItemElement = getByText(title);
const { getAllByText } = render(<MenuItem title={title} />);
const menuItemElement = getAllByText(title);
await waitFor(() => expect(menuItemElement).toBeTruthy());
});

Expand Down
49 changes: 49 additions & 0 deletions src/components/Menu/MenuItem/__tests__/__snapshots__/menuItem-snapshots.jest.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ exports[`Snapshots renders correctly when disabled 1`] = `
>
my item
</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>
my item
</div>

<div
style={
Expand Down Expand Up @@ -42,6 +49,13 @@ exports[`Snapshots renders correctly when selected 1`] = `
>
my item
</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>
my item
</div>

<div
style={
Expand Down Expand Up @@ -70,6 +84,13 @@ exports[`Snapshots renders correctly with a label 1`] = `
>
my item
</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>
my item
</div>
<span
className=""
data-testid="label"
Expand Down Expand Up @@ -112,6 +133,13 @@ exports[`Snapshots renders correctly with custom class name 1`] = `
className="title"
>

</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>

</div>

<div
Expand Down Expand Up @@ -140,6 +168,13 @@ exports[`Snapshots renders correctly with empty props 1`] = `
className="title"
>

</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>

</div>

<div
Expand Down Expand Up @@ -191,6 +226,13 @@ exports[`Snapshots renders correctly with title and SVG icon 1`] = `
>
my item
</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>
my item
</div>

<div
style={
Expand Down Expand Up @@ -231,6 +273,13 @@ exports[`Snapshots renders correctly with title and font icon 1`] = `
>
my item
</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>
my item
</div>

<div
style={
Expand Down
14 changes: 14 additions & 0 deletions ...tton/SplitButtonMenu/__tests__/__snapshots__/splitButtonMenu-snapshot-tests.jest.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ exports[`SplitButtonMenu renders correctly 1`] = `
>
Test 1
</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>
Test 1
</div>

<div
style={
Expand All @@ -52,6 +59,13 @@ exports[`SplitButtonMenu renders correctly 1`] = `
>
Test 2
</div>
<div
aria-hidden={true}
className="hiddenTitle"
tabIndex={-1}
>
Test 2
</div>

<div
style={
Expand Down
Loading