Merge pull request #910 from hasparus/simplify-types

Simplify types and fix minor bugs

Author: hasparus

examples/codesandbox-starter/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@emotion/core": "^10.0.17",
     "@mdx-js/react": "^1.4.5",
-    "@theme-ui/presets": "^0.4.0-alpha.2",
+    "@theme-ui/presets": "^0.4.0-alpha.3",
     "react": "^16.12.0",
     "react-dom": "^16.9.0",
     "theme-ui": "^0.4.0-alpha.3"

packages/chrome/package.json

@@ -32,7 +32,7 @@
     "webpack-cli": "^3.3.4"
   },
   "devDependencies": {
-    "@theme-ui/css": "^0.4.0-alpha.2"
+    "@theme-ui/css": "^0.4.0-alpha.3"
   },
   "gitHead": "bfd026cae085f377ca537de897dc43233d50f5d5"
 }

packages/color-modes/package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@emotion/core": "^10.0.0",
     "@theme-ui/core": "^0.4.0-alpha.3",
-    "@theme-ui/css": "^0.4.0-alpha.2",
+    "@theme-ui/css": "^0.4.0-alpha.3",
     "deepmerge": "^4.2.2"
   },
   "peerDependencies": {

packages/color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/color",
-  "version": "0.4.0-alpha.2",
+  "version": "0.4.0-alpha.3",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -10,7 +10,7 @@
     "watch": "microbundle watch --no-compress"
   },
   "dependencies": {
-    "@theme-ui/css": "^0.4.0-alpha.2",
+    "@theme-ui/css": "^0.4.0-alpha.3",
     "polished": "^3.4.1"
   },
   "publishConfig": {

packages/components/package.json

@@ -16,7 +16,7 @@
     "@styled-system/color": "^5.1.2",
     "@styled-system/should-forward-prop": "^5.1.2",
     "@styled-system/space": "^5.1.2",
-    "@theme-ui/css": "^0.4.0-alpha.2"
+    "@theme-ui/css": "^0.4.0-alpha.3"
   },
   "peerDependencies": {
     "react": "^16.8.0"

packages/core/package.json

@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@emotion/core": "^10.0.0",
-    "@theme-ui/css": "^0.4.0-alpha.2",
+    "@theme-ui/css": "^0.4.0-alpha.3",
     "deepmerge": "^4.2.2"
   },
   "peerDependencies": {

packages/core/src/index.ts

@@ -89,7 +89,7 @@ const BaseProvider: React.FC<BaseProviderProps> = ({ context, children }) =>
   )
 
 export interface ThemeProviderProps {
-  theme: Partial<Theme> | ((outerTheme: Theme) => Theme)
+  theme: Theme | ((outerTheme: Theme) => Theme)
   children?: React.ReactNode
 }
 

packages/core/src/types.ts

@@ -1,11 +1,11 @@
-import { SystemStyleObject } from '@theme-ui/css'
+import { ThemeUIStyleObject } from '@theme-ui/css'
 
 /**
  * The `sx` prop accepts a `SxStyleProp` object and properties that are part of
  * the `Theme` will be transformed to their corresponding values. Other valid
  * CSS properties are also allowed.
  */
-export type SxStyleProp = SystemStyleObject
+export type SxStyleProp = ThemeUIStyleObject
 
 export interface SxProps {
   /**

packages/css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/css",
-  "version": "0.4.0-alpha.2",
+  "version": "0.4.0-alpha.3",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",

packages/css/src/index.ts

@@ -1,4 +1,4 @@
-import { CSSObject, SystemStyleObject, UseThemeFunction, Theme } from './types'
+import { CSSObject, ThemeUIStyleObject, UseThemeFunction, Theme } from './types'
 
 export * from './types'
 
@@ -215,10 +215,10 @@ const transforms = [
   {}
 )
 
-const responsive = (styles: Exclude<SystemStyleObject, UseThemeFunction>) => (
+const responsive = (styles: Exclude<ThemeUIStyleObject, UseThemeFunction>) => (
   theme?: Theme
 ) => {
-  const next: Exclude<SystemStyleObject, UseThemeFunction> = {}
+  const next: Exclude<ThemeUIStyleObject, UseThemeFunction> = {}
   const breakpoints =
     (theme && (theme.breakpoints as string[])) || defaultBreakpoints
   const mediaQueries = [
@@ -252,7 +252,7 @@ const responsive = (styles: Exclude<SystemStyleObject, UseThemeFunction>) => (
 
 type CssPropsArgument = { theme: Theme } | Theme
 
-export const css = (args: SystemStyleObject = {}) => (
+export const css = (args: ThemeUIStyleObject = {}) => (
   props: CssPropsArgument = {}
 ): CSSObject => {
   const theme: Theme = {