[typescript] [createMuiTheme] Fix typings & deepmerge shape (mui#11993)

* fix typings * fix * revert * fix shape * fix unit test * add unit test
acroyear · Jul 14, 2018 · 4e4b7fb · 4e4b7fb
1 parent 8e6939d
commit 4e4b7fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/packages/material-ui/src/styles/createMuiTheme.js b/packages/material-ui/src/styles/createMuiTheme.js
@@ -33,12 +33,12 @@ function createMuiTheme(options: Object = {}) {
     palette,
     props: {}, // Inject custom properties
     shadows: shadowsInput || shadows,
-    shape,
     typography: createTypography(palette, typographyInput),
     ...deepmerge(
       {
-        transitions,
+        shape,
         spacing,
+        transitions,
         zIndex,
       },
       other,

diff --git a/packages/material-ui/src/styles/createPalette.d.ts b/packages/material-ui/src/styles/createPalette.d.ts
@@ -21,6 +21,8 @@ interface TypeBackground {
   paper: string;
 }
 
+type TypeDivider = string;
+
 export type PaletteColorOptions = SimplePaletteColorOptions | Partial<Color>;
 
 export interface SimplePaletteColorOptions {
@@ -40,6 +42,7 @@ export interface PaletteColor {
 export interface TypeObject {
   text: TypeText;
   action: TypeAction;
+  divider: TypeDivider;
   background: TypeBackground;
 }
 
@@ -56,7 +59,7 @@ export interface Palette {
   error: PaletteColor;
   grey: Color;
   text: TypeText;
-  divider: string;
+  divider: TypeDivider;
   action: TypeAction;
   background: TypeBackground;
   getContrastText: (background: string) => string;
@@ -72,11 +75,13 @@ type PartialTypeObject = { [P in keyof TypeObject]?: Partial<TypeObject[P]> };
 type ColorPartial = Partial<Color>;
 
 export interface PaletteOptions {
-  common?: Partial<CommonColors>;
-  type?: PaletteType;
   primary?: PaletteColorOptions;
   secondary?: PaletteColorOptions;
   error?: PaletteColorOptions;
+  type?: PaletteType;
+  tonalOffset?: number;
+  contrastThreshold?: number;
+  common?: Partial<CommonColors>;
   grey?: ColorPartial;
   text?: Partial<TypeText>;
   divider?: string;
@@ -85,6 +90,4 @@ export interface PaletteOptions {
   getContrastText?: (background: string) => string;
 }
 
-//export type PaletteOptions = DeepPartial<Palette>;
-
 export default function createPalette(palette: PaletteOptions): Palette;
diff --git a/packages/material-ui/test/typescript/styles.spec.tsx b/packages/material-ui/test/typescript/styles.spec.tsx
@@ -77,6 +77,8 @@ const theme = createMuiTheme({
   palette: {
     type: 'dark',
     primary: blue,
+    contrastThreshold: 3,
+    tonalOffset: 0.2,
     common: {
       white: '#ffffff',
     },