From 8df5afdcd16be2b873a62bfe9b45cf4bbf4e5817 Mon Sep 17 00:00:00 2001 From: joshwooding <12938082+joshwooding@users.noreply.github.com> Date: Sun, 26 May 2019 21:02:24 +0100 Subject: [PATCH 1/3] initial --- docs/src/pages/components/no-ssr/FrameDeferring.js | 2 +- docs/src/pages/system/flexbox/AlignContent.js | 4 ++-- packages/material-ui/src/useScrollTrigger/index.d.ts | 1 - scripts/sizeSnapshot/create.js | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/src/pages/components/no-ssr/FrameDeferring.js b/docs/src/pages/components/no-ssr/FrameDeferring.js index c39187af0518a6..40e458acd6827f 100644 --- a/docs/src/pages/components/no-ssr/FrameDeferring.js +++ b/docs/src/pages/components/no-ssr/FrameDeferring.js @@ -45,7 +45,7 @@ function FrameDeferring() { {state.open ? (
- Outisde NoSsr + Outside NoSsr ....Inside NoSsr diff --git a/docs/src/pages/system/flexbox/AlignContent.js b/docs/src/pages/system/flexbox/AlignContent.js index 750f5e2082b69e..bad492b8717f13 100644 --- a/docs/src/pages/system/flexbox/AlignContent.js +++ b/docs/src/pages/system/flexbox/AlignContent.js @@ -1,7 +1,7 @@ import React from 'react'; import Box from '@material-ui/core/Box'; -function AlignContnet() { +function AlignContent() { return (
Date: Sun, 26 May 2019 22:58:12 +0100 Subject: [PATCH 2/3] more changes --- .../pages/components/autocomplete/IntegrationDownshift.tsx | 2 +- packages/material-ui-system/src/index.d.ts | 6 ------ packages/material-ui/src/Button/Button.d.ts | 2 +- packages/material-ui/src/Divider/Divider.d.ts | 1 - packages/material-ui/src/Hidden/Hidden.d.ts | 1 - packages/material-ui/src/index.d.ts | 2 +- packages/material-ui/src/styles/props.d.ts | 2 ++ packages/material-ui/src/test-utils/createMount.d.ts | 1 + 8 files changed, 6 insertions(+), 11 deletions(-) diff --git a/docs/src/pages/components/autocomplete/IntegrationDownshift.tsx b/docs/src/pages/components/autocomplete/IntegrationDownshift.tsx index a7c3d345a3fe7d..dac9905f45034e 100644 --- a/docs/src/pages/components/autocomplete/IntegrationDownshift.tsx +++ b/docs/src/pages/components/autocomplete/IntegrationDownshift.tsx @@ -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'; diff --git a/packages/material-ui-system/src/index.d.ts b/packages/material-ui-system/src/index.d.ts index 918cc1292afa48..941155d15c91ef 100644 --- a/packages/material-ui-system/src/index.d.ts +++ b/packages/material-ui-system/src/index.d.ts @@ -1,14 +1,8 @@ -import { CSSProperties } from '@material-ui/styles'; import * as CSS from 'csstype'; // disable automatic export export {}; -type ThemeOf = Props extends WithTheme ? Theme : never; -type WithThemeOfProps = WithTheme>; -interface WithTheme { - theme?: Theme; -} export type PropsFor = SomeStyleFunction extends StyleFunction ? Props : never; diff --git a/packages/material-ui/src/Button/Button.d.ts b/packages/material-ui/src/Button/Button.d.ts index 1677af6e992f3f..122cace4883d6b 100644 --- a/packages/material-ui/src/Button/Button.d.ts +++ b/packages/material-ui/src/Button/Button.d.ts @@ -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 = ExtendButtonBaseTypeMap<{ props: P & { diff --git a/packages/material-ui/src/Divider/Divider.d.ts b/packages/material-ui/src/Divider/Divider.d.ts index d6cfe692a62b3c..c659f311a9e790 100644 --- a/packages/material-ui/src/Divider/Divider.d.ts +++ b/packages/material-ui/src/Divider/Divider.d.ts @@ -1,4 +1,3 @@ -import * as React from 'react'; import { OverridableComponent, SimplifiedPropsOf } from '../OverridableComponent'; declare const Divider: OverridableComponent<{ diff --git a/packages/material-ui/src/Hidden/Hidden.d.ts b/packages/material-ui/src/Hidden/Hidden.d.ts index e89ff63233419f..d7a2285e96e375 100644 --- a/packages/material-ui/src/Hidden/Hidden.d.ts +++ b/packages/material-ui/src/Hidden/Hidden.d.ts @@ -1,5 +1,4 @@ import * as React from 'react'; -import { StandardProps } from '..'; import { Breakpoint } from '../styles/createBreakpoints'; export interface HiddenProps { diff --git a/packages/material-ui/src/index.d.ts b/packages/material-ui/src/index.d.ts index 825bb713d01013..4cd73ebd045914 100644 --- a/packages/material-ui/src/index.d.ts +++ b/packages/material-ui/src/index.d.ts @@ -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 }; diff --git a/packages/material-ui/src/styles/props.d.ts b/packages/material-ui/src/styles/props.d.ts index a20b48e602a663..5b3972ba55524b 100644 --- a/packages/material-ui/src/styles/props.d.ts +++ b/packages/material-ui/src/styles/props.d.ts @@ -147,12 +147,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; diff --git a/packages/material-ui/src/test-utils/createMount.d.ts b/packages/material-ui/src/test-utils/createMount.d.ts index 1b2ff48f5d6239..9083d86706eabd 100644 --- a/packages/material-ui/src/test-utils/createMount.d.ts +++ b/packages/material-ui/src/test-utils/createMount.d.ts @@ -2,6 +2,7 @@ import { mount } from 'enzyme'; export interface MountOptions { mount: typeof mount; + strict: boolean; } export default function createMount( From 6b0cfcda91b305d1dacfc39fcf826063e790a954 Mon Sep 17 00:00:00 2001 From: joshwooding <12938082+joshwooding@users.noreply.github.com> Date: Tue, 28 May 2019 15:11:40 +0100 Subject: [PATCH 3/3] Remove unneeded StyleRules import --- packages/material-ui/src/styles/props.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/material-ui/src/styles/props.d.ts b/packages/material-ui/src/styles/props.d.ts index 5b3972ba55524b..015024b91f5315 100644 --- a/packages/material-ui/src/styles/props.d.ts +++ b/packages/material-ui/src/styles/props.d.ts @@ -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';