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

[Divider] Migrate to emotion #24558

Merged
merged 18 commits into from
Jan 25, 2021
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/pages/api-docs/divider.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"type": { "name": "enum", "description": "'horizontal'<br>&#124;&nbsp;'vertical'" },
"default": "'horizontal'"
},
"sx": { "type": { "name": "object" } },
"textAlign": {
"type": {
"name": "enum",
Expand Down Expand Up @@ -51,6 +52,6 @@
"filename": "/packages/material-ui/src/Divider/Divider.js",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/dividers/\">Dividers</a></li>\n<li><a href=\"/components/lists/\">Lists</a></li></ul>",
"styledComponent": false,
"styledComponent": true,
"cssComponent": false
}
1 change: 1 addition & 0 deletions docs/translations/api-docs/divider/divider.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"flexItem": "If <code>true</code>, a vertical divider will have the correct height when used in flex container. (By default, a vertical divider will have a calculated height of <code>0px</code> if it is the child of a flex container.)",
"light": "If <code>true</code>, the divider will have a lighter color.",
"orientation": "The component orientation.",
"sx": "The system prop that allows defining system overrides as well as additional CSS styles. See the <a href=\"/system/basics/#the-sx-prop\">`sx` page</a> for more details.",
"textAlign": "The text alignment.",
"variant": "The variant to use."
},
Expand Down
6 changes: 6 additions & 0 deletions packages/material-ui/src/Divider/Divider.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { OverridableStringUnion } from '@material-ui/types';
import { SxProps } from '@material-ui/system';
import { Theme } from '..';
import { OverridableComponent, OverrideProps } from '../OverridableComponent';

export interface DividerPropsVariantOverrides {}
Expand Down Expand Up @@ -64,6 +66,10 @@ export interface DividerTypeMap<P = {}, D extends React.ElementType = 'hr'> {
* @default 'horizontal'
*/
orientation?: 'horizontal' | 'vertical';
/**
* The system prop that allows defining system overrides as well as additional CSS styles.
*/
sx?: SxProps<Theme>;
/**
* The text alignment.
* @default 'center'
Expand Down
Loading