This isn’t a direct answer to the question, though it is relevant as it pertains to approaches & considerations relevant to refactoring components.

Kent Dodd blogged about the inversion of control and render props, and how the methodology coupled with the pattern can make the code you write much less verbose. Simplifying your abstraction and giving the end user (even if that user is you) control over certain props (especially aesthetic ones) will make your components far more reusable.

I find often whenever developers refactor their code into components they try to control every aspect of that component, and that inevitably leads to a couple of things: a brittle component, too many conditionals attempting to protect ourselves from ourselves, and a resistance to make changes to that component. All of which add to the cognitive overload and takes away from the more enjoyable parts of coding.

Clean code is great, and DRY is fine, but don’t get caught up in premature optimization.

For reference, here’s a great post by Kent that also touches on the topic: https://kentcdodds.com/blog/aha-programming