Update types, remove link for static sheet

Author: lttb

src/index.js

@@ -5,23 +5,29 @@ import preset from 'jss-preset-default'
 import filterProps from './utils/filter-props'
 import composeClasses from './utils/compose-classes'
 import type {
-  styledType,
+  BaseStylesType,
+  ComponentStylesType,
+  StyledType,
   StyledElementAttrsType,
   StyledElementType,
-  tagOrStyledElementTypeype,
+  TagOrStyledElementTypeype,
   StyledElementPropsType
 } from './types'
 
 const jssDefault = createJss(preset())
 
-const createStyled = (jss?: Function = jssDefault) => (baseStyles: Object = {}): styledType => {
+
+const createStyled = (
+  jss?: Function = jssDefault
+) => (
+  baseStyles: BaseStylesType = {}
+): StyledType => {
   const sheets = {}
   let counter = 0
 
   const mountSheets = () => {
     if (!sheets.staticSheet) {
       sheets.staticSheet = jss.createStyleSheet(baseStyles, {
-        link: true,
         meta: 'StaticBaseSheet',
       }).attach()
 
@@ -33,8 +39,8 @@ const createStyled = (jss?: Function = jssDefault) => (baseStyles: Object = {}):
   }
 
   const styled = (
-    tagOrStyledElement: tagOrStyledElementTypeype,
-    ownStyles: Object
+    tagOrStyledElement: TagOrStyledElementTypeype,
+    ownStyles: ComponentStylesType
   ): StyledElementType => {
     const {tag, styles}: StyledElementAttrsType = typeof tagOrStyledElement === 'string'
       ? {tag: tagOrStyledElement, styles: {}}
@@ -45,9 +51,8 @@ const createStyled = (jss?: Function = jssDefault) => (baseStyles: Object = {}):
     const staticTag = `${tag}-${++counter}`
 
     return class StyledElement extends PureComponent {
-      static tag = tag
-
-      static styles = elementStyles
+      static tag: string = tag
+      static styles: ComponentStylesType = elementStyles
 
       props: StyledElementPropsType
 

src/injectStyled.js

@@ -1,9 +1,9 @@
 import {createElement} from 'react'
 
 import composeClasses from './utils/compose-classes'
-import type {styledType} from './types'
+import type {StyledType} from './types'
 
-const injectStyled = (styled: styledType) => (InnerComponent: ReactClass<any>) => {
+const injectStyled = (styled: StyledType) => (InnerComponent: ReactClass<any>) => {
   styled.mountSheets()
 
   const {sheets} = styled

src/tests/App.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
-import type {styledType} from '../types'
+import type {StyledType} from '../types'
 
-export default (styled: styledType) => {
+export default (styled: StyledType) => {
   const App = styled('div', {
     margin: 50,
   })

src/types/index.js

@@ -1,15 +1,22 @@
-export type styledType = Function & {
+export type JssStyles = Object
+export type JssStyle = Object
+export type JssStaticSheet = Object
+export type JssDynamicSheet = JssStaticSheet
+
+export type BaseStylesType = JssStyles
+export type ComponentStylesType = JssStyle
+export type StyledType = Function & {
   sheets: {
     // TODO: use types from jss
-    staticSheet: Object,
-    dynamicSheet: Object,
+    staticSheet: JssStaticSheet,
+    dynamicSheet: JssDynamicSheet,
   },
   mountSheets: Function,
-  styles: Object
+  styles: JssStyles
 }
-export type StyledElementAttrsType = {tag: string, styles: Object}
+export type StyledElementAttrsType = {tag: string, styles: ComponentStylesType}
 export type StyledElementType = Function & StyledElementAttrsType
-export type tagOrStyledElementTypeype = string | StyledElementType
+export type TagOrStyledElementTypeype = string | StyledElementType
 export type StyledElementPropsType = {
   classes: Object,
   children: ?any,