@kbach/react 0.6.39 → 0.6.41

package/dist/{chunk-Z4ZOGRZG.mjs → chunk-LM3OWOK2.mjs}

@@ -2,6 +2,7 @@
 import {
   EMPTY_BREAKPOINTS,
   InteractiveWrapper,
+  composeNativeStyle,
   expandModeAwareColorClasses,
   flatten,
   getActiveBreakpoints,
@@ -9,7 +10,7 @@ import {
   getDefaultFontFamily,
   getEffectiveIsWeb,
   getGlobalScreens,
-  getImpliedRNStyle,
+  getImpliedRNClasses,
   getInteractiveModifiers,
   getModeModifiers,
   getResponsiveModifiers,
@@ -17,7 +18,6 @@ import {
   hasResponsiveBuckets,
   isNative,
   isRuntimeCSSDisabled,
-  isWeb,
   normalizeClassString,
   onConfigChange,
   resolve,
@@ -26,7 +26,7 @@ import {
   transformToWebProps,
   useConditionalGlobalDarkMode,
   useConditionalWidth
-} from "./chunk-NE4LAJXK.mjs";
+} from "./chunk-PTOTQ6A2.mjs";
 
 // src/jsx-runtime.tsx
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -51,7 +51,7 @@ var DarkWrapper = React.forwardRef(
       return s;
     }, [resolvedStyle, isDark, width, screens, isNonStringComponent]);
     const skipComputedInline = isWebPlatform;
-    const finalStyle = skipComputedInline ? styleProp ?? void 0 : styleProp ? Array.isArray(styleProp) ? [computedStyle, ...styleProp] : [computedStyle, styleProp] : computedStyle;
+    const finalStyle = skipComputedInline ? styleProp ?? void 0 : composeNativeStyle(computedStyle, styleProp);
     const props = { ref, ...rest, style: finalStyle };
     return Array.isArray(children) ? React.createElement(Component, props, ...children) : React.createElement(Component, props, children);
   }
@@ -107,15 +107,6 @@ function omitConsumed(props) {
   }
   return out;
 }
-function mergeStyle(computed, userStyle) {
-  if (!userStyle) return computed;
-  return Array.isArray(userStyle) ? [computed, ...userStyle] : [computed, userStyle];
-}
-function withImpliedRNStyleIfNeeded(webTag, resolvedBase, userStyle) {
-  const compensation = getImpliedRNStyle(webTag, resolvedBase);
-  if (!compensation) return userStyle;
-  return Array.isArray(userStyle) ? [compensation, ...userStyle] : { ...compensation, ...userStyle };
-}
 function makeElement(isStaticChildren, type, props, key) {
   return (isStaticChildren ? _jsxs : _jsx)(type, props, key);
 }
@@ -133,7 +124,7 @@ function processElement(type, rawProps, key, isStaticChildren) {
   }
   const classStr = classStrRaw;
   const config = getConfig();
-  const expandedClassStr = classStr ? expandModeAwareColorClasses(classStr, config.theme.colors) : classStr;
+  let expandedClassStr = classStr ? expandModeAwareColorClasses(classStr, config.theme.colors) : classStr;
   if (!isNative && isRuntimeCSSDisabled() && expandedClassStr && !__kbachStyles) {
     const { style: userStyle2, ...passProps2 } = omitConsumed(workingProps);
     return makeElement(isStaticChildren, effectiveType, {
@@ -158,9 +149,13 @@ function processElement(type, rawProps, key, isStaticChildren) {
     const finalStyle2 = userStyle2 ? Array.isArray(userStyle2) ? { fontFamily: defaultFont, ...Object.assign({}, ...userStyle2) } : { fontFamily: defaultFont, ...userStyle2 } : { fontFamily: defaultFont };
     return makeElement(isStaticChildren, effectiveType, { ...passProps2, style: finalStyle2 }, key);
   }
-  const resolved = !isWeb && __kbachStyles != null ? __kbachStyles : expandedClassStr ? resolve(expandedClassStr, config.theme, config.darkMode) : {};
-  const { style: rawUserStyle, ...passProps } = omitConsumed(workingProps);
-  const userStyle = withImpliedRNStyleIfNeeded(webTag, resolved.base, rawUserStyle);
+  let resolved = isNative && __kbachStyles != null ? __kbachStyles : expandedClassStr ? resolve(expandedClassStr, config.theme, config.darkMode) : {};
+  const impliedClasses = getImpliedRNClasses(webTag, resolved.base);
+  if (impliedClasses) {
+    expandedClassStr = expandedClassStr ? `${expandedClassStr} ${impliedClasses}` : impliedClasses;
+    resolved = resolve(expandedClassStr, config.theme, config.darkMode);
+  }
+  const { style: userStyle, ...passProps } = omitConsumed(workingProps);
   const { interactive, modeOrResponsive } = bucketMods(resolved);
   if (interactive) {
     return _jsx(InteractiveWrapper, {
@@ -186,7 +181,7 @@ function processElement(type, rawProps, key, isStaticChildren) {
     const computedStyle = flatten(resolved, false);
     stripInternalMarkers(computedStyle);
     if (typeof effectiveType !== "string") stripWebOnlyProps(computedStyle);
-    finalStyle = mergeStyle(computedStyle, userStyle);
+    finalStyle = composeNativeStyle(computedStyle, userStyle);
   } else {
     finalStyle = userStyle ?? void 0;
   }