smbls 0.15.21 → 0.15.23

package/package.json

@@ -3,7 +3,7 @@
   "description": "UI Library built on Scratch and DOMQL",
   "private": false,
   "author": "symbo.ls",
-  "version": "0.15.21",
+  "version": "0.15.23",
   "repository": "https://github.com/symbo-ls/smbls",
   "main": "src/index.js",
   "files": [
@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@domql/utils": "latest",
+    "@symbo.ls/cli": "latest",
     "@symbo.ls/init": "latest",
     "@symbo.ls/scratch": "latest",
     "@symbo.ls/utils": "latest"

package/src/Box.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { Shape, Position, Theme, Block, Text, Overflow, Timing, Transform, Media, Interaction, XYZ } from './atoms'
+import { Shape, Position, Theme, Block, Text, Overflow, Timing, Transform, Media, Interaction, XYZ, Animation } from './atoms'
 
 const PropsCSS = {
   class: {
@@ -9,5 +9,5 @@ const PropsCSS = {
 }
 
 export const Box = {
-  extend: [Shape, Position, Theme, Block, Text, Overflow, Timing, Transform, Media, PropsCSS, Interaction, XYZ]
+  extend: [Shape, Position, Theme, Block, Text, Overflow, Timing, Transform, Media, PropsCSS, Interaction, XYZ, Animation]
 }

package/src/atoms/Animation.js

@@ -1,52 +1,53 @@
 'use strict'
 
-import { merge } from '@domql/utils'
-import { getTimingFunction } from '@symbo.ls/scratch'
-import { convertPropsToClass } from './Media'
-import { transformDuration } from './Timing'
+import { getTimingByKey, getTimingFunction } from '@symbo.ls/scratch'
+import { isObject } from '@domql/utils'
+import { convertPropsToClass } from './Media' // eslint-disable-line no-unused-vars
+import createEmotion from '@symbo.ls/create-emotion'
+const { keyframes } = createEmotion
 
-const applyAnimationProps = (key, props, result, element) => {
+const applyAnimationProps = (animation, element) => {
+  if (isObject(animation)) return { animationName: keyframes(animation) }
   const { ANIMATION } = element.context && element.context.SYSTEM
-  const mediaName = ANIMATION[key.slice(1)]
-  const generatedClass = convertPropsToClass(props, result, element)
-
-  const rootState = element.__root ? element.__root.state : element.state
-  const { globalTheme } = rootState
-  const name = key.slice(1)
-  const isTheme = ['dark', 'light'].includes(name)
-  const matchesGlobal = name === globalTheme
-
-  if (globalTheme && isTheme) {
-    if (matchesGlobal) return merge(result, generatedClass)
-    return
-  }
-
-  const mediaKey = `@media screen and ${mediaName}`
-  result[mediaKey] = generatedClass
-  return result[mediaKey]
+  const record = ANIMATION[animation]
+  return keyframes(record)
 }
 
 export const Animation = {
   class: {
-    animation: ({ props }) => props.animation && ({
-      animation: applyAnimationProps(props.animation)
-    }),
+    animation: (el) => el.props.animation && {
+      animationName: applyAnimationProps(el.props.animation, el),
+      animationDuration: getTimingByKey(el.props.animationDuration || 'A').timing,
+      animationDelay: getTimingByKey(el.props.animationDelay).timing || '0s',
+      animationTimingFunction: getTimingFunction(el.props.animationTimingFunction || 'ease'),
+      animationFillMode: el.props.animationFillMode || 'both',
+      animationPlayState: el.props.animationPlayState,
+      animationDirection: el.props.animationDirection
+    },
+    animationName: (el) => el.props.animationName && {
+      animationName: applyAnimationProps(el.props.animationName, el)
+    },
 
     animationDuration: ({ props }) => props.animationDuration && ({
-      animationDuration: transformDuration(props.animationDuration)
+      animationDuration: getTimingByKey(props.animationDuration || 'A').timing
     }),
     animationDelay: ({ props }) => props.animationDelay && ({
-      animationDelay: transformDuration(props.animationDelay)
+      animationDelay: getTimingByKey(props.animationDelay).timing || '0s'
     }),
     animationTimingFunction: ({ props }) => props.animationTimingFunction && ({
-      animationTimingFunction: getTimingFunction(props.animationTimingFunction)
+      animationTimingFunction: getTimingFunction(props.animationTimingFunction || 'ease')
     }),
     animationFillMode: ({ props }) => props.animationFillMode && ({
-      animationFillMode: props.animationFillMode
+      animationFillMode: props.animationFillMode || 'both'
+    }),
+    animationPlayState: ({ props }) => props.animationPlayState && ({
+      animationPlayState: props.animationPlayState
+    }),
+    animationIterationCount: ({ props }) => props.animationIterationCount && ({
+      animationIterationCount: props.animationIterationCount || 1
     }),
-    animationProperty: ({ props }) => props.animationProperty && ({
-      animationProperty: props.animationProperty,
-      willChange: props.animationProperty
+    animationDirection: ({ props }) => props.animationDirection && ({
+      animationDirection: props.animationDirection
     })
   }
 }

package/src/atoms/Block.js

@@ -138,3 +138,5 @@ export const Block = {
     }
   }
 }
+
+export const Span = { tag: 'span' }

package/src/atoms/Interaction.js

@@ -51,6 +51,7 @@ export const Focusable = {
   },
 
   attr: {
-    placeholder: ({ props }) => props.placeholder
+    placeholder: ({ props }) => props.placeholder,
+    tabIndex: ({ props }) => props.tabIndex
   }
 }

package/src/atoms/Text.js

@@ -3,10 +3,7 @@
 import { getFontSizeByKey, getFontFamily } from '@symbo.ls/scratch'
 
 export const Text = {
-  props: {},
-
   text: ({ props }) => props.text,
-
   class: {
     fontSize: ({ props }) => props.fontSize ? getFontSizeByKey(props.fontSize) : null,
     fontFamily: ({ props }) => props.fontFamily && ({ fontFamily: getFontFamily(props.fontFamily) || props.fontFamily }),
@@ -19,3 +16,16 @@ export const Text = {
     fontWeight: ({ props }) => props.fontWeight && ({ fontWeight: props.fontWeight })
   }
 }
+
+export const H1 = { tag: 'h1' }
+export const H2 = { tag: 'h2' }
+export const H3 = { tag: 'h3' }
+export const H4 = { tag: 'h4' }
+export const H5 = { tag: 'h5' }
+export const H6 = { tag: 'h6' }
+export const P = { tag: 'p' }
+export const Caption = { tag: 'caption' }
+export const Strong = {
+  tag: 'strong',
+  props: { fontWeight: '900' }
+}

package/src/atoms/Timing.js

@@ -34,6 +34,9 @@ export const Timing = {
     transition: ({ props }) => props.transition && ({
       transition: splitTransition(props.transition)
     }),
+    willChange: ({ props }) => props.willChange && ({
+      willChange: props.willChange
+    }),
     transitionDuration: ({ props }) => props.transitionDuration && ({
       transitionDuration: transformDuration(props.transitionDuration)
     }),
@@ -46,23 +49,6 @@ export const Timing = {
     transitionProperty: ({ props }) => props.transitionProperty && ({
       transitionProperty: props.transitionProperty,
       willChange: props.transitionProperty
-    }),
-
-    animationDuration: ({ props }) => props.animationDuration && ({
-      animationDuration: transformDuration(props.animationDuration)
-    }),
-    animationDelay: ({ props }) => props.animationDelay && ({
-      animationDelay: transformDuration(props.animationDelay)
-    }),
-    animationTimingFunction: ({ props }) => props.animationTimingFunction && ({
-      animationTimingFunction: getTimingFunction(props.animationTimingFunction)
-    }),
-    animationFillMode: ({ props }) => props.animationFillMode && ({
-      animationFillMode: props.animationFillMode
-    }),
-    animationProperty: ({ props }) => props.animationProperty && ({
-      animationProperty: props.animationProperty,
-      willChange: props.animationProperty
     })
   }
 }

package/src/atoms/Transform.js

@@ -2,8 +2,7 @@
 
 export const Transform = {
   class: {
-    transform: ({ props }) => props.transform && ({
-      transform: props.transform
-    })
+    transform: ({ props }) => props.transform && ({ transform: props.transform }),
+    transformOrigin: ({ props }) => props.transformOrigin && ({ transformOrigin: props.transformOrigin })
   }
 }

package/src/atoms/index.js

@@ -18,3 +18,4 @@ export * from './Text'
 export * from './Timing'
 export * from './Transform'
 export * from './XYZ'
+export * from './Animation'