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

v3: Menu is using ListItem #1295

Merged
merged 29 commits into from
Jun 1, 2023
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0c78c71
Updating MenuItem to use ListItem
gretanausedaite May 18, 2023
f956dc4
unit test fix
gretanausedaite May 22, 2023
e19701e
CSS tests update
gretanausedaite May 24, 2023
bf9a178
Finally fixed img version of MenuItem icon
gretanausedaite May 24, 2023
11c8da3
Merge branch 'dev' into greta/new-menu-item
gretanausedaite May 24, 2023
43ef956
Merge remote-tracking branch 'origin/dev' into greta/new-menu-item
gretanausedaite May 25, 2023
93007f8
Prop deprecate not remove
gretanausedaite May 25, 2023
7b1ec0d
fix skeleton a bit
gretanausedaite May 25, 2023
b29704b
remove select cloneElement
gretanausedaite May 25, 2023
aead592
focused prop instead of data attr
gretanausedaite May 25, 2023
808956f
Merge remote-tracking branch 'origin/dev' into greta/new-menu-item
gretanausedaite May 29, 2023
d252b52
undo select changes
gretanausedaite May 30, 2023
b317fee
fix tests?
gretanausedaite May 30, 2023
b6cf131
Merge branch 'dev' into greta/new-menu-item
gretanausedaite May 31, 2023
eaad312
fix icon
gretanausedaite May 31, 2023
6f5db0f
Updating css for skeleton
gretanausedaite May 31, 2023
5f5be5e
unit tests fix
gretanausedaite May 31, 2023
ec2ee58
css skeleton fix
gretanausedaite May 31, 2023
11cfc01
changeset
gretanausedaite May 31, 2023
46524e9
changeset
gretanausedaite May 31, 2023
e57c9e2
Undo the undo
gretanausedaite May 31, 2023
d1d596f
Update .changeset/quick-dodos-hang.md
gretanausedaite May 31, 2023
14fcace
Rename storybook tests
gretanausedaite May 31, 2023
740700b
not needed
gretanausedaite May 31, 2023
e427b4d
Merge branch 'dev' into greta/new-menu-item
gretanausedaite Jun 1, 2023
e8c2feb
docs update
gretanausedaite Jun 1, 2023
cf4520c
docs update
gretanausedaite Jun 1, 2023
c116a56
Updating for comments
gretanausedaite Jun 1, 2023
b9e0021
Merge branch 'dev' into greta/new-menu-item
gretanausedaite Jun 1, 2023
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
2 changes: 1 addition & 1 deletion apps/storybook/src/ComboBox.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('ComboBox', () => {
cy.compareSnapshot(`${testName} (Closed)`);
cy.get('input').focus();
if (testName === 'Multiple Select') {
cy.get('.iui-menu-item').then((els) => {
cy.get('.iui-list-item').then((els) => {
const items = Array.from(els, (el) => el);
items[3].click();
});
Expand Down
22 changes: 13 additions & 9 deletions apps/storybook/src/DropdownMenu.stories.tsx
mayank99 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,17 @@ export const WithIcons: Story<DropdownMenuProps> = (args) => {
close();
};
const dropdownMenuItems = (close: () => void) => [
<MenuItem key={1} onClick={onClick('Crop', close)} icon={<SvgCrop />}>
<MenuItem key={1} onClick={onClick('Crop', close)} startIcon={<SvgCrop />}>
Crop
</MenuItem>,
<MenuItem key={2} onClick={onClick('Paste', close)} icon={<SvgClipboard />}>
<MenuItem
key={2}
onClick={onClick('Paste', close)}
startIcon={<SvgClipboard />}
>
Paste
</MenuItem>,
<MenuItem key={3} onClick={onClick('Move', close)} icon={<SvgMove />}>
<MenuItem key={3} onClick={onClick('Move', close)} startIcon={<SvgMove />}>
Move
</MenuItem>,
];
Expand All @@ -109,17 +113,17 @@ export const WithBadges: Story<DropdownMenuProps> = (args) => {
close();
};
const dropdownMenuItems = (close: () => void) => [
<MenuItem key={1} onClick={onClick('Crop', close)} badge={<SvgCrop />}>
<MenuItem key={1} onClick={onClick('Crop', close)} endIcon={<SvgCrop />}>
Crop
</MenuItem>,
<MenuItem
key={2}
onClick={onClick('Paste', close)}
badge={<SvgClipboard />}
endIcon={<SvgClipboard />}
>
Paste
</MenuItem>,
<MenuItem key={3} onClick={onClick('Move', close)} badge={<SvgMove />}>
<MenuItem key={3} onClick={onClick('Move', close)} endIcon={<SvgMove />}>
Move
</MenuItem>,
];
Expand All @@ -146,23 +150,23 @@ export const WithSublabels: Story<DropdownMenuProps> = (args) => {
<MenuItem
key={1}
onClick={onClick(1, close)}
icon={<SvgPlaceholder />}
startIcon={<SvgPlaceholder />}
sublabel='Sublabel #1'
>
Item #1
</MenuItem>,
<MenuItem
key={2}
onClick={onClick(2, close)}
icon={<SvgPlaceholder />}
startIcon={<SvgPlaceholder />}
sublabel='Sublabel #2'
>
Item #2
</MenuItem>,
<MenuItem
key={3}
onClick={onClick(3, close)}
icon={<SvgPlaceholder />}
startIcon={<SvgPlaceholder />}
sublabel='Sublabel #3'
>
Item #3
Expand Down
2 changes: 1 addition & 1 deletion apps/storybook/src/DropdownMenu.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('DropdownMenu', () => {
cy.get('.iui-button').click();

if (testName === 'Submenu') {
cy.get('.iui-menu-item').last().trigger('mouseenter');
cy.get('.iui-list-item').last().trigger('mouseenter');
}

cy.compareSnapshot(`${testName} (Open)`);
Expand Down
6 changes: 3 additions & 3 deletions apps/storybook/src/Select.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ describe('Select', () => {
cy.compareSnapshot(`${testName} (Open)`);

if (testName.includes('Multi')) {
cy.get('.iui-menu-item').first().click();
cy.get('.iui-menu-item').eq(1).click();
cy.get('.iui-list-item').first().click();
cy.get('.iui-list-item').eq(1).click();
cy.compareSnapshot(`${testName} (Multi selected)`);
}

if (testName === 'Custom') {
cy.get('.iui-menu-item').first().click();
cy.get('.iui-list-item').first().click();
cy.compareSnapshot(`${testName} (Closed With Value)`);
}
});
Expand Down
2 changes: 1 addition & 1 deletion apps/website/src/examples/ButtonGroup.overflow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default () => {
close();
};
return (
<MenuItem key={index} onClick={onClick} icon={<SvgPlaceholder />}>
<MenuItem key={index} onClick={onClick} startIcon={<SvgPlaceholder />}>
Button #{index}
</MenuItem>
);
Expand Down
6 changes: 3 additions & 3 deletions apps/website/src/examples/DropdownMenu.badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import { SvgMore, SvgCrop, SvgClipboard, SvgMove } from '@itwin/itwinui-icons-re

export default () => {
const dropdownMenuItems = (close: () => void) => [
<MenuItem key={1} onClick={() => close()} badge={<SvgCrop />}>
<MenuItem key={1} onClick={() => close()} endIcon={<SvgCrop />}>
Crop
</MenuItem>,
<MenuItem key={2} onClick={() => close()} badge={<SvgClipboard />}>
<MenuItem key={2} onClick={() => close()} endIcon={<SvgClipboard />}>
Paste
</MenuItem>,
<MenuItem key={3} onClick={() => close()} badge={<SvgMove />}>
<MenuItem key={3} onClick={() => close()} endIcon={<SvgMove />}>
Move
</MenuItem>,
];
Expand Down
6 changes: 3 additions & 3 deletions apps/website/src/examples/DropdownMenu.icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import { SvgMore, SvgCrop, SvgClipboard, SvgMove } from '@itwin/itwinui-icons-re

export default () => {
const dropdownMenuItems = (close: () => void) => [
<MenuItem key={1} onClick={() => close()} icon={<SvgCrop />}>
<MenuItem key={1} onClick={() => close()} startIcon={<SvgCrop />}>
Crop
</MenuItem>,
<MenuItem key={2} onClick={() => close()} icon={<SvgClipboard />}>
<MenuItem key={2} onClick={() => close()} startIcon={<SvgClipboard />}>
Paste
</MenuItem>,
<MenuItem key={3} onClick={() => close()} icon={<SvgMove />}>
<MenuItem key={3} onClick={() => close()} startIcon={<SvgMove />}>
Move
</MenuItem>,
];
Expand Down
6 changes: 3 additions & 3 deletions apps/website/src/examples/DropdownMenu.sublabel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import { SvgMore, SvgPlaceholder } from '@itwin/itwinui-icons-react';

export default () => {
const dropdownMenuItems = (close: () => void) => [
<MenuItem key={1} onClick={() => close()} icon={<SvgPlaceholder />} sublabel='Sublabel #1'>
<MenuItem key={1} onClick={() => close()} startIcon={<SvgPlaceholder />} sublabel='Sublabel #1'>
Item #1
</MenuItem>,
<MenuItem key={2} onClick={() => close()} icon={<SvgPlaceholder />} sublabel='Sublabel #2'>
<MenuItem key={2} onClick={() => close()} startIcon={<SvgPlaceholder />} sublabel='Sublabel #2'>
Item #2
</MenuItem>,
<MenuItem key={3} onClick={() => close()} icon={<SvgPlaceholder />} sublabel='Sublabel #3'>
<MenuItem key={3} onClick={() => close()} startIcon={<SvgPlaceholder />} sublabel='Sublabel #3'>
Item #3
</MenuItem>,
];
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.