@symbo.ls/atoms 2.11.333 → 2.11.335

package/Flex.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isString } from '@domql/utils'
+import { isString, isUndefined } from '@domql/utils'
 
 export const Flex = {
   props: {
@@ -19,6 +19,8 @@ export const Flex = {
       }
     },
 
+    verticalAlign: ({ props }) => !isUndefined(props.verticalAlign) && ({ flexWrap: props.verticalAlign }),
+
     wrap: ({ props }) => props.wrap && ({ flexWrap: props.wrap }),
     align: ({ props }) => {
       if (!isString(props.align)) return

package/Media.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { merge, isArray, overwriteShallow } from '@domql/utils'
+import { merge, isArray, overwriteDeep, overwriteShallow } from '@domql/utils'
 import { getSystemTheme } from './Theme'
 
 export const keySetters = {
@@ -130,13 +130,13 @@ const applyConditionalCaseProps = (key, props, result, element) => {
   const caseKey = key.slice(1)
   const isPropTrue = element.props[caseKey] || element.state[caseKey]
   if (!isPropTrue) return // remove classname if not here
-  return merge(result, convertPropsToClass(props, result, element))
+  return overwriteDeep(result, convertPropsToClass(props, result, element))
 }
 
 const applyConditionalFalsyProps = (key, props, result, element) => {
   const caseKey = key.slice(1)
   const isPropTrue = element.props[caseKey] || element.state[caseKey] === true
-  if (!isPropTrue) return merge(result, convertPropsToClass(props, result, element))
+  if (!isPropTrue) return overwriteDeep(result, convertPropsToClass(props, result, element))
 }
 
 const applyTrueProps = (props, result, element) => merge(result, convertPropsToClass(props, result, element))
@@ -166,17 +166,18 @@ const beforeClassAssign = (element, s) => {
           isForced: true,
           preventDefineUpdate: true
         })
-      } else if (key === 'true') applyTrueProps(props[key], CLASS_NAMES, element)
+      }
     }
     if (setter) setter(key, props[key], CLASS_NAMES, element)
+    else if (key === 'true') applyTrueProps(props[key], CLASS_NAMES, element)
   }
 
   // override props
-  if (props['^']) {
-    for (const key in props['^']) {
-      execClass(key, props, CLASS_NAMES, element)
-    }
-  }
+  // if (props['^']) {
+  //   for (const key in props['^']) {
+  //     execClass(key, props, CLASS_NAMES, element)
+  //   }
+  // }
 
   const parentProps = element.parent && element.parent.props
   if (parentProps && parentProps.spacingRatio && parentProps.inheritSpacingRatio) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@symbo.ls/atoms",
-  "version": "2.11.333",
+  "version": "2.11.335",
   "main": "index.js",
   "license": "MIT",
-  "gitHead": "8c0ee0deb6786d87ae0ece3b87462269af4db917",
+  "gitHead": "d50ff66f06943052be9d1af69767ed9d12387936",
   "dependencies": {
     "@domql/state": "latest",
     "@domql/utils": "latest",