css-in-props 3.8.9 → 3.14.1

package/src/props/block.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isUndefined, isString } from '@domql/utils'
+import { isUndefined, isString } from '@symbo.ls/utils'
 
 import {
   getSpacingBasedOnRatio,
@@ -11,16 +11,12 @@ import {
 } from '@symbo.ls/scratch'
 
 export const BLOCK_PROPS = {
-  show: (val, el, s, ctx) => !!(ctx.utils.exec(val, el, s) === false) && ({
-    display: 'none !important'
-  }),
+  show: (val) => !val ? ({ display: 'none !important' }) : undefined,
 
-  hide: (val, el, s, ctx) => !!ctx.utils.exec(val, el, s) && ({
-    display: 'none !important'
-  }),
+  hide: (val) => val ? ({ display: 'none !important' }) : undefined,
 
-  height: (val, { props }) => transformSizeRatio('height', val, props),
-  width: (val, { props }) => transformSizeRatio('width', val, props),
+  height: (val, el) => transformSizeRatio('height', val, el),
+  width: (val, el) => transformSizeRatio('width', val, el),
 
   boxSizing: (val) => !isUndefined(val)
     ? ({ boxSizing: val })
@@ -35,11 +31,11 @@ export const BLOCK_PROPS = {
     }
   },
 
-  inlineSize: (val, { props }) => transformSizeRatio('inlineSize', val, props),
-  blockSize: (val, { props }) => transformSizeRatio('blockSize', val, props),
+  inlineSize: (val, el) => transformSizeRatio('inlineSize', val, el),
+  blockSize: (val, el) => transformSizeRatio('blockSize', val, el),
 
-  minWidth: (val, { props }) => transformSizeRatio('minWidth', val, props),
-  maxWidth: (val, { props }) => transformSizeRatio('maxWidth', val, props),
+  minWidth: (val, el) => transformSizeRatio('minWidth', val, el),
+  maxWidth: (val, el) => transformSizeRatio('maxWidth', val, el),
   widthRange: (val) => {
     if (!isString(val)) return
     const [minWidth, maxWidth] = val.split(' ')
@@ -49,8 +45,8 @@ export const BLOCK_PROPS = {
     }
   },
 
-  minHeight: (val, { props }) => transformSizeRatio('minHeight', val, props),
-  maxHeight: (val, { props }) => transformSizeRatio('maxHeight', val, props),
+  minHeight: (val, el) => transformSizeRatio('minHeight', val, el),
+  maxHeight: (val, el) => transformSizeRatio('maxHeight', val, el),
   heightRange: (val) => {
     if (!isString(val)) return
     const [minHeight, maxHeight] = val.split(' ')
@@ -69,11 +65,11 @@ export const BLOCK_PROPS = {
     }
   },
 
-  minBlockSize: (val, { props }) => transformSizeRatio('minBlockSize', val, props),
-  minInlineSize: (val, { props }) => transformSizeRatio('minInlineSize', val, props),
+  minBlockSize: (val, el) => transformSizeRatio('minBlockSize', val, el),
+  minInlineSize: (val, el) => transformSizeRatio('minInlineSize', val, el),
 
-  maxBlockSize: (val, { props }) => transformSizeRatio('maxBlockSize', val, props),
-  maxInlineSize: (val, { props }) => transformSizeRatio('maxInlineSize', val, props),
+  maxBlockSize: (val, el) => transformSizeRatio('maxBlockSize', val, el),
+  maxInlineSize: (val, el) => transformSizeRatio('maxInlineSize', val, el),
 
   minSize: (val) => {
     if (!isString(val)) return
@@ -93,10 +89,10 @@ export const BLOCK_PROPS = {
     }
   },
 
-  borderWidth: (val, { props }) => transformSizeRatio('borderWidth', val, props),
+  borderWidth: (val, el) => transformSizeRatio('borderWidth', val, el),
 
-  padding: (val, { props }) => transformSizeRatio('padding', val, props),
-  scrollPadding: (val, { props }) => transformSizeRatio('scrollPadding', val, props),
+  padding: (val, el) => transformSizeRatio('padding', val, el),
+  scrollPadding: (val, el) => transformSizeRatio('scrollPadding', val, el),
   paddingInline: (val) => {
     if (!isString(val)) return
     const [paddingInlineStart, paddingInlineEnd] = val.split(' ')
@@ -113,19 +109,17 @@ export const BLOCK_PROPS = {
       ...transformSize('paddingBlockEnd', paddingBlockEnd || paddingBlockStart)
     }
   },
-  // Traditional directional padding
-  paddingTop: (val, { props }) => transformSizeRatio('paddingBlockStart', val, props),
-  paddingBottom: (val, { props }) => transformSizeRatio('paddingBlockEnd', val, props),
-  paddingLeft: (val, { props }) => transformSizeRatio('paddingInlineStart', val, props),
-  paddingRight: (val, { props }) => transformSizeRatio('paddingInlineEnd', val, props),
-
-  // Logical properties (for reference)
-  paddingBlockStart: (val, { props }) => transformSizeRatio('paddingBlockStart', val, props), // maps to top
-  paddingBlockEnd: (val, { props }) => transformSizeRatio('paddingBlockEnd', val, props), // maps to bottom
-  paddingInlineStart: (val, { props }) => transformSizeRatio('paddingInlineStart', val, props), // maps to left
-  paddingInlineEnd: (val, { props }) => transformSizeRatio('paddingInlineEnd', val, props), // maps to right
-
-  margin: (val, { props }) => transformSizeRatio('margin', val, props),
+  paddingTop: (val, el) => transformSizeRatio('paddingBlockStart', val, el),
+  paddingBottom: (val, el) => transformSizeRatio('paddingBlockEnd', val, el),
+  paddingLeft: (val, el) => transformSizeRatio('paddingInlineStart', val, el),
+  paddingRight: (val, el) => transformSizeRatio('paddingInlineEnd', val, el),
+
+  paddingBlockStart: (val, el) => transformSizeRatio('paddingBlockStart', val, el),
+  paddingBlockEnd: (val, el) => transformSizeRatio('paddingBlockEnd', val, el),
+  paddingInlineStart: (val, el) => transformSizeRatio('paddingInlineStart', val, el),
+  paddingInlineEnd: (val, el) => transformSizeRatio('paddingInlineEnd', val, el),
+
+  margin: (val, el) => transformSizeRatio('margin', val, el),
   marginInline: (val) => {
     if (!isString(val)) return
     const [marginInlineStart, marginInlineEnd] = val.split(' ')
@@ -134,39 +128,37 @@ export const BLOCK_PROPS = {
       ...transformSize('marginInlineEnd', marginInlineEnd || marginInlineStart)
     }
   },
-  marginBlock: (val, { props }) => {
-    if (!isString(props.marginBlock)) return
-    const [marginBlockStart, marginBlockEnd] = props.marginBlock.split(' ')
+  marginBlock: (val, el) => {
+    if (!isString(el.marginBlock)) return
+    const [marginBlockStart, marginBlockEnd] = el.marginBlock.split(' ')
     return {
       ...transformSize('marginBlockStart', marginBlockStart),
       ...transformSize('marginBlockEnd', marginBlockEnd || marginBlockStart)
     }
   },
-  // Traditional directional margin
-  marginTop: (val, { props }) => transformSizeRatio('marginBlockStart', val, props),
-  marginBottom: (val, { props }) => transformSizeRatio('marginBlockEnd', val, props),
-  marginLeft: (val, { props }) => transformSizeRatio('marginInlineStart', val, props),
-  marginRight: (val, { props }) => transformSizeRatio('marginInlineEnd', val, props),
-
-  // Logical properties
-  marginInlineStart: (val, { props }) => transformSizeRatio('marginInlineStart', val, props),
-  marginInlineEnd: (val, { props }) => transformSizeRatio('marginInlineEnd', val, props),
-  marginBlockStart: (val, { props }) => transformSizeRatio('marginBlockStart', val, props),
-  marginBlockEnd: (val, { props }) => transformSizeRatio('marginBlockEnd', val, props),
+  marginTop: (val, el) => transformSizeRatio('marginBlockStart', val, el),
+  marginBottom: (val, el) => transformSizeRatio('marginBlockEnd', val, el),
+  marginLeft: (val, el) => transformSizeRatio('marginInlineStart', val, el),
+  marginRight: (val, el) => transformSizeRatio('marginInlineEnd', val, el),
+
+  marginInlineStart: (val, el) => transformSizeRatio('marginInlineStart', val, el),
+  marginInlineEnd: (val, el) => transformSizeRatio('marginInlineEnd', val, el),
+  marginBlockStart: (val, el) => transformSizeRatio('marginBlockStart', val, el),
+  marginBlockEnd: (val, el) => transformSizeRatio('marginBlockEnd', val, el),
 
   gap: (val) => ({
     gap: transfromGap(val)
   }),
 
-  columnGap: (val, { props }) => getSpacingBasedOnRatio(props, 'columnGap', val),
-  rowGap: (val, { props }) => getSpacingBasedOnRatio(props, 'rowGap', val),
+  columnGap: (val, el) => getSpacingBasedOnRatio(el, 'columnGap', val),
+  rowGap: (val, el) => getSpacingBasedOnRatio(el, 'rowGap', val),
 
-  flexWrap: (val, { props }) => ({
+  flexWrap: (val) => ({
     display: 'flex',
-    flexFlow: (val || 'row').split(' ')[0] + ' ' + props.flexWrap
+    flexWrap: val
   }),
-  flexFlow: (val, { props }) => {
-    const { reverse } = props
+  flexFlow: (val, el) => {
+    const reverse = el.reverse
     if (!isString(val)) return
     let [direction, wrap] = (val || 'row').split(' ')
     if (val.startsWith('x') || val === 'row') direction = 'row'
@@ -186,6 +178,6 @@ export const BLOCK_PROPS = {
     }
   },
 
-  round: (val, { props }) => transformBorderRadius(val || props.borderRadius, props, 'round'),
-  borderRadius: (val, { props }) => transformBorderRadius(val || props.round, props, 'borderRadius')
+  round: (val, el) => transformBorderRadius(val ?? el.borderRadius, el, 'round'),
+  borderRadius: (val, el) => transformBorderRadius(val ?? el.round, el, 'borderRadius')
 }

package/src/props/flex.js

@@ -1,11 +1,10 @@
 'use strict'
 
-import { isString } from '@domql/utils'
+import { isString } from '@symbo.ls/utils'
 
 export const FLEX_PROPS = {
   flow: (value, el) => {
-    const { props } = el
-    const { reverse } = props
+    const reverse = el.reverse
     if (!isString(value)) return
     let [direction, wrap] = (value || 'row').split(' ')
     if (value.startsWith('x') || value === 'row') direction = 'row'
@@ -20,11 +19,11 @@ export const FLEX_PROPS = {
     }
   },
 
-  wrap: (value, { props }) => {
+  wrap: (value, el) => {
     return { display: 'flex', flexWrap: value }
   },
 
-  align: (value, { props }) => {
+  align: (value, el) => {
     const [alignItems, justifyContent] = value.split(' ')
     return { display: 'flex', alignItems, justifyContent }
   }

package/src/props/index.js

@@ -1,31 +1,30 @@
 'use strict'
 
-import { ANIMATION_PROPS } from './animation'
-import { BLOCK_PROPS } from './block'
-import { FONT_PROPS } from './font'
-import { MISC_PROPS } from './misc'
-import { POSITION_PROPS } from './position'
-import { THEME_PROPS } from './theme'
-import { TIMING_PROPS } from './timing'
-import { FLEX_PROPS } from './flex'
-import { GRID_PROPS } from './grid'
+import { ANIMATION_PROPS } from './animation.js'
+import { BLOCK_PROPS } from './block.js'
+import { FONT_PROPS } from './font.js'
+import { MISC_PROPS } from './misc.js'
+import { POSITION_PROPS } from './position.js'
+import { THEME_PROPS } from './theme.js'
+import { TIMING_PROPS } from './timing.js'
+import { FLEX_PROPS } from './flex.js'
+import { GRID_PROPS } from './grid.js'
 
-export * from './animation'
-export * from './block'
-export * from './font'
-export * from './misc'
-export * from './position'
-export * from './theme'
-export * from './timing'
-export * from './flex'
-export * from './grid'
+export * from './animation.js'
+export * from './block.js'
+export * from './font.js'
+export * from './misc.js'
+export * from './position.js'
+export * from './theme.js'
+export * from './timing.js'
+export * from './flex.js'
+export * from './grid.js'
 
 export const CSS_PROPS_REGISTRY = {
   ...ANIMATION_PROPS,
   ...BLOCK_PROPS,
   ...FONT_PROPS,
   ...MISC_PROPS,
-  ...MISC_PROPS,
   ...POSITION_PROPS,
   ...THEME_PROPS,
   ...TIMING_PROPS,

package/src/props/misc.js

@@ -8,9 +8,16 @@ export const MISC_PROPS = {
   cursor: (value, el, s, ctx) => {
     if (!value) return
 
-    const file = ctx.files && ctx.files[value]
-    if (file && file.content) value = `url(${file.content.src})`
+    const asset = ctx.assets && ctx.assets[value]
+    if (asset && asset.content) value = `url(${asset.content.src})`
+    else {
+      const file = ctx.files && ctx.files[value]
+      if (file && file.content) value = `url(${file.content.src})`
+    }
 
     return ({ cursor: value })
-  }
+  },
+  opacity: (value) => value != null ? ({ opacity: String(value) }) : undefined,
+  visibility: (value) => value != null ? ({ visibility: value }) : undefined,
+  pointerEvents: (value) => value != null ? ({ pointerEvents: value }) : undefined
 }

package/src/props/theme.js

@@ -12,7 +12,7 @@ import {
   transformSizeRatio
 } from '@symbo.ls/scratch'
 
-import { isDefined, isString } from '@domql/utils'
+import { isDefined, isString } from '@symbo.ls/utils'
 
 export const getSystemGlobalTheme = ({ context, state }) => {
   const theme = state?.root?.globalTheme || context.designSystem?.globalTheme
@@ -21,12 +21,11 @@ export const getSystemGlobalTheme = ({ context, state }) => {
 
 export const THEME_PROPS = {
   theme: (val, element) => {
-    const { props } = element
     if (!val) return
 
     // themeModifier explicitly forces a scheme on this component
-    if (props.themeModifier) {
-      return getMediaTheme(val, `@${props.themeModifier}`)
+    if (element.themeModifier) {
+      return getMediaTheme(val, `@${element.themeModifier}`)
     }
 
     // CSS vars handle dark/light switching — no modifier needed, no DOMQL re-render
@@ -63,8 +62,12 @@ export const THEME_PROPS = {
   backgroundImage: (val, element, s, ctx) => {
     const globalTheme = getSystemGlobalTheme(element)
     if (!val) return
-    const file = ctx.files && ctx.files[val]
-    if (file && file.content) val = file.content.src
+    const asset = ctx.assets && ctx.assets[val]
+    if (asset && asset.content) val = asset.content.src
+    else {
+      const file = ctx.files && ctx.files[val]
+      if (file && file.content) val = file.content.src
+    }
     return {
       backgroundImage: transformBackgroundImage(val, globalTheme)
     }
@@ -78,7 +81,7 @@ export const THEME_PROPS = {
     outline: transformBorder(val)
   }),
 
-  outlineOffset: (val, { props }) => transformSizeRatio('outlineOffset', val, props),
+  outlineOffset: (val, el) => transformSizeRatio('outlineOffset', val, el),
 
   border: (val) => ({
     border: transformBorder(val)

package/src/set.js

@@ -1,9 +1,16 @@
 'use strict'
 
-import { transformClassname } from './_transform'
-import { transformEmotion } from './emotion'
+import { isObject } from '@symbo.ls/utils'
+import { useCssInProps } from './transform/index.js'
+import { css } from '@symbo.ls/css'
 
-export const setClassname = (props, emotionCss) => {
+export const transformClassname = (element) => {
+  if (!isObject(element)) return
+  return useCssInProps(element, element)
+}
+
+export const setClassname = (props, cssEngine) => {
   const transform = transformClassname(props)
-  return transformEmotion(transform, emotionCss)
+  if (typeof cssEngine === 'function') return cssEngine(transform)
+  return css(transform)
 }

package/src/transform/executors.js

@@ -1,9 +1,10 @@
 'use strict'
 
-import { exec, isArray, isFunction, isObject, isProduction, merge, overwrite, overwriteDeep } from '@domql/utils'
-import { CSS_PROPS_REGISTRY } from '../props'
-import { DEFAULT_CSS_PROPERTIES_LIST } from '../props/defaults'
-import { applyTrueProps, transformersByPrefix } from './transformers'
+import { exec, isArray, isFunction, isObject, isProduction, merge, overwrite, overwriteDeep } from '@symbo.ls/utils'
+import { pushConfig, popConfig } from '@symbo.ls/scratch'
+import { CSS_PROPS_REGISTRY } from '../props/index.js'
+import { DEFAULT_CSS_PROPERTIES_LIST } from '../props/defaults.js'
+import { applyTrueProps, transformersByPrefix } from './transformers.js'
 
 /**
  * CLASS ASSIGNMENT
@@ -14,60 +15,67 @@ const isProd = isProduction()
 
 // Process non-setter properties and return remaining props
 export const usePropsAsCSS = (sourceObj, element, opts) => {
-  let obj = {}
-  const rest = {}
+  const ds = element?.context?.designSystem
+  if (ds) pushConfig(ds)
 
-  const setToObj = (key, val) => {
-    if (opts.unpack) {
-      obj = { ...obj, ...val }
-      return
-    }
-    obj[key] = val
-  }
+  try {
+    let obj = {}
+    const rest = {}
 
-  for (const key in sourceObj) {
-    const value = sourceObj[key]
-    if (key === 'class' && element.call('isString', sourceObj.class)) {
-      const val = value.split(' ')
-      if (val.length) {
-        const CLASS = element.context.designSystem.class
-        const result = val
-          .reduce((acc, curr) => merge(acc, CLASS[curr]), {})
-        obj.designSystemClass = result
+    const setToObj = (key, val) => {
+      if (opts.unpack) {
+        obj = { ...obj, ...val }
+        return
       }
-    } else if (key === 'true') {
-      const val = exec(value, element)
-      merge(obj, applyTrueProps(val, element))
-    } else if (element.classlist[key]) {
-      const originalFromClass = element.classlist[key]
-      const result = isFunction(originalFromClass)
-        ? originalFromClass(element, element.state, element.context)
-        : originalFromClass
-      if (result) setToObj(key, result)
-      if (!isProd && isObject(obj[key])) obj[key].label = key
-    } else if (CSS_PROPS_REGISTRY[key]) {
-      let val = exec(value, element)
-      if (isArray(val)) {
-        val = val.reduce((a, c) => merge(a, c), {})
-      }
-      let result = CSS_PROPS_REGISTRY[key](val, element, element.state, element.context)
-      if (isArray(result)) result = result.reduce((a, c) => merge(a, c), {})
-      if (result) setToObj(key, result)
-      if (!isProd && isObject(obj[key])) obj[key].label = key
-    } else if (DEFAULT_CSS_PROPERTIES_LIST.has(key)) {
-      // they can be grouped
-      let result = exec(value, element)
-      if (typeof result === 'string' && result.charCodeAt(0) === 45 && result.charCodeAt(1) === 45) {
-        result = `var(${result})`
+      obj[key] = val
+    }
+
+    for (const key in sourceObj) {
+      const value = sourceObj[key]
+      if (key === 'class' && element.call('isString', sourceObj.class)) {
+        const val = value.split(' ')
+        if (val.length) {
+          const CLASS = element.context.designSystem.class
+          const result = val
+            .reduce((acc, curr) => merge(acc, CLASS[curr]), {})
+          obj.designSystemClass = result
+        }
+      } else if (key === 'true') {
+        const val = exec(value, element)
+        merge(obj, applyTrueProps(val, element))
+      } else if (element.classlist[key]) {
+        const originalFromClass = element.classlist[key]
+        const result = isFunction(originalFromClass)
+          ? originalFromClass(element, element.state, element.context)
+          : originalFromClass
+        if (result) setToObj(key, result)
+        if (!isProd && isObject(obj[key])) obj[key].label = key
+      } else if (CSS_PROPS_REGISTRY[key]) {
+        let val = exec(value, element)
+        if (isArray(val)) {
+          val = val.reduce((a, c) => merge(a, c), {})
+        }
+        let result = CSS_PROPS_REGISTRY[key](val, element, element.state, element.context)
+        if (isArray(result)) result = result.reduce((a, c) => merge(a, c), {})
+        if (result) setToObj(key, result)
+        if (!isProd && isObject(obj[key])) obj[key].label = key
+      } else if (DEFAULT_CSS_PROPERTIES_LIST.has(key)) {
+        // they can be grouped
+        let result = exec(value, element)
+        if (typeof result === 'string' && result.charCodeAt(0) === 45 && result.charCodeAt(1) === 45) {
+          result = `var(${result})`
+        }
+        setToObj(key, { [key]: result })
+        if (!isProd && isObject(obj[key])) obj[key].label = key
+      } else {
+        rest[key] = value
       }
-      setToObj(key, { [key]: result })
-      if (!isProd && isObject(obj[key])) obj[key].label = key
-    } else {
-      rest[key] = value
     }
-  }
 
-  return [obj, rest]
+    return [obj, rest]
+  } finally {
+    if (ds) popConfig()
+  }
 }
 
 export const useSelectorsAsCSS = (sourceObj, element) => {

package/src/transform/index.js

@@ -1,4 +1,4 @@
 'use strict'
 
-export * from './executors'
-export * from './transformers'
+export * from './executors.js'
+export * from './transformers.js'

package/src/transform/transformers.js

@@ -1,34 +1,58 @@
 'use strict'
 
-import { isFunction } from '@domql/utils'
-import { useCssInProps } from './executors'
+import { isFunction } from '@symbo.ls/utils'
+import { useCssInProps } from './executors.js'
 
 /**
  * PROP APPLICATORS
  * Functions that handle different types of property applications
  */
 
+// Match `[data-theme="dark"]` / `[data-theme='light']` with either quote
+// style, grabbing the scheme name (`dark` / `light` / custom) for pairing
+// with `prefers-color-scheme`.
+const DATA_THEME_RE = /^\[data-theme=(?:"([^"]+)"|'([^']+)')\]$/
+
 // Media query handler
 const applyMediaProps = (key, selectorProps, element) => {
   const { context } = element
   if (!context.designSystem?.media) return
 
-  const mediaValue = context.designSystem.media[key.slice(1)]
+  const schemeKey = key.slice(1)
+  const mediaValue = context.designSystem.media[schemeKey]
   const generatedClass = useCssInProps(selectorProps, element)
 
-  let mediaKey
   if (!mediaValue) {
-    mediaKey = key
-  } else if (mediaValue === 'print') {
-    mediaKey = '@media print'
-  } else if (mediaValue[0] === '(') {
-    mediaKey = `@media screen and ${mediaValue}`
-  } else {
-    // CSS selector (e.g. [data-theme="dark"]) — use as parent selector
-    mediaKey = `${mediaValue} &`
+    return { [key]: generatedClass }
+  }
+  if (mediaValue === 'print') {
+    return { '@media print': generatedClass }
+  }
+  if (mediaValue[0] === '(') {
+    return { [`@media screen and ${mediaValue}`]: generatedClass }
   }
 
-  return { [mediaKey]: generatedClass }
+  // CSS selector (e.g. `[data-theme="dark"]`). Always emit the selector
+  // rule so explicit `data-theme="dark"` wins. For the standard `dark` /
+  // `light` schemes, ALSO emit a `@media (prefers-color-scheme: X)`
+  // fallback so the component adopts the OS scheme when `data-theme` is
+  // absent (i.e. `globalTheme: 'auto'`). Guard the fallback with
+  // `:not([data-theme])` on the app scope root so an explicit
+  // `data-theme="light"` (stamped on the app root) forces light even when
+  // the OS prefers dark. Other schemes (`sepia`, custom) are opt-in only.
+  const match = mediaValue.match(DATA_THEME_RE)
+  const scheme = match ? (match[1] || match[2]) : schemeKey
+  const result = { [`${mediaValue} &`]: generatedClass }
+  if (scheme === 'dark' || scheme === 'light') {
+    const scopeSelector = context.designSystem?.scopeSelector || ':root'
+    const guard = scopeSelector === ':root'
+      ? ':root:not([data-theme])'
+      : `${scopeSelector}:not([data-theme])`
+    result[`@media (prefers-color-scheme: ${scheme})`] = {
+      [`${guard} &`]: generatedClass
+    }
+  }
+  return result
 }
 
 // Simple applicators
@@ -38,7 +62,37 @@ const applyAndProps = (key, selectorProps, element) => {
 
 const applySelectorProps = (key, selectorProps, element) => {
   const selectorKey = `&${key}`
-  return { [selectorKey]: useCssInProps(selectorProps, element) }
+  const resolved = useCssInProps(selectorProps, element)
+
+  // When the selector has commas and the resolved value contains nested selectors
+  // (e.g. '> h1'), distribute each nested selector across all comma parts
+  if (key.includes(',') && resolved) {
+    const flat = {}
+    const nested = {}
+    for (const k in resolved) {
+      if (typeof resolved[k] === 'object' && resolved[k] !== null) {
+        nested[k] = resolved[k]
+      } else {
+        flat[k] = resolved[k]
+      }
+    }
+    if (Object.keys(nested).length) {
+      const parts = selectorKey.split(',').map(p => p.trim())
+      const result = {}
+      // Flat styles apply to the combined selector
+      if (Object.keys(flat).length) {
+        result[selectorKey] = flat
+      }
+      // Each nested selector is distributed across all comma parts
+      for (const nestedKey in nested) {
+        const distributed = parts.map(p => `${p} ${nestedKey}`).join(', ')
+        result[distributed] = nested[nestedKey]
+      }
+      return result
+    }
+  }
+
+  return { [selectorKey]: resolved }
 }
 
 // Resolve a case value from context.cases
@@ -54,7 +108,7 @@ const applyCaseProps = (key, selectorProps, element) => {
   const caseKey = key.slice(1)
   let isCaseTrue = resolveCase(caseKey, element)
   if (isCaseTrue === undefined) {
-    isCaseTrue = !!element.props?.[caseKey]
+    isCaseTrue = !!element[caseKey]
   }
   if (!isCaseTrue) return
   return useCssInProps(selectorProps, element)
@@ -64,25 +118,33 @@ const applyVariableProps = (key, selectorVal, element) => {
   return { [key]: selectorVal }
 }
 
-// . prefix: Truthy conditional (props/state first, then context.cases)
+// . prefix: Truthy conditional (element/state first, then context.cases)
 const applyConditionalCaseProps = (key, selectorProps, element) => {
   const caseKey = key.slice(1)
-  let isCaseTrue = element.props[caseKey] === true || element.state[caseKey] || element[caseKey]
+  let isCaseTrue = element[caseKey] === true || element.state?.[caseKey]
   if (!isCaseTrue) {
-    const caseResult = resolveCase(caseKey, element)
-    if (caseResult !== undefined) isCaseTrue = caseResult
+    if (typeof element[caseKey] === 'function') {
+      try { isCaseTrue = element[caseKey](element, element.state, element.context) } catch (e) {}
+    } else {
+      const caseResult = resolveCase(caseKey, element)
+      if (caseResult !== undefined) isCaseTrue = caseResult
+    }
   }
   if (!isCaseTrue) return
   return useCssInProps(selectorProps, element)
 }
 
-// ! prefix: Falsy conditional (props/state first, then context.cases)
+// ! prefix: Falsy conditional (element/state first, then context.cases)
 const applyConditionalFalsyProps = (key, selectorProps, element) => {
   const caseKey = key.slice(1)
-  let isCaseTrue = element.props[caseKey] === true || element.state[caseKey] || element[caseKey]
+  let isCaseTrue = element[caseKey] === true || element.state?.[caseKey]
   if (!isCaseTrue) {
-    const caseResult = resolveCase(caseKey, element)
-    if (caseResult !== undefined) isCaseTrue = caseResult
+    if (typeof element[caseKey] === 'function') {
+      try { isCaseTrue = element[caseKey](element, element.state, element.context) } catch (e) {}
+    } else {
+      const caseResult = resolveCase(caseKey, element)
+      if (caseResult !== undefined) isCaseTrue = caseResult
+    }
   }
   if (isCaseTrue) return
   return useCssInProps(selectorProps, element)