small styling adjustments

Author: kof

package.json

@@ -4,8 +4,9 @@
   "description": "Styled primitives with JSS",
   "main": "lib/index.js",
   "scripts": {
-    "clean": "rm -rf lib/*",
+    "clean": "rimraf lib/*",
     "lint": "eslint src",
+    "lint:staged": "lint-staged",
     "test": "jest",
     "test:watch": "npm test -- --watch",
     "test:coverage": "npm test -- --coverage",
@@ -20,18 +21,21 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/lttb/jss-styled.git"
+    "url": "git+https://github.com/cssinjs/styled-jss.git"
   },
   "keywords": [
     "jss",
-    "styled"
+    "styled",
+    "react",
+    "styled-components",
+    "primitives"
   ],
   "author": "lttb <kenzhaev.artur@gmail.com>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/lttb/jss-styled/issues"
+    "url": "https://github.com/cssinjs/styled-jss/issues"
   },
-  "homepage": "https://github.com/lttb/jss-styled#readme",
+  "homepage": "https://github.com/cssinjs/styled-jss#readme",
   "dependencies": {
     "is-react-prop": "^0.0.2",
     "jss": "^7.1.0",
@@ -58,6 +62,18 @@
     "flow-bin": "^0.44.2",
     "flow-typed": "^2.0.0",
     "jest": "^18.1.0",
-    "react-test-renderer": "^15.4.2"
-  }
+    "lint-staged": "^3.4.0",
+    "pre-commit": "^1.2.2",
+    "react": "^15.5.4",
+    "react-dom": "^15.5.4",
+    "react-test-renderer": "^15.4.2",
+    "rimraf": "^2.6.1"
+  },
+  "lint-staged": {
+    "./src": [
+      "eslint",
+      "git add"
+    ]
+  },
+  "pre-commit": "lint:staged"
 }

src/index.jsx src/index.jssrc/index.jsx renamed to src/index.js

@@ -1,50 +1,44 @@
-import React, {PureComponent} from 'react'
-
+import {PureComponent, createElement} from 'react'
 import {create as createJss, getDynamicStyles} from 'jss'
 import preset from 'jss-preset-default'
-
 import filterProps from './utils/filter-props'
 
-
 const jssDefault = createJss(preset())
 
-type StyledElementAttrsT = { tag: string, styles: Object }
-type StyledElementT = Function & StyledElementAttrsT
-type tagOrStyledElementT = string | StyledElementT
-type StyledElementPropsT = {
+type StyledElementAttrsType = { tag: string, styles: Object }
+type StyledElementType = Function & StyledElementAttrsType
+type tagOrStyledElementTypeype = string | StyledElementType
+type StyledElementPropsType = {
   classes: Object,
   children: ?any,
   className: ?string,
 }
 
-
 export const createStyled = (jss?: Function = jssDefault) => (baseStyles: Object = {}) => {
   let sheet
   let dynamicSheet
-
   let counter = 0
 
-  return (tagOrStyledElement: tagOrStyledElementT, ownStyles: Object): StyledElementT => {
-    const {tag, styles}: StyledElementAttrsT = typeof tagOrStyledElement === 'string'
+  return (tagOrStyledElement: tagOrStyledElementTypeype, ownStyles: Object): StyledElementType => {
+    const {tag, styles}: StyledElementAttrsType = typeof tagOrStyledElement === 'string'
       ? {tag: tagOrStyledElement, styles: {}}
       : tagOrStyledElement
 
     const elementStyles = {...styles, ...ownStyles}
     const dynamicStyles = getDynamicStyles(elementStyles)
-
-    const StaticTag = `${tag}-${++counter}`
+    const staticTag = `${tag}-${++counter}`
 
     return class StyledElement extends PureComponent {
-      props: StyledElementPropsT
-
       static tag = tag
+
       static styles = elementStyles
 
+      props: StyledElementPropsType
+
       tagScoped = ''
 
       constructor(props) {
         super(props)
-
         this.tagScoped = `${tag}-${++counter}`
       }
 
@@ -61,8 +55,8 @@ export const createStyled = (jss?: Function = jssDefault) => (baseStyles: Object
           }).attach()
         }
 
-        if (!sheet.getRule(StaticTag)) {
-          sheet.addRule(StaticTag, elementStyles)
+        if (!sheet.getRule(staticTag)) {
+          sheet.addRule(staticTag, elementStyles)
         }
 
         if (dynamicStyles && !dynamicSheet.getRule(this.tagScoped)) {
@@ -73,7 +67,7 @@ export const createStyled = (jss?: Function = jssDefault) => (baseStyles: Object
         }
       }
 
-      componentWillReceiveProps(nextProps: StyledElementPropsT) {
+      componentWillReceiveProps(nextProps: StyledElementPropsType) {
         if (dynamicStyles) dynamicSheet.update(this.tagScoped, nextProps)
       }
 
@@ -88,25 +82,30 @@ export const createStyled = (jss?: Function = jssDefault) => (baseStyles: Object
 
         const props = filterProps(attrs)
         const tagClass = [
-          sheet.classes[StaticTag],
+          sheet.classes[staticTag],
           dynamicSheet.classes[this.tagScoped],
           className,
         ]
           .filter(Boolean)
           .join(' ')
 
-        return React.createElement(tag, {...props, className: tagClass}, children)
+        return createElement(tag, {...props, className: tagClass}, children)
       }
     }
   }
 }
 
-const defaultStyledBased = createStyled()
-const defaultStyled = defaultStyledBased()
+const defaultStyledCreator = createStyled()
 
-export {defaultStyled as styled}
+const defaultStyled = defaultStyledCreator()
 
-export const createStyledCreator = (styled: Function = defaultStyledBased) =>
+const createStyledCreator = (styled: Function = defaultStyledCreator) => (
   (baseStyles: Object) => Object.assign(styled(baseStyles), {styles: baseStyles})
+)
+
+export {
+  defaultStyled as styled,
+  createStyledCreator
+}
 
 export default createStyledCreator()