@coze-arch/cli 0.1.4-alpha.5377b5 → 0.1.4-alpha.8c3e03

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

@@ -6,13 +6,19 @@ import {
   View,
   TouchableWithoutFeedback,
   Keyboard,
-  ViewStyle,
+  type ViewStyle,
   FlatList,
+  type FlatListProps,
   SectionList,
+  type SectionListProps,
+  type ScrollViewProps,
   Modal,
 } from 'react-native';
 import { withUniwind } from 'uniwind';
-import { useSafeAreaInsets, Edge } from 'react-native-safe-area-context';
+import {
+  useSafeAreaInsets,
+  type Edge,
+} from 'react-native-safe-area-context';
 import { StatusBar } from 'expo-status-bar';
 // 引入 KeyboardAware 系列组件
 import {
@@ -86,58 +92,92 @@ type KeyboardAwareProps = {
   contentInsetBehaviorIOS: 'automatic' | 'never';
 };
 
+type NativeScrollableProps = Pick<
+  ScrollViewProps,
+  | 'contentContainerStyle'
+  | 'keyboardShouldPersistTaps'
+  | 'keyboardDismissMode'
+  | 'contentInsetAdjustmentBehavior'
+>;
+
 const KeyboardAwareScrollable = ({
   element,
   extraPadding,
   contentInsetBehaviorIOS,
 }: KeyboardAwareProps) => {
-  // 获取原始组件的 props
-  const childAttrs = ((element as React.ReactElement).props ?? {}) as Record<string, unknown>;
-  const originStyle = childAttrs['contentContainerStyle'];
-  const styleArray = Array.isArray(originStyle) ? originStyle : originStyle ? [originStyle] : [];
-  const merged = Object.assign({}, ...styleArray);
-  const currentPB = typeof merged.paddingBottom === 'number' ? merged.paddingBottom : 0;
+  const createEnhancedContentStyle = (
+    contentContainerStyle: ScrollViewProps['contentContainerStyle'],
+  ) => {
+    const mergedStyle = StyleSheet.flatten(contentContainerStyle) ?? {};
+    const currentPaddingBottom =
+      typeof mergedStyle.paddingBottom === 'number'
+        ? mergedStyle.paddingBottom
+        : 0;
 
-  // 合并 paddingBottom (安全区 + 额外留白)
-  const enhancedContentStyle = [{ ...merged, paddingBottom: currentPB + extraPadding }];
+    return [
+      {
+        ...mergedStyle,
+        paddingBottom: currentPaddingBottom + extraPadding,
+      },
+    ];
+  };
 
-  // 基础配置 props，用于传递给 KeyboardAware 组件
-  const commonProps = {
-    ...childAttrs,
-    contentContainerStyle: enhancedContentStyle,
-    keyboardShouldPersistTaps: childAttrs['keyboardShouldPersistTaps'] ?? 'handled',
-    keyboardDismissMode: childAttrs['keyboardDismissMode'] ?? 'on-drag',
+  const createKeyboardAwareProps = <Props extends NativeScrollableProps>(
+    childProps: Props,
+  ) => ({
+    ...childProps,
+    contentContainerStyle: createEnhancedContentStyle(
+      childProps.contentContainerStyle,
+    ),
+    keyboardShouldPersistTaps:
+      childProps.keyboardShouldPersistTaps ?? 'handled',
+    keyboardDismissMode: childProps.keyboardDismissMode ?? 'on-drag',
     enableOnAndroid: true,
     // 类似于原代码中的 setTimeout/scrollToEnd 逻辑，这里设置额外的滚动高度确保输入框可见
     extraHeight: 100,
     // 禁用自带的 ScrollView 自动 inset，由外部 padding 控制
     enableAutomaticScroll: true,
     ...(Platform.OS === 'ios'
-      ? { contentInsetAdjustmentBehavior: childAttrs['contentInsetAdjustmentBehavior'] ?? contentInsetBehaviorIOS }
+      ? {
+          contentInsetAdjustmentBehavior:
+            childProps.contentInsetAdjustmentBehavior ??
+            contentInsetBehaviorIOS,
+        }
       : {}),
-  };
+  });
 
-  const t = (element as React.ReactElement).type;
+  const t = element.type;
 
   // 根据组件类型返回对应的 KeyboardAware 版本
   // 注意：不再使用 KeyboardAvoidingView，直接替换为增强版 ScrollView
   if (t === ScrollView) {
-    return <KeyboardAwareScrollView {...commonProps} />;
+    const childProps = element.props as ScrollViewProps;
+    return (
+      <KeyboardAwareScrollView {...createKeyboardAwareProps(childProps)} />
+    );
   }
 
   if (t === FlatList) {
-    return <KeyboardAwareFlatList {...commonProps} />;
+    const childProps = element.props as FlatListProps<unknown>;
+    return <KeyboardAwareFlatList {...createKeyboardAwareProps(childProps)} />;
   }
 
   if (t === SectionList) {
-    return <KeyboardAwareSectionList {...commonProps} />;
+    const childProps = element.props as SectionListProps<unknown>;
+    return (
+      <KeyboardAwareSectionList {...createKeyboardAwareProps(childProps)} />
+    );
   }
 
   // 理论上不应运行到这里，如果是非标准组件则原样返回，仅修改样式
+  const childProps = element.props as NativeScrollableProps;
   return React.cloneElement(element, {
-    contentContainerStyle: enhancedContentStyle,
-    keyboardShouldPersistTaps: childAttrs['keyboardShouldPersistTaps'] ?? 'handled',
-    keyboardDismissMode: childAttrs['keyboardDismissMode'] ?? 'on-drag',
+    contentContainerStyle: createEnhancedContentStyle(
+      childProps.contentContainerStyle,
+    ),
+    keyboardShouldPersistTaps:
+      childProps.keyboardShouldPersistTaps ?? 'handled',
+    keyboardDismissMode: childProps.keyboardDismissMode ?? 'on-drag',
   });
 };
 

package/lib/__templates__/expo/client/heroui/components/toast/toast.tsx

@@ -1,5 +1,9 @@
 import React, { forwardRef, useMemo } from 'react';
-import { View, Text as RNText } from 'react-native';
+import {
+  type GestureResponderEvent,
+  View,
+  Text as RNText,
+} from 'react-native';
 import { GestureDetector } from 'react-native-gesture-handler';
 import Animated from 'react-native-reanimated';
 import { useThemeColor } from '../../helpers/external/hooks';
@@ -339,7 +343,7 @@ const ToastClose = forwardRef<View, ToastCloseProps>((props, ref) => {
    * If hide and id are available from context, use them to hide the toast
    * Otherwise, use the provided onPress handler
    */
-  const handlePress = (event: Parameters<NonNullable<React.ComponentProps<typeof Button>['onPress']>>[0]) => {
+  const handlePress = (event: GestureResponderEvent) => {
     if (hide && id) {
       hide(id);
     }

package/lib/__templates__/expo/client/heroui/helpers/internal/hooks/use-controllable-state.ts

@@ -108,7 +108,7 @@ function useUncontrolledState<T>({
  * A custom hook that converts a callback to a ref to avoid triggering re-renders when passed as a
  * prop or avoid re-executing effects when passed as a dependency
  */
-function useCallbackRef<T extends (...args: unknown[]) => unknown>(
+function useCallbackRef<T extends (...args: never[]) => unknown>(
   callback: T | undefined
 ): T {
   const callbackRef = useRef(callback);

package/lib/__templates__/nextjs/next.config.ts

@@ -1,9 +1,18 @@
 import type { NextConfig } from 'next';
+import path from 'path';
 
 const nextConfig: NextConfig = {
   // outputFileTracingRoot: path.resolve(__dirname, '../../'),  // Uncomment and add 'import path from "path"' if needed
   /* config options here */
   serverExternalPackages: ['coze-coding-dev-sdk'],
+  webpack: (config, { dev }) => {
+    if (dev && config.cache && config.cache.type === 'filesystem') {
+      config.cache.cacheDirectory = path.resolve(
+        'node_modules/.cache/next-webpack',
+      );
+    }
+    return config;
+  },
   allowedDevOrigins: ['*.dev.coze.site'],
   images: {
     remotePatterns: [

package/lib/__templates__/nextjs/package.json

@@ -73,8 +73,6 @@
     "zod": "^4.3.5"
   },
   "devDependencies": {
-    "@react-dev-inspector/babel-plugin": "^2.0.1",
-    "@react-dev-inspector/middleware": "^2.0.1",
     "@tailwindcss/postcss": "^4",
     "@types/node": "^20",
     "@types/pg": "^8.16.0",
@@ -83,7 +81,6 @@
     "eslint": "^9",
     "eslint-config-next": "16.1.1",
     "only-allow": "^1.2.2",
-    "react-dev-inspector": "^2.0.1",
     "shadcn": "latest",
     "stylelint": "^16.4.0",
     "stylelint-config-standard": "^38.0.0",