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

COM-310: Refactor theming of MenuItem #1597

Merged

Conversation

juliawegmayr
Copy link
Contributor

Screenshot 2024-01-19 at 08 25 22
Screenshot 2024-01-19 at 08 25 34
Screenshot 2024-01-19 at 08 25 42

@johnnyomair johnnyomair changed the title COM-310 Refactor Theming of Item Refactor theming of MenuItem Jan 22, 2024
@juliawegmayr juliawegmayr changed the title Refactor theming of MenuItem COM-310: Refactor theming of Item Jan 23, 2024
@juliawegmayr juliawegmayr force-pushed the refactor-theming-of-item branch 3 times, most recently from 2d0a025 to 12fa518 Compare January 23, 2024 14:44
@johnnyomair johnnyomair changed the title COM-310: Refactor theming of Item COM-310: Refactor theming of MenuItem Jan 23, 2024
@juliawegmayr juliawegmayr force-pushed the refactor-theming-of-item branch from 12fa518 to 64f8d5a Compare January 26, 2024 09:17
@johnnyomair
Copy link
Collaborator

@juliawegmayr please merge the feature branch and resolve conflicts, thanks!

@juliawegmayr juliawegmayr force-pushed the refactor-theming-of-item branch from c57f913 to f1e7627 Compare January 31, 2024 09:22
@jamesricky
Copy link
Contributor

@juliawegmayr the error in the pipeline is caused by a similar problem, as I fixed here: #1642

Since slotProps was added to MenuItemProps and MenuCollapsibleItemProps defines it's own slotProps and extends MenuItemProps it doesn't know which slotProps to use.

This can be fixed by extending MenuCollapsibleItemProps from Omit<MenuItemProps, "slopProps"> instead of MenuItemProps.

But to continue to allow overriding the slotProps of MenuItem inside MenuCollapsibleItem, the MenuItem needs to be a slot so slotProps can be passed into it.

@johnnyomair johnnyomair merged commit 1a1d831 into feature/refactor-admin-component-theming Jan 31, 2024
2 checks passed
@johnnyomair johnnyomair deleted the refactor-theming-of-item branch January 31, 2024 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants