@mgcrea/react-native-tailwind 0.12.1 → 0.13.0

package/src/babel/utils/colorSchemeModifierProcessing.ts

@@ -5,6 +5,7 @@
 import type * as BabelTypes from "@babel/types";
 import type { ColorSchemeModifierType, CustomTheme, ParsedModifier } from "../../parser/index.js";
 import type { StyleObject } from "../../types/core.js";
+import { hasRuntimeDimensions } from "./windowDimensionsProcessing.js";
 
 /**
  * Plugin state interface (subset needed for color scheme modifier processing)
@@ -66,6 +67,16 @@ export function processColorSchemeModifiers(
     // Parse all classes for this color scheme together
     const classNames = modifiers.map((m) => m.baseClass).join(" ");
     const styleObject = parseClassName(classNames, state.customTheme);
+
+    // Check for runtime dimensions (w-screen, h-screen)
+    if (hasRuntimeDimensions(styleObject)) {
+      throw new Error(
+        `w-screen and h-screen cannot be combined with color scheme modifiers (dark:, light:, scheme:). ` +
+          `Found in: "${scheme}:${classNames}". ` +
+          `Use w-screen/h-screen without modifiers instead.`,
+      );
+    }
+
     const styleKey = generateStyleKey(`${scheme}_${classNames}`);
 
     // Register style in the registry

package/src/babel/utils/componentSupport.test.ts

@@ -86,6 +86,26 @@ describe("getComponentModifierSupport", () => {
         supportedModifiers: ["focus", "disabled", "placeholder"],
       });
     });
+
+    it("should recognize TouchableOpacity component", () => {
+      const element = createJSXElement("<TouchableOpacity />");
+      const result = getComponentModifierSupport(element, t);
+
+      expect(result).toEqual({
+        component: "TouchableOpacity",
+        supportedModifiers: ["active", "disabled"],
+      });
+    });
+
+    it("should recognize TouchableOpacity with attributes", () => {
+      const element = createJSXElement('<TouchableOpacity className="m-4" onPress={handlePress} />');
+      const result = getComponentModifierSupport(element, t);
+
+      expect(result).toEqual({
+        component: "TouchableOpacity",
+        supportedModifiers: ["active", "disabled"],
+      });
+    });
   });
 
   describe("Member expressions", () => {
@@ -139,13 +159,6 @@ describe("getComponentModifierSupport", () => {
       expect(result).toBeNull();
     });
 
-    it("should return null for TouchableOpacity", () => {
-      const element = createJSXElement("<TouchableOpacity />");
-      const result = getComponentModifierSupport(element, t);
-
-      expect(result).toBeNull();
-    });
-
     it("should return null for custom components", () => {
       const element = createJSXElement("<CustomButton />");
       const result = getComponentModifierSupport(element, t);

package/src/babel/utils/componentSupport.ts

@@ -41,6 +41,8 @@ export function getComponentModifierSupport(
   switch (componentName) {
     case "Pressable":
       return { component: "Pressable", supportedModifiers: ["active", "hover", "focus", "disabled"] };
+    case "TouchableOpacity":
+      return { component: "TouchableOpacity", supportedModifiers: ["active", "disabled"] };
     case "TextInput":
       return { component: "TextInput", supportedModifiers: ["focus", "disabled", "placeholder"] };
     default:

package/src/babel/utils/modifierProcessing.ts

@@ -6,6 +6,7 @@ import type * as BabelTypes from "@babel/types";
 import type { CustomTheme, ModifierType, ParsedModifier } from "../../parser/index.js";
 import type { StyleObject } from "../../types/core.js";
 import { getStatePropertyForModifier } from "./componentSupport.js";
+import { hasRuntimeDimensions } from "./windowDimensionsProcessing.js";
 
 /**
  * Plugin state interface (subset needed for modifier processing)
@@ -36,6 +37,16 @@ export function processStaticClassNameWithModifiers(
   if (baseClasses.length > 0) {
     const baseClassName = baseClasses.join(" ");
     const baseStyleObject = parseClassName(baseClassName, state.customTheme);
+
+    // Check for runtime dimensions (w-screen, h-screen) in base classes
+    if (hasRuntimeDimensions(baseStyleObject)) {
+      throw new Error(
+        `w-screen and h-screen cannot be combined with state modifiers (active:, hover:, focus:, etc.) or platform modifiers (ios:, android:, web:). ` +
+          `Found in: "${baseClassName}". ` +
+          `Use w-screen/h-screen without modifiers instead.`,
+      );
+    }
+
     const baseStyleKey = generateStyleKey(baseClassName);
     state.styleRegistry.set(baseStyleKey, baseStyleObject);
     baseStyleExpression = t.memberExpression(t.identifier(state.stylesIdentifier), t.identifier(baseStyleKey));
@@ -67,6 +78,16 @@ export function processStaticClassNameWithModifiers(
     // Parse all modifier classes together
     const modifierClassNames = modifiers.map((m) => m.baseClass).join(" ");
     const modifierStyleObject = parseClassName(modifierClassNames, state.customTheme);
+
+    // Check for runtime dimensions (w-screen, h-screen) in modifier classes
+    if (hasRuntimeDimensions(modifierStyleObject)) {
+      throw new Error(
+        `w-screen and h-screen cannot be combined with state modifiers (active:, hover:, focus:, etc.) or platform modifiers (ios:, android:, web:). ` +
+          `Found in: "${modifierType}:${modifierClassNames}". ` +
+          `Use w-screen/h-screen without modifiers instead.`,
+      );
+    }
+
     const modifierStyleKey = generateStyleKey(`${modifierType}_${modifierClassNames}`);
     state.styleRegistry.set(modifierStyleKey, modifierStyleObject);
 

package/src/babel/utils/platformModifierProcessing.ts

@@ -5,6 +5,7 @@
 import type * as BabelTypes from "@babel/types";
 import type { CustomTheme, ParsedModifier, PlatformModifierType } from "../../parser/index.js";
 import type { StyleObject } from "../../types/core.js";
+import { hasRuntimeDimensions } from "./windowDimensionsProcessing.js";
 
 /**
  * Plugin state interface (subset needed for platform modifier processing)
@@ -62,6 +63,16 @@ export function processPlatformModifiers(
     // Parse all classes for this platform together
     const classNames = modifiers.map((m) => m.baseClass).join(" ");
     const styleObject = parseClassName(classNames, state.customTheme);
+
+    // Check for runtime dimensions (w-screen, h-screen)
+    if (hasRuntimeDimensions(styleObject)) {
+      throw new Error(
+        `w-screen and h-screen cannot be combined with platform modifiers (ios:, android:, web:). ` +
+          `Found in: "${platform}:${classNames}". ` +
+          `Use w-screen/h-screen without modifiers instead.`,
+      );
+    }
+
     const styleKey = generateStyleKey(`${platform}_${classNames}`);
 
     // Register style in the registry

package/src/babel/utils/styleInjection.ts

@@ -220,6 +220,121 @@ export function injectColorSchemeHook(
   return true;
 }
 
+/**
+ * Add useWindowDimensions import to the file or merge with existing react-native import
+ */
+export function addWindowDimensionsImport(path: NodePath<BabelTypes.Program>, t: typeof BabelTypes): void {
+  // Check if there's already an import from react-native
+  const body = path.node.body;
+  let existingValueImport: BabelTypes.ImportDeclaration | null = null;
+
+  for (const statement of body) {
+    if (t.isImportDeclaration(statement) && statement.source.value === "react-native") {
+      // Only consider value imports (not type-only imports which get erased)
+      if (statement.importKind !== "type") {
+        existingValueImport = statement;
+        break; // Found a value import, we can stop
+      }
+    }
+  }
+
+  // If we found a value import (not type-only), merge with it
+  if (existingValueImport) {
+    // Check if the hook is already imported
+    const hasHook = existingValueImport.specifiers.some(
+      (spec) =>
+        t.isImportSpecifier(spec) &&
+        spec.imported.type === "Identifier" &&
+        spec.imported.name === "useWindowDimensions",
+    );
+
+    if (!hasHook) {
+      // Add hook to existing value import
+      existingValueImport.specifiers.push(
+        t.importSpecifier(t.identifier("useWindowDimensions"), t.identifier("useWindowDimensions")),
+      );
+    }
+  } else {
+    // No value import exists - create a new one
+    // (Don't merge with type-only imports as they get erased by Babel/TypeScript)
+    const importDeclaration = t.importDeclaration(
+      [t.importSpecifier(t.identifier("useWindowDimensions"), t.identifier("useWindowDimensions"))],
+      t.stringLiteral("react-native"),
+    );
+    path.unshiftContainer("body", importDeclaration);
+  }
+}
+
+/**
+ * Inject useWindowDimensions hook call at the top of a function component
+ *
+ * @param functionPath - Path to the function component
+ * @param dimensionsVariableName - Name for the dimensions variable
+ * @param hookName - Name of the hook to call (e.g., 'useWindowDimensions')
+ * @param localIdentifier - Local identifier if hook is already imported with an alias
+ * @param t - Babel types
+ * @returns true if hook was injected, false if already exists
+ */
+export function injectWindowDimensionsHook(
+  functionPath: NodePath<BabelTypes.Function>,
+  dimensionsVariableName: string,
+  hookName: string,
+  localIdentifier: string | undefined,
+  t: typeof BabelTypes,
+): boolean {
+  let body = functionPath.node.body;
+
+  // Handle concise arrow functions: () => <JSX />
+  // Convert to block statement: () => { const _twDimensions = useWindowDimensions(); return <JSX />; }
+  if (!t.isBlockStatement(body)) {
+    if (t.isArrowFunctionExpression(functionPath.node) && t.isExpression(body)) {
+      // Convert concise body to block statement with return
+      const returnStatement = t.returnStatement(body);
+      const blockStatement = t.blockStatement([returnStatement]);
+      functionPath.node.body = blockStatement;
+      body = blockStatement;
+    } else {
+      // Other non-block functions (shouldn't happen for components, but be safe)
+      return false;
+    }
+  }
+
+  // Check if hook is already injected
+  const hasHook = body.body.some((statement) => {
+    if (
+      t.isVariableDeclaration(statement) &&
+      statement.declarations.length > 0 &&
+      t.isVariableDeclarator(statement.declarations[0])
+    ) {
+      const declarator = statement.declarations[0];
+      return t.isIdentifier(declarator.id) && declarator.id.name === dimensionsVariableName;
+    }
+    return false;
+  });
+
+  if (hasHook) {
+    return false; // Already injected
+  }
+
+  // Use the local identifier if hook was already imported with an alias,
+  // otherwise use the configured hook name
+  // e.g., import { useWindowDimensions as useDims } → call useDims()
+  const identifierToCall = localIdentifier ?? hookName;
+
+  // Create: const _twDimensions = useWindowDimensions(); (or aliased name if already imported)
+  const hookCall = t.variableDeclaration("const", [
+    t.variableDeclarator(
+      t.identifier(dimensionsVariableName),
+      t.callExpression(t.identifier(identifierToCall), []),
+    ),
+  ]);
+
+  // Insert at the beginning of function body
+  body.body.unshift(hookCall);
+
+  return true;
+}
+
 /**
  * Inject StyleSheet.create with all collected styles at the top of the file
  * This ensures the styles object is defined before any code that references it

package/src/babel/utils/twProcessing.ts

@@ -15,6 +15,7 @@ import type { SchemeModifierConfig } from "../../types/config.js";
 import type { StyleObject } from "../../types/core.js";
 import { processColorSchemeModifiers } from "./colorSchemeModifierProcessing.js";
 import { processPlatformModifiers } from "./platformModifierProcessing.js";
+import { hasRuntimeDimensions } from "./windowDimensionsProcessing.js";
 
 /**
  * Plugin state interface (subset needed for tw processing)
@@ -77,6 +78,16 @@ export function processTwCall(
   if (baseClasses.length > 0) {
     const baseClassName = baseClasses.join(" ");
     const baseStyleObject = parseClassName(baseClassName, state.customTheme);
+
+    // Check for runtime dimensions (w-screen, h-screen)
+    if (hasRuntimeDimensions(baseStyleObject)) {
+      throw path.buildCodeFrameError(
+        `w-screen and h-screen are not supported in tw\`\` or twStyle() calls. ` +
+          `Found: "${baseClassName}". ` +
+          `Use them in className attributes instead.`,
+      );
+    }
+
     const baseStyleKey = generateStyleKey(baseClassName);
     state.styleRegistry.set(baseStyleKey, baseStyleObject);
 

package/src/babel/utils/windowDimensionsProcessing.ts

@@ -0,0 +1,121 @@
+/**
+ * Utility functions for processing window dimensions (w-screen, h-screen)
+ */
+
+import type * as BabelTypes from "@babel/types";
+import { RUNTIME_DIMENSIONS_MARKER } from "../../config/markers.js";
+import type { StyleObject } from "../../types/core.js";
+
+/**
+ * Plugin state interface (subset needed for window dimensions processing)
+ */
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export interface WindowDimensionsProcessingState {
+  needsWindowDimensionsImport: boolean;
+  windowDimensionsVariableName: string;
+}
+
+/**
+ * Check if a style object contains runtime dimension markers
+ *
+ * @param styleObject - Style object to check
+ * @returns true if the style object contains runtime dimension markers
+ *
+ * @example
+ * hasRuntimeDimensions({ width: "{{RUNTIME:dimensions.width}}" }) // true
+ * hasRuntimeDimensions({ width: 100 }) // false
+ */
+export function hasRuntimeDimensions(styleObject: StyleObject): boolean {
+  return Object.values(styleObject).some(
+    (value) => typeof value === "string" && value.startsWith(RUNTIME_DIMENSIONS_MARKER),
+  );
+}
+
+/**
+ * Create an inline style object with runtime dimension access
+ *
+ * Converts runtime markers like "{{RUNTIME:dimensions.width}}" to
+ * AST nodes like: { width: _twDimensions.width }
+ *
+ * @param styleObject - Style object with runtime markers
+ * @param state - Plugin state
+ * @param t - Babel types
+ * @returns AST object expression for inline style
+ *
+ * @example
+ * Input: { width: "{{RUNTIME:dimensions.width}}", height: "{{RUNTIME:dimensions.height}}" }
+ * Output: { width: _twDimensions.width, height: _twDimensions.height }
+ */
+export function createRuntimeDimensionObject(
+  styleObject: StyleObject,
+  state: WindowDimensionsProcessingState,
+  t: typeof BabelTypes,
+): BabelTypes.ObjectExpression {
+  // Mark that we need useWindowDimensions import and hook injection
+  state.needsWindowDimensionsImport = true;
+
+  const properties: BabelTypes.ObjectProperty[] = [];
+
+  for (const [key, value] of Object.entries(styleObject)) {
+    let valueNode: BabelTypes.Expression;
+
+    if (typeof value === "string" && value.startsWith(RUNTIME_DIMENSIONS_MARKER)) {
+      // Extract property name: "{{RUNTIME:dimensions.width}}" -> "width"
+      const match = value.match(/dimensions\.(\w+)/);
+      const prop = match?.[1];
+
+      if (prop) {
+        // Generate: _twDimensions.width or _twDimensions.height
+        valueNode = t.memberExpression(t.identifier(state.windowDimensionsVariableName), t.identifier(prop));
+      } else {
+        // Fallback: shouldn't happen, but handle gracefully
+        valueNode = t.stringLiteral(value);
+      }
+    } else if (typeof value === "number") {
+      valueNode = t.numericLiteral(value);
+    } else if (typeof value === "string") {
+      valueNode = t.stringLiteral(value);
+    } else if (typeof value === "object" && value !== null) {
+      // Handle nested objects (e.g., transform arrays)
+      valueNode = t.valueToNode(value);
+    } else {
+      // Handle other types
+      valueNode = t.valueToNode(value);
+    }
+
+    properties.push(t.objectProperty(t.identifier(key), valueNode));
+  }
+
+  return t.objectExpression(properties);
+}
+
+/**
+ * Split a style object into static and runtime parts
+ *
+ * @param styleObject - Style object to split
+ * @returns Object with static and runtime style objects
+ *
+ * @example
+ * Input: { width: "{{RUNTIME:dimensions.width}}", padding: 16, backgroundColor: "#fff" }
+ * Output: {
+ *   static: { padding: 16, backgroundColor: "#fff" },
+ *   runtime: { width: "{{RUNTIME:dimensions.width}}" }
+ * }
+ */
+export function splitStaticAndRuntimeStyles(styleObject: StyleObject): {
+  static: StyleObject;
+  runtime: StyleObject;
+} {
+  const staticStyles: StyleObject = {};
+  const runtimeStyles: StyleObject = {};
+
+  for (const [key, value] of Object.entries(styleObject)) {
+    if (typeof value === "string" && value.startsWith(RUNTIME_DIMENSIONS_MARKER)) {
+      runtimeStyles[key] = value;
+    } else {
+      staticStyles[key] = value;
+    }
+  }
+
+  return { static: staticStyles, runtime: runtimeStyles };
+}

package/src/components/TouchableOpacity.tsx

@@ -0,0 +1,71 @@
+/**
+ * Enhanced TouchableOpacity component with modifier support
+ * Adds active state support for active: modifier via onPressIn/onPressOut
+ */
+
+import type { ComponentRef } from "react";
+import { forwardRef, useCallback, useState } from "react";
+import {
+  TouchableOpacity as RNTouchableOpacity,
+  type TouchableOpacityProps as RNTouchableOpacityProps,
+  type StyleProp,
+  type ViewStyle,
+} from "react-native";
+
+// TouchableOpacity state for style function
+type TouchableOpacityState = { active: boolean; disabled: boolean | null | undefined };
+
+export type TouchableOpacityProps = Omit<RNTouchableOpacityProps, "style"> & {
+  /**
+   * Style can be a static style object/array or a function that receives TouchableOpacity state
+   */
+  style?: StyleProp<ViewStyle> | ((state: TouchableOpacityState) => StyleProp<ViewStyle>);
+  className?: string; // compile-time only
+};
+
+/**
+ * Enhanced TouchableOpacity that supports active: and disabled: modifiers
+ *
+ * @example
+ * <TouchableOpacity
+ *   disabled={isLoading}
+ *   className="bg-blue-500 active:bg-blue-700 disabled:bg-gray-400"
+ * >
+ *   <Text>Submit</Text>
+ * </TouchableOpacity>
+ */
+export const TouchableOpacity = forwardRef<ComponentRef<typeof RNTouchableOpacity>, TouchableOpacityProps>(
+  function TouchableOpacity({ style, disabled = false, onPressIn, onPressOut, ...props }, ref) {
+    const [isActive, setIsActive] = useState(false);
+
+    const handlePressIn = useCallback(
+      (event: Parameters<NonNullable<RNTouchableOpacityProps["onPressIn"]>>[0]) => {
+        setIsActive(true);
+        onPressIn?.(event);
+      },
+      [onPressIn],
+    );
+
+    const handlePressOut = useCallback(
+      (event: Parameters<NonNullable<RNTouchableOpacityProps["onPressOut"]>>[0]) => {
+        setIsActive(false);
+        onPressOut?.(event);
+      },
+      [onPressOut],
+    );
+
+    // Inject active and disabled state into style function context
+    const resolvedStyle = typeof style === "function" ? style({ active: isActive, disabled }) : style;
+
+    return (
+      <RNTouchableOpacity
+        ref={ref}
+        disabled={disabled}
+        style={resolvedStyle}
+        onPressIn={handlePressIn}
+        onPressOut={handlePressOut}
+        {...props}
+      />
+    );
+  },
+);

package/src/components/index.ts

@@ -0,0 +1,3 @@
+export * from "./Pressable";
+export * from "./TextInput";
+export * from "./TouchableOpacity";

package/src/config/markers.ts

@@ -0,0 +1,5 @@
+/**
+ * Runtime marker prefix for window dimension values
+ * Used to mark style values that need runtime evaluation via useWindowDimensions()
+ */
+export const RUNTIME_DIMENSIONS_MARKER = "{{RUNTIME:dimensions.";

package/src/index.ts

@@ -15,6 +15,9 @@ export { generateStyleKey } from "./utils/styleKey";
 export type { StyleObject } from "./types/core";
 export type { NativeStyle, TwStyle } from "./types/runtime";
 
+// Re-export colors
+export { TAILWIND_COLORS } from "./config/tailwind";
+
 // Re-export individual parsers for advanced usage
 export {
   parseAspectRatio,
@@ -39,8 +42,4 @@ export { SPACING_SCALE } from "./parser/spacing";
 export { FONT_SIZES, LETTER_SPACING_SCALE } from "./parser/typography";
 
 // Re-export enhanced components with modifier support
-export { Pressable } from "./components/Pressable";
-export type { PressableProps } from "./components/Pressable";
-export { TextInput } from "./components/TextInput";
-export type { TextInputProps } from "./components/TextInput";
-export { TAILWIND_COLORS } from "./config/tailwind";
+export * from "./components";

package/src/parser/borders.test.ts

@@ -327,3 +327,61 @@ describe("parseBorder - comprehensive coverage", () => {
     });
   });
 });
+
+describe("parseBorder - color pattern detection", () => {
+  it("should return null for directional border colors with preset values", () => {
+    // These should be handled by parseColor
+    expect(parseBorder("border-t-red-500")).toBeNull();
+    expect(parseBorder("border-r-blue-500")).toBeNull();
+    expect(parseBorder("border-b-green-500")).toBeNull();
+    expect(parseBorder("border-l-yellow-500")).toBeNull();
+  });
+
+  it("should return null for directional border colors with basic values", () => {
+    // These should be handled by parseColor
+    expect(parseBorder("border-t-white")).toBeNull();
+    expect(parseBorder("border-r-black")).toBeNull();
+    expect(parseBorder("border-b-transparent")).toBeNull();
+    expect(parseBorder("border-l-white")).toBeNull();
+  });
+
+  it("should return null for directional border colors with arbitrary hex values", () => {
+    // These should be handled by parseColor
+    expect(parseBorder("border-t-[#ff0000]")).toBeNull();
+    expect(parseBorder("border-r-[#3B82F6]")).toBeNull();
+    expect(parseBorder("border-b-[#abc]")).toBeNull();
+    expect(parseBorder("border-l-[#00FF00AA]")).toBeNull();
+  });
+
+  it("should return null for directional border colors with opacity", () => {
+    // These should be handled by parseColor
+    expect(parseBorder("border-t-red-500/50")).toBeNull();
+    expect(parseBorder("border-r-blue-500/80")).toBeNull();
+    expect(parseBorder("border-b-[#ff0000]/60")).toBeNull();
+    expect(parseBorder("border-l-black/25")).toBeNull();
+  });
+
+  it("should return null for directional border colors with custom colors", () => {
+    // These should be handled by parseColor (assuming brand-primary is a custom color)
+    expect(parseBorder("border-t-brand-primary")).toBeNull();
+    expect(parseBorder("border-r-accent")).toBeNull();
+    expect(parseBorder("border-b-brand-secondary")).toBeNull();
+    expect(parseBorder("border-l-custom")).toBeNull();
+  });
+
+  it("should still handle directional border widths correctly", () => {
+    // These should NOT be detected as color patterns
+    expect(parseBorder("border-t-2")).toEqual({ borderTopWidth: 2 });
+    expect(parseBorder("border-r-4")).toEqual({ borderRightWidth: 4 });
+    expect(parseBorder("border-b-8")).toEqual({ borderBottomWidth: 8 });
+    expect(parseBorder("border-l-0")).toEqual({ borderLeftWidth: 0 });
+  });
+
+  it("should still handle directional border width arbitrary values", () => {
+    // These should NOT be detected as color patterns
+    expect(parseBorder("border-t-[3px]")).toEqual({ borderTopWidth: 3 });
+    expect(parseBorder("border-r-[5px]")).toEqual({ borderRightWidth: 5 });
+    expect(parseBorder("border-b-[10]")).toEqual({ borderBottomWidth: 10 });
+    expect(parseBorder("border-l-[8px]")).toEqual({ borderLeftWidth: 8 });
+  });
+});

package/src/parser/borders.ts

@@ -3,6 +3,7 @@
  */
 
 import type { StyleObject } from "../types";
+import { parseColor } from "./colors";
 
 // Border width scale
 export const BORDER_WIDTH_SCALE: Record<string, number> = {
@@ -108,8 +109,10 @@ function parseArbitraryBorderRadius(value: string): number | null {
 
 /**
  * Parse border classes
+ * @param cls - The class name to parse
+ * @param customColors - Optional custom colors from tailwind.config (used to detect color patterns)
  */
-export function parseBorder(cls: string): StyleObject | null {
+export function parseBorder(cls: string, customColors?: Record<string, string>): StyleObject | null {
   // Border style (must come before parseBorderWidth)
   if (cls === "border-solid") return { borderStyle: "solid" };
   if (cls === "border-dotted") return { borderStyle: "dotted" };
@@ -117,7 +120,7 @@ export function parseBorder(cls: string): StyleObject | null {
 
   // Border width (border-0, border-t, border-[8px], etc.)
   if (cls.startsWith("border-")) {
-    return parseBorderWidth(cls);
+    return parseBorderWidth(cls, customColors);
   }
 
   if (cls === "border") {
@@ -134,14 +137,26 @@ export function parseBorder(cls: string): StyleObject | null {
 
 /**
  * Parse border width classes
+ * @param cls - The class name to parse
+ * @param customColors - Optional custom colors (passed to parseColor for pattern detection)
  */
-function parseBorderWidth(cls: string): StyleObject | null {
+function parseBorderWidth(cls: string, customColors?: Record<string, string>): StyleObject | null {
   // Directional borders: border-t, border-t-2, border-t-[8px]
+  // Note: border-x and border-y are handled by parseColor for colors only
   const dirMatch = cls.match(/^border-([trbl])(?:-(.+))?$/);
   if (dirMatch) {
     const dir = dirMatch[1];
     const valueStr = dirMatch[2] || ""; // empty string for border-t
 
+    // If it's a color pattern, let parseColor handle it
+    // Try to parse as color - if it succeeds, return null (let parseColor handle it)
+    if (valueStr) {
+      const colorResult = parseColor(cls, customColors);
+      if (colorResult !== null) {
+        return null; // It's a color, let parseColor handle it
+      }
+    }
+
     // Try arbitrary value first (if it starts with [)
     if (valueStr.startsWith("[")) {
       const arbitraryValue = parseArbitraryBorderWidth(valueStr);