Skip to content

[internal] Include history from the @mui/base components & hooks#43079

Merged
oliviertassinari merged 6 commits intomui:masterfrom
mnajdova:perserve-history-mui-base-1
Sep 11, 2024
Merged

[internal] Include history from the @mui/base components & hooks#43079
oliviertassinari merged 6 commits intomui:masterfrom
mnajdova:perserve-history-mui-base-1

Conversation

@mnajdova
Copy link
Member

@mnajdova mnajdova commented Jul 26, 2024

An alternative of #43028, it preserves the history on both locations, packages/mui-material and packages/mui-base for the files that were copied from Base UI to Material UI.

An example result:

https://github.com/mui/material-ui/blame/e32621f065657f36da3ce4fa274ca622ac075aea/packages/mui-material/src/Badge/useBadge.ts
https://github.com/mui/material-ui/blame/e32621f065657f36da3ce4fa274ca622ac075aea/packages/mui-base/src/useBadge/useBadge.ts
I've used a script for all files, so no need to go trough all of them for a check, one example should be enough

This is a follow-up on #42907

@mnajdova mnajdova added the internal Behind-the-scenes enhancement. Formerly called “core”. label Jul 26, 2024
@mnajdova mnajdova marked this pull request as ready for review July 26, 2024 13:13
@mui-bot
Copy link

mui-bot commented Jul 26, 2024

Netlify deploy preview

https://deploy-preview-43079--material-ui.netlify.app/

Bundle size report

No bundle size changes (Toolpad)
No bundle size changes

Generated by 🚫 dangerJS against e32621f

@mnajdova
Copy link
Member Author

@oliviertassinari can you help with moving all these commits on next (we can't squash and merge because it doesn't keep the commits changes). I tried enabling the pull request options:

Screenshot 2024-07-26 at 15 20 10

but the Create merge commit was not enabled even after this change. I couldn't do the Rebase and merge was throwing an error:

Screenshot 2024-07-26 at 15 22 03

@oliviertassinari oliviertassinari merged commit edce3d9 into mui:master Sep 11, 2024
@oliviertassinari
Copy link
Member

I'm not sure what happened, merging this PR didn't work.
Proof: https://github.com/mui/material-ui/blame/edce3d9b2aca35b841ba961850421208f69dbabb/packages/mui-material/src/Unstable_TrapFocus/FocusTrap.tsx.

However, applying the same strategy that you had (I looked at this PR commits to understand what you did) and doing it straight from the HEAD, worked.
Proof: https://github.com/mui/material-ui/blame/c1c0d7c73fdb585d468ea106f8ef31a65bf6e49a/packages/mui-material/src/Unstable_TrapFocus/FocusTrap.tsx

So, I'm happy that we have the history back 😄, and that we have one clear source of truth.

@oliviertassinari oliviertassinari added the package: @mui/base Specific to @mui/base (legacy). label Sep 11, 2024
@oliviertassinari oliviertassinari changed the title [core] Include history from the @mui/base components & hooks [internal] Include history from the @mui/base components & hooks Feb 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

internal Behind-the-scenes enhancement. Formerly called “core”. package: @mui/base Specific to @mui/base (legacy).

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants