Skip to content

Commit

Permalink
[Tooltip] Migrate to emotion
Browse files Browse the repository at this point in the history
  • Loading branch information
queengooborg committed Jan 23, 2021
1 parent 1f70579 commit 712305b
Show file tree
Hide file tree
Showing 9 changed files with 210 additions and 100 deletions.
3 changes: 2 additions & 1 deletion docs/pages/api-docs/tooltip.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
},
"PopperComponent": { "type": { "name": "elementType" }, "default": "Popper" },
"PopperProps": { "type": { "name": "object" }, "default": "{}" },
"sx": { "type": { "name": "object" } },
"TransitionComponent": { "type": { "name": "elementType" }, "default": "Grow" },
"TransitionProps": { "type": { "name": "object" } }
},
Expand All @@ -54,6 +55,6 @@
"filename": "/packages/material-ui/src/Tooltip/Tooltip.js",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/tooltips/\">Tooltips</a></li></ul>",
"styledComponent": false,
"styledComponent": true,
"cssComponent": false
}
1 change: 1 addition & 0 deletions docs/translations/api-docs/tooltip/tooltip.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"placement": "Tooltip placement.",
"PopperComponent": "The component used for the popper.",
"PopperProps": "Props applied to the <a href=\"/api/popper/\"><code>Popper</code></a> element.",
"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.",
"title": "Tooltip title. Zero-length titles string are never displayed.",
"TransitionComponent": "The component used for the transition. <a href=\"/components/transitions/#transitioncomponent-prop\">Follow this guide</a> to learn more about the requirements for this component.",
"TransitionProps": "Props applied to the transition element. By default, the element is based on this <a href=\"http://reactcommunity.org/react-transition-group/transition\"><code>Transition</code></a> component."
Expand Down
7 changes: 6 additions & 1 deletion packages/material-ui/src/Tooltip/Tooltip.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { InternalStandardProps as StandardProps } from '..';
import { SxProps } from '@material-ui/system';
import { InternalStandardProps as StandardProps, Theme } from '..';
import { TransitionProps } from '../transitions/transition';
import { PopperProps } from '../Popper/Popper';

Expand Down Expand Up @@ -147,6 +148,10 @@ export interface TooltipProps extends StandardProps<React.HTMLAttributes<HTMLDiv
* @default {}
*/
PopperProps?: Partial<PopperProps>;
/**
* The system prop that allows defining system overrides as well as additional CSS styles.
*/
sx?: SxProps<Theme>;
/**
* Tooltip title. Zero-length titles string are never displayed.
*/
Expand Down
Loading

0 comments on commit 712305b

Please sign in to comment.