smbls 0.8.5 → 0.8.6

package/package.json

@@ -3,7 +3,7 @@
   "description": "UI Library built on Scratch and DOMQL",
   "private": false,
   "author": "symbo.ls",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "repository": "https://github.com/rackai/symbols",
   "main": "src/index.js",
   "files": [

package/src/Link/index.js

@@ -1,5 +1,6 @@
 'use strict'
 
+import { exec } from '@domql/utils'
 import { Shape, Text } from '..'
 
 export const Link = {
@@ -12,7 +13,7 @@ export const Link = {
     aria: {}
   },
   attr: {
-    href: ({ props }) => props.href,
+    href: element => exec(element.props.href, element),
     target: ({ props }) => props.target,
     'aria-label': ({ props }) => props.aria.label || props.text
   }

package/src/Responsive/index.js

@@ -7,14 +7,10 @@ export const Responsive = {
     init: (el, s) => {
       const { props } = el
 
-      // Object.keys(props)
-      //   .filter(v => v.slice(0, 1) === '@')
-      //   .map()
-
       for (const screen in props) {
         if (screen.slice(0, 1) === '@') {
-          const screenName = screen.slice(1)
-          const responsiveKey = `@media screen and ${RESPONSIVE[screenName]}`
+          const mediaName = screen.slice(1)
+          const responsiveKey = `@media screen and ${RESPONSIVE[mediaName]}`
           const screenProps = props[screen]
           const calculatedScreenProps = {}
 
@@ -41,6 +37,33 @@ export const Responsive = {
               [responsiveKey]: calculatedScreenProps
             }
           }
+        } else if (screen.slice(0, 1) === ':') {
+          const selectorProps = {}
+          const selectorName = screen.slice(1)
+          const underSelectorProps = props[screen]
+          const selectorKey = `&${selectorName}`
+
+          for (const prop in underSelectorProps) {
+            const classProp = el.class[prop]
+            if (typeof classProp !== 'function') continue
+            let calculatedProp = classProp({ props: underSelectorProps })
+
+            if (Array.isArray(underSelectorProps)) {
+              underSelectorProps = Object.assign({}, ...underSelectorProps)
+            }
+
+            for (const finalProp in calculatedProp) {
+              selectorProps[finalProp] = calculatedProp[finalProp]
+            }
+          }
+
+          const { selectors } = el.class
+          if (selectors) selectors[selectorKey] = selectorProps
+          else {
+            el.class.selectors = {
+              [selectorKey]: selectorProps
+            }
+          }
         }
       }
     }