@mpxjs/webpack-plugin 2.10.15 → 2.10.16-beta.11

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

@@ -0,0 +1,275 @@
+import React, { forwardRef, useRef, useCallback, useContext, useState, useEffect } from 'react'
+// import { Camera, useCameraDevice, useCodeScanner, useCameraFormat } from 'react-native-vision-camera'
+import { getCustomEvent } from './getInnerListeners'
+import { noop } from '@mpxjs/utils'
+import { RouteContext } from './context'
+
+const qualityValue = {
+  high: 90,
+  normal: 75,
+  low: 50,
+  original: 100
+}
+
+interface CameraProps {
+  mode?: 'normal' | 'scanCode'
+  resolution?: 'low' | 'medium' | 'high'
+  devicePosition?: 'front' | 'back'
+  flash?: 'auto' | 'on' | 'off'
+  frameSize?: 'small' | 'medium' | 'large'
+  style?: Record<string, any>
+  bindstop?: () => void
+  binderror?: (error: { message: string }) => void
+  bindinitdone?: (result: { type: string, data: string }) => void
+  bindscancode?: (result: { type: string, data: string }) => void
+}
+
+interface TakePhotoOptions {
+  quality?: 'high' | 'normal' | 'low' | 'original'
+  success?: (result: { errMsg: string, tempImagePath: string }) => void
+  fail?: (result: { errMsg: string }) => void
+  complete?: (result: { errMsg: string, tempImagePath?: string }) => void
+}
+
+interface RecordOptions {
+  timeout?: number
+  success?: (result: { errMsg: string }) => void
+  fail?: (result: { errMsg: string, error?: any }) => void
+  complete?: (result: { errMsg: string }) => void
+  timeoutCallback?: (result: { errMsg: string, error?: any }) => void
+}
+
+interface StopRecordOptions {
+  success?: (result: { errMsg: string, tempVideoPath: string, duration: number }) => void
+  fail?: (result: { errMsg: string }) => void
+  complete?: (result: { errMsg: string, tempVideoPath?: string, duration?: number }) => void
+}
+
+interface CameraRef {
+  setZoom: (zoom: number) => void
+  takePhoto: (options?: TakePhotoOptions) => void
+  startRecord: (options?: RecordOptions) => void
+  stopRecord: (options?: StopRecordOptions) => void
+}
+
+type HandlerRef<T, P> = {
+  current: T | null
+}
+
+let RecordRes: any = null
+
+const _camera = forwardRef<HandlerRef<any, CameraProps>, CameraProps>((props: CameraProps, ref): JSX.Element | null => {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { Camera, useCameraDevice, useCodeScanner, useCameraFormat } = require('react-native-vision-camera')
+  const cameraRef = useRef<any>(null)
+  const {
+    mode = 'normal',
+    resolution = 'medium',
+    devicePosition = 'back',
+    flash = 'auto',
+    frameSize = 'medium',
+    bindinitdone,
+    bindstop,
+    bindscancode
+  } = props
+
+  const isPhoto = mode === 'normal'
+  const device = useCameraDevice(devicePosition || 'back')
+  const { navigation } = useContext(RouteContext) || {}
+  const [zoomValue, setZoomValue] = useState<number>(1)
+  const [hasPermission, setHasPermission] = useState<boolean | null>(null)
+  const hasCamera = useRef(false)
+
+  // 先定义常量，避免在条件判断后使用
+  const maxZoom = device?.maxZoom || 1
+  const RESOLUTION_MAPPING: Record<string, { width: number, height: number }> = {
+    low: { width: 640, height: 480 },
+    medium: { width: 1280, height: 720 },
+    high: { width: 1920, height: 1080 }
+  }
+  const FRAME_SIZE_MAPPING: Record<string, { width: number, height: number }> = {
+    small: { width: 480, height: 360 },
+    medium: { width: 720, height: 540 },
+    large: { width: 1080, height: 810 }
+  }
+
+  // 所有 Hooks 必须在条件判断之前调用
+  const format = useCameraFormat(device, [
+    {
+      photoResolution: RESOLUTION_MAPPING[resolution],
+      videoResolution: FRAME_SIZE_MAPPING[frameSize] || RESOLUTION_MAPPING[resolution]
+    }
+  ])
+
+  const codeScanner = useCodeScanner({
+    codeTypes: ['qr', 'ean-13'],
+    onCodeScanned: (codes: any[]) => {
+      const result = codes.map(code => code.value).join(',')
+      bindscancode && bindscancode(getCustomEvent('scancode', {}, {
+        detail: {
+          result: codes.map(code => code.value).join(',')
+        }
+      }))
+    }
+  })
+
+  const onInitialized = useCallback(() => {
+    bindinitdone && bindinitdone(getCustomEvent('initdone', {}, {
+      detail: {
+        maxZoom
+      }
+    }))
+  }, [bindinitdone, maxZoom])
+
+  const onStopped = useCallback(() => {
+    bindstop && bindstop()
+  }, [bindstop])
+
+  const camera: CameraRef = {
+    setZoom: (zoom: number) => {
+      setZoomValue(zoom)
+    },
+    takePhoto: (options: TakePhotoOptions = {}) => {
+      const { success = noop, fail = noop, complete = noop } = options
+      cameraRef.current?.takePhoto?.({
+        quality: qualityValue[options.quality || 'normal'] as number
+      } as any).then((res: { path: any }) => {
+        const result = {
+          errMsg: 'takePhoto:ok',
+          tempImagePath: res.path
+        }
+        success(result)
+        complete(result)
+      }).catch(() => {
+        const result = {
+          errMsg: 'takePhoto:fail'
+        }
+        fail(result)
+        complete(result)
+      })
+    },
+    startRecord: (options: RecordOptions = {}) => {
+      let { timeout = 30, success = noop, fail = noop, complete = noop, timeoutCallback = noop } = options
+      timeout = timeout > 300 ? 300 : timeout
+      let recordTimer: NodeJS.Timeout | null = null
+      let isTimeout = false
+      try {
+        const result = {
+          errMsg: 'startRecord:ok'
+        }
+        success(result)
+        complete(result)
+
+        cameraRef.current?.startRecording?.({
+          onRecordingError: (error: any) => {
+            if (recordTimer) clearTimeout(recordTimer)
+            const errorResult = {
+              errMsg: 'startRecord:fail during recording',
+              error: error
+            }
+            timeoutCallback(errorResult)
+          },
+          onRecordingFinished: (video: any) => {
+            RecordRes = video
+            if (recordTimer) clearTimeout(recordTimer)
+          }
+        })
+
+        recordTimer = setTimeout(() => { // 超时自动停止
+          isTimeout = true
+          cameraRef.current?.stopRecording().catch(() => {
+            // 忽略停止录制时的错误
+          })
+        }, timeout * 1000)
+      } catch (error: any) {
+        if (recordTimer) clearTimeout(recordTimer)
+        const result = {
+          errMsg: 'startRecord:fail ' + (error.message || 'unknown error')
+        }
+        fail(result)
+        complete(result)
+      }
+    },
+    stopRecord: (options: StopRecordOptions = {}) => {
+      const { success = noop, fail = noop, complete = noop } = options
+      try {
+        cameraRef.current?.stopRecording().then(() => {
+          setTimeout(() => {
+            if (RecordRes) {
+              const result = {
+                errMsg: 'stopRecord:ok',
+                tempVideoPath: RecordRes?.path,
+                duration: RecordRes.duration * 1000 // 转成ms
+              }
+              RecordRes = null
+              success(result)
+              complete(result)
+            }
+          }, 200) // 延时200ms，确保录制结果已准备好
+        }).catch((e: any) => {
+          const result = {
+            errMsg: 'stopRecord:fail ' + (e.message || 'promise rejected')
+          }
+          fail(result)
+          complete(result)
+        })
+      } catch (error: any) {
+        const result = {
+          errMsg: 'stopRecord:fail ' + (error.message || 'unknown error')
+        }
+        fail(result)
+        complete(result)
+      }
+    }
+  }
+  useEffect(() => {
+    if (navigation) {
+      if (navigation && !navigation.camera) {
+        navigation.camera = camera
+      } else {
+        hasCamera.current = true
+        navigation.camera.multi = true
+      }
+    }
+    const checkCameraPermission = async () => {
+      try {
+        const cameraPermission = global?.__mpx?.config?.rnConfig?.cameraPermission
+        if (typeof cameraPermission === 'function') {
+          const permissionResult = await cameraPermission()
+          setHasPermission(permissionResult === true)
+        } else {
+          setHasPermission(true)
+        }
+      } catch (error) {
+        setHasPermission(false)
+      }
+    }
+    checkCameraPermission()
+  }, [])
+
+  if (!hasPermission || hasCamera.current || !device) {
+    return null
+  }
+
+  return (
+    <Camera
+      ref={cameraRef}
+      isActive={true}
+      photo={true}
+      video={true}
+      onInitialized={onInitialized}
+      onStopped={onStopped}
+      device={device}
+      flash={flash}
+      format={format}
+      codeScanner={!isPhoto ? codeScanner : undefined}
+      style={{ flex: 1 }}
+      zoom={zoomValue}
+      {...props}
+    />
+  )
+})
+
+_camera.displayName = 'MpxCamera'
+
+export default _camera

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

@@ -62,8 +62,8 @@ export interface ImageProps {
 }
 
 interface ImageState {
-  viewWidth?: number
-  viewHeight?: number
+  viewWidth: number
+  viewHeight: number
   imageWidth?: number
   imageHeight?: number
   ratio?: number
@@ -93,9 +93,20 @@ const ModeMap = new Map<Mode, ImageResizeMode | undefined>([
   ...cropMode.map<[Mode, ImageResizeMode]>(mode => [mode, 'stretch'])
 ])
 
-const isNumber = (value: DimensionValue) => typeof value === 'number'
+const isNumber = (value: DimensionValue): value is number => typeof value === 'number'
 
-const relativeCenteredSize = (viewSize: number, imageSize: number) => (viewSize - imageSize) / 2
+const relativeCenteredSize = (viewSize: number, imageSize: number) => {
+  return (viewSize - imageSize) / 2
+}
+
+// 获取能完全显示图片的缩放比例：长宽方向的缩放比例最小值即为能完全展示的比例
+function getFitScale (width1: number, height1: number, width2: number, height2: number) {
+  return Math.min(width2 / width1, height2 / height1)
+}
+
+function getFillScale (width1: number, height1: number, width2: number, height2: number) {
+  return Math.max(width2 / width1, height2 / height1)
+}
 
 function noMeetCalcRule (isSvg: boolean, mode: Mode, viewWidth: number, viewHeight: number, ratio: number) {
   const isMeetSize = viewWidth && viewHeight && ratio
@@ -104,6 +115,17 @@ function noMeetCalcRule (isSvg: boolean, mode: Mode, viewWidth: number, viewHeig
   return false
 }
 
+const getFixedWidth = (viewWidth: number, viewHeight: number, ratio: number) => {
+  if (!ratio) return viewWidth
+  const fixed = viewHeight / ratio
+  return !fixed ? viewWidth : fixed
+}
+
+const getFixedHeight = (viewWidth: number, viewHeight: number, ratio: number) => {
+  const fixed = viewWidth * ratio
+  return !fixed ? viewHeight : fixed
+}
+
 const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, ref): JSX.Element => {
   const {
     src = '',
@@ -131,8 +153,6 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
     { overflow: 'hidden' }
   )
 
-  const state = useRef<ImageState>({})
-
   const nodeRef = useRef(null)
   useNodesRef(props, ref, nodeRef, {
     defaultStyle
@@ -148,14 +168,18 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
   const onLayout = ({ nativeEvent: { layout: { width, height } } }: LayoutChangeEvent) => {
     state.current.viewWidth = width
     state.current.viewHeight = height
-
+    // 实际渲染尺寸可能会指定的值不一致，误差低于 0.5 则认为没有变化
+    if (Math.abs(viewHeight - height) < 0.5 && Math.abs(viewWidth - width) < 0.5) {
+      if (state.current.imageWidth && state.current.imageHeight && state.current.ratio) {
+        if (!loaded) setLoaded(true)
+      }
+      return
+    }
     if (state.current.imageWidth && state.current.imageHeight && state.current.ratio) {
-      setViewWidth(width)
-      setViewHeight(height)
       setRatio(state.current.ratio)
       setImageWidth(state.current.imageWidth)
       setImageHeight(state.current.imageHeight)
-      state.current = {}
+      setViewSize(state.current.viewWidth!, state.current.viewHeight!, state.current.ratio!)
       setLoaded(true)
     }
   }
@@ -186,43 +210,57 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
   const [ratio, setRatio] = useState(0)
   const [loaded, setLoaded] = useState(!isLayoutMode)
 
-  const fixedHeight = useMemo(() => {
-    const fixed = viewWidth * ratio
-    return !fixed ? viewHeight : fixed
-  }, [ratio, viewWidth, viewHeight])
+  const state = useRef<ImageState>({
+    viewWidth,
+    viewHeight
+  })
 
-  const fixedWidth = useMemo(() => {
-    if (!ratio) return viewWidth
-    const fixed = viewHeight / ratio
-    return !fixed ? viewWidth : fixed
-  }, [ratio, viewWidth, viewHeight])
+  function setViewSize (viewWidth: number, viewHeight: number, ratio: number) {
+    // 在特定模式下可预测 view 的变化，在onLayout触发时能以此避免重复render
+    switch (mode) {
+      case 'widthFix': {
+        setViewWidth(viewWidth)
+        const fixedHeight = getFixedHeight(viewWidth, viewHeight, ratio)
+        setViewHeight(fixedHeight)
+        break
+      }
+      case 'heightFix': {
+        setViewHeight(viewHeight)
+        const fixedWidth = getFixedWidth(viewWidth, viewHeight, ratio)
+        setViewWidth(fixedWidth)
+        break
+      }
+      default:
+        setViewHeight(viewHeight)
+        setViewWidth(viewWidth)
+        break
+    }
+  }
 
   const modeStyle: ImageStyle = useMemo(() => {
     if (noMeetCalcRule(isSvg, mode, viewWidth, viewHeight, ratio)) return {}
     switch (mode) {
-      case 'scaleToFill':
+      case 'scaleToFill': // wx 中 svg 图片的 scaleToFill 模式效果与 aspectFit 一致，不会就行图片缩放，此处保持一致
       case 'aspectFit':
         if (isSvg) {
-          const scale = ratio <= 1
-            ? imageWidth >= viewWidth ? viewWidth / imageWidth : imageWidth / viewWidth
-            : imageHeight >= viewHeight ? viewHeight / imageHeight : imageHeight / viewHeight
+          const scale = getFitScale(imageWidth, imageHeight, viewWidth, viewHeight)
           return {
             transform: [
-              { scale },
-              ratio <= 1 ? { translateY: -(imageHeight * scale - viewHeight) / 2 / scale } : { translateX: -(imageWidth * scale - viewWidth) / 2 / scale }
+              { translateY: relativeCenteredSize(viewHeight, imageHeight * scale) },
+              { translateX: relativeCenteredSize(viewWidth, imageWidth * scale) },
+              { scale }
             ]
           }
         }
         return {}
       case 'aspectFill':
         if (isSvg) {
-          const scale = ratio >= 1
-            ? imageWidth >= viewWidth ? viewWidth / imageWidth : imageWidth / viewWidth
-            : imageHeight >= viewHeight ? viewHeight / imageHeight : imageHeight / viewHeight
+          const scale = getFillScale(imageWidth, imageHeight, viewWidth, viewHeight)
           return {
             transform: [
-              { scale },
-              ratio >= 1 ? { translateY: -(imageHeight * scale - viewHeight) / 2 / scale } : { translateX: -(imageWidth * scale - viewWidth) / 2 / scale }
+              { translateY: relativeCenteredSize(viewHeight, imageHeight * scale) },
+              { translateX: relativeCenteredSize(viewWidth, imageWidth * scale) },
+              { scale }
             ]
           }
         }
@@ -230,9 +268,7 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
       case 'widthFix':
       case 'heightFix':
         if (isSvg) {
-          const scale = ratio >= 1
-            ? imageWidth >= fixedWidth ? fixedWidth / imageWidth : imageWidth / fixedWidth
-            : imageHeight >= fixedHeight ? fixedHeight / imageHeight : imageHeight / fixedHeight
+          const scale = getFitScale(imageWidth, imageHeight, viewWidth, viewHeight)
           return {
             transform: [{ scale }]
           }
@@ -295,13 +331,25 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
       default:
         return {}
     }
-  }, [isSvg, mode, viewWidth, viewHeight, imageWidth, imageHeight, ratio, fixedWidth, fixedHeight])
+  }, [isSvg, mode, viewWidth, viewHeight, imageWidth, imageHeight, ratio])
 
   const onSvgLoad = (evt: LayoutChangeEvent) => {
     const { width, height } = evt.nativeEvent.layout
-    setRatio(!width ? 0 : height / width)
-    setImageWidth(width)
+    state.current.imageHeight = height
     setImageHeight(height)
+    state.current.ratio = !width ? 0 : height / width
+
+    if (isWidthFixMode
+      ? state.current.viewWidth
+      : isHeightFixMode
+        ? state.current.viewHeight
+        : state.current.viewWidth && state.current.viewHeight) {
+      setRatio(state.current.ratio)
+      setImageWidth(width)
+      setImageHeight(height)
+      setViewSize(state.current.viewWidth!, state.current.viewHeight!, state.current.ratio)
+      setLoaded(true)
+    }
 
     bindload && bindload(
       getCustomEvent(
@@ -375,12 +423,11 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
             : isHeightFixMode
               ? state.current.viewHeight
               : state.current.viewWidth && state.current.viewHeight) {
-            state.current.viewWidth && setViewWidth(state.current.viewWidth)
-            state.current.viewHeight && setViewHeight(state.current.viewHeight)
-            setRatio(!width ? 0 : height / width)
+            setRatio(state.current.ratio)
             setImageWidth(width)
             setImageHeight(height)
-            state.current = {}
+            setViewSize(state.current.viewWidth!, state.current.viewHeight!, state.current.ratio!)
+
             setLoaded(true)
           }
         },
@@ -402,8 +449,8 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
           {},
           normalStyle,
           layoutStyle,
-          isHeightFixMode ? { width: fixedWidth } : {},
-          isWidthFixMode ? { height: fixedHeight } : {}
+          isHeightFixMode ? { width: viewWidth } : {},
+          isWidthFixMode ? { height: viewHeight } : {}
         )
       }
     ),

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

@@ -18,7 +18,7 @@
  * ✔ selection-start
  * ✔ selection-end
  * ✔ adjust-position
- * ✘ hold-keyboard
+ * ✔ hold-keyboard
  * ✘ safe-password-cert-path
  * ✘ safe-password-length
  * ✘ safe-password-time-stamp
@@ -102,6 +102,7 @@ export interface InputProps {
   'parent-width'?: number
   'parent-height'?: number
   'adjust-position': boolean,
+  'hold-keyboard'?: boolean
   bindinput?: (evt: NativeSyntheticEvent<TextInputTextInputEventData> | unknown) => void
   bindfocus?: (evt: NativeSyntheticEvent<TextInputFocusEventData> | unknown) => void
   bindblur?: (evt: NativeSyntheticEvent<TextInputFocusEventData> | unknown) => void
@@ -150,6 +151,7 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
     'parent-width': parentWidth,
     'parent-height': parentHeight,
     'adjust-position': adjustPosition = true,
+    'hold-keyboard': holdKeyboard = false,
     bindinput,
     bindfocus,
     bindblur,
@@ -198,7 +200,12 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
     { padding: 0, backgroundColor: '#fff' },
     style,
     multiline && autoHeight
-      ? { height: 'auto', minHeight: Math.max((style as any)?.minHeight || 35, contentHeight) }
+      ? extendObject(
+        { height: 'auto' },
+        (style as any)?.minHeight
+          ? { minHeight: (style as any)?.minHeight } // 用户设置了 minHeight 才会透传
+          : {}
+      )
       : {}
   )
 
@@ -280,8 +287,8 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
   }
 
   const setKeyboardAvoidContext = () => {
-    if (adjustPosition && keyboardAvoid) {
-      keyboardAvoid.current = { cursorSpacing, ref: nodeRef }
+    if (keyboardAvoid) {
+      keyboardAvoid.current = { cursorSpacing, ref: nodeRef, adjustPosition, holdKeyboard }
     }
   }
 
@@ -295,20 +302,45 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
   }
 
   const onFocus = (evt: NativeSyntheticEvent<TextInputFocusEventData>) => {
-    setKeyboardAvoidContext()
-    bindfocus && bindfocus(
-      getCustomEvent(
-        'focus',
-        evt,
-        {
-          detail: {
-            value: tmpValue.current || ''
-          },
-          layoutRef
-        },
-        props
-      )
-    )
+    if (!keyboardAvoid?.current) {
+      setKeyboardAvoidContext()
+    }
+
+    if (bindfocus) {
+      const focusAction = () => {
+        bindfocus(
+          getCustomEvent(
+            'focus',
+            evt,
+            {
+              detail: {
+                value: tmpValue.current || '',
+                height: keyboardAvoid?.current?.keyboardHeight
+              },
+              layoutRef
+            },
+            props
+          )
+        )
+        if (keyboardAvoid?.current?.onKeyboardShow) {
+          keyboardAvoid.current.onKeyboardShow = undefined
+        }
+      }
+      if (keyboardAvoid?.current) {
+        // 有 keyboardAvoiding
+        if (keyboardAvoid.current.keyboardHeight) {
+          // iOS: keyboard 获取高度时机 keyboardWillShow 在 input focus 之前，可以立即执行
+          focusAction()
+        } else {
+          // Android,Harmony: keyboard 获取高度时机 keyboardDidShow 在 input focus 之后，需要延迟回调
+          evt.persist()
+          keyboardAvoid.current.onKeyboardShow = focusAction
+        }
+      } else {
+        // 无 keyboardAvoiding，直接执行 focus 回调
+        focusAction()
+      }
+    }
   }
 
   const onBlur = (evt: NativeSyntheticEvent<TextInputFocusEventData>) => {