-
-
Notifications
You must be signed in to change notification settings - Fork 32.3k
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
[pigment-css] Add Box component #41451
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import type { BaseDefaultProps, Substitute, NoInfer } from './base'; | ||
import type { SxProp } from './sx'; | ||
|
||
export type PolymorphicComponentProps< | ||
BaseProps extends object, | ||
AsTarget extends React.ElementType | undefined, | ||
AsTargetProps extends object = AsTarget extends React.ElementType | ||
? React.ComponentPropsWithRef<AsTarget> | ||
: BaseDefaultProps, | ||
> = NoInfer<Omit<Substitute<BaseProps, AsTargetProps>, 'as' | 'component'>> & { | ||
as?: AsTarget; | ||
component?: AsTarget; | ||
sx?: SxProp; | ||
children?: React.ReactNode; | ||
}; | ||
|
||
export interface PolymorphicComponent<BaseProps extends BaseDefaultProps> | ||
extends React.ForwardRefExoticComponent<BaseProps> { | ||
<AsTarget extends React.ElementType | undefined = undefined>( | ||
props: PolymorphicComponentProps<BaseProps, AsTarget>, | ||
): JSX.Element; | ||
} | ||
|
||
declare const Box: PolymorphicComponent<{}>; | ||
|
||
export { Box }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
import * as React from 'react'; | ||
|
||
// eslint-disable-next-line react/prop-types | ||
export const Box = React.forwardRef( | ||
( | ||
{ | ||
as = 'div', | ||
// Added to support compatibility with @mui/system | ||
component, | ||
/** | ||
* The type of the transformed sx prop is either a | ||
* "string" if the css passed was fully static or an | ||
* object with the following shape: | ||
* { | ||
* className: string, | ||
* vars: Record<string, [string | number, boolean]> | ||
* } | ||
*/ | ||
sx, | ||
className, | ||
style, | ||
...rest | ||
}, | ||
ref, | ||
) => { | ||
const Component = component ?? as; | ||
// eslint-disable-next-line react/prop-types | ||
const sxClass = typeof sx === 'string' ? sx : sx?.className; | ||
const classes = [className, sxClass].filter(Boolean).join(' '); | ||
// eslint-disable-next-line react/prop-types | ||
const sxVars = sx && typeof sx !== 'string' ? sx?.vars : {}; | ||
const varStyles = {}; | ||
|
||
if (sxVars) { | ||
Object.entries(sxVars).forEach(([cssVariable, [value, isUnitLess]]) => { | ||
if (typeof value === 'string' || isUnitLess) { | ||
varStyles[`--${cssVariable}`] = value; | ||
} else { | ||
varStyles[`--${cssVariable}`] = `${value}px`; | ||
} | ||
}); | ||
} | ||
|
||
const styles = { | ||
...style, | ||
...varStyles, | ||
}; | ||
|
||
return <Component ref={ref} className={classes} style={styles} {...rest} />; | ||
}, | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import * as React from 'react'; | ||
import { Box } from '@pigment-css/react/Box'; | ||
|
||
export function App() { | ||
return ( | ||
<Box as="div" sx={{ display: 'flex' }}> | ||
brijeshb42 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<Box as="p" sx={() => ({ color: 'primary' })}> | ||
Hello{' '} | ||
<Box as="a" href="https://mui.com" download> | ||
Link | ||
</Box> | ||
<Box component="dialog" open> | ||
Dialog | ||
</Box> | ||
{/* @ts-expect-error */} | ||
<Box component="dialog" as="button" open> | ||
Dialog 2 | ||
</Box> | ||
</Box> | ||
</Box> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's find time to comment on the purpose of these types later 😅. I can imagine how hard to make the
PolymorphicComponent
work.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah. Definitely. I hope this doesn't get more complex than this 🤣.