@mpxjs/webpack-plugin 2.9.67 → 2.9.69-beta.1

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

@@ -1,9 +1,17 @@
 import { View } from 'react-native'
-import { LinearGradient, LinearGradientProps } from 'react-native-linear-gradient'
-import React, { forwardRef, useState, useRef, ReactElement, JSX } from 'react'
+import React, { forwardRef, useRef } from 'react'
 import useInnerProps, { getCustomEvent } from './getInnerListeners'
-import useNodesRef, { HandlerRef } from './useNodesRef' // 引入辅助函数
-import { parseInlineStyle, useTransformStyle, splitStyle, splitProps, useLayout, wrapChildren } from './utils'
+import useNodesRef, { HandlerRef } from './useNodesRef'
+import {
+  useLayout,
+  splitProps,
+  splitStyle,
+  wrapChildren,
+  parseInlineStyle,
+  useTransformStyle,
+  extendObject
+} from './utils'
+import type { AnyFunc } from './types/common'
 /**
  * ✔ value
  * ✔ bindchange
@@ -11,20 +19,21 @@ import { parseInlineStyle, useTransformStyle, splitStyle, splitProps, useLayout,
  * ✘ bindpickend
  * ✘ mask-class
  * ✔ indicator-style: 优先级indicator-style.height > pick-view-column中的子元素设置的height
+ * WebView Only:
  * ✘ indicator-class
- * ✘ mask-style
+ * ✔ mask-style
  * ✘ immediate-change
  */
 
 interface PickerViewProps {
   children: React.ReactNode
-  // 初始的defaultValue数组中的数字依次表示 picker-view 内的 picker-view-column 选择的第几项（下标从 0 开始），数字大于 picker-view-column 可选项长度时，选择最后一项。
   value?: Array<number>
-  bindchange?: Function
+  bindchange?: AnyFunc
   style: {
     [key: string]: any
   }
   'indicator-style'?: string
+  'mask-style'?: string
   'enable-var': boolean
   'external-var-context'?: Record<string, any>,
   'enable-offset': boolean
@@ -48,27 +57,31 @@ const styles: { [key: string]: Object } = {
     justifyContent: 'space-around',
     overflow: 'hidden',
     alignItems: 'center'
-  },
-  maskTop: {
-    position: 'absolute',
-    width: 1000,
-    zIndex: 100
-  },
-  maskBottom: {
-    position: 'absolute',
-    width: 1000,
-    zIndex: 100
   }
 }
+
+const DefaultPickerItemH = 36
+
 const _PickerView = forwardRef<HandlerRef<View, PickerViewProps>, PickerViewProps>((props: PickerViewProps, ref) => {
-  const { children, value = [], bindchange, style, 'enable-var': enableVar, 'external-var-context': externalVarContext } = props
-  // indicatorStyle 需要转换为rn的style
-  // 微信设置到pick-view上上设置的normalStyle如border等需要转换成RN的style然后进行透传
+  const {
+    children,
+    value = [],
+    bindchange,
+    style,
+    'enable-var': enableVar,
+    'external-var-context': externalVarContext
+  } = props
   const indicatorStyle = parseInlineStyle(props['indicator-style'])
-  const { height: indicatorH, width: indicatorW } = indicatorStyle
+  const pickerMaskStyle = parseInlineStyle(props['mask-style'])
+  const { height: indicatorH, ...pickerOverlayStyle } = indicatorStyle
   const nodeRef = useRef(null)
-  useNodesRef<View, PickerViewProps>(props, ref, nodeRef, {})
-  //  picker-view 设置的color等textStyle,在小程序上的表现是可以继承到最内层的text样式, 但是RN内部column是slot无法设置, 需要业务自己在column内的元素上设置
+  const cloneRef = useRef(null)
+  const activeValueRef = useRef(value)
+  activeValueRef.current = value.slice()
+  const snapActiveValueRef = useRef<number[] | null>(null)
+
+  console.log('[mpx-picker-view] value=', value, Date.now())
+
   const {
     normalStyle,
     hasVarDec,
@@ -77,69 +90,90 @@ const _PickerView = forwardRef<HandlerRef<View, PickerViewProps>, PickerViewProp
     setWidth,
     setHeight
   } = useTransformStyle(style, { enableVar, externalVarContext })
-  const { textStyle } = splitStyle(normalStyle)
-  const { textProps } = splitProps(props)
+
+  useNodesRef<View, PickerViewProps>(props, ref, nodeRef, {
+    style: normalStyle
+  })
+
   const {
-    // 存储layout布局信息
     layoutRef,
     layoutProps,
     layoutStyle
   } = useLayout({ props, hasSelfPercent, setWidth, setHeight, nodeRef: nodeRef })
+  const { textProps } = splitProps(props)
+  const { textStyle } = splitStyle(normalStyle)
 
-  const isSetW = indicatorW !== undefined ? 1 : 0
-  const cloneRef = useRef(null)
-  const maskPos: PosType = {}
-  let [pickH, setPickH] = useState(0)
-  const itemH = pickH / 5
-  if (normalStyle?.height && pickH && pickH !== normalStyle?.height) {
-    maskPos.height = itemH * 2 + Math.ceil((normalStyle.height - pickH) / 2)
-  } else {
-    maskPos.height = itemH * 2
+  const onSelectChange = (columnIndex: number, selectedIndex: number) => {
+    const activeValue = activeValueRef.current
+    activeValue[columnIndex] = selectedIndex
+    console.log('[mpx-picker-view], onSelectChange ---> columnIndex=', columnIndex, 'selectedIndex=', selectedIndex, 'activeValue=', activeValue)
+    const eventData = getCustomEvent(
+      'change',
+      {},
+      { detail: { value: activeValue, source: 'change' }, layoutRef }
+    )
+    bindchange?.(eventData)
+    snapActiveValueRef.current = activeValueRef.current
   }
 
-  const onColumnLayoutChange = (layoutConfig: PickerLayout) => {
-    pickH = layoutConfig.height
-    setPickH(layoutConfig.height)
+  const hasDiff = (a: number[] = [], b: number[]) => {
+    return a.some((v, i) => v !== b[i])
   }
 
-  const onSelectChange = (columnIndex: number, selIndex: number) => {
-    const changeValue = value.slice()
-    changeValue[columnIndex] = selIndex
-    const eventData = getCustomEvent('change', {}, { detail: { value: changeValue, source: 'change' }, layoutRef })
-    bindchange && bindchange(eventData)
+  const onInitialChange = (isInvalid: boolean, value: number[]) => {
+    if (isInvalid || !snapActiveValueRef.current || hasDiff(snapActiveValueRef.current, value)) {
+      console.log('[mpx-picker-view], onInitialChange ===> value=', value)
+      const eventData = getCustomEvent(
+        'change',
+        {},
+        { detail: { value, source: 'change' }, layoutRef }
+      )
+      bindchange?.(eventData)
+      snapActiveValueRef.current = value.slice()
+    }
   }
 
-  const innerProps = useInnerProps(props, {
-    ref: nodeRef,
-    style: {
-      ...normalStyle,
-      ...layoutStyle,
-      position: 'relative',
-      overflow: 'hidden'
-    },
-    ...layoutProps
-  }, [
-    'enable-offset'
-  ], { layoutRef })
-
-  const cloneChild = (child: React.ReactNode, index: number) => {
-    // const extraProps = index === 0 ? { getInnerLayout: getInnerLayout, innerProps } : {}
-    const extraProps = {}
-    const childProps = {
-      ...(child as ReactElement)?.props,
-      ref: cloneRef,
-      prefix: index,
-      key: 'pick-view' + index,
-      wrapperStyle: {
-        height: normalStyle?.height || 0,
-        itemHeight: indicatorH || 0
-      },
-      onColumnLayoutChange,
-      onSelectChange: onSelectChange.bind(null, index),
-      selectedIndex: value?.[index] || 0,
-      ...extraProps
-    }
-    const realElement = React.cloneElement(child as ReactElement, childProps)
+  const innerProps = useInnerProps(
+    props,
+    extendObject({
+      ref: nodeRef,
+      style: extendObject(
+        {},
+        normalStyle,
+        layoutStyle,
+        {
+          position: 'relative',
+          overflow: 'hidden'
+        }
+      ),
+      layoutProps
+    }),
+    ['enable-offset'],
+    { layoutRef }
+  )
+
+  const renderColumn = (child: React.ReactElement, index: number, columnData: React.ReactNode[], initialIndex: number) => {
+    const childProps = child?.props || {}
+    const wrappedProps = extendObject(
+      {},
+      childProps,
+      {
+        columnData,
+        ref: cloneRef,
+        columnIndex: index,
+        key: `pick-view-${index}`,
+        wrapperStyle: {
+          height: normalStyle?.height || DefaultPickerItemH,
+          itemHeight: indicatorH || DefaultPickerItemH
+        },
+        columnStyle: normalStyle,
+        onSelectChange: onSelectChange.bind(null, index),
+        initialIndex,
+        pickerOverlayStyle,
+        pickerMaskStyle
+      }
+    )
+    const realElement = React.cloneElement(child, wrappedProps)
     return wrapChildren(
       {
         children: realElement
@@ -153,69 +187,43 @@ const _PickerView = forwardRef<HandlerRef<View, PickerViewProps>, PickerViewProp
     )
   }
 
-  const renderTopMask = () => {
-    const linearProps: LinearGradientProps = {
-      colors: ['rgba(255,255,255,0.8)', 'rgba(255,255,255,0.2)'],
-      style: [
-        styles.maskTop,
-        {
-          height: maskPos.height,
-          top: 0,
-          pointerEvents: 'none'
-        }
-      ]
-    }
-    return (<LinearGradient {...linearProps}/>)
+  const validateChildInitialIndex = (index: number, data: React.ReactNode[]) => {
+    return Math.max(0, Math.min(value[index] || 0, data.length - 1))
   }
 
-  const renderBottomMask = () => {
-    const linearProps: LinearGradientProps = {
-      colors: ['rgba(255,255,255,0.2)', 'rgba(255,255,255,0.8)'],
-      style: [
-        styles.maskBottom,
-        {
-          height: maskPos.height,
-          bottom: 0,
-          pointerEvents: 'none'
-        }
-      ]
+  const flatColumnChildren = (data: React.ReactElement) => {
+    const columnData = React.Children.toArray(data?.props?.children)
+    if (columnData.length === 1 && React.isValidElement(columnData[0]) && columnData[0].type === React.Fragment) {
+      // 只有一个 Fragment 嵌套情况
+      return React.Children.toArray(columnData[0].props.children)
     }
-    return <LinearGradient {...linearProps}></LinearGradient>
+    return columnData
   }
 
-  const renderLine = () => {
-    return <View style={[{
-      position: 'absolute',
-      top: '50%',
-      transform: [{ translateY: -(itemH / 2) }],
-      height: itemH,
-      borderTopWidth: 1,
-      borderBottomWidth: 1,
-      borderColor: '#f0f0f0',
-      width: '100%',
-      zIndex: 101
-    }]}></View>
+  const renderPickerColumns = () => {
+    const columns = React.Children.toArray(children)
+    const renderColumns: React.ReactNode[] = []
+    const validValue: number[] = []
+    let isInvalid = false
+    columns.forEach((item: React.ReactElement, index) => {
+      const columnData = flatColumnChildren(item)
+      const validIndex = validateChildInitialIndex(index, columnData)
+      if (validIndex !== value[index]) {
+        isInvalid = true
+      }
+      validValue.push(validIndex)
+      renderColumns.push(renderColumn(item, index, columnData, validIndex))
+    })
+    onInitialChange(isInvalid, validValue)
+    return renderColumns
   }
 
-  const renderSubChild = () => {
-    if (Array.isArray(children)) {
-      return children.map((item, index) => {
-        return cloneChild(item, index)
-      })
-    } else {
-      return cloneChild(children, 0)
-    }
-  }
-  return (<View {...innerProps}>
-    {renderTopMask()}
-    <View style={[styles.wrapper]}>
-      {renderSubChild()}
+  return (
+    <View {...innerProps}>
+      <View style={[styles.wrapper]}>{renderPickerColumns()}</View>
     </View>
-    {renderBottomMask()}
-    {!isSetW && renderLine()}
-  </View>)
+  )
 })
 
-_PickerView.displayName = 'mpx-picker-view'
-
+_PickerView.displayName = 'MpxPickerView'
 export default _PickerView

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

@@ -8,7 +8,8 @@ import {
   ReactNode,
   useContext,
   useMemo,
-  useEffect
+  useEffect,
+  createElement
 } from 'react'
 import {
   View,
@@ -20,7 +21,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 +68,7 @@ const radioGroup = forwardRef<
     flexWrap: 'wrap'
   }
 
-  const styleObj = {
-    ...defaultStyle,
-    ...style
-  }
+  const styleObj = extendObject({}, defaultStyle, style)
 
   const {
     hasSelfPercent,
@@ -82,7 +80,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,31 +142,30 @@ const radioGroup = forwardRef<
 
   const innerProps = useInnerProps(
     props,
-    {
-      ref: nodeRef,
-      style: { ...normalStyle, ...layoutStyle },
-      ...layoutProps
-    },
-    [],
+    extendObject(
+      {
+        ref: nodeRef,
+        style: extendObject({}, normalStyle, layoutStyle)
+      },
+      layoutProps
+    ),
+    ['name'],
     {
       layoutRef
     }
   )
 
-  return (
-    <View {...innerProps}>
-      <RadioGroupContext.Provider value={contextValue}>
-        {
-          wrapChildren(
-            props,
-            {
-              hasVarDec,
-              varContext: varContextRef.current
-            }
-          )
-        }
-      </RadioGroupContext.Provider>
-    </View>
+  return createElement(View, innerProps, createElement(
+    RadioGroupContext.Provider,
+    { value: contextValue },
+    wrapChildren(
+      props,
+      {
+        hasVarDec,
+        varContext: varContextRef.current
+      }
+    )
+  )
   )
 })
 

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

@@ -4,13 +4,13 @@
  * ✔ checked
  * ✔ color
  */
-import { JSX, useRef, useState, forwardRef, useEffect, ReactNode, useContext, Dispatch, SetStateAction } from 'react'
+import { JSX, useRef, useState, forwardRef, useEffect, ReactNode, useContext, Dispatch, SetStateAction, createElement } from 'react'
 import { View, StyleSheet, ViewStyle, NativeSyntheticEvent } from 'react-native'
 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
       }
@@ -196,32 +193,26 @@ const Radio = forwardRef<HandlerRef<View, RadioProps>, RadioProps>(
       }
     }, [checked])
 
-    return (
-      <View {...innerProps}>
-        <View style={defaultStyle}>
-          <Icon
-            type='success'
-            size={24}
-            color={disabled ? '#E1E1E1' : color}
-            style={{
-              ...styles.icon,
-              ...(isChecked && styles.iconChecked),
-              ...(disabled && styles.iconDisabled)
-            }}
-          />
-        </View>
+    return createElement(View, innerProps,
+      createElement(
+        View,
+        { style: defaultStyle },
+        createElement(Icon, {
+          type: 'success',
+          size: 24,
+          color: disabled ? '#E1E1E1' : color,
+          style: extendObject({}, styles.icon, isChecked && styles.iconChecked, disabled && styles.iconDisabled)
+        })
+      ),
+      wrapChildren(
+        props,
         {
-          wrapChildren(
-            props,
-            {
-              hasVarDec,
-              varContext: varContextRef.current,
-              textStyle,
-              textProps
-            }
-          )
+          hasVarDec,
+          varContext: varContextRef.current,
+          textStyle,
+          textProps
         }
-      </View>
+      )
     )
   }
 )

package/lib/runtime/components/react/mpx-rich-text/html.ts

@@ -0,0 +1,40 @@
+
+export const generateHTML = (html: string) => {
+  return `<html><head>
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scaleable=no" name="viewport">
+    <style>
+      html {
+        -ms-content-zooming: none;
+        -ms-touch-action: pan-x pan-y;
+      }
+      body {
+        position: fixed;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        overflow: hidden;
+      }
+      html,body {
+        margin: 0;
+        padding: 0;
+      }
+      * {
+        user-select: none;
+        -ms-user-select: none;
+        -moz-user-select: none;
+        -webkit-user-select: none;
+      }
+    </style>
+  </head>
+  <body><div id="rich-text">${html}</div>
+  <script>
+    function sendHeight() {
+      const dom = document.getElementById('rich-text')
+      window.ReactNativeWebView.postMessage(dom.scrollHeight);
+    }
+    window.onload = sendHeight;
+</script>
+</body
+></html>`
+}