@mpxjs/webpack-plugin 2.10.3-beta.4 → 2.10.4

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

@@ -10,7 +10,7 @@
  * ✔ enable-back-to-top
  * ✘ enable-passive
  * ✔ refresher-enabled
- * ✘ refresher-threshold
+ * ✔ refresher-threshold(仅自定义下拉节点样式支持)
  * ✔ refresher-default-style(仅 android 支持)
  * ✔ refresher-background(仅 android 支持)
  * ✔ refresher-triggered
@@ -31,14 +31,14 @@
  * ✔ bindscrolltolower
  * ✔ bindscroll
  */
-import { ScrollView, RefreshControl } from 'react-native-gesture-handler'
+import { ScrollView, RefreshControl, Gesture, GestureDetector } from 'react-native-gesture-handler'
 import { View, NativeSyntheticEvent, NativeScrollEvent, LayoutChangeEvent, ViewStyle } from 'react-native'
-import { JSX, ReactNode, RefObject, useRef, useState, useEffect, forwardRef, useContext, createElement, useMemo } from 'react'
-import { useAnimatedRef } from 'react-native-reanimated'
+import { isValidElement, Children, JSX, ReactNode, RefObject, useRef, useState, useEffect, forwardRef, useContext, useMemo, createElement } from 'react'
+import Animated, { useAnimatedRef, useSharedValue, withTiming, useAnimatedStyle, runOnJS } 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, extendObject, flatGesture, GestureHandler } from './utils'
+import { splitProps, splitStyle, useTransformStyle, useLayout, wrapChildren, extendObject, flatGesture, GestureHandler, HIDDEN_STYLE } from './utils'
 import { IntersectionObserverContext, ScrollViewContext } from './context'
 
 interface ScrollViewProps {
@@ -46,6 +46,7 @@ interface ScrollViewProps {
   enhanced?: boolean;
   bounces?: boolean;
   style?: ViewStyle;
+  scrollEventThrottle?: number;
   'scroll-x'?: boolean;
   'scroll-y'?: boolean;
   'enable-back-to-top'?: boolean;
@@ -58,6 +59,7 @@ interface ScrollViewProps {
   'refresher-enabled'?: boolean;
   'refresher-default-style'?: 'black' | 'white' | 'none';
   'refresher-background'?: string;
+  'refresher-threshold'?: number;
   'scroll-top'?: number;
   'scroll-left'?: number;
   'enable-offset'?: boolean;
@@ -90,7 +92,6 @@ type ScrollAdditionalProps = {
   onScroll: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
   onContentSizeChange: (width: number, height: number) => void;
   onLayout?: (event: LayoutChangeEvent) => void;
-  scrollEventThrottle: number;
   scrollsToTop: boolean;
   showsHorizontalScrollIndicator: boolean;
   showsVerticalScrollIndicator: boolean;
@@ -106,6 +107,7 @@ type ScrollAdditionalProps = {
   onScrollEndDrag?: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
   onMomentumScrollEnd?: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
 };
+
 const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, ScrollViewProps>((scrollViewProps: ScrollViewProps = {}, ref): JSX.Element => {
   const { textProps, innerProps: props = {} } = splitProps(scrollViewProps)
   const {
@@ -129,6 +131,7 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     'refresher-enabled': refresherEnabled,
     'refresher-default-style': refresherDefaultStyle,
     'refresher-background': refresherBackground,
+    'refresher-threshold': refresherThreshold = 45,
     'show-scrollbar': showScrollbar = true,
     'scroll-into-view': scrollIntoView = '',
     'scroll-top': scrollTop = 0,
@@ -148,11 +151,21 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
   const simultaneousHandlers = flatGesture(originSimultaneousHandlers)
   const waitForHandlers = flatGesture(waitFor)
 
-  const [refreshing, setRefreshing] = useState(true)
-
   const snapScrollTop = useRef(0)
   const snapScrollLeft = useRef(0)
 
+  const [refreshing, setRefreshing] = useState(false)
+
+  const [enableScroll, setEnableScroll] = useState(true)
+  const enableScrollValue = useSharedValue(true)
+
+  const [scrollBounces, setScrollBounces] = useState(false)
+  const bouncesValue = useSharedValue(!!false)
+
+  const translateY = useSharedValue(0)
+  const isAtTop = useSharedValue(true)
+  const refresherHeight = useSharedValue(0)
+
   const scrollOptions = useRef({
     contentLength: 0,
     offset: 0,
@@ -168,6 +181,14 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
 
   const firstScrollIntoViewChange = useRef<boolean>(false)
 
+  const refreshColor = {
+    black: ['#000'],
+    white: ['#fff']
+  }
+
+  const { refresherContent, otherContent } = getRefresherContent(props.children)
+  const hasRefresher = refresherContent && refresherEnabled
+
   const {
     normalStyle,
     hasVarDec,
@@ -203,6 +224,10 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
 
   const { layoutRef, layoutStyle, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: scrollViewRef, onLayout })
 
+  const hasRefresherLayoutRef = useRef(false)
+
+  // layout 完成前先隐藏，避免安卓闪烁问题
+  const refresherLayoutStyle = useMemo(() => { return !hasRefresherLayoutRef.current ? HIDDEN_STYLE : {} }, [hasRefresherLayoutRef.current])
   const lastOffset = useRef(0)
 
   if (scrollX && scrollY) {
@@ -222,12 +247,6 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     }
   }, [scrollTop, scrollLeft])
 
-  useEffect(() => {
-    if (refreshing !== refresherTriggered) {
-      setRefreshing(!!refresherTriggered)
-    }
-  }, [refresherTriggered])
-
   useEffect(() => {
     if (scrollIntoView && __selectRef) {
       if (!firstScrollIntoViewChange.current) {
@@ -239,6 +258,22 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     firstScrollIntoViewChange.current = true
   }, [scrollIntoView])
 
+  useEffect(() => {
+    if (refresherEnabled) {
+      setRefreshing(!!refresherTriggered)
+
+      if (!refresherContent) return
+
+      if (refresherTriggered) {
+        translateY.value = withTiming(refresherHeight.value)
+        resetScrollState(false)
+      } else {
+        translateY.value = withTiming(0)
+        resetScrollState(true)
+      }
+    }
+  }, [refresherTriggered])
+
   function scrollTo ({ top = 0, left = 0, animated = false } : { top?: number; left?: number; animated?: boolean }) {
     scrollToOffset(left, top, animated)
   }
@@ -249,7 +284,7 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     const { nodeRef } = refs.getNodeInstance()
     nodeRef.current?.measureLayout(
       scrollViewRef.current,
-      (left: number, top:number) => {
+      (left: number, top: number) => {
         scrollToOffset(left, top)
       }
     )
@@ -333,6 +368,7 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     const { bindscroll } = props
     const { x: scrollLeft, y: scrollTop } = e.nativeEvent.contentOffset
     const { width: scrollWidth, height: scrollHeight } = e.nativeEvent.contentSize
+    isAtTop.value = scrollTop <= 0
     bindscroll &&
       bindscroll(
         getCustomEvent('scroll', e, {
@@ -359,6 +395,7 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     const { bindscrollend } = props
     const { x: scrollLeft, y: scrollTop } = e.nativeEvent.contentOffset
     const { width: scrollWidth, height: scrollHeight } = e.nativeEvent.contentSize
+    isAtTop.value = scrollTop <= 0
     bindscrollend &&
       bindscrollend(
         getCustomEvent('scrollend', e, {
@@ -394,14 +431,6 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     }
   }
 
-  function onRefresh () {
-    const { bindrefresherrefresh } = props
-    bindrefresherrefresh &&
-      bindrefresherrefresh(
-        getCustomEvent('refresherrefresh', {}, { layoutRef }, props)
-      )
-  }
-
   function onScrollTouchStart (e: NativeSyntheticEvent<TouchEvent>) {
     const { bindtouchstart } = props
     bindtouchstart && bindtouchstart(e)
@@ -462,6 +491,156 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     onScrollDrag(e)
   }
 
+  // 处理刷新
+  function onRefresh () {
+    if (hasRefresher && refresherTriggered === undefined) {
+      // 处理使用了自定义刷新组件，又没设置 refresherTriggered 的情况
+      setRefreshing(true)
+      setTimeout(() => {
+        setRefreshing(false)
+        translateY.value = withTiming(0)
+        if (!enableScrollValue.value) {
+          resetScrollState(true)
+        }
+      }, 500)
+    }
+    const { bindrefresherrefresh } = props
+    bindrefresherrefresh &&
+      bindrefresherrefresh(
+        getCustomEvent('refresherrefresh', {}, { layoutRef }, props)
+      )
+  }
+
+  function getRefresherContent (children: ReactNode) {
+    let refresherContent = null
+    const otherContent: ReactNode[] = []
+
+    Children.forEach(children, (child) => {
+      if (isValidElement(child) && child.props.slot === 'refresher') {
+        refresherContent = child
+      } else {
+        otherContent.push(child)
+      }
+    })
+
+    return {
+      refresherContent,
+      otherContent
+    }
+  }
+
+  // 刷新控件的动画样式
+  const refresherAnimatedStyle = useAnimatedStyle(() => {
+    return {
+      position: 'absolute',
+      left: 0,
+      right: 0,
+      top: -refresherHeight.value, // 初始隐藏在顶部
+      transform: [{ translateY: Math.min(translateY.value, refresherHeight.value) }],
+      backgroundColor: refresherBackground || 'transparent'
+    }
+  })
+
+  // 内容区域的动画样式 - 只有内容区域需要下移
+  const contentAnimatedStyle = useAnimatedStyle(() => {
+    return {
+      transform: [{
+        translateY: translateY.value > refresherHeight.value
+          ? refresherHeight.value
+          : translateY.value
+      }]
+    }
+  })
+
+  function onRefresherLayout (e: LayoutChangeEvent) {
+    const { height } = e.nativeEvent.layout
+    refresherHeight.value = height
+    hasRefresherLayoutRef.current = true
+  }
+
+  function updateScrollState (newValue: boolean) {
+    'worklet'
+    if (enableScrollValue.value !== newValue) {
+      enableScrollValue.value = newValue
+      runOnJS(setEnableScroll)(newValue)
+    }
+  }
+
+  const resetScrollState = (value: boolean) => {
+    enableScrollValue.value = value
+    setEnableScroll(value)
+  }
+
+  function updateBouncesState (newValue: boolean) {
+    'worklet'
+    if (bouncesValue.value !== newValue) {
+      bouncesValue.value = newValue
+      runOnJS(setScrollBounces)(newValue)
+    }
+  }
+
+  // 处理下拉刷新的手势
+  const panGesture = Gesture.Pan()
+    .onUpdate((event) => {
+      'worklet'
+      if (enhanced && !!bounces) {
+        if (event.translationY > 0 && bouncesValue.value) {
+          updateBouncesState(false)
+        } else if ((event.translationY < 0) && !bouncesValue.value) {
+          updateBouncesState(true)
+        }
+      }
+
+      if (translateY.value <= 0 && event.translationY < 0) {
+        // 滑动到顶再向上开启滚动
+        updateScrollState(true)
+      } else if (event.translationY > 0 && isAtTop.value) {
+        // 滚动到顶再向下禁止滚动
+        updateScrollState(false)
+      }
+      // 禁止滚动后切换为滑动
+      if (!enableScrollValue.value && isAtTop.value) {
+        if (refreshing) {
+          // 从完全展开状态(refresherHeight.value)开始计算偏移
+          translateY.value = Math.max(
+            0,
+            Math.min(
+              refresherHeight.value,
+              refresherHeight.value + event.translationY
+            )
+          )
+        } else if (event.translationY > 0) {
+          // 非刷新状态下的下拉逻辑保持不变
+          translateY.value = Math.min(event.translationY * 0.6, refresherHeight.value)
+        }
+      }
+    })
+    .onEnd((event) => {
+      'worklet'
+      if (enableScrollValue.value) return
+      if (refreshing) {
+        // 刷新状态下，根据滑动距离决定是否隐藏
+        // 如果向下滑动没超过 refresherThreshold，就完全隐藏，如果向上滑动完全隐藏
+        if ((event.translationY > 0 && translateY.value < refresherThreshold) || event.translationY < 0) {
+          translateY.value = withTiming(0)
+          updateScrollState(true)
+          runOnJS(setRefreshing)(false)
+        } else {
+          translateY.value = withTiming(refresherHeight.value)
+        }
+      } else if (event.translationY >= refresherHeight.value) {
+        // 触发刷新
+        translateY.value = withTiming(refresherHeight.value)
+        runOnJS(onRefresh)()
+      } else {
+        // 回弹
+        translateY.value = withTiming(0)
+        updateScrollState(true)
+        runOnJS(setRefreshing)(false)
+      }
+    })
+    .simultaneousWithExternalGesture(scrollViewRef)
+
   const scrollAdditionalProps: ScrollAdditionalProps = extendObject(
     {
       style: extendObject({}, innerStyle, layoutStyle),
@@ -473,7 +652,8 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
       scrollsToTop: enableBackToTop,
       showsHorizontalScrollIndicator: scrollX && showScrollbar,
       showsVerticalScrollIndicator: scrollY && showScrollbar,
-      scrollEnabled: scrollX || scrollY,
+      scrollEnabled: !enableScroll ? false : !!(scrollX || scrollY),
+      bounces: false,
       ref: scrollViewRef,
       onScroll: onScroll,
       onContentSizeChange: onContentSizeChange,
@@ -491,7 +671,7 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
 
   if (enhanced) {
     Object.assign(scrollAdditionalProps, {
-      bounces,
+      bounces: hasRefresher ? scrollBounces : !!bounces,
       pagingEnabled
     })
   }
@@ -524,35 +704,61 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     'bindrefresherrefresh'
   ], { layoutRef })
 
-  const refreshColor = {
-    black: ['#000'],
-    white: ['#fff']
-  }
+  const withRefresherScrollView = createElement(
+    GestureDetector,
+    { gesture: panGesture },
+    createElement(
+      ScrollView,
+      innerProps,
+      createElement(
+        Animated.View,
+        { style: [refresherAnimatedStyle, refresherLayoutStyle], onLayout: onRefresherLayout },
+        refresherContent
+      ),
+      createElement(
+        Animated.View,
+        { style: contentAnimatedStyle },
+        createElement(
+          ScrollViewContext.Provider,
+          { value: contextValue },
+          wrapChildren(
+            extendObject({}, props, { children: otherContent }),
+            {
+              hasVarDec,
+              varContext: varContextRef.current,
+              textStyle,
+              textProps
+            }
+          )
+        )
+      )
+    )
+  )
 
-  return createElement(
+  const commonScrollView = createElement(
     ScrollView,
-    extendObject({}, innerProps, {
+    extendObject(innerProps, {
       refreshControl: refresherEnabled
         ? createElement(RefreshControl, extendObject({
           progressBackgroundColor: refresherBackground,
           refreshing: refreshing,
           onRefresh: onRefresh
-        }, (refresherDefaultStyle && refresherDefaultStyle !== 'none' ? { colors: refreshColor[refresherDefaultStyle] } : null)))
+        }, refresherDefaultStyle && refresherDefaultStyle !== 'none'
+          ? { colors: refreshColor[refresherDefaultStyle] }
+          : {}))
         : undefined
     }),
-    createElement(ScrollViewContext.Provider,
-      { value: contextValue },
-      wrapChildren(
-        props,
-        {
-          hasVarDec,
-          varContext: varContextRef.current,
-          textStyle,
-          textProps
-        }
-      )
+    createElement(ScrollViewContext.Provider, { value: contextValue },
+      wrapChildren(props, {
+        hasVarDec,
+        varContext: varContextRef.current,
+        textStyle,
+        textProps
+      })
     )
   )
+
+  return hasRefresher ? withRefresherScrollView : commonScrollView
 })
 
 _ScrollView.displayName = 'MpxScrollView'

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

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

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

@@ -1,23 +1,18 @@
 import { View, ViewProps, TextStyle } from 'react-native'
-import { createElement, forwardRef, useRef } from 'react'
-import useNodesRef, { HandlerRef } from './useNodesRef'
-import { extendObject, splitProps, splitStyle, wrapChildren } from './utils'
-
-const _View2 = forwardRef<HandlerRef<View, ViewProps>, ViewProps>((simpleViewProps: ViewProps, ref) => {
-  const nodeRef = useRef(null)
+import { createElement } from 'react'
+import { splitProps, splitStyle, wrapChildren } from './utils'
+import useInnerProps from './getInnerListeners'
 
+const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
   const { textProps, innerProps: props = {} } = splitProps(simpleViewProps)
 
   const { textStyle, innerStyle = {} } = splitStyle(props.style || {})
 
-  useNodesRef(props, ref, nodeRef, {
-    style: innerStyle || {}
-  })
+  const innerProps = useInnerProps(props, {
+    style: innerStyle
+  }, [])
 
-  return createElement(View, extendObject({}, props, {
-    style: innerStyle,
-    ref: nodeRef
-  }), wrapChildren(
+  return createElement(View, innerProps, wrapChildren(
     props,
     {
       hasVarDec: false,
@@ -25,8 +20,8 @@ const _View2 = forwardRef<HandlerRef<View, ViewProps>, ViewProps>((simpleViewPro
       textProps
     }
   ))
-})
+}
 
-_View2.displayName = 'MpxSimpleView'
+SimpleView.displayName = 'MpxSimpleView'
 
-export default _View2
+export default SimpleView

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

@@ -55,7 +55,6 @@ interface SwiperProps {
   'parent-width'?: number;
   'parent-height'?: number;
   'external-var-context'?: Record<string, any>;
-  disableGesture?: boolean;
   bindchange?: (event: NativeSyntheticEvent<TouchEvent> | unknown) => void;
 }
 
@@ -137,8 +136,7 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
     'external-var-context': externalVarContext,
     style = {},
     autoplay = false,
-    circular = false,
-    disableGesture = false
+    circular = false
   } = props
   const easeingFunc = props['easing-function'] || 'default'
   const easeDuration = props.duration || 500
@@ -732,7 +730,7 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
     </View>)
   }
 
-  if (children.length === 1 || disableGesture) {
+  if (children.length === 1) {
     return renderSwiper()
   } else {
     return (<GestureDetector gesture={gestureHandler}>

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

@@ -233,7 +233,7 @@ const MpxVideo = forwardRef<HandlerRef<View, VideoProps>, VideoProps>((videoProp
         {},
         {
           detail: {
-            position: Platform.OS === 'android' ? seekTime * 1000 : seekTime
+            position: __mpx_mode__ !== 'ios' ? seekTime * 1000 : seekTime
           },
           layoutRef
         },
@@ -326,7 +326,7 @@ const MpxVideo = forwardRef<HandlerRef<View, VideoProps>, VideoProps>((videoProp
   if (isDrm) {
     source.drm = {
       type: DRMType.FAIRPLAY,
-      certificateUrl: Platform.OS === 'android' ? provisionUrl : certificateUrl,
+      certificateUrl: __mpx_mode__ !== 'ios' ? provisionUrl : certificateUrl,
       licenseServer: licenseUrl
     }
   }

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

@@ -143,7 +143,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
   }
 
   const _reload = function () {
-    if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {
+    if (__mpx_mode__ !== 'ios') {
       fristLoaded.current = false // 安卓需要重新设置
     }
     setPageLoadErr(false)
@@ -189,7 +189,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
   }
 
   const _onLoadProgress = function (event: WebViewProgressEvent) {
-    if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {
+    if (__mpx_mode__ !== 'ios') {
       canGoBack.current = event.nativeEvent.canGoBack
     }
   }
@@ -305,8 +305,8 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
     }
   }
   const onLoadEnd = function (res: WebViewEvent) {
-    res.persist()
-    if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {
+    if (__mpx_mode__ !== 'ios') {
+      res.persist()
       setTimeout(() => {
         onLoadEndHandle(res)
       }, 0)

package/lib/runtime/components/react/types/getInnerListeners.d.ts

@@ -53,6 +53,9 @@ interface UseInnerPropsConfig {
 interface DataSetType {
   [key: string]: string;
 }
+interface ExtendedNativeTouchEvent extends NativeTouchEvent {
+  _stoppedEventTypes?: Set<string>
+}
 
 export {
   NativeTouchEvent,
@@ -64,5 +67,6 @@ export {
   LayoutRef,
   SetTimeoutReturnType,
   DataSetType,
-  Navigation
+  Navigation,
+  ExtendedNativeTouchEvent
 }

package/lib/runtime/components/react/utils.tsx

@@ -99,7 +99,7 @@ export function isText (ele: ReactNode): ele is ReactElement {
   if (isValidElement(ele)) {
     const displayName = (ele.type as ExtendedFunctionComponent)?.displayName
     const isCustomText = (ele.type as ExtendedFunctionComponent)?.isCustomText
-    return displayName === 'MpxText' || displayName === 'MpxSimpleText' || displayName === 'Text' || !!isCustomText
+    return displayName === 'MpxText' || displayName === 'MpxSimpleText' || displayName === 'MpxInlineText' || displayName === 'Text' || !!isCustomText
   }
   return false
 }

package/lib/runtime/components/web/mpx-input.vue

@@ -85,7 +85,7 @@
       const domProps = {
         name: this.name,
         value: this.value,
-        type: this.password ? 'password' : this.type,
+        type: this.password ? 'password' : this.type === 'digit' ? 'number' : this.type,
         placeholder: this.placeholder,
         disabled: this.disabled,
         autofocus: this.focus || this.autoFocus

package/lib/runtime/stringify.wxs

@@ -223,13 +223,13 @@ function normalizeDynamicStyle (value) {
 }
 
 module.exports = {
-  stringifyClass: function (staticClass, dynamicClass) {
+  c: function (staticClass, dynamicClass) {
     if (typeof staticClass !== 'string') {
       return console.log('Template attr class must be a string!')
     }
     return concat(staticClass, mpEscape(stringifyDynamicClass(dynamicClass)))
   },
-  stringifyStyle: function (staticStyle, dynamicStyle) {
+  s: function (staticStyle, dynamicStyle) {
     var normalizedDynamicStyle = normalizeDynamicStyle(dynamicStyle)
     var parsedStaticStyle = typeof staticStyle === 'string' ? parseStyleText(staticStyle) : {}
     return genStyleText(extend(parsedStaticStyle, normalizedDynamicStyle))