react-native-css 3.0.0-nightly.8dd703d → 3.0.0-nightly.9c84741

package/src/metro/index.ts

@@ -6,7 +6,7 @@ import connect from "connect";
 import debug from "debug";
 import type { MetroConfig } from "metro-config";
 
-import type { CompilerOptions, ReactNativeCssStyleSheet_V2 } from "../compiler";
+import type { CompilerOptions, ReactNativeCssStyleSheet } from "../compiler";
 import { compile } from "../compiler/compiler";
 import { getNativeInjectionCode, getWebInjectionCode } from "./injection-code";
 import { nativeResolver, webResolver } from "./resolver";
@@ -53,16 +53,18 @@ export function withReactNativeCSS<
   const originalMiddleware = config.server?.enhanceMiddleware;
   const originalResolver = config.resolver?.resolveRequest;
 
-  const poisonPillPath = "./poison.pill";
-
   return {
     ...config,
     transformerPath: require.resolve("./metro-transformer"),
+    transformer: {
+      ...config.transformer,
+      reactNativeCSS: options,
+    },
     resolver: {
       ...config.resolver,
       sourceExts: [...(config?.resolver?.sourceExts || []), "css"],
       resolveRequest: (context, moduleName, platform) => {
-        if (moduleName === poisonPillPath) {
+        if (moduleName.includes("poison.pill")) {
           return { type: "empty" };
         }
 
@@ -95,7 +97,7 @@ export function withReactNativeCSS<
 
           const nativeCSSFiles = new Map<
             string,
-            [string, ReactNativeCssStyleSheet_V2]
+            [string, ReactNativeCssStyleSheet]
           >();
           const webCSSFiles = new Set<string>();
 
@@ -161,7 +163,7 @@ export function withReactNativeCSS<
                     // Let the transformer know that we will handle compilation
                     customTransformOptions: {
                       ...transformOptions.customTransformOptions,
-                      reactNativeCSSCompile: false,
+                      reactNativeCSS: options,
                     },
                   },
                   fileBuffer,

package/src/metro/injection-code.ts

@@ -1,17 +1,13 @@
 /**
- * This is a hack around Expo's handling of CSS files.
+ * This is a hack around Metro's handling of bundles.
  * When a component is inside a lazy() barrier, it is inside a different JS bundle.
  * So when it updates, it only updates its local bundle, not the global one which contains the CSS files.
  *
- * To fix this, we force our code to always import the CSS files.
- * Now the CSS files are in every bundle.
+ * This means that the CSS file will not be re-evaluated when a component in a different bundle updates,
+ * breaking tools like Tailwind CSS
  *
- * We achieve this by collecting all CSS files and injecting them into a special file
- * which is included inside react-native-css's runtime.
- *
- * This is why both of these function add imports for the CSS files.
+ * To fix this, we force our code to always import the CSS files, so now the CSS files are in every bundle.
  */
-
 export function getWebInjectionCode(filePaths: string[]) {
   const importStatements = filePaths
     .map((filePath) => `import "${filePath}";`)
@@ -27,12 +23,12 @@ export function getNativeInjectionCode(
   const importStatements = cssFilePaths
     .map((filePath) => `import "${filePath}";`)
     .join("\n");
-  const importPath = `import { StyleCollection } from "./api";`;
+
   const contents = values
     .map((value) => `StyleCollection.inject(${JSON.stringify(value)});`)
     .join("\n");
 
   return Buffer.from(
-    `${importStatements}\n${importPath}\n${contents};export {};`,
+    `import { StyleCollection } from "react-native-css/style-collection";\n${importStatements}\n${contents};export {};`,
   );
 }

package/src/metro/metro-transformer.ts

@@ -1,31 +1,48 @@
+import { unstable_transformerPath } from "@expo/metro-config";
 import type {
   JsTransformerConfig,
   JsTransformOptions,
   TransformResponse,
 } from "metro-transform-worker";
 
+import { compile, type CompilerOptions } from "../compiler";
+import { getNativeInjectionCode } from "./injection-code";
+
 const worker =
   // eslint-disable-next-line @typescript-eslint/no-require-imports
-  require("@expo/metro-config/build/transform-worker/transform-worker.js") as typeof import("metro-transform-worker");
+  require(unstable_transformerPath) as typeof import("metro-transform-worker");
 
-export function transform(
+export async function transform(
   config: JsTransformerConfig,
   projectRoot: string,
   filePath: string,
   data: Buffer,
-  options: JsTransformOptions,
+  options: JsTransformOptions & {
+    reactNativeCSS?: CompilerOptions | undefined;
+  },
 ): Promise<TransformResponse> {
   const isCss = options.type !== "asset" && /\.(s?css|sass)$/.test(filePath);
-  const skipCompile =
-    options.customTransformOptions &&
-    "reactNativeCSSCompile" in options.customTransformOptions &&
-    options.customTransformOptions.reactNativeCSSCompile === false;
 
-  if (!isCss || skipCompile) {
+  if (options.platform === "web" || !isCss) {
     return worker.transform(config, projectRoot, filePath, data, options);
   }
 
-  // TODO - compile the CSS file inline
+  const cssFile = (await worker.transform(config, projectRoot, filePath, data, {
+    ...options,
+    platform: "web",
+  })) as TransformResponse & {
+    output: [{ data: { css: { code: Buffer } } }];
+  };
+
+  const css = cssFile.output[0].data.css.code.toString();
+
+  const productionJS = compile(css, {
+    ...options.reactNativeCSS,
+    filename: filePath,
+    projectRoot: projectRoot,
+  }).stylesheet();
+
+  data = Buffer.from(getNativeInjectionCode([], [productionJS]));
 
-  return worker.transform(config, projectRoot, filePath, data, options);
+  return worker.transform(config, projectRoot, `${filePath}.js`, data, options);
 }

package/src/metro/resolver.ts

@@ -45,6 +45,14 @@ export function nativeResolver(
     return resolver(context, `react-native-css/components`, platform);
   }
 
+  if (moduleName === "react-native-safe-area-context") {
+    return resolver(
+      context,
+      `react-native-css/components/react-native-safe-area-context`,
+      platform,
+    );
+  }
+
   // We only care about `react-native/Library/Components/<module>.js` components
   const segments = resolution.filePath.split(sep);
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/src/poison.pill.ts

@@ -3,9 +3,9 @@ const canWarn = process.env.NODE_ENV !== "test";
 if (canWarn) {
   throw new Error(`react-native-css has encountered a setup error. 
 
-┌─────-─┐
-| Metro | 
-└─────-─┘
+┌───────┐
+│ Metro │ 
+└───────┘
 
 Either your metro.config.js is missing the 'withReactNativeCSS' wrapper OR
 the resolver.resolveRequest function of your config is being overridden, and not calling the parent resolver.
@@ -19,15 +19,15 @@ module.exports = with3rdPartyPlugin(
 )
 \`\`\`
 
-┌─────------─┐
-| NativeWind | 
-└─────------─┘
+┌────────────┐
+│ NativeWind │ 
+└────────────┘
 
-If you are using NativeWind with the 'withNativeWind' function, follow the Metro instructions above, but use 'withNativeWind' instead of 'withReactNativeCSS'.
+If you are using NativeWind follow the Metro instructions above but use 'withNativeWind' instead of 'withReactNativeCSS'.
 
-┌─────----------─┐
-| Other bundlers | 
-└─────----------─┘
+┌────────────────┐
+│ Other bundlers │ 
+└────────────────┘
 
 If you are using another bundler (Vite, Webpack, etc), or non-Metro framework (Next.js, Remix, etc), please ensure you have included 'react-native-css/babel' as a babel preset.
 `);

package/src/runtime/native/api.ts

@@ -21,7 +21,9 @@ import {
 } from "./reactivity";
 import { resolveValue } from "./styles/resolve";
 
-export { StyleCollection } from "./injection";
+export { StyleCollection } from "react-native-css/style-collection";
+
+export { useNativeCss };
 
 /**
  * Generates a new Higher-Order component the wraps the base component and applies the styles.

package/src/runtime/native/conditions/index.ts

@@ -39,10 +39,12 @@ export function testRule(
 }
 
 function pseudoClasses(query: PseudoClassesQuery, get: Getter) {
-  if (query.h && !get(hoverFamily(get))) {
+  // IMPORTANT: active needs: to be first. Modifies a global value
+  // that we use to determine if the component should be a pressable
+  if (query.a && !get(activeFamily(get))) {
     return false;
   }
-  if (query.a && !get(activeFamily(get))) {
+  if (query.h && !get(hoverFamily(get))) {
     return false;
   }
   if (query.f && !get(focusFamily(get))) {

package/src/runtime/native/conditions/media-query.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { PixelRatio, Platform } from "react-native";
+import { I18nManager, PixelRatio, Platform } from "react-native";
 
 import type { MediaCondition } from "../../../compiler";
 import { colorScheme, vh, vw, type Getter } from "../reactivity";
@@ -34,35 +34,39 @@ function test(mediaQuery: MediaCondition, get: Getter): Boolean {
 }
 
 function testComparison(mediaQuery: MediaCondition, get: Getter): Boolean {
-  let left: number | undefined;
-  const right = mediaQuery[2];
+  const value = mediaQuery[2];
 
   switch (mediaQuery[1]) {
+    case "dir":
+      return (I18nManager.isRTL && value === "rtl") || value === "ltr";
     case "hover":
       return true;
     case "platform":
-      return right === "native" || right === Platform.OS;
+      return value === "native" || value === Platform.OS;
     case "prefers-color-scheme": {
-      return right === get(colorScheme);
+      return value === get(colorScheme);
     }
     case "display-mode":
-      return right === "native" || Platform.OS === right;
+      return value === "native" || Platform.OS === value;
     case "min-width":
-      return typeof right === "number" && get(vw) >= right;
+      return typeof value === "number" && get(vw) >= value;
     case "max-width":
-      return typeof right === "number" && get(vw) <= right;
+      return typeof value === "number" && get(vw) <= value;
     case "min-height":
-      return typeof right === "number" && get(vh) >= right;
+      return typeof value === "number" && get(vh) >= value;
     case "max-height":
-      return typeof right === "number" && get(vh) <= right;
+      return typeof value === "number" && get(vh) <= value;
     case "orientation":
-      return right === "landscape" ? get(vh) < get(vw) : get(vh) >= get(vw);
+      return value === "landscape" ? get(vh) < get(vw) : get(vh) >= get(vw);
   }
 
-  if (typeof right !== "number") {
+  if (typeof value !== "number") {
     return false;
   }
 
+  let left: number | undefined;
+  const right = value;
+
   switch (mediaQuery[1]) {
     case "width":
       left = get(vw);

package/src/runtime/native/react/rules.ts

@@ -1,10 +1,11 @@
 /* eslint-disable */
+import { StyleCollection } from "react-native-css/style-collection";
+
 import type { InlineVariable, StyleRule } from "../../../compiler";
 import { getDeepPath } from "../../utils";
 import { testRule } from "../conditions";
 import { DEFAULT_CONTAINER_NAME } from "../conditions/container-query";
 import type { RenderGuard } from "../conditions/guards";
-import { StyleCollection } from "../injection";
 import {
   activeFamily,
   containerLayoutFamily,
@@ -12,6 +13,7 @@ import {
   hoverFamily,
   VAR_SYMBOL,
   weakFamily,
+  type ContainerContextValue,
   type VariableContextValue,
 } from "../reactivity";
 import { stylesFamily } from "../styles";
@@ -36,11 +38,12 @@ export function updateRules(
 
   let usesVariables = false;
 
-  let variables = state.variables ? inheritedVariables : undefined;
-  let containers = state.containers ? inheritedContainers : undefined;
+  let variables: VariableContextValue | undefined;
+  let containers: ContainerContextValue | undefined;
   const inlineVariables = new Set<InlineVariable>();
 
   let animated = false;
+  let pressable = false;
 
   for (const config of state.configs) {
     const source = currentProps?.[config.source];
@@ -68,6 +71,11 @@ export function updateRules(
     if (target) {
       if (Array.isArray(target)) {
         for (const item of target) {
+          // undefined or falsy is allowed in the style array
+          if (!item) {
+            continue;
+          }
+          
           if (VAR_SYMBOL in item) {
             inlineVariables.add(item);
           } else if (
@@ -93,13 +101,20 @@ export function updateRules(
     }
 
     for (let rule of styleRuleSet) {
-      // Even if a rule does not match, make sure we register that it could set
-      // a variable or container or be animated.
-      if (rule.v) usesVariables = true;
-      if (rule.c) containers ??= inheritedContainers;
+      usesVariables ||= Boolean(rule.dv);
+
+      // We do this even if the rule doesn't match so we can maintain a consistent render tree
+      // We we need to inject React context
       if (rule.a) animated = true;
 
-      usesVariables ||= Boolean(rule.dv);
+      if (rule.v) {
+        variables ??= inheritedVariables;
+      }
+
+      if (rule.c) {
+        containers ??= inheritedContainers;
+        activeFamily(state.ruleEffectGetter);
+      }
 
       if (
         !testRule(
@@ -114,11 +129,8 @@ export function updateRules(
       }
 
       if (rule.v) {
-        // We're going to set a value, so we need to create a new object
         if (variables === inheritedVariables) {
           variables = { ...inheritedVariables };
-        } else {
-          variables ??= { ...inheritedVariables };
         }
 
         for (const v of rule.v) {
@@ -163,7 +175,7 @@ export function updateRules(
 
     if (process.env.NODE_ENV !== "production") {
       if (isRerender) {
-        let pressable = activeFamily.has(state.ruleEffectGetter);
+        const pressable = activeFamily.has(state.ruleEffectGetter);
 
         if (Boolean(variables) !== Boolean(state.variables)) {
           console.log(
@@ -186,11 +198,7 @@ export function updateRules(
     }
   }
 
-  // We only track this in development
-  let pressable =
-    process.env.NODE_ENV === "production"
-      ? undefined
-      : activeFamily.has(state.ruleEffectGetter);
+  pressable = activeFamily.has(state.ruleEffectGetter);
 
   if (!rules.size && !state.stylesObs && !inlineVariables.size) {
     return {
@@ -199,6 +207,8 @@ export function updateRules(
       guards,
       animated,
       pressable,
+      variables,
+      containers,
     };
   }
 

package/src/runtime/native/reactivity.ts

@@ -209,6 +209,18 @@ export const vh = observable<number>(
   (read, value) => value ?? read(dimensions)?.height,
 );
 
+Dimensions.addEventListener("change", ({ window }) => {
+  observableBatch.current = new Set();
+  vw.set(window.width);
+  vh.set(window.height);
+
+  for (const effect of observableBatch.current) {
+    effect.run();
+  }
+
+  observableBatch.current = undefined;
+});
+
 /** Color Scheme **************************************************************/
 
 export const colorScheme = observable<ColorSchemeName>(

package/src/runtime/native/styles/calculate-props.ts

@@ -11,6 +11,7 @@ import {
   type Getter,
   type VariableContextValue,
 } from "../reactivity";
+import { transformKeys } from "./defaults";
 import { resolveValue } from "./resolve";
 
 export function calculateProps(
@@ -28,6 +29,7 @@ export function calculateProps(
   let important: Record<string, any> | undefined;
 
   const delayedStyles: (() => void)[] = [];
+  const transformStyles: (() => void)[] = [];
 
   for (const rule of rules) {
     if (VAR_SYMBOL in rule) {
@@ -67,6 +69,7 @@ export function calculateProps(
         inlineVariables,
         inheritedVariables,
         delayedStyles,
+        transformStyles,
         guards,
         target,
         topLevelTarget,
@@ -78,6 +81,10 @@ export function calculateProps(
     delayedStyle();
   }
 
+  for (const transformStyle of transformStyles) {
+    transformStyle();
+  }
+
   return {
     normal,
     guards,
@@ -91,6 +98,7 @@ export function applyDeclarations(
   inlineVariables: InlineVariable,
   inheritedVariables: VariableContextValue,
   delayedStyles: (() => void)[] = [],
+  transformStyles: (() => void)[] = [],
   guards: RenderGuard[] = [],
   target: Record<string, any> = {},
   topLevelTarget = target,
@@ -136,7 +144,7 @@ export function applyDeclarations(
 
       const shouldDelay = declaration[2];
 
-      if (shouldDelay) {
+      if (shouldDelay || transformKeys.has(prop)) {
         /**
          * We need to delay the resolution of this value until after all
          * styles have been calculated. But another style might override
@@ -149,9 +157,9 @@ export function applyDeclarations(
         const originalValue = value;
         // This needs to be a object with the [prop] so we can discover in transform arrays
         value = { [prop]: true };
-        delayedStyles.push(() => {
-          if (getDeepPath(target, prop) === value) {
-            delete target[prop];
+
+        if (transformKeys.has(prop)) {
+          transformStyles.push(() => {
             value = resolveValue(originalValue, get, {
               inlineVariables,
               inheritedVariables,
@@ -159,8 +167,21 @@ export function applyDeclarations(
               calculateProps,
             });
             applyValue(target, prop, value);
-          }
-        });
+          });
+        } else {
+          delayedStyles.push(() => {
+            if (getDeepPath(target, prop) === value) {
+              delete target[prop];
+              value = resolveValue(originalValue, get, {
+                inlineVariables,
+                inheritedVariables,
+                renderGuards: guards,
+                calculateProps,
+              });
+              applyValue(target, prop, value);
+            }
+          });
+        }
       } else {
         value = resolveValue(value, get, {
           inlineVariables,