@symbo.ls/atoms 2.11.126 → 2.11.146

package/Media.js

@@ -13,7 +13,10 @@ export const keySetters = {
   '[': (key, props, result, element, isSubtree) => applySelectorProps(
     key, props, isSubtree ? result : (result && result.selector), element
   ),
-  '&': (key, props, result, element, isSubtree) => applyEndProps(
+  '&': (key, props, result, element, isSubtree) => applyAndProps(
+    key, props, isSubtree ? result : (result && result.selector), element
+  ),
+  '>': (key, props, result, element, isSubtree) => applyAndProps(
     key, props, isSubtree ? result : (result && result.selector), element
   ),
   $: (key, props, result, element, isSubtree) => applyCaseProps(
@@ -87,7 +90,7 @@ const applyMediaProps = (key, props, result, element) => {
   return result[mediaKey]
 }
 
-const applyEndProps = (key, props, result, element) => {
+const applyAndProps = (key, props, result, element) => {
   result[key] = convertPropsToClass(props, result, element)
   return result[key]
 }

package/Text.js

@@ -1,15 +1,17 @@
 'use strict'
 
+import { isObject } from '@domql/utils'
 import { getFontSizeByKey, getFontFamily } from '@symbo.ls/scratch'
 
 export const Text = {
-  text: ({ key, props, state }) => {
-    if (props.text === true) return (state && state[key]) || (props && props[key])
+  deps: { isObject, getFontSizeByKey, getFontFamily },
+  text: ({ key, props, state, deps }) => {
+    if (deps.isObject(props) && props.text === true) return (state && state[key]) || (props && props[key])
     return props.text
   },
   class: {
-    fontSize: ({ props }) => props.fontSize ? getFontSizeByKey(props.fontSize) : null,
-    fontFamily: ({ props }) => props.fontFamily && ({ fontFamily: getFontFamily(props.fontFamily) || props.fontFamily }),
+    fontSize: ({ props, deps }) => props.fontSize ? deps.getFontSizeByKey(props.fontSize) : null,
+    fontFamily: ({ props, deps }) => props.fontFamily && ({ fontFamily: deps.getFontFamily(props.fontFamily) || props.fontFamily }),
     lineHeight: ({ props }) => props.lineHeight && ({ lineHeight: props.lineHeight }),
     // lineHeight: ({ props }) => props.lineHeight && getSpacingBasedOnRatio(props, 'lineHeight', null, ''),
     textDecoration: ({ props }) => props.textDecoration && ({ textDecoration: props.textDecoration }),

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@symbo.ls/atoms",
-  "version": "2.11.126",
+  "version": "2.11.146",
   "main": "index.js",
   "license": "MIT",
-  "gitHead": "463c4925df4dfbed4611feafe34c6f011d3ba287",
+  "gitHead": "b8899bfbe4ca5e7ed373cd5e2e6612aa330899ed",
   "dependencies": {
     "@domql/state": "latest",
     "@domql/utils": "latest",