Merge pull request #111 from vigour-io/feature/style-type

expose style as type and use state.key as name when target.key === de…
vigour-io · Dec 12, 2016 · 4c015f8 · 4c015f8
2 parents baaba20 + fd649d5
commit 4c015f8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/lib/property/html.js b/lib/property/html.js
@@ -1,6 +1,6 @@
 const parent = require('../render/dom/parent')
 
-exports.props = {
+exports.types = {
   html: {
     type: 'element',
     render: {
@@ -34,3 +34,9 @@ exports.props = {
     }
   }
 }
+
+exports.props = {
+  html: {
+    type: 'html'
+  }
+}
diff --git a/lib/property/style/index.js b/lib/property/style/index.js
@@ -5,10 +5,7 @@ const { property } = require('../../render/static')
 const ua = require('vigour-ua/navigator')
 
 exports.types = {
-  style: require('./type')
-}
-
-exports.props = {
+  styleProp: require('./type'),
   style: {
     type: 'property',
     render: {
@@ -30,7 +27,7 @@ exports.props = {
       require('./transform')
     ],
     props: {
-      default: { type: 'style' },
+      default: { type: 'styleProp' },
       order: {
         // put ua info on top for server or from render for example
         // or add both for now
@@ -39,3 +36,9 @@ exports.props = {
     }
   }
 }
+
+exports.props = {
+  style: {
+    type: 'style'
+  }
+}
diff --git a/lib/property/style/type.js b/lib/property/style/type.js
@@ -7,12 +7,12 @@ exports.render = {
   static (target, pnode) {
     pnode.style[target.name || target.key] = target.compute()
   },
-  state (target, s, type, subs, tree, id, pid) {
+  state (t, s, type, subs, tree, id, pid) {
     if (type !== 'remove') {
       const pnode = parent(tree, pid)
-      pnode.style[target.name || target.key] = s
-      ? target.compute(s, s)
-      : target.compute()
+      pnode.style[t.name || (t.key !== 'default' ? t.key : s.key)] = s
+      ? t.compute(s, s)
+      : t.compute()
     }
   }
 }