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

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

@@ -1,6 +1,7 @@
 import { Text, TextProps } from 'react-native'
 import { JSX, createElement } from 'react'
 import useInnerProps from './getInnerListeners'
+import { extendObject } from './utils'
 
 const SimpleText = (props: TextProps): JSX.Element => {
   const {
@@ -8,9 +9,15 @@ const SimpleText = (props: TextProps): JSX.Element => {
     children
   } = props
 
-  const innerProps = useInnerProps(props, {
-    allowFontScaling
-  }, [])
+  const innerProps = useInnerProps(
+    extendObject(
+      {},
+      props,
+      {
+        allowFontScaling
+      }
+    )
+  )
 
   return createElement(Text, innerProps, children)
 }

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

@@ -1,6 +1,6 @@
 import { View, ViewProps, TextStyle } from 'react-native'
 import { createElement } from 'react'
-import { splitProps, splitStyle, wrapChildren } from './utils'
+import { splitProps, splitStyle, wrapChildren, extendObject } from './utils'
 import useInnerProps from './getInnerListeners'
 
 const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
@@ -8,9 +8,15 @@ const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
 
   const { textStyle, innerStyle = {} } = splitStyle(props.style || {})
 
-  const innerProps = useInnerProps(props, {
-    style: innerStyle
-  }, [])
+  const innerProps = useInnerProps(
+    extendObject(
+      {},
+      props,
+      {
+        style: innerStyle
+      }
+    )
+  )
 
   return createElement(View, innerProps, wrapChildren(
     props,

package/lib/runtime/components/react/mpx-sticky-header.tsx

@@ -0,0 +1,176 @@
+import { useEffect, useRef, useState, useContext, forwardRef, useMemo, createElement, ReactNode, useId } from 'react'
+import { Animated, StyleSheet, View, NativeSyntheticEvent, ViewStyle, LayoutChangeEvent } from 'react-native'
+import { ScrollViewContext, StickyContext } from './context'
+import useNodesRef, { HandlerRef } from './useNodesRef'
+import { splitProps, splitStyle, useTransformStyle, wrapChildren, useLayout, extendObject } from './utils'
+import { error } from '@mpxjs/utils'
+import useInnerProps, { getCustomEvent } from './getInnerListeners'
+
+interface StickyHeaderProps {
+  children?: ReactNode;
+  style?: ViewStyle;
+  padding?: [number, number, number, number];
+  'offset-top'?: number;
+  'enable-var'?: boolean;
+  'external-var-context'?: Record<string, any>;
+  'parent-font-size'?: number;
+  'parent-width'?: number;
+  'parent-height'?: number;
+  bindstickontopchange?: (e: NativeSyntheticEvent<unknown>) => void;
+}
+
+const _StickyHeader = forwardRef<HandlerRef<View, StickyHeaderProps>, StickyHeaderProps>((stickyHeaderProps: StickyHeaderProps = {}, ref): JSX.Element => {
+  const { textProps, innerProps: props = {} } = splitProps(stickyHeaderProps)
+  const {
+    style,
+    bindstickontopchange,
+    padding = [0, 0, 0, 0],
+    'offset-top': offsetTop = 0,
+    'enable-var': enableVar,
+    'external-var-context': externalVarContext,
+    'parent-font-size': parentFontSize,
+    'parent-width': parentWidth,
+    'parent-height': parentHeight
+  } = props
+
+  const scrollViewContext = useContext(ScrollViewContext)
+  const stickyContext = useContext(StickyContext)
+  const { scrollOffset } = scrollViewContext
+  const { registerStickyHeader, unregisterStickyHeader } = stickyContext
+  const headerRef = useRef<View>(null)
+  const isStickOnTopRef = useRef(false)
+  const id = useId()
+
+  const {
+    normalStyle,
+    hasVarDec,
+    varContextRef,
+    hasSelfPercent,
+    setWidth,
+    setHeight
+  } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight })
+
+  const { layoutRef, layoutProps } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: headerRef, onLayout })
+
+  const { textStyle, innerStyle = {} } = splitStyle(normalStyle)
+
+  const headerTopAnimated = useRef(new Animated.Value(0)).current
+
+  useEffect(() => {
+    registerStickyHeader({ key: id, updatePosition })
+    return () => {
+      unregisterStickyHeader(id)
+    }
+  }, [])
+
+  function updatePosition () {
+    if (headerRef.current) {
+      const scrollViewRef = scrollViewContext.gestureRef
+      if (scrollViewRef && scrollViewRef.current) {
+        headerRef.current.measureLayout(
+          scrollViewRef.current,
+          (left: number, top: number) => {
+            Animated.timing(headerTopAnimated, {
+              toValue: top,
+              duration: 0,
+              useNativeDriver: true
+            }).start()
+          }
+        )
+      } else {
+        error('StickyHeader measureLayout error: scrollViewRef is not a valid native component reference')
+      }
+    }
+  }
+
+  function onLayout (e: LayoutChangeEvent) {
+    updatePosition()
+  }
+
+  useNodesRef(props, ref, headerRef, {
+    style: normalStyle
+  })
+
+  useEffect(() => {
+    if (!bindstickontopchange) return
+
+    const listener = scrollOffset.addListener((state: { value: number }) => {
+      const currentScrollValue = state.value
+      const newIsStickOnTop = currentScrollValue > (headerTopAnimated as any)._value
+      if (newIsStickOnTop !== isStickOnTopRef.current) {
+        isStickOnTopRef.current = newIsStickOnTop
+        bindstickontopchange(
+          getCustomEvent('stickontopchange', {}, {
+            detail: {
+              isStickOnTop: newIsStickOnTop
+            },
+            layoutRef
+          }, props))
+      }
+    })
+
+    return () => {
+      scrollOffset.removeListener(listener)
+    }
+  }, [])
+
+  const animatedStyle = useMemo(() => {
+    const translateY = Animated.subtract(scrollOffset, headerTopAnimated).interpolate({
+      inputRange: [0, 1],
+      outputRange: [0, 1],
+      extrapolateLeft: 'clamp',
+      extrapolateRight: 'extend'
+    })
+
+    const finalTranslateY = offsetTop === 0
+      ? translateY
+      : Animated.add(
+        translateY,
+        Animated.subtract(scrollOffset, headerTopAnimated).interpolate({
+          inputRange: [0, 1],
+          outputRange: [0, offsetTop],
+          extrapolate: 'clamp'
+        })
+      )
+
+    return {
+      transform: [{ translateY: finalTranslateY }]
+    }
+  }, [scrollOffset, headerTopAnimated, offsetTop])
+
+  const innerProps = useInnerProps(extendObject({}, props, {
+    ref: headerRef,
+    style: extendObject({}, styles.content, innerStyle, animatedStyle, {
+      paddingTop: padding[0] || 0,
+      paddingRight: padding[1] || 0,
+      paddingBottom: padding[2] || 0,
+      paddingLeft: padding[3] || 0
+    })
+  }, layoutProps), [], { layoutRef })
+
+  return (
+    createElement(
+      Animated.View,
+      innerProps,
+      wrapChildren(
+        props,
+        {
+          hasVarDec,
+          varContext: varContextRef.current,
+          textStyle,
+          textProps
+        }
+      )
+    )
+  )
+})
+
+const styles = StyleSheet.create({
+  content: {
+    width: '100%',
+    zIndex: 10
+  }
+})
+
+_StickyHeader.displayName = 'MpxStickyHeader'
+export default _StickyHeader

