@mpxjs/webpack-plugin 2.9.69 → 2.9.70-alpha.0

package/lib/runtime/components/react/mpx-picker/index.tsx

@@ -32,10 +32,11 @@ import { FormContext, FormFieldValue } from '../context'
  */
 
 const _Picker = forwardRef<HandlerRef<View, PickerProps>, PickerProps>((props: PickerProps, ref): React.JSX.Element => {
-  const { mode = 'selector', value, bindcancel, bindchange, children, bindcolumnchange } = props
+  const { mode = 'selector', value, bindcancel, bindchange, children, bindcolumnchange, style } = props
   const innerLayout = useRef({})
   const nodeRef = useRef(null)
   useNodesRef<View, PickerProps>(props, ref, nodeRef, {
+    style
   })
   const innerProps = useInnerProps(props, {
     ref: nodeRef
@@ -92,7 +93,7 @@ const _Picker = forwardRef<HandlerRef<View, PickerProps>, PickerProps>((props: P
     bindcolumnchange && bindcolumnchange(eventData)
   }
   const commonProps = {
-    ...{ innerProps },
+    ...innerProps,
     mode,
     children,
     bindchange: onChange,

package/lib/runtime/components/react/mpx-picker/multiSelector.tsx

@@ -80,7 +80,7 @@ function getColumnIndexByValue (range: any[] = [], column: number, value: any[]
 }
 
 const _MultiSelectorPicker = forwardRef<HandlerRef<View, MultiSelectorProps>, MultiSelectorProps>((props: MultiSelectorProps, ref): React.JSX.Element => {
-  const { range, value, disabled, bindchange, bindcancel, children, bindcolumnchange } = props
+  const { range, value, disabled, bindchange, bindcancel, children, bindcolumnchange, style } = props
   const formatRange = formatRangeFun(range, props['range-key'])
   const initValue = getInnerValueByIndex(formatRange, value)
   // 选中的索引值
@@ -90,7 +90,9 @@ const _MultiSelectorPicker = forwardRef<HandlerRef<View, MultiSelectorProps>, Mu
   // 存储layout布局信息
   const layoutRef = useRef({})
   const viewRef = useRef<View>(null)
-  useNodesRef<View, MultiSelectorProps>(props, ref, viewRef, {
+  const nodeRef = useRef<View>(null)
+  useNodesRef<View, MultiSelectorProps>(props, ref, nodeRef, {
+    style
   })
 
   useEffect(() => {
@@ -126,6 +128,7 @@ const _MultiSelectorPicker = forwardRef<HandlerRef<View, MultiSelectorProps>, Mu
   }
 
   const antPickerProps = {
+    ref: nodeRef,
     data,
     value: selected,
     cols: range.length,

package/lib/runtime/components/react/mpx-picker/region.tsx

@@ -38,14 +38,16 @@ function formateRegionData (clObj: RegionObj[] = [], customItem?: string, depth
 }
 
 const _RegionPicker = forwardRef<HandlerRef<View, RegionProps>, RegionProps>((props: RegionProps, ref): React.JSX.Element => {
-  const { children, value, bindchange, bindcancel, disabled } = props
+  const { children, value, bindchange, bindcancel, disabled, style } = props
   const formatRegionData = formateRegionData(regionData, props['custom-item'])
 
   const [regionvalue, setRegionValue] = useState(value)
   // 存储layout布局信息
   const layoutRef = useRef({})
   const viewRef = useRef<View>(null)
-  useNodesRef<View, RegionProps>(props, ref, viewRef, {
+  const nodeRef = useRef(null)
+  useNodesRef<View, RegionProps>(props, ref, nodeRef, {
+    style
   })
 
   const onChange = (value: string[]): void => {
@@ -83,6 +85,7 @@ const _RegionPicker = forwardRef<HandlerRef<View, RegionProps>, RegionProps>((pr
   }
 
   const regionProps = {
+    ref: nodeRef,
     data: formatRegionData,
     value: regionvalue,
     onChange,

package/lib/runtime/components/react/mpx-picker/selector.tsx

@@ -22,7 +22,7 @@ const formatRangeFun = (range: Array<RangeItemType>, rangeKey = ''): any => {
 }
 
 const _SelectorPicker = forwardRef<HandlerRef<View, SelectorProps>, SelectorProps>((props: SelectorProps, ref): React.JSX.Element => {
-  const { range, children, value, disabled, bindchange, bindcancel } = props
+  const { range, children, value, disabled, bindchange, bindcancel, style } = props
   // 格式化数据为Array<*>
   const formatRange: PickerColumn = formatRangeFun(range, props['range-key'])
   // 选中的索引值
@@ -32,7 +32,9 @@ const _SelectorPicker = forwardRef<HandlerRef<View, SelectorProps>, SelectorProp
   // 存储layout布局信息
   const layoutRef = useRef({})
   const viewRef = useRef<View>(null)
-  useNodesRef<View, SelectorProps>(props, ref, viewRef, {
+  const nodeRef = useRef(null)
+  useNodesRef<View, SelectorProps>(props, ref, nodeRef, {
+    style
   })
 
   useEffect(() => {
@@ -62,6 +64,7 @@ const _SelectorPicker = forwardRef<HandlerRef<View, SelectorProps>, SelectorProp
   }
 
   const antPickerProps = {
+    ref: nodeRef,
     data,
     value: [selected],
     cols: 1,

package/lib/runtime/components/react/mpx-picker/time.tsx

@@ -1,5 +1,5 @@
 import { View, Text, Modal, TouchableWithoutFeedback } from 'react-native'
-import { PickerView } from '@ant-design/react-native'
+import { PickerView, Portal } from '@ant-design/react-native'
 import React, { forwardRef, useState, useRef, useEffect } from 'react'
 import useNodesRef, { HandlerRef } from '../useNodesRef' // 引入辅助函数
 import { TimeProps } from './type'
@@ -13,8 +13,8 @@ const styles: { [key: string]: Object } = {
   showModal: {
     backgroundColor: 'black',
     opacity: 0.5,
-    position: 'absolute',
-    width: '100%'
+    width: '100%',
+    height: '100%'
   },
   hideModal: {
     opacity: 1,
@@ -125,7 +125,7 @@ function checkSelectedIsValid (strStart: string, strEnd: string, selected: numbe
 // start="02:10" end = 23:01
 
 const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: TimeProps, ref): React.JSX.Element => {
-  const { children, start, end, value, bindchange, bindcancel, disabled } = props
+  const { children, start, end, value, bindchange, bindcancel, style } = props
   const defaultProps = {
     start: '00:10',
     end: '23:59'
@@ -135,11 +135,11 @@ const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: T
   // 存储layout布局信息
   const layoutRef = useRef({})
   const viewRef = useRef<View>(null)
-  useNodesRef<View, TimeProps>(props, ref, viewRef, {})
+  const nodeRef = useRef<View>(null)
+  useNodesRef<View, TimeProps>(props, ref, nodeRef, { style })
   // 存储modal的布局信息
   const modalLayoutRef = useRef({})
   const modalRef = useRef<View>(null)
-  useNodesRef<View, TimeProps>(props, ref, modalRef, {})
   const [visible, setVisible] = useState(false)
   const columnData = generateColumns()
   const [data, setData] = useState(columnData)
@@ -188,12 +188,6 @@ const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: T
     } else {
       // [9, 13]
       setTimeValue(date)
-      const strDate = formatStr(date)
-      bindchange && bindchange({
-        detail: {
-          value: strDate
-        }
-      })
     }
   }
 
@@ -213,6 +207,7 @@ const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: T
 
   const renderModalChildren = () => {
     const pickerProps = {
+      ref: nodeRef,
       data,
       value: timevalue,
       defaultValue: timevalue,
@@ -249,12 +244,11 @@ const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: T
       </TouchableWithoutFeedback>
     </View>
   }
-  const strStyle = visible ? styles.showModal : styles.hideModal
-  const mheight = Math.floor(offsetTop)
 
   // Animated.View
   return (<>
-    <View style={{ ...strStyle, height: visible ? mheight : 0, bottom: 0 }}>
+    <Portal>
+      <View style={visible ? styles.showModal : styles.hideModal}>
       <Modal
         animationType="slide"
         transparent={true}
@@ -263,6 +257,7 @@ const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: T
         {renderModalChildren()}
       </Modal>
     </View>
+    </Portal>
     {renderChildren()}
   </>)
 })

package/lib/runtime/components/react/mpx-picker/type.ts

@@ -3,87 +3,92 @@ import { PickerValue } from '@ant-design/react-native'
 
 export type Obj = Record<string, any>
 export type SelectorProps = {
-  mode: string,
+  mode: string
   // 表示选择了 range 中的第几个（下标从 0 开始）
   value: PickerValue
-  disabled?: boolean,
-  children: ReactNode,
-  bindcancel?: Function,
-  bindchange: Function,
+  disabled?: boolean
+  children: ReactNode
+  bindcancel?: Function
+  bindchange: Function
   // mode 为 selector 或 multiSelector 时，range 有效
-  range: Array<number|string|Obj>,
+  range: Array<number|string|Obj>
   // 当 range 是一个 Object Array 时，通过 range-key 来指定 Object 中 key 的值作为选择器《显示内容》 对象中的属性
-  'range-key': string,
+  'range-key': string
   getInnerLayout: Function
+  style?: Record<string, any>
   // bindcolumnchange?: Function
 }
 
 export type MultiSelectorProps = {
-  mode: string,
+  mode: string
   // 表示选择了 range 中的第几个（下标从 0 开始）
-  value: Array<number>,
-  disabled?: boolean,
-  children: ReactNode,
-  bindcancel?: Function,
-  bindchange: Function,
-  bindcolumnchange?: Function,
+  value: Array<number>
+  disabled?: boolean
+  children: ReactNode
+  bindcancel?: Function
+  bindchange: Function
+  bindcolumnchange?: Function
   // mode 为 selector 或 multiSelector 时，range 有效
-  range: Array<Array<any>>,
+  range: Array<Array<any>>
   // 当 range 是一个 Object Array 时，通过 range-key 来指定 Object 中 key 的值作为选择器《显示内容》 对象中的属性
-  'range-key': string,
+  'range-key': string
   getInnerLayout: Function
+  style?: Record<string, any>
 }
 
 export type TimeProps = {
-  mode: string,
+  mode: string
   // 表示选择了 range 中的第几个（下标从 0 开始）
-  value: string,
-  disabled?: boolean,
-  children: ReactNode,
-  bindcancel?: Function,
-  bindchange: Function,
-  start: string,
-  end: string,
+  value: string
+  disabled?: boolean
+  children: ReactNode
+  bindcancel?: Function
+  bindchange: Function
+  start: string
+  end: string
   getInnerLayout: Function
+  style?: Record<string, any>
 }
 
 export type DateProps = {
-  mode: string,
+  mode: string
   // 表示选择了 range 中的第几个（下标从 0 开始）
-  value: string,
-  fields?: 'day' | 'month' | 'year',
-  disabled?: boolean,
-  children: ReactNode,
-  bindcancel?: Function,
-  bindchange: Function,
-  start: string,
-  end: string,
+  value: string
+  fields?: 'day' | 'month' | 'year'
+  disabled?: boolean
+  children: ReactNode
+  bindcancel?: Function
+  bindchange: Function
+  start: string
+  end: string
   getInnerLayout: Function
+  style?: Record<string, any>
 }
 
 export type RegionProps = {
-  mode: string,
+  mode: string
   // 表示选择了 range 中的第几个（下标从 0 开始）
-  value: Array<string>,
+  value: Array<string>
   level: 'province' | 'city' | 'region' | 'sub-district'
-  'custom-item'?: string,
-  disabled?: boolean,
-  children: ReactNode,
-  bindcancel?: Function,
-  bindchange: Function,
+  'custom-item'?: string
+  disabled?: boolean
+  children: ReactNode
+  bindcancel?: Function
+  bindchange: Function
   getInnerLayout: Function
+  style?: Record<string, any>
 }
 
 export type RegionObj = {
-  value: string,
+  value: string
   code: string
   postcode?: string
   children?: RegionObj[]
 }
 
 export type PickerData = {
-  value: string,
-  label: string,
+  value: string
+  label: string
   children?: Array<Object>
 }
 

package/lib/runtime/components/react/mpx-picker-view-column.tsx

@@ -57,7 +57,10 @@ const _PickerViewColumn = forwardRef<HandlerRef<ScrollView & View, ColumnProps>,
   const { textStyle } = splitStyle(normalStyle)
   const { textProps } = splitProps(props)
   const scrollViewRef = useRef<ScrollView>(null)
-  useNodesRef(props, ref, scrollViewRef, {})
+
+  useNodesRef(props, ref, scrollViewRef, {
+    style: normalStyle
+  })
 
   const { height: pickerH, itemHeight = DefaultPickerItemH } = wrapperStyle
   const [itemRawH, setItemRawH] = useState(0) // 单个选项真实渲染高度

package/lib/runtime/components/react/mpx-picker-view.tsx

@@ -90,7 +90,11 @@ const _PickerView = forwardRef<HandlerRef<View, PickerViewProps>, PickerViewProp
     setWidth,
     setHeight
   } = useTransformStyle(style, { enableVar, externalVarContext })
-  useNodesRef<View, PickerViewProps>(props, ref, nodeRef, {})
+
+  useNodesRef<View, PickerViewProps>(props, ref, nodeRef, {
+    style: normalStyle
+  })
+
   const {
     // 存储layout布局信息
     layoutRef,
@@ -134,6 +138,7 @@ const _PickerView = forwardRef<HandlerRef<View, PickerViewProps>, PickerViewProp
     extendObject({
       ref: nodeRef,
       style: extendObject(
+        {},
         normalStyle,
         layoutStyle,
         {
@@ -151,6 +156,7 @@ const _PickerView = forwardRef<HandlerRef<View, PickerViewProps>, PickerViewProp
     const extraProps = {}
     const childProps = child?.props || {}
     const wrappedProps = extendObject(
+      {},
       childProps,
       {
         columnData,

package/lib/runtime/components/react/mpx-radio-group.tsx

@@ -20,7 +20,7 @@ import { warn } from '@mpxjs/utils'
 import { FormContext, FormFieldValue, RadioGroupContext, GroupValue } from './context'
 import useInnerProps, { getCustomEvent } from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef'
-import { useLayout, useTransformStyle, wrapChildren } from './utils'
+import { useLayout, useTransformStyle, wrapChildren, extendObject } from './utils'
 
 export interface RadioGroupProps {
   name: string
@@ -67,10 +67,7 @@ const radioGroup = forwardRef<
     flexWrap: 'wrap'
   }
 
-  const styleObj = {
-    ...defaultStyle,
-    ...style
-  }
+  const styleObj = extendObject({}, defaultStyle, style)
 
   const {
     hasSelfPercent,
@@ -82,7 +79,7 @@ const radioGroup = forwardRef<
   } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight })
 
   const nodeRef = useRef(null)
-  useNodesRef(props, ref, nodeRef, { defaultStyle })
+  useNodesRef(props, ref, nodeRef, { style: normalStyle })
 
   const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef })
 
@@ -144,12 +141,14 @@ const radioGroup = forwardRef<
 
   const innerProps = useInnerProps(
     props,
-    {
-      ref: nodeRef,
-      style: { ...normalStyle, ...layoutStyle },
-      ...layoutProps
-    },
-    [],
+    extendObject(
+      {
+        ref: nodeRef,
+        style: extendObject({}, normalStyle, layoutStyle)
+      },
+      layoutProps
+    ),
+    ['name'],
     {
       layoutRef
     }

package/lib/runtime/components/react/mpx-radio.tsx

@@ -10,7 +10,7 @@ import { warn } from '@mpxjs/utils'
 import { LabelContext, RadioGroupContext } from './context'
 import useInnerProps, { getCustomEvent } from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef'
-import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren } from './utils'
+import { splitProps, splitStyle, useLayout, useTransformStyle, wrapChildren, extendObject } from './utils'
 import Icon from './mpx-icon'
 
 export interface RadioProps {
@@ -27,7 +27,6 @@ export interface RadioProps {
   'parent-height'?: number;
   children: ReactNode
   bindtap?: (evt: NativeSyntheticEvent<TouchEvent> | unknown) => void
-  catchtap?: (evt: NativeSyntheticEvent<TouchEvent> | unknown) => void
 }
 
 const styles = StyleSheet.create({
@@ -79,8 +78,7 @@ const Radio = forwardRef<HandlerRef<View, RadioProps>, RadioProps>(
       'parent-font-size': parentFontSize,
       'parent-width': parentWidth,
       'parent-height': parentHeight,
-      bindtap,
-      catchtap
+      bindtap
     } = props
 
     const [isChecked, setIsChecked] = useState<boolean>(!!checked)
@@ -91,16 +89,14 @@ const Radio = forwardRef<HandlerRef<View, RadioProps>, RadioProps>(
 
     const labelContext = useContext(LabelContext)
 
-    const defaultStyle = {
-      ...styles.wrapper,
-      ...(isChecked && styles.wrapperChecked),
-      ...(disabled && styles.wrapperDisabled)
-    }
+    const defaultStyle = extendObject(
+      {},
+      styles.wrapper,
+      isChecked ? styles.wrapperChecked : {},
+      disabled ? styles.wrapperDisabled : {}
+    )
 
-    const styleObj = {
-      ...styles.container,
-      ...style
-    }
+    const styleObj = extendObject({}, styles.container, style)
 
     const onChange = (evt: NativeSyntheticEvent<TouchEvent>) => {
       if (disabled || isChecked) return
@@ -116,16 +112,10 @@ const Radio = forwardRef<HandlerRef<View, RadioProps>, RadioProps>(
     }
 
     const onTap = (evt: NativeSyntheticEvent<TouchEvent>) => {
-      if (disabled) return
       bindtap && bindtap(getCustomEvent('tap', evt, { layoutRef }, props))
       onChange(evt)
     }
 
-    const catchTap = (evt: NativeSyntheticEvent<TouchEvent>) => {
-      if (disabled) return
-      catchtap && catchtap(getCustomEvent('tap', evt, { layoutRef }, props))
-    }
-
     const {
       hasSelfPercent,
       normalStyle,
@@ -135,7 +125,7 @@ const Radio = forwardRef<HandlerRef<View, RadioProps>, RadioProps>(
       setHeight
     } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight })
 
-    const { textStyle, backgroundStyle, innerStyle } = splitStyle(normalStyle)
+    const { textStyle, backgroundStyle, innerStyle = {} } = splitStyle(normalStyle)
 
     if (backgroundStyle) {
       warn('Radio does not support background image-related styles!')
@@ -143,7 +133,7 @@ const Radio = forwardRef<HandlerRef<View, RadioProps>, RadioProps>(
 
     const nodeRef = useRef(null)
     useNodesRef(props, ref, nodeRef, {
-      defaultStyle,
+      style: extendObject({}, defaultStyle, normalStyle),
       change: onChange
     })
 
@@ -160,14 +150,21 @@ const Radio = forwardRef<HandlerRef<View, RadioProps>, RadioProps>(
 
     const innerProps = useInnerProps(
       props,
-      {
-        ref: nodeRef,
-        style: { ...innerStyle, ...layoutStyle },
-        ...layoutProps,
-        bindtap: onTap,
-        catchtap: catchTap
-      },
-      [],
+      extendObject(
+        {
+          ref: nodeRef,
+          style: extendObject({}, innerStyle, layoutStyle)
+        },
+        layoutProps,
+        {
+          bindtap: !disabled && onTap
+        }
+      ),
+      [
+        'value',
+        'disabled',
+        'checked'
+      ],
       {
         layoutRef
       }

package/lib/runtime/components/react/mpx-scroll-view.tsx

@@ -38,7 +38,7 @@ import { useAnimatedRef } from 'react-native-reanimated'
 import { warn } from '@mpxjs/utils'
 import useInnerProps, { getCustomEvent } from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef'
-import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, flatGesture, GestureHandler } from './utils'
+import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture, GestureHandler } from './utils'
 import { IntersectionObserverContext } from './context'
 
 interface ScrollViewProps {
@@ -176,10 +176,11 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     setHeight
   } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight })
 
-  const { textStyle, innerStyle } = splitStyle(normalStyle)
+  const { textStyle, innerStyle = {} } = splitStyle(normalStyle)
 
   const scrollViewRef = useAnimatedRef<ScrollView>()
   useNodesRef(props, ref, scrollViewRef, {
+    style: normalStyle,
     scrollOffset: scrollOptions,
     node: {
       scrollEnabled: scrollX || scrollY,
@@ -298,14 +299,13 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     const visibleLength = selectLength(e.nativeEvent.layoutMeasurement)
     const contentLength = selectLength(e.nativeEvent.contentSize)
     const offset = selectOffset(e.nativeEvent.contentOffset)
-    scrollOptions.current = {
-      ...scrollOptions.current,
+    extendObject(scrollOptions.current, {
       contentLength,
       offset,
       scrollLeft: position.scrollLeft,
       scrollTop: position.scrollTop,
       visibleLength
-    }
+    })
   }
 
   function onScroll (e: NativeSyntheticEvent<NativeScrollEvent>) {
@@ -426,34 +426,36 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     updateScrollOptions(e, { scrollLeft, scrollTop })
   }
 
-  let scrollAdditionalProps: ScrollAdditionalProps = {
-    style: { ...innerStyle, ...layoutStyle },
-    pinchGestureEnabled: false,
-    horizontal: scrollX && !scrollY,
-    scrollEventThrottle: scrollEventThrottle,
-    scrollsToTop: enableBackToTop,
-    showsHorizontalScrollIndicator: scrollX && showScrollbar,
-    showsVerticalScrollIndicator: scrollY && showScrollbar,
-    scrollEnabled: scrollX || scrollY,
-    ref: scrollViewRef,
-    onScroll: onScroll,
-    onContentSizeChange: onContentSizeChange,
-    bindtouchstart: ((enhanced && binddragstart) || bindtouchstart) ? onScrollTouchStart : undefined,
-    bindtouchmove: ((enhanced && binddragging) || bindtouchend) ? onScrollTouchMove : undefined,
-    bindtouchend: ((enhanced && binddragend) || bindtouchend) ? onScrollTouchEnd : undefined,
-    onScrollBeginDrag: onScrollDrag,
-    onScrollEndDrag: onScrollDrag,
-    onMomentumScrollEnd: onScrollEnd,
-    ...layoutProps,
-    ...(simultaneousHandlers ? { simultaneousHandlers } : {}),
-    ...(waitForHandlers ? { waitFor: waitForHandlers } : {})
-  }
+  const scrollAdditionalProps: ScrollAdditionalProps = extendObject(
+    {
+      style: extendObject({}, innerStyle, layoutStyle),
+      pinchGestureEnabled: false,
+      horizontal: scrollX && !scrollY,
+      scrollEventThrottle: scrollEventThrottle,
+      scrollsToTop: enableBackToTop,
+      showsHorizontalScrollIndicator: scrollX && showScrollbar,
+      showsVerticalScrollIndicator: scrollY && showScrollbar,
+      scrollEnabled: scrollX || scrollY,
+      ref: scrollViewRef,
+      onScroll: onScroll,
+      onContentSizeChange: onContentSizeChange,
+      bindtouchstart: ((enhanced && binddragstart) || bindtouchstart) && onScrollTouchStart,
+      bindtouchmove: ((enhanced && binddragging) || bindtouchend) && onScrollTouchMove,
+      bindtouchend: ((enhanced && binddragend) || bindtouchend) && onScrollTouchEnd,
+      onScrollBeginDrag: onScrollDrag,
+      onScrollEndDrag: onScrollDrag,
+      onMomentumScrollEnd: onScrollEnd
+    },
+    (simultaneousHandlers ? { simultaneousHandlers } : {}),
+    (waitForHandlers ? { waitFor: waitForHandlers } : {}),
+    layoutProps
+  )
+
   if (enhanced) {
-    scrollAdditionalProps = {
-      ...scrollAdditionalProps,
+    Object.assign(scrollAdditionalProps, {
       bounces,
       pagingEnabled
-    }
+    })
   }
 
   const innerProps = useInnerProps(props, scrollAdditionalProps, [

package/lib/runtime/components/react/mpx-simple-text.tsx

@@ -0,0 +1,18 @@
+import { Text, TextProps } from 'react-native'
+import { JSX, createElement } from 'react'
+
+import { extendObject } from './utils'
+
+const _Text2 = (props: TextProps): JSX.Element => {
+  const {
+    allowFontScaling = false
+  } = props
+
+  return createElement(Text, extendObject({}, props, {
+    allowFontScaling
+  }))
+}
+
+_Text2.displayName = 'MpxSimpleText'
+
+export default _Text2

package/lib/runtime/components/react/mpx-swiper/carouse.tsx

@@ -57,7 +57,7 @@ const _Carouse = forwardRef<HandlerRef<ScrollView & View, CarouseProps>, Carouse
     parentWidth,
     parentHeight
   } = props
-  // 计算transfrom之类的
+  // 计算transform之类的
   const {
     normalStyle,
     hasVarDec,
@@ -92,7 +92,9 @@ const _Carouse = forwardRef<HandlerRef<ScrollView & View, CarouseProps>, Carouse
   // 内部存储上一次的offset值
   const autoplayTimerRef = useRef<ReturnType <typeof setTimeout> | null>(null)
   const scrollViewRef = useRef<ScrollView & View>(null)
-  useNodesRef<ScrollView & View, CarouseProps>(props, ref, scrollViewRef, {})
+  useNodesRef<ScrollView & View, CarouseProps>(props, ref, scrollViewRef, {
+    style: normalStyle
+  })
   const {
     // 存储layout布局信息
     layoutRef,