material-ui icon indicating copy to clipboard operation
material-ui copied to clipboard

[core] Include history from the @mui/base components & hooks

Open mnajdova opened this issue 1 year ago • 2 comments

An alternative of https://github.com/mui/material-ui/pull/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

mnajdova avatar Jul 26 '24 13:07 mnajdova

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 :no_entry_sign: dangerJS against e32621f065657f36da3ce4fa274ca622ac075aea

mui-bot avatar Jul 26 '24 13:07 mui-bot

@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

mnajdova avatar Jul 26 '24 13:07 mnajdova

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 avatar Sep 11 '24 23:09 oliviertassinari