package/lib/runtime/components/react/mpx-sticky-section.tsx

@@ -0,0 +1,96 @@
+
+import { useRef, forwardRef, createElement, ReactNode, useCallback, useMemo } from 'react'
+import { View, ViewStyle } from 'react-native'
+import useNodesRef, { HandlerRef } from './useNodesRef'
+import { splitProps, splitStyle, useTransformStyle, wrapChildren, useLayout, extendObject } from './utils'
+import { StickyContext } from './context'
+import useInnerProps from './getInnerListeners'
+
+interface StickySectionProps {
+  children?: ReactNode;
+  style?: ViewStyle;
+  'offset-top'?: number;
+  'enable-var'?: boolean;
+  'external-var-context'?: Record<string, any>;
+  'parent-font-size'?: number;
+  'parent-width'?: number;
+  'parent-height'?: number;
+}
+
+const _StickySection = forwardRef<HandlerRef<View, StickySectionProps>, StickySectionProps>((stickySectionProps: StickySectionProps = {}, ref): JSX.Element => {
+  const { textProps, innerProps: props = {} } = splitProps(stickySectionProps)
+  const {
+    style,
+    'enable-var': enableVar,
+    'external-var-context': externalVarContext,
+    'parent-font-size': parentFontSize,
+    'parent-width': parentWidth,
+    'parent-height': parentHeight
+  } = props
+  const sectionRef = useRef<View>(null)
+
+  const {
+    normalStyle,
+    hasVarDec,
+    varContextRef,
+    hasSelfPercent,
+    setWidth,
+    setHeight
+  } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight })
+
+  const { layoutRef, layoutProps, layoutStyle } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: sectionRef, onLayout })
+
+  const { textStyle, innerStyle = {} } = splitStyle(normalStyle)
+
+  const stickyHeaders = useRef<Map<string, any>>(new Map())
+
+  const registerStickyHeader = useCallback((item: { id: string, updatePosition: Function }) => {
+    stickyHeaders.current.set(item.id, item)
+  }, [])
+
+  const unregisterStickyHeader = useCallback((id: string) => {
+    stickyHeaders.current.delete(id)
+  }, [])
+
+  const contextValue = useMemo(() => ({
+    registerStickyHeader,
+    unregisterStickyHeader
+  }), [])
+
+  useNodesRef(props, ref, sectionRef, {
+    style: normalStyle
+  })
+
+  function onLayout () {
+    stickyHeaders.current.forEach(item => {
+      item.updatePosition()
+    })
+  }
+
+  const innerProps = useInnerProps(extendObject({}, props, {
+    style: extendObject(innerStyle, layoutStyle),
+    ref: sectionRef
+  }, layoutProps), [], { layoutRef })
+
+  return (
+    createElement(
+      View,
+      innerProps,
+      createElement(
+        StickyContext.Provider,
+        { value: contextValue },
+        wrapChildren(
+          props,
+          {
+            hasVarDec,
+            varContext: varContextRef.current,
+            textStyle,
+            textProps
+          }
+        )
+      ))
+  )
+})
+
+_StickySection.displayName = 'MpxStickySection'
+export default _StickySection

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

@@ -3,28 +3,28 @@ import Animated, { useAnimatedStyle, interpolate, SharedValue } from 'react-nati
 import { ReactNode, forwardRef, useRef, useContext } from 'react'
 import useInnerProps from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef' // 引入辅助函数
-import { useTransformStyle, splitStyle, splitProps, wrapChildren, useLayout } from './utils'
+import { useTransformStyle, splitStyle, splitProps, wrapChildren, useLayout, extendObject } from './utils'
 import { SwiperContext } from './context'
 
 interface SwiperItemProps {
-  'item-id'?: string;
-  'enable-offset'?: boolean;
-  'enable-var': boolean;
-  'external-var-context'?: Record<string, any>;
-  'parent-font-size'?: number;
-  'parent-width'?: number;
-  'parent-height'?: number;
-  children?: ReactNode;
-  style?: Object;
-  customStyle: Object;
-  itemIndex: number;
+  'item-id'?: string
+  'enable-offset'?: boolean
+  'enable-var': boolean
+  'external-var-context'?: Record<string, any>
+  'parent-font-size'?: number
+  'parent-width'?: number
+  'parent-height'?: number
+  children?: ReactNode
+  style?: Object
+  customStyle: Object
+  itemIndex: number
 }
 
 interface ContextType {
-  offset: SharedValue<number>;
-  step: SharedValue<number>;
-  scale: boolean;
-  dir: string;
+  offset: SharedValue<number>
+  step: SharedValue<number>
+  scale: boolean
+  dir: string
 }
 
 const _SwiperItem = forwardRef<HandlerRef<View, SwiperItemProps>, SwiperItemProps>((props: SwiperItemProps, ref) => {
@@ -64,14 +64,21 @@ const _SwiperItem = forwardRef<HandlerRef<View, SwiperItemProps>, SwiperItemProp
     layoutStyle
   } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: nodeRef })
 
-  const innerProps = useInnerProps(props, {
-    ref: nodeRef,
-    ...layoutProps
-  }, [
-    'children',
-    'enable-offset',
-    'style'
-  ], { layoutRef })
+  const innerProps = useInnerProps(
+    extendObject(
+      {},
+      props,
+      layoutProps,
+      {
+        ref: nodeRef
+      }
+    ),
+    [
+      'children',
+      'enable-offset',
+      'style'
+    ],
+    { layoutRef })
   const itemAnimatedStyle = useAnimatedStyle(() => {
     if (!step.value) return {}
     const inputRange = [step.value, 0]

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

@@ -5,7 +5,7 @@ import Animated, { useAnimatedStyle, useSharedValue, withTiming, Easing, runOnJS
 import React, { JSX, forwardRef, useRef, useEffect, ReactNode, ReactElement, useMemo } from 'react'
 import useInnerProps, { getCustomEvent } from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef' // 引入辅助函数
-import { useTransformStyle, splitStyle, splitProps, useLayout, wrapChildren } from './utils'
+import { useTransformStyle, splitStyle, splitProps, useLayout, wrapChildren, extendObject } from './utils'
 import { SwiperContext } from './context'
 /**
  * ✔ indicator-dots
@@ -30,32 +30,32 @@ type EventDataType = {
 }
 
 interface SwiperProps {
-  children?: ReactNode;
-  circular?: boolean;
-  current?: number;
-  interval?: number;
-  autoplay?: boolean;
+  children?: ReactNode
+  circular?: boolean
+  current?: number
+  interval?: number
+  autoplay?: boolean
   // scrollView 只有安卓可以设
-  duration?: number;
+  duration?: number
   // 滑动过程中元素是否scale变化
-  scale?: boolean;
-  'indicator-dots'?: boolean;
-  'indicator-color'?: string;
-  'indicator-active-color'?: string;
-  vertical?: boolean;
+  scale?: boolean
+  'indicator-dots'?: boolean
+  'indicator-color'?: string
+  'indicator-active-color'?: string
+  vertical?: boolean
   style: {
     [key: string]: any
-  };
-  'easing-function'?: EaseType;
-  'previous-margin'?: string;
-  'next-margin'?: string;
-  'enable-offset'?: boolean;
-  'enable-var': boolean;
-  'parent-font-size'?: number;
-  'parent-width'?: number;
-  'parent-height'?: number;
-  'external-var-context'?: Record<string, any>;
-  bindchange?: (event: NativeSyntheticEvent<TouchEvent> | unknown) => void;
+  }
+  'easing-function'?: EaseType
+  'previous-margin'?: string
+  'next-margin'?: string
+  'enable-offset'?: boolean
+  'enable-var': boolean
+  'parent-font-size'?: number
+  'parent-width'?: number
+  'parent-height'?: number
+  'external-var-context'?: Record<string, any>
+  bindchange?: (event: NativeSyntheticEvent<TouchEvent> | unknown) => void
 }
 
 /**
@@ -201,23 +201,29 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
     layoutProps,
     layoutStyle
   } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef, onLayout: onWrapperLayout })
-  const innerProps = useInnerProps(props, {
-    ref: nodeRef
-  }, [
-    'style',
-    'indicator-dots',
-    'indicator-color',
-    'indicator-active-color',
-    'previous-margin',
-    'vertical',
-    'previous-margin',
-    'next-margin',
-    'easing-function',
-    'autoplay',
-    'circular',
-    'interval',
-    'easing-function'
-  ], { layoutRef: layoutRef })
+  const innerProps = useInnerProps(
+    extendObject(
+      {},
+      props,
+      {
+        ref: nodeRef
+      }
+    ),
+    [
+      'style',
+      'indicator-dots',
+      'indicator-color',
+      'indicator-active-color',
+      'previous-margin',
+      'vertical',
+      'previous-margin',
+      'next-margin',
+      'easing-function',
+      'autoplay',
+      'circular',
+      'interval',
+      'easing-function'
+    ], { layoutRef: layoutRef })
 
   function onWrapperLayout (e: LayoutChangeEvent) {
     const { width, height } = e.nativeEvent.layout
@@ -251,8 +257,8 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
       dots.push(<View style={[dotCommonStyle, { backgroundColor: unActionColor }]} key={i}></View>)
     }
     return (
-      <View pointerEvents="none" style = {styles['pagination_' + dir]}>
-        <View style = {[styles['pagerWrapper' + dir]]}>
+      <View pointerEvents="none" style={styles['pagination_' + dir]}>
+        <View style={[styles['pagerWrapper' + dir]]}>
           <Animated.View style={[
             dotCommonStyle,
             activeDotStyle,
@@ -266,8 +272,8 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
           ]}
           />
           {dots}
-      </View>
-    </View>)
+        </View>
+      </View>)
   }
 
   function renderItems () {
@@ -392,7 +398,7 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
     }
   }
 
-  function getOffset (index:number, stepValue: number) {
+  function getOffset (index: number, stepValue: number) {
     if (!stepValue) return 0
     let targetOffset = 0
     if (circular && children.length > 1) {
@@ -404,7 +410,7 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
     return targetOffset
   }
 
-  function updateCurrent (index:number, stepValue: number) {
+  function updateCurrent (index: number, stepValue: number) {
     const targetOffset = getOffset(index || 0, stepValue)
     if (targetOffset !== offset.value) {
       // 内部基于props.current!==currentIndex.value决定是否使用动画及更新currentIndex.value
@@ -712,21 +718,21 @@ const SwiperWrapper = forwardRef<HandlerRef<View, SwiperProps>, SwiperProps>((pr
   function renderSwiper () {
     const arrPages: Array<ReactNode> | ReactNode = renderItems()
     return (<View style={[normalStyle, layoutStyle, styles.swiper]} {...layoutProps} {...innerProps}>
-        <Animated.View style={[{
-          flexDirection: dir === 'x' ? 'row' : 'column',
-          width: '100%',
-          height: '100%'
-        }, animatedStyles]}>
-          {wrapChildren({
-            children: arrPages
-          }, {
-            hasVarDec,
-            varContext: varContextRef.current,
-            textStyle,
-            textProps
-          })}
-        </Animated.View>
-        {showsPagination && renderPagination()}
+      <Animated.View style={[{
+        flexDirection: dir === 'x' ? 'row' : 'column',
+        width: '100%',
+        height: '100%'
+      }, animatedStyles]}>
+        {wrapChildren({
+          children: arrPages
+        }, {
+          hasVarDec,
+          varContext: varContextRef.current,
+          textStyle,
+          textProps
+        })}
+      </Animated.View>
+      {showsPagination && renderPagination()}
     </View>)
   }
 

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

@@ -120,20 +120,25 @@ const _Switch = forwardRef<HandlerRef<Switch, _SwitchProps>, _SwitchProps>((prop
     }
   }, [])
 
-  const innerProps = useInnerProps(props, extendObject({
-    ref: nodeRef,
-    style: extendObject({}, normalStyle, layoutStyle)
-  },
-  layoutProps,
-  !disabled ? { [type === 'switch' ? 'onValueChange' : '_onChange']: onChange } : {})
-  , [
-    'checked',
-    'disabled',
-    'type',
-    'color'
-  ], {
-    layoutRef
-  })
+  const innerProps = useInnerProps(
+    extendObject(
+      {},
+      props,
+      layoutProps,
+      {
+        ref: nodeRef,
+        style: extendObject({}, normalStyle, layoutStyle)
+      },
+      !disabled ? { [type === 'switch' ? 'onValueChange' : '_onChange']: onChange } : {}
+    ),
+    [
+      'checked',
+      'disabled',
+      'type',
+      'color'
+    ],
+    { layoutRef }
+  )
 
   if (type === 'checkbox') {
     return createElement(

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

@@ -8,7 +8,7 @@ import { Text, TextStyle, TextProps } from 'react-native'
 import { useRef, forwardRef, ReactNode, JSX, createElement } from 'react'
 import useInnerProps from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef' // 引入辅助函数
-import { useTransformStyle, wrapChildren } from './utils'
+import { useTransformStyle, wrapChildren, extendObject } from './utils'
 
 interface _TextProps extends TextProps {
   style?: TextStyle
@@ -35,8 +35,6 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
     'parent-height': parentHeight
   } = props
 
-  const layoutRef = useRef({})
-
   const {
     normalStyle,
     hasVarDec,
@@ -54,16 +52,21 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
     style: normalStyle
   })
 
-  const innerProps = useInnerProps(props, {
-    ref: nodeRef,
-    style: normalStyle,
-    selectable: !!selectable || !!userSelect,
-    allowFontScaling
-  }, [
-    'user-select'
-  ], {
-    layoutRef
-  })
+  const innerProps = useInnerProps(
+    extendObject(
+      {},
+      props,
+      {
+        ref: nodeRef,
+        style: normalStyle,
+        selectable: !!selectable || !!userSelect,
+        allowFontScaling
+      }
+    ),
+    [
+      'user-select'
+    ]
+  )
 
   return createElement(Text, innerProps, wrapChildren(
     props,