smbls 0.8.27 → 0.8.30

package/package.json

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

package/src/{Block/index.js → Block.js}

@@ -38,10 +38,10 @@ export const Block = {
     height: ({ props }) => props.height && mapBasedOnRatio(props, 'height'),
     boxSize: ({ props }) => {
       if (typeof props.boxSize !== 'string') return
-      const [width, height] = props.boxSize.split(' ')
+      const [height, width] = props.boxSize.split(' ')
       return {
-        ...mapSpacing(width, 'width'),
-        ...mapSpacing(height, 'height')
+        ...mapSpacing(height, 'height'),
+        ...mapSpacing(width, 'width')
       }
     },
 

package/src/{Box/index.js → Box.js}

@@ -1,9 +1,11 @@
 'use strict'
 
-import { Shape, Position, Block, Text, Overflow, Transition, Transform, Responsive } from '..'
+import { Shape, Position, Block, Text, Overflow, Transition, Transform, Responsive } from '.'
 
 const PropsCSS = {
-  class: { propsCSS: ({ props }) => props && props.css }
+  class: {
+    propsCSS: ({ props }) => props && props.css
+  }
 }
 
 export const Box = {

package/src/{Button/index.js → Button.js}

@@ -1,6 +1,6 @@
 'use strict'
 
-import { IconText } from '../'
+import { IconText } from '.'
 
 const css = {
   appearance: 'none',

package/src/ButtonSet.js

@@ -0,0 +1,10 @@
+'use strict'
+
+import { SquareButton } from './Button'
+import { Flex } from './Flex'
+
+export const ButtonSet = {
+  tag: 'nav',
+  proto: Flex,
+  childProto: SquareButton
+}

package/src/DatePicker/index.js

@@ -3,13 +3,10 @@
 import style from './style'
 
 import Icon from '../Icon'
-import Shape from '../Shape'
-import { Block } from '../Block'
 
 export const DatePicker = {
   style,
 
-  proto: [Shape, Block],
   props: {
     theme: 'lightDark',
     padding: 'A',

package/src/{Flex/index.js → Flex.js}

@@ -1,12 +1,10 @@
 'use strict'
 
-import style from './style'
-import { mapBasedOnRatio } from '../Block'
+import { mapBasedOnRatio } from './Block'
 
 export const Flex = {
-  style,
-
   props: {
+    display: 'flex',
     flow: 'row'
   },
 

package/src/{Grid/index.js → Grid.js}

@@ -1,12 +1,9 @@
 'use strict'
 
-import style from './style'
-import { mapBasedOnRatio } from '../Block'
+import { mapBasedOnRatio } from './Block'
 
 export const Grid = {
-  style,
-
-  props: {},
+  props: { display: 'grid' },
 
   class: {
     columns: ({ props }) => props.columns ? ({ gridTemplateColumns: props.columns }) : null,

package/src/{Label/index.js → Label.js}

@@ -1,7 +1,7 @@
 'use strict'
-import { Block } from '../Block'
-import { Shape } from '../Shape'
-import { Text } from '../Text'
+import { Block } from './Block'
+import { Shape } from './Shape'
+import { Text } from './Text'
 
 export const Label = {
   proto: [Shape, Block, Text],

package/src/{Link/index.js → Link.js}

@@ -1,7 +1,7 @@
 'use strict'
 
 import { exec } from '@domql/utils'
-import { Shape, Text } from '..'
+import { Shape, Text } from '.'
 
 export const Link = {
   proto: [Shape, Text],

package/src/Media.js

@@ -0,0 +1,96 @@
+'use strict'
+
+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 { 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), {})
+    }
+
+    for (const finalProp in contertedToClass) subPropsClassname[finalProp] = contertedToClass[finalProp]
+  }
+  return subPropsClassname
+}
+
+const init = (el, s) => {
+  const { props, class: className } = el
+
+  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))
+    }
+  }
+}
+
+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)
+      }
+
+      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/{Notification/index.js → Notification.js}

@@ -1,6 +1,6 @@
 'use strict'
 
-import { Shape, Block, IconText, Direction, Flex, Text } from '../'
+import { Shape, Block, IconText, Direction, Flex, Text } from '.'
 
 export const Notification = {
   style: { cursor: 'pointer' },

package/src/{Overflow/index.js → Overflow.js}

@@ -2,6 +2,6 @@
 
 export const Overflow = {
   class: {
-    overflow: ({ props }) => props.overflow && ({ overflow: props.overflow }),
+    overflow: ({ props }) => props.overflow && ({ overflow: props.overflow })
   }
 }

package/src/{Pills/index.js → Pills.js}

@@ -1,5 +1,4 @@
 'use strict'
-import Shape from '../Shape'
 
 export const Pills = {
   style: {
@@ -18,13 +17,10 @@ export const Pills = {
   },
   childProto: {
     tag: 'div',
-    proto: Shape,
     props: {
       round: 42,
       theme: 'White'
     }
   },
-  ...[
-    {}, {}, {}
-  ]
+  ...[{}, {}, {}]
 }

package/src/Shape/index.js

@@ -45,10 +45,14 @@ export const Shape = {
     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 }) => props.theme ? getTheme(props.theme) : 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,
-    // border: ({ props }) => props.border ? ({ borderColor: getColor(props.border) }) : null,
 
     textStroke: ({ props }) => props.textStroke ? diffStroke(props.textStroke) : null,
 

package/src/Shape/style.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { UNIT, getColor } from '@symbo.ls/scratch'
+import { UNIT, getColor, getTheme } from '@symbo.ls/scratch'
 
 export default {
   boxSizing: 'border-box'
@@ -27,7 +27,7 @@ export const SHAPES = {
       display: 'block',
       width: '0px',
       height: '0px',
-      border: `6px solid ${getColor(props.background)}`,
+      border: `6px solid ${getColor(props.background) || (props.theme && getTheme(props.theme).backgroundColor)}`,
       position: 'absolute',
       borderRadius: '2px'
     }
@@ -71,10 +71,10 @@ export const SHAPES = {
       display: 'block',
       width: '0',
       height: '0',
-      border: `16px solid ${getColor(props.background)}`,
+      border: `16px solid ${getColor(props.background) || (props.theme && getTheme(props.theme).backgroundColor)}`,
       borderRadius: '6px',
       position: 'absolute'
-    },
+    }
   }),
 
   tagDirection: {

package/src/{SideBar/index.js → Sidebar.js}

@@ -1,5 +1,6 @@
 'use strict'
-import { Icon, Link } from '../'
+
+import { Icon, Link } from '.'
 
 const MenuItem = {
   proto: Link,

package/src/{Transform/index.js → Transform.js}

@@ -4,6 +4,6 @@ export const Transform = {
   class: {
     transform: ({ props }) => props.transform && ({
       transform: props.transform
-    }),
+    })
   }
 }

package/src/Block/style.js

@@ -1 +0,0 @@
-'use strict'

package/src/Button/style.js

@@ -1,4 +0,0 @@
-'use strict'
-
-export default {
-}

package/src/ButtonSet/index.js

@@ -1,14 +0,0 @@
-'use strict'
-
-import { SquareButton } from '../Button'
-import { Shape } from '../Shape'
-import { Flex } from '../Flex'
-import { Block } from '../Block'
-
-export const ButtonSet = {
-  tag: 'nav',
-  proto: [Shape, Flex, Block],
-  childProto: {
-    proto: [SquareButton]
-  }
-}

package/src/Flex/style.js

@@ -1,5 +0,0 @@
-'use strict'
-
-export default {
-  display: 'flex'
-}

package/src/Grid/style.js

@@ -1,5 +0,0 @@
-'use strict'
-
-export default {
-  display: 'grid'
-}

package/src/Media/index.js

@@ -1,71 +0,0 @@
-'use strict'
-
-import { MEDIA as BREAKPOINTS } from '@symbo.ls/scratch'
-
-export const Responsive = {
-  on: {
-    init: (el, s) => {
-      const { props } = el
-
-      for (const screen in props) {
-        if (screen.slice(0, 1) === '@') {
-          const mediaName = screen.slice(1)
-          const responsiveKey = `@media screen and ${BREAKPOINTS[mediaName]}`
-          const screenProps = props[screen]
-          const calculatedScreenProps = {}
-
-          for (const prop in screenProps) {
-            // if (!el.class || !el.class[prop]) return
-            // const classProp = el.class[prop]
-            const classProp = el.class[prop]
-            if (typeof classProp !== 'function') continue
-            let calculatedProp = classProp({ props: screenProps })
-
-            if (Array.isArray(calculatedProp)) {
-              calculatedProp = Object.assign({}, ...calculatedProp)
-            }
-
-            for (const finalProp in calculatedProp) {
-              calculatedScreenProps[finalProp] = calculatedProp[finalProp]
-            }
-          }
-
-          const { MEDIA } = el.class
-          if (MEDIA) MEDIA[responsiveKey] = calculatedScreenProps
-          else {
-            el.class.MEDIA = {
-              [responsiveKey]: calculatedScreenProps
-            }
-          }
-        } else if (screen.slice(0, 1) === ':') {
-          const selectorProps = {}
-          // const selectorName = screen.slice(1)
-          const underSelectorProps = props[screen]
-          const selectorKey = `&${screen}`
-
-          for (const prop in underSelectorProps) {
-            const classProp = el.class[prop]
-            if (typeof classProp !== 'function') continue
-            let calculatedProp = classProp({ props: underSelectorProps })
-
-            if (Array.isArray(calculatedProp)) {
-              calculatedProp = Object.assign({}, ...calculatedProp)
-            }
-
-            for (const finalProp in calculatedProp) {
-              selectorProps[finalProp] = calculatedProp[finalProp]
-            }
-          }
-
-          const { SELECTORS } = el.class
-          if (SELECTORS) SELECTORS[selectorKey] = selectorProps
-          else {
-            el.class.SELECTORS = {
-              [selectorKey]: selectorProps
-            }
-          }
-        }
-      }
-    }
-  }
-}

package/src/Text/style.js

@@ -1,2 +0,0 @@
-'use strict'
-

package/src/Transition/style.js

@@ -1,2 +0,0 @@
-'use strict'
-