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

[core] Minor fixes #15875

Merged
merged 3 commits into from
May 30, 2019
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import deburr from 'lodash/deburr';
import Downshift from 'downshift';
import { createStyles, makeStyles, Theme, WithStyles } from '@material-ui/core/styles';
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
import TextField, { TextFieldProps } from '@material-ui/core/TextField';
import Popper from '@material-ui/core/Popper';
import Paper from '@material-ui/core/Paper';
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components/no-ssr/FrameDeferring.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function FrameDeferring() {
</button>
{state.open ? (
<div className={classes.container}>
<span>Outisde NoSsr</span>
<span>Outside NoSsr</span>
<NoSsr defer={state.defer}>
....Inside NoSsr
<LargeTree />
Expand Down
4 changes: 2 additions & 2 deletions docs/src/pages/system/flexbox/AlignContent.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import Box from '@material-ui/core/Box';

function AlignContnet() {
function AlignContent() {
return (
<div style={{ width: '100%' }}>
<Box
Expand Down Expand Up @@ -70,4 +70,4 @@ function AlignContnet() {
);
}

export default AlignContnet;
export default AlignContent;
6 changes: 0 additions & 6 deletions packages/material-ui-system/src/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
import { CSSProperties } from '@material-ui/styles';
import * as CSS from 'csstype';

// disable automatic export
export {};

type ThemeOf<Props> = Props extends WithTheme<infer Theme> ? Theme : never;
type WithThemeOfProps<Props> = WithTheme<ThemeOf<Props>>;
interface WithTheme<Theme extends object> {
theme?: Theme;
}
export type PropsFor<SomeStyleFunction> = SomeStyleFunction extends StyleFunction<infer Props>
? Props
: never;
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui/src/Button/Button.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PropTypes } from '..';
import { ExtendButtonBase, ExtendButtonBaseTypeMap } from '../ButtonBase';
import { OverridableComponent, OverrideProps, SimplifiedPropsOf } from '../OverridableComponent';
import { OverrideProps } from '../OverridableComponent';

export type ButtonTypeMap<P, D extends React.ElementType> = ExtendButtonBaseTypeMap<{
props: P & {
Expand Down
1 change: 0 additions & 1 deletion packages/material-ui/src/Divider/Divider.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as React from 'react';
import { OverridableComponent, SimplifiedPropsOf } from '../OverridableComponent';

declare const Divider: OverridableComponent<{
Expand Down
1 change: 0 additions & 1 deletion packages/material-ui/src/Hidden/Hidden.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { StandardProps } from '..';
import { Breakpoint } from '../styles/createBreakpoints';

export interface HiddenProps {
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui/src/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { ConsistentWith, Omit } from '@material-ui/types';
import { Omit } from '@material-ui/types';
import { StyledComponentProps } from './styles';
export { StyledComponentProps };

Expand Down
3 changes: 2 additions & 1 deletion packages/material-ui/src/styles/props.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ import { StepIconProps } from '../StepIcon';
import { StepLabelProps } from '../StepLabel';
import { StepperProps } from '../Stepper';
import { StepProps } from '../Step';
import { StyleRules } from './withStyles';
import { SvgIconProps } from '../SvgIcon';
import { SwitchBaseProps } from '../internal/SwitchBase';
import { SwitchProps } from '../Switch';
Expand Down Expand Up @@ -147,12 +146,14 @@ export interface ComponentsPropsList {
MuiListSubheader: ListSubheaderProps;
MuiMenu: MenuProps;
MuiMenuItem: MenuItemProps;
MuiMenuList: MenuListProps;
MuiMobileStepper: MobileStepperProps;
MuiModal: ModalProps;
MuiNativeSelect: NativeSelectProps;
MuiPaper: PaperProps;
MuiPopover: PopoverProps;
MuiRadio: RadioProps;
MuiRadioGroup: RadioGroupProps;
MuiSelect: SelectProps;
MuiSnackbar: SnackbarProps;
MuiSnackbarContent: SnackbarContentProps;
Expand Down
1 change: 1 addition & 0 deletions packages/material-ui/src/test-utils/createMount.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { mount } from 'enzyme';

export interface MountOptions {
mount: typeof mount;
strict: boolean;
}

export default function createMount(
Expand Down
1 change: 0 additions & 1 deletion packages/material-ui/src/useScrollTrigger/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export { default } from './useScrollTrigger';
export * from './useScrollTrigger';
2 changes: 1 addition & 1 deletion scripts/sizeSnapshot/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const workspaceRoot = path.join(__dirname, '../../');
const snapshotDestPath = path.join(workspaceRoot, 'size-snapshot.json');

/**
* @param {object} snapshot snaphot generated by rollup-plugin-size-snapshot
* @param {object} snapshot snapshot generated by rollup-plugin-size-snapshot
* @returns {object} size snapshot with the same format as a snapshot from size-limit
*/
function normalizeRollupSnapshot(snapshot) {
Expand Down