smbls 0.15.9 → 0.15.11

package/package.json

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

package/src/Button.js

@@ -3,13 +3,6 @@
 import { FocusableComponent } from './atoms'
 import { IconText } from '.'
 
-const style = {
-  appearance: 'none',
-  border: 'none',
-  cursor: 'pointer',
-  fontFamily: 'inherit'
-}
-
 export const Button = {
   extend: [FocusableComponent, IconText],
   tag: 'button',
@@ -25,8 +18,7 @@ export const Button = {
     whiteSpace: 'nowrap',
     padding: 'Z A1',
     fontFamily: 'inherit',
-    round: 'C2',
-    style
+    round: 'C2'
   },
   attr: {
     type: ({ props }) => props.type
@@ -53,7 +45,5 @@ export const CircleButton = {
 
 export const KangorooButton = {
   extend: Button,
-  childExtend: IconText,
-
-  props: { style }
+  childExtend: IconText
 }

package/src/Input.js

@@ -13,7 +13,7 @@ export const Input = {
     fontSize: 'A',
     round: 'C',
     lineHeight: 1,
-    padding: 'Z A'
+    padding: 'Z A',
   },
 
   attr: {

package/src/atoms/Block.js

@@ -4,7 +4,7 @@ import { getSpacingBasedOnRatio, getSpacingByKey } from '@symbo.ls/scratch'
 
 export const Block = {
   class: {
-    boxSizing: ({ props }) => props.boxSizing ? ({ display: props.boxSizing }) : {
+    boxSizing: ({ props }) => props.boxSizing ? ({ boxSizing: props.boxSizing }) : {
       boxSizing: 'border-box'
     },
 

package/src/atoms/FocusableComponent.js

@@ -6,10 +6,7 @@ const style = {
   appearance: 'none',
   border: 'none',
   cursor: 'pointer',
-  fontFamily: 'inherit',
-  '& > *': {
-    pointerEvents: 'none'
-  }
+  fontFamily: 'inherit'
 }
 
 export const FocusableComponent = {

package/src/atoms/Theme.js

@@ -10,6 +10,7 @@ const isBorderStyle = str =>
 const transformBorder = border => {
   const arr = border.split(', ')
   return arr.map(v => {
+    v = v.trim()
     if (isBorderStyle(v)) return v || 'solid'
     else if (v.slice(-2) === 'px' || v.slice(-2) === 'em') return v // TODO: add map spacing
     else if (getColor(v).length > 2) return getColor(v)
@@ -24,16 +25,16 @@ const transformTextStroke = stroke => ({
   }).join(' ')
 })
 
-const transformShadow = shadow => ({
-  boxShadow: shadow.split(', ').map(v => {
-    if (v !== getColor(v)) return getColor(v)
-    if (v.includes('px')) return v
-
+const transformShadow = shadows => shadows.split('|').map(shadow => {
+  return shadow.split(', ').map(v => {
+    v = v.trim()
+    if (getColor(v).length > 2) return getColor(v)
+    if (v.includes('px') || v.slice(-2) === 'em') return v
     const arr = v.split(' ')
     if (!arr.length) return v
     return arr.map(v => getSpacingByKey(v, 'shadow').shadow).join(' ')
   }).join(' ')
-})
+}).join(',')
 
 const transformBackgroundImage = (backgroundImage, ctx) => ({
   backgroundImage: backgroundImage.split(', ').map(v => {
@@ -86,7 +87,9 @@ export const Theme = {
       borderBottom: transformBorder(props.borderBottom)
     }),
 
-    boxShadow: ({ props }) => props.boxShadow ? transformShadow(props.boxShadow) : null,
+    boxShadow: ({ props }) => props.boxShadow && ({
+      boxShadow: transformShadow(props.boxShadow)
+    }),
 
     opacity: ({ props }) => props.opacity && ({ opacity: props.opacity }),
     visibility: ({ props }) => props.visibility && ({ visibility: props.visibility })