@coze-arch/cli 0.0.1-alpha.ef0249 → 0.0.1-alpha.f11735

package/lib/__templates__/expo/client/app/_layout.tsx

@@ -5,6 +5,7 @@ import { StatusBar } from 'expo-status-bar';
 import { LogBox } from 'react-native';
 import Toast from 'react-native-toast-message';
 import { AuthProvider } from "@/contexts/AuthContext";
+import { ColorSchemeProvider } from '@/hooks/useColorScheme';
 
 LogBox.ignoreLogs([
   "TurboModuleRegistry.getEnforcing(...): 'RNMapsAirModule' could not be found",
@@ -14,20 +15,22 @@ LogBox.ignoreLogs([
 export default function RootLayout() {
   return (
     <AuthProvider>
-      <GestureHandlerRootView style={{ flex: 1 }}>
+      <ColorSchemeProvider>
+        <GestureHandlerRootView style={{ flex: 1 }}>
           <StatusBar style="dark"></StatusBar>
           <Stack screenOptions={{
-              // 设置所有页面的切换动画为从右侧滑入，适用于iOS 和 Android
-              animation: 'slide_from_right',
-              gestureEnabled: true,
-              gestureDirection: 'horizontal',
-              // 隐藏自带的头部
-              headerShown: false
+            // 设置所有页面的切换动画为从右侧滑入，适用于iOS 和 Android
+            animation: 'slide_from_right',
+            gestureEnabled: true,
+            gestureDirection: 'horizontal',
+            // 隐藏自带的头部
+            headerShown: false
           }}>
             <Stack.Screen name="index" options={{ title: "" }} />
           </Stack>
           <Toast />
-      </GestureHandlerRootView>
+        </GestureHandlerRootView>
+      </ColorSchemeProvider>
     </AuthProvider>
   );
 }

package/lib/__templates__/expo/client/components/Screen.tsx

@@ -197,26 +197,10 @@ export const Screen = ({
   // 强制禁用 iOS 自动调整内容区域，完全由手动 padding 控制，消除系统自动计算带来的多余空白
   const contentInsetBehaviorIOS = 'never';
 
-  // 1. 外层容器样式
-  // 负责：背景色、Top/Left/Right 安全区、以及非滚动模式下的 Bottom 安全区
-  const childArray = React.Children.toArray(children);
-  let firstChild: React.ReactElement<any, any> | null = null;
-  for (let i = 0; i < childArray.length; i++) {
-    const el = childArray[i];
-    if (React.isValidElement(el)) { firstChild = el as React.ReactElement<any, any>; break; }
-  }
-  const firstChildHasInlinePaddingTop = (() => {
-    if (!firstChild) return false;
-    const st: any = (firstChild as any).props?.style;
-    const arr = Array.isArray(st) ? st : st ? [st] : [];
-    return arr.some((s) => s && typeof s === 'object' && typeof (s as any).paddingTop === 'number' && (s as any).paddingTop > 10);
-  })();
-  const applyTopInset = hasTop && !firstChildHasInlinePaddingTop;
-
   const wrapperStyle: ViewStyle = {
     flex: 1,
     backgroundColor,
-    paddingTop: applyTopInset ? insets.top : 0,
+    paddingTop: hasTop ? insets.top : 0,
     paddingLeft: hasLeft ? insets.left : 0,
     paddingRight: hasRight ? insets.right : 0,
     // 当页面不使用外层 ScrollView 时（子树本身可滚动），由外层 View 负责底部安全区

package/lib/__templates__/expo/client/components/ThemedView.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { View, ViewProps, ViewStyle } from 'react-native';
 import { useTheme } from '@/hooks/useTheme';
 
-type BackgroundLevel = 'root' | 'default' | 'secondary' | 'tertiary';
+type BackgroundLevel = 'root' | 'default' | 'tertiary';
 
 interface ThemedViewProps extends ViewProps {
   level?: BackgroundLevel;
@@ -12,7 +12,6 @@ interface ThemedViewProps extends ViewProps {
 const backgroundMap: Record<BackgroundLevel, string> = {
   root: 'backgroundRoot',
   default: 'backgroundDefault',
-  secondary: 'backgroundSecondary',
   tertiary: 'backgroundTertiary',
 };