smbls 0.8.30 → 0.8.33

package/package.json

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

package/src/Block.js

@@ -27,9 +27,11 @@ export const mapBasedOnRatio = (props, prop, unit) => {
 }
 
 export const Block = {
-  props: {},
-
   class: {
+    boxSizing: ({ props }) => props.boxSizing ? ({ display: props.boxSizing }) : {
+      boxSizing: 'border-box'
+    },
+
     display: ({ props }) => props.display && ({ display: props.display }),
 
     hide: ({ props }) => props.hide && ({ display: 'none' }),

package/src/Box.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { Shape, Position, Block, Text, Overflow, Transition, Transform, Responsive } from '.'
+import { Shape, Position, Theme, Block, Text, Overflow, Transition, Transform, Responsive } from '.'
 
 const PropsCSS = {
   class: {
@@ -9,5 +9,5 @@ const PropsCSS = {
 }
 
 export const Box = {
-  proto: [Shape, Position, Block, Text, Overflow, Transition, Transform, Responsive, PropsCSS]
+  proto: [Shape, Position, Theme, Block, Text, Overflow, Transition, Transform, Responsive, PropsCSS]
 }

package/src/Link.js

@@ -7,7 +7,7 @@ export const Link = {
   proto: [Shape, Text],
   tag: 'a',
   props: {
-    theme: 'link',
+    // theme: 'link',
     aria: {},
     fontWeight: 'bold',
     textDecoration: 'none'

package/src/Media.js

@@ -3,93 +3,138 @@
 import { merge, isArray } from '@domql/utils'
 import { CASES as CONFIG_CASES, MEDIA as CONFIG_MEDIA, getTheme } from '@symbo.ls/scratch'
 
-const convertToClass = (subProps, element) => {
+// const keySetters = {
+//   '@': (props, result, element, isSubtree) => {
+//     if (isSubtree) result.media = {}
+//     return applyMediaProps(props, result.media, element)
+//   },
+//   ':': (props, result, element, isSubtree) => {
+//     if (isSubtree) result.selector = {}
+//     return applySelectorProps(props, result.selector, element)
+//   },
+//   $: (props, result, element, isSubtree) => {
+//     if (isSubtree) result.case = {}
+//     return applyCaseProps(props, result.case, element)
+//   }
+// }
+
+// const keySetters = {
+//   '@': (props, result, element) => applyMediaProps(props, result.media, element),
+//   ':': (props, result, element) => applySelectorProps(props, result.selector, element),
+//   $: (props, result, element) => applyCaseProps(props, result.case, element)
+// }
+
+const keySetters = {
+  '@': (key, props, result, element, isSubtree) => applyMediaProps(key, props, isSubtree ? result : result.media, element),
+  ':': (key, props, result, element, isSubtree) => applySelectorProps(key, props, isSubtree ? result : result.selector, element),
+  $: (key, props, result, element, isSubtree) => applyCaseProps(key, props, isSubtree ? result : result.case, element),
+  '.': (key, props, result, element, isSubtree) => applyCaseProps(key, props, isSubtree ? result : result.case, element)
+}
+
+const execClass = (key, props, result, element) => {
   const { class: className } = element
-  const subPropsClassname = {}
-  for (const prop in subProps) {
-    const classnameExec = className[prop]
-    if (typeof classnameExec !== 'function') continue
-
-    let contertedToClass = classnameExec({ props: subProps })
-    if (isArray(contertedToClass)) {
-      contertedToClass = contertedToClass.reduce((a, c) => merge(a, c), {})
-    }
+  const classnameExec = className[key]
 
-    for (const finalProp in contertedToClass) subPropsClassname[finalProp] = contertedToClass[finalProp]
+  if (typeof classnameExec !== 'function') return
+
+  let classExec = classnameExec({ props })
+  if (isArray(classExec)) {
+    classExec = classExec.reduce((a, c) => merge(a, c), {})
+  }
+
+  for (const finalProp in classExec) {
+    result[finalProp] = classExec[finalProp]
   }
-  return subPropsClassname
 }
 
-const init = (el, s) => {
-  const { props, class: className } = el
+const convertPropsToClass = (props, result, element) => {
+  const propsClassObj = {}
 
-  for (const screen in props) {
-    if (screen.slice(0, 1) === '@') {
-      const mediaName = CONFIG_MEDIA[screen.slice(1)]
-      const mediaKey = `@media screen and ${mediaName}`
-      const screenProps = props[screen]
-
-      const { MEDIA } = className
-      if (!MEDIA) className.MEDIA = {}
-      className.MEDIA[mediaKey] = convertToClass(screenProps, el)
-    } else if (screen.slice(0, 1) === ':') {
-      const selectorProps = props[screen]
-      const selectorKey = `&${screen}`
-
-      const { SELECTORS } = className
-      if (!SELECTORS) className.SELECTORS = {}
-      className.SELECTORS[selectorKey] = convertToClass(selectorProps, el)
-    } else if (screen.slice(0, 1) === '$') {
-      const caseKey = screen.slice(1)
-      if (!CONFIG_CASES[caseKey]) continue
-      const caseProps = props[screen]
-      const { CASE } = className
-      if (!CASE) className.CASE = {}
-      merge(className.CASE, convertToClass(caseProps, el))
+  for (const key in props) {
+    const setter = keySetters[key.slice(0, 1)]
+    if (setter) {
+      setter(key, props[key], propsClassObj, element, true)
+      continue
+    } else {
+      execClass(key, props, propsClassObj, element)
     }
   }
+
+  return propsClassObj
+}
+
+const applyMediaProps = (key, props, result, element) => {
+  const mediaName = CONFIG_MEDIA[key.slice(1)]
+  const mediaKey = `@media screen and ${mediaName}`
+  result[mediaKey] = convertPropsToClass(props, result, element)
+}
+
+const applySelectorProps = (key, props, result, element) => {
+  const selectorKey = `&${key}`
+  result[selectorKey] = convertPropsToClass(props, result, element)
+}
+
+const applyCaseProps = (key, props, result, element) => {
+  const caseKey = key.slice(1)
+  if (!(CONFIG_CASES[caseKey] || element.props[caseKey])) return
+  merge(result, convertPropsToClass(props, result, element))
+}
+
+const init = (element, s) => {
+  const { props, class: className } = element
+
+  const CLASS_NAMES = {
+    media: {},
+    selector: {},
+    case: {}
+  }
+
+  for (const key in props) {
+    const setter = keySetters[key.slice(0, 1)]
+    if (setter) setter(key, props[key], CLASS_NAMES, element)
+  }
+
+  merge(className, CLASS_NAMES)
 }
 
 export const Responsive = {
-  on: {
-    init,
-    initUpdate: el => {
-      // FORCE STATE UPDATE:
-      const { props, class: className } = el
-      const rootState = el.__root ? el.__root.state : el.state
-      // console.log(props)
-      if (el.key !== 'app') return
-
-      if (props.theme) {
-        const { theme } = props
-        // console.group(props.theme)
-
-        const convertTheme = getTheme(theme)
-
-        for (const key in convertTheme) {
-          if (key.includes('dark') || key.includes('light')) {
-            const parse = key.split(': ')[1].split(')')[0]
-            if (rootState.globalTheme === parse) {
-              props.theme = getTheme(theme[key])
-            } else props.theme = theme
-            className.MEDIA_FORCED_BY_STATE = props.theme
-          }
-        }
-        // console.groupEnd(props.theme)
+  on: { init }
+}
+
+export const initUpdate = el => {
+  // FORCE STATE UPDATE:
+  const { props, class: className } = el
+  const rootState = el.__root ? el.__root.state : el.state
+  if (el.key !== 'app') return
+
+  if (props.theme) {
+    const { theme } = props
+    // console.group(props.theme)
+
+    const convertTheme = getTheme(theme)
+
+    for (const key in convertTheme) {
+      if (key.includes('dark') || key.includes('light')) {
+        const parse = key.split(': ')[1].split(')')[0]
+        if (rootState.globalTheme === parse) {
+          props.theme = getTheme(theme[key])
+        } else props.theme = theme
+        className.MEDIA_FORCED_BY_STATE = props.theme
       }
+    }
+    // console.groupEnd(props.theme)
+  }
 
-      for (const screen in props) {
-        if (screen.slice(0, 1) === '@') {
-          const mediaName = screen.slice(1)
-          const mediaKey = `@media screen and ${CONFIG_MEDIA[mediaName]}`
-          if (mediaName === 'dark' || mediaName === 'light') {
-            const { MEDIA_FORCE } = className
-            if (!MEDIA_FORCE) className.media = {}
-            if (rootState.globalTheme === mediaName) {
-              className.MEDIA_FORCED = className.MEDIA[mediaKey]
-            } else className.MEDIA_FORCED = {}
-          }
-        }
+  for (const screen in props) {
+    if (screen.slice(0, 1) === '@') {
+      const mediaName = screen.slice(1)
+      const mediaKey = `@media screen and ${CONFIG_MEDIA[mediaName]}`
+      if (mediaName === 'dark' || mediaName === 'light') {
+        const { MEDIA_FORCE } = className
+        if (!MEDIA_FORCE) className.media = {}
+        if (rootState.globalTheme === mediaName) {
+          className.MEDIA_FORCED = className.MEDIA[mediaKey]
+        } else className.MEDIA_FORCED = {}
       }
     }
   }

package/src/Shape/index.js

@@ -1,35 +1,10 @@
 'use strict'
 
-import { isArray, isObject, exec } from '@domql/utils'
-import { mapSpacing, getTheme, getColor } from '@symbo.ls/scratch'
-
-import style, { SHAPES, depth } from './style'
-
-const isBorderStyle = str =>
-  ['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset', 'initial'].some(v => str.includes(v))
-
-const diffBorder = (border, key = 'border') => {
-  const obj = {}
-  const arr = isObject(border) ? Object.values(border) : isArray(border) ? border : border.split(', ')
-  arr.map(v => {
-    if (v.includes('px')) obj[`${key}Width`] = v
-    else if (isBorderStyle(v)) obj[`${key}Style`] = v || 'solid'
-    else if (getColor(v)) obj[`${key}Color`] = getColor(v)
-  })
-  return obj
-}
-
-const diffStroke = stroke => {
-  const WebkitTextStroke = stroke.split(', ').map(v => {
-    if (v.includes('px')) return v
-    else if (getColor(v)) return getColor(v)
-  }).join(' ')
-  return { WebkitTextStroke }
-}
+import { exec } from '@domql/utils'
+import { SHAPES } from './style'
 
 export const Shape = {
   class: {
-    default: style,
     shape: (element) => {
       const { props } = element
       const { shape } = props
@@ -41,54 +16,8 @@ export const Shape = {
       const shapeDir = SHAPES[shape + 'Direction']
       return shape ? shapeDir[shapeDirection || 'top'] : null
     },
-    shapeDirectionColor: ({ props, ...el }) => props.shapeDirection ? { '&:before': { borderColor: el.class.backgroundColor } } : null,
-    depth: ({ props }) => depth[props.depth],
-    round: ({ props, key, ...el }) => props.round ? (mapSpacing(props.round, 'borderRadius') || ({ borderRadius: props.round })) : null,
-    borderRadius: ({ props, key, ...el }) => props.borderRadius ? (mapSpacing(props.borderRadius, 'borderRadius') || ({ borderRadius: props.borderRadius })) : null,
-
-    theme: ({ props }) => {
-      if (!props.theme) return
-      return getTheme(props.theme)
-    },
-
-    color: ({ props }) => props.color ? ({ color: getColor(props.color) }) : null,
-    background: ({ props }) => props.background ? ({ backgroundColor: getColor(props.background) }) : null,
-
-    textStroke: ({ props }) => props.textStroke ? diffStroke(props.textStroke) : null,
-
-    border: ({ props }) => props.border ? diffBorder(props.border) : null,
-    borderColor: ({ props }) => props.borderColor ? ({ borderColor: getColor(props.borderColor) }) : null,
-    borderStyle: ({ props }) => props.borderStyle && ({ borderStyle: props.borderStyle }),
-
-    borderLeft: ({ props }) => props.borderLeft ? diffBorder(props.borderLeft, 'borderLeft') : null,
-    borderTop: ({ props }) => props.borderTop ? diffBorder(props.borderTop, 'borderTop') : null,
-    borderRight: ({ props }) => props.borderRight ? diffBorder(props.borderRight, 'borderRight') : null,
-    borderBottom: ({ props }) => props.borderBottom ? diffBorder(props.borderBottom, 'borderBottom') : null,
-
-    opacity: ({ props }) => props.opacity && ({ opacity: props.opacity }),
-    visibility: ({ props }) => props.visibility && ({ visibility: props.visibility })
+    shapeDirectionColor: ({ props, ...el }) => props.shapeDirection ? { '&:before': { borderColor: el.class.backgroundColor } } : null
   }
-
-  // mode: {
-  //   dark: {
-  //     theme: 'white'
-  //   }
-  // }
-
-  // theme: {
-  //   default: 'primary',
-  //   dark: 'whiteish'
-  // }
-
-  // size: {
-  //   default: 'auto',
-  //   mobile: 'fit'
-  // }
-
-  // padding: {
-  //   default: ratio.phi,
-  //   mobile: ratio.perfect
-  // }
 }
 
 export default Shape

package/src/Shape/style.js

@@ -2,10 +2,6 @@
 
 import { UNIT, getColor, getTheme } from '@symbo.ls/scratch'
 
-export default {
-  boxSizing: 'border-box'
-}
-
 export const depth = {
   4: { boxShadow: `rgba(0,0,0,.10) 0 2${UNIT.default} 4${UNIT.default}` },
   6: { boxShadow: `rgba(0,0,0,.10) 0 3${UNIT.default} 6${UNIT.default}` },

package/src/Theme.js

@@ -0,0 +1,58 @@
+'use strict'
+
+import { isArray, isObject } from '@domql/utils'
+import { mapSpacing, getTheme, getColor } from '@symbo.ls/scratch'
+
+import { depth } from './Shape/style'
+
+const isBorderStyle = str =>
+  ['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset', 'initial'].some(v => str.includes(v))
+
+const diffBorder = (border, key = 'border') => {
+  const obj = {}
+  const arr = isObject(border) ? Object.values(border) : isArray(border) ? border : border.split(', ')
+  arr.map(v => {
+    if (v.includes('px')) obj[`${key}Width`] = v // TODO: add map spacing
+    else if (isBorderStyle(v)) obj[`${key}Style`] = v || 'solid'
+    else if (getColor(v)) obj[`${key}Color`] = getColor(v)
+  })
+  return obj
+}
+
+const diffStroke = stroke => {
+  const WebkitTextStroke = stroke.split(', ').map(v => {
+    if (v.includes('px')) return v
+    else if (getColor(v)) return getColor(v)
+  }).join(' ')
+  return { WebkitTextStroke }
+}
+
+export const Theme = {
+  class: {
+    depth: ({ props }) => depth[props.depth],
+    round: ({ props, key, ...el }) => props.round ? (mapSpacing(props.round, 'borderRadius') || ({ borderRadius: props.round })) : null,
+    borderRadius: ({ props, key, ...el }) => props.borderRadius ? (mapSpacing(props.borderRadius, 'borderRadius') || ({ borderRadius: props.borderRadius })) : null,
+
+    theme: ({ props }) => {
+      if (!props.theme) return
+      return getTheme(props.theme)
+    },
+
+    color: ({ props }) => props.color ? ({ color: getColor(props.color) }) : null,
+    background: ({ props }) => props.background ? ({ backgroundColor: getColor(props.background) }) : null,
+
+    textStroke: ({ props }) => props.textStroke ? diffStroke(props.textStroke) : null,
+
+    border: ({ props }) => props.border ? diffBorder(props.border) : null,
+    borderColor: ({ props }) => props.borderColor ? ({ borderColor: getColor(props.borderColor) }) : null,
+    borderStyle: ({ props }) => props.borderStyle && ({ borderStyle: props.borderStyle }),
+
+    borderLeft: ({ props }) => props.borderLeft ? diffBorder(props.borderLeft, 'borderLeft') : null,
+    borderTop: ({ props }) => props.borderTop ? diffBorder(props.borderTop, 'borderTop') : null,
+    borderRight: ({ props }) => props.borderRight ? diffBorder(props.borderRight, 'borderRight') : null,
+    borderBottom: ({ props }) => props.borderBottom ? diffBorder(props.borderBottom, 'borderBottom') : null,
+
+    opacity: ({ props }) => props.opacity && ({ opacity: props.opacity }),
+    visibility: ({ props }) => props.visibility && ({ visibility: props.visibility })
+  }
+}

package/src/index.js

@@ -7,6 +7,7 @@ export * from './styles'
 export * from './Text'
 export * from './Block'
 export * from './Shape'
+export * from './Theme'
 export * from './Flex'
 export * from './Grid'
 export * from './Direction'