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

[pickers] Migrate PickersToolbarButton to emotion #25989

Merged
merged 24 commits into from
May 10, 2021
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
28dd1ac
migrate to emotion
siriwatknp Apr 26, 2021
b6bd7b4
run prettier
siriwatknp Apr 26, 2021
6331a25
Merge branch 'next' into pickers-toolbar-button-emotion
siriwatknp Apr 28, 2021
ceb4b76
add sx props
siriwatknp Apr 29, 2021
29755fe
Merge branch 'pickers-toolbar-button-emotion' of github.com:siriwatkn…
siriwatknp Apr 29, 2021
99cc435
remove TODO and fix ts error
siriwatknp Apr 29, 2021
546aa39
move classes to component file
siriwatknp Apr 29, 2021
74fb48e
Update packages/material-ui-lab/src/internal/pickers/PickersToolbarBu…
mnajdova Apr 29, 2021
2b01c78
Update packages/material-ui-lab/src/internal/pickers/PickersToolbarBu…
mnajdova Apr 29, 2021
e6cfdde
use generic
siriwatknp Apr 30, 2021
3044613
moved classes declaration before it's used
mnajdova Apr 30, 2021
1512211
sort asc
oliviertassinari May 2, 2021
5808511
remove unit per convention
oliviertassinari May 2, 2021
d81ad06
component name should match filename
oliviertassinari May 2, 2021
93f34e6
simplify
mnajdova May 3, 2021
8a39015
Update packages/material-ui-lab/src/internal/pickers/PickersToolbarBu…
mnajdova May 3, 2021
c1a5de6
Let's keep it minimal
eps1lon May 4, 2021
1967a29
Merge branch 'next' into pickers-toolbar-button-emotion
eps1lon May 4, 2021
d8eff0f
ToolbarButtonProps -> PickersToolbarButton
eps1lon May 4, 2021
2365534
Strip out customization
eps1lon May 4, 2021
8da9524
Merge branch 'next' into pickers-toolbar-button-emotion
eps1lon May 5, 2021
fd34778
Update packages/material-ui-lab/src/internal/pickers/PickersToolbarBu…
mnajdova May 7, 2021
3c96a51
Update packages/material-ui-lab/src/internal/pickers/PickersToolbarBu…
mnajdova May 10, 2021
7af8843
prettier
mnajdova May 10, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,59 +1,46 @@
import * as React from 'react';
import clsx from 'clsx';
import Button, { ButtonProps } from '@material-ui/core/Button';
import { MuiStyles, WithStyles, withStyles } from '@material-ui/core/styles';
import styled from '@material-ui/styled-engine';
mnajdova marked this conversation as resolved.
Show resolved Hide resolved
import { TypographyProps } from '@material-ui/core/Typography';
import PickersToolbarText from './PickersToolbarText';
import { ExtendMui } from './typings/helpers';

export interface ToolbarButtonProps extends ExtendMui<ButtonProps, 'value' | 'variant'> {
export interface PickersToolbarButtonProps extends ExtendMui<ButtonProps, 'value' | 'variant'> {
align?: TypographyProps['align'];
selected: boolean;
typographyClassName?: string;
value: React.ReactNode;
variant: TypographyProps['variant'];
}

export type PickersToolbarButtonClassKey = 'root';
const PickersToolbarButtonRoot = styled(Button)({
mnajdova marked this conversation as resolved.
Show resolved Hide resolved
padding: 0,
minWidth: 16,
textTransform: 'none',
});

export const styles: MuiStyles<PickersToolbarButtonClassKey> = {
root: {
padding: 0,
minWidth: '16px',
textTransform: 'none',
},
};

const ToolbarButton: React.FunctionComponent<ToolbarButtonProps & WithStyles<typeof styles>> = (
props,
) => {
const {
align,
classes,
className,
selected,
typographyClassName,
value,
variant,
...other
} = props;
const PickersToolbarButton: React.FunctionComponent<PickersToolbarButtonProps> = React.forwardRef(
function PickersToolbarButton(props, ref) {
const { align, className, selected, typographyClassName, value, variant, ...other } = props;

return (
<Button
data-mui-test="toolbar-button"
variant="text"
className={clsx(classes.root, className)}
{...other}
>
<PickersToolbarText
align={align}
className={typographyClassName}
variant={variant}
value={value}
selected={selected}
/>
</Button>
);
};
return (
<PickersToolbarButtonRoot
data-mui-test="toolbar-button"
variant="text"
ref={ref}
className={className}
{...other}
>
<PickersToolbarText
align={align}
className={typographyClassName}
variant={variant}
value={value}
selected={selected}
/>
</PickersToolbarButtonRoot>
);
},
);

export default withStyles(styles, { name: 'MuiPickersToolbarButton' })(ToolbarButton);
export default PickersToolbarButton;
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@ export interface LabComponents {
MuiPickersToolbar?: {
styleOverrides?: ComponentsOverrides['MuiPickersToolbar'];
};
MuiPickersToolbarButton?: {
styleOverrides?: ComponentsOverrides['MuiPickersToolbarButton'];
};
MuiPickersToolbarText?: {
styleOverrides?: ComponentsOverrides['MuiPickersToolbarText'];
};
Expand Down
2 changes: 0 additions & 2 deletions packages/material-ui-lab/src/themeAugmentation/overrides.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { PickersModalDialogClassKey } from '../internal/pickers/PickersModalDial
import { PickersMonthClassKey } from '../MonthPicker/PickersMonth';
import { PickersPopperClassKey } from '../internal/pickers/PickersPopper';
import { PickersSlideTransitionClassKey } from '../CalendarPicker/PickersSlideTransition';
import { PickersToolbarButtonClassKey } from '../internal/pickers/PickersToolbarButton';
import { PickersToolbarClassKey } from '../internal/pickers/PickersToolbar';
import { PickersToolbarTextClassKey } from '../internal/pickers/PickersToolbarText';
import { PickersYearClassKey } from '../YearPicker/PickersYear';
Expand Down Expand Up @@ -61,7 +60,6 @@ export interface LabComponentNameToClassKey {
MuiPickersPopper: PickersPopperClassKey;
MuiPickersSlideTransition: PickersSlideTransitionClassKey;
MuiPickersToolbar: PickersToolbarClassKey;
MuiPickersToolbarButton: PickersToolbarButtonClassKey;
MuiPickersToolbarText: PickersToolbarTextClassKey;
MuiPickersYear: PickersYearClassKey;
MuiTabList: TabListClassKey;
Expand Down