@mpxjs/webpack-plugin 2.10.14-beta.7 → 2.10.14-beta.8

package/lib/platform/style/wx/index.js

@@ -315,7 +315,7 @@ module.exports = function getSpec ({ warn, error }) {
     switch (prop) {
       case bgPropMap.image: {
         // background-image 支持背景图/渐变/css var
-        if (cssVariableExp.test(value) || urlExp.test(value) || linearExp.test(value)) {
+        if (cssVariableExp.test(value) || urlExp.test(value) || linearExp.test(value) || value === 'none') {
           return { prop, value }
         } else {
           error(`Value of ${prop} in ${selector} selector only support value <url()> or <linear-gradient()>, received ${value}, please check again!`)
@@ -359,6 +359,12 @@ module.exports = function getSpec ({ warn, error }) {
           error(`Property [${bgPropMap.all}] in ${selector} is abbreviated property and does not support CSS var`)
           return false
         }
+        if (value === 'none') {
+          return [
+            { prop: bgPropMap.image, value },
+            { prop: bgPropMap.color, value: 'transparent' }
+          ]
+        }
         const bgMap = []
         const values = parseValues(value)
         values.forEach(item => {

package/lib/runtime/components/react/dist/context.d.ts

@@ -7,7 +7,6 @@ export type KeyboardAvoidContextValue = MutableRefObject<{
     cursorSpacing: number;
     ref: MutableRefObject<any>;
     adjustPosition: boolean;
-    holdKeyboard?: boolean;
     keyboardHeight?: number;
     onKeyboardShow?: () => void;
 } | null>;
@@ -55,6 +54,10 @@ export interface StickyContextValue {
     registerStickyHeader: Function;
     unregisterStickyHeader: Function;
 }
+export interface NavSharedValue {
+    customNav?: React.ReactNode;
+    setCustomNav: (value: React.ReactNode) => void;
+}
 export declare const MovableAreaContext: import("react").Context<{
     width: number;
     height: number;
@@ -72,5 +75,4 @@ export declare const KeyboardAvoidContext: import("react").Context<KeyboardAvoid
 export declare const ScrollViewContext: import("react").Context<ScrollViewContextValue>;
 export declare const PortalContext: import("react").Context<PortalContextValue>;
 export declare const StickyContext: import("react").Context<StickyContextValue>;
-export declare const ProviderContext: import("react").Context<null>;
-//# sourceMappingURL=context.d.ts.map
+export declare const NavSharedContext: import("react").Context<NavSharedValue>;

package/lib/runtime/components/react/dist/context.js

@@ -15,4 +15,4 @@ export const KeyboardAvoidContext = createContext(null);
 export const ScrollViewContext = createContext({ gestureRef: null, scrollOffset: new Animated.Value(0) });
 export const PortalContext = createContext(null);
 export const StickyContext = createContext({ registerStickyHeader: noop, unregisterStickyHeader: noop });
-export const ProviderContext = createContext(null);
+export const NavSharedContext = createContext(null);

package/lib/runtime/components/react/dist/event.config.d.ts

@@ -5,4 +5,3 @@ declare const eventConfigMap: {
     };
 };
 export default eventConfigMap;
-//# sourceMappingURL=event.config.d.ts.map

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

@@ -5,4 +5,3 @@ export declare const getCustomEvent: (type: string | undefined, oe: any, { detai
 }, props?: Props) => any;
 declare const useInnerProps: (props?: Props, userRemoveProps?: RemoveProps, rawConfig?: RawConfig) => Record<string, (e: ExtendedNativeTouchEvent) => void> & Omit<Props, string>;
 export default useInnerProps;
-//# sourceMappingURL=getInnerListeners.d.ts.map

package/lib/runtime/components/react/dist/getInnerListeners.js

@@ -3,8 +3,7 @@ import { collectDataset } from '@mpxjs/utils';
 import { omit, extendObject, useNavigation } from './utils';
 import eventConfigMap from './event.config';
 const globalEventState = {
-    needPress: true,
-    identifier: null
+    needPress: true
 };
 const getTouchEvent = (type, event, config) => {
     const { navigation, propsRef, layoutRef } = config;
@@ -95,48 +94,36 @@ function checkIsNeedPress(e, type, ref) {
         ref.current.startTimer[type] = null;
     }
 }
-function shouldHandleTapEvent(e, eventConfig) {
-    const { identifier } = e.nativeEvent.changedTouches[0];
-    return eventConfig.tap && globalEventState.identifier === identifier;
-}
 function handleTouchstart(e, type, eventConfig) {
+    // 阻止事件被释放放回对象池，导致对象复用 _stoppedEventTypes 状态被保留
     e.persist();
     const { innerRef } = eventConfig;
-    const touch = e.nativeEvent.changedTouches[0];
-    const { identifier } = touch;
-    const isSingle = e.nativeEvent.touches.length <= 1;
-    if (isSingle) {
-        // 仅在 touchstart 记录第一个单指触摸点
-        globalEventState.identifier = identifier;
-        globalEventState.needPress = true;
-        innerRef.current.mpxPressInfo.detail = {
-            x: touch.pageX,
-            y: touch.pageY
-        };
-    }
+    globalEventState.needPress = true;
+    innerRef.current.mpxPressInfo.detail = {
+        x: e.nativeEvent.changedTouches[0].pageX,
+        y: e.nativeEvent.changedTouches[0].pageY
+    };
     handleEmitEvent('touchstart', e, type, eventConfig);
     if (eventConfig.longpress) {
-        // 只有单指触摸时才启动长按定时器
-        if (isSingle) {
-            if (e._stoppedEventTypes?.has('longpress')) {
-                return;
-            }
-            if (eventConfig.longpress.hasCatch) {
-                e._stoppedEventTypes = e._stoppedEventTypes || new Set();
-                e._stoppedEventTypes.add('longpress');
-            }
-            innerRef.current.startTimer[type] && clearTimeout(innerRef.current.startTimer[type]);
-            innerRef.current.startTimer[type] = setTimeout(() => {
-                globalEventState.needPress = false;
-                handleEmitEvent('longpress', e, type, eventConfig);
-            }, 350);
+        if (e._stoppedEventTypes?.has('longpress')) {
+            return;
+        }
+        if (eventConfig.longpress.hasCatch) {
+            e._stoppedEventTypes = e._stoppedEventTypes || new Set();
+            e._stoppedEventTypes.add('longpress');
         }
+        innerRef.current.startTimer[type] && clearTimeout(innerRef.current.startTimer[type]);
+        innerRef.current.startTimer[type] = setTimeout(() => {
+            // 只要触发过longpress, 全局就不再触发tap
+            globalEventState.needPress = false;
+            handleEmitEvent('longpress', e, type, eventConfig);
+        }, 350);
     }
 }
 function handleTouchmove(e, type, eventConfig) {
     const { innerRef } = eventConfig;
     handleEmitEvent('touchmove', e, type, eventConfig);
-    if (shouldHandleTapEvent(e, eventConfig)) {
+    if (eventConfig.tap) {
         checkIsNeedPress(e, type, innerRef);
     }
 }
@@ -144,8 +131,7 @@ function handleTouchend(e, type, eventConfig) {
     const { innerRef, disableTap } = eventConfig;
     handleEmitEvent('touchend', e, type, eventConfig);
     innerRef.current.startTimer[type] && clearTimeout(innerRef.current.startTimer[type]);
-    // 只有单指触摸结束时才触发 tap
-    if (shouldHandleTapEvent(e, eventConfig)) {
+    if (eventConfig.tap) {
         checkIsNeedPress(e, type, innerRef);
         if (!globalEventState.needPress || (type === 'bubble' && disableTap) || e._stoppedEventTypes?.has('tap')) {
             return;

package/lib/runtime/components/react/dist/mpx-async-suspense.d.ts

@@ -10,4 +10,3 @@ interface AsyncSuspenseProps {
 }
 declare const AsyncSuspense: React.FC<AsyncSuspenseProps>;
 export default AsyncSuspense;
-//# sourceMappingURL=mpx-async-suspense.d.ts.map

package/lib/runtime/components/react/dist/mpx-async-suspense.jsx

@@ -100,8 +100,8 @@ const AsyncSuspense = ({ type, chunkName, moduleId, innerProps, getLoading, getF
                             });
                         });
                     }
-                    if (type === 'page' && typeof mpxGlobal.__mpx.config?.rnConfig?.onLazyLoadPageError === 'function') {
-                        mpxGlobal.__mpx.config.rnConfig.onLazyLoadPageError({
+                    if (type === 'page' && typeof mpxGlobal.__mpx.config?.rnConfig?.lazyLoadPageErrorHandler === 'function') {
+                        mpxGlobal.__mpx.config.rnConfig.lazyLoadPageErrorHandler({
                             subpackage: chunkName,
                             errType: e.type
                         });

package/lib/runtime/components/react/dist/mpx-button.d.ts

@@ -66,4 +66,3 @@ export interface ButtonProps {
 }
 declare const Button: import("react").ForwardRefExoticComponent<ButtonProps & import("react").RefAttributes<HandlerRef<View, ButtonProps>>>;
 export default Button;
-//# sourceMappingURL=mpx-button.d.ts.map

package/lib/runtime/components/react/dist/mpx-canvas/Bus.d.ts

@@ -21,4 +21,3 @@ export default class Bus {
     clearBatchingTimeout(): void;
 }
 export {};
-//# sourceMappingURL=Bus.d.ts.map

package/lib/runtime/components/react/dist/mpx-canvas/CanvasGradient.d.ts

@@ -5,4 +5,3 @@ export default class CanvasGradient {
     constructor(canvas: CanvasInstance, noOnConstruction?: boolean);
     postMessage(message: WebviewMessage): Promise<any>;
 }
-//# sourceMappingURL=CanvasGradient.d.ts.map

package/lib/runtime/components/react/dist/mpx-canvas/CanvasRenderingContext2D.d.ts

@@ -4,4 +4,3 @@ export default class CanvasRenderingContext2D {
     constructor(canvas: CanvasInstance);
     postMessage(message: WebviewMessage): Promise<any>;
 }
-//# sourceMappingURL=CanvasRenderingContext2D.d.ts.map

package/lib/runtime/components/react/dist/mpx-canvas/Image.d.ts

@@ -18,4 +18,3 @@ export declare class Image {
     get onerror(): ((...args: any[]) => void);
 }
 export declare function createImage(canvas: CanvasInstance, width?: number, height?: number): Image;
-//# sourceMappingURL=Image.d.ts.map

package/lib/runtime/components/react/dist/mpx-canvas/ImageData.d.ts

@@ -6,4 +6,3 @@ export default class ImageData {
     postMessage: (message: WebviewMessage) => Promise<any>;
 }
 export declare function createImageData(canvas: CanvasInstance, dataArray: number[], width: number, height: number): ImageData;
-//# sourceMappingURL=ImageData.d.ts.map

package/lib/runtime/components/react/dist/mpx-canvas/constructorsRegistry.d.ts

@@ -8,4 +8,3 @@ export declare function useConstructorsRegistry(): {
     register: (registerWebviewConstructor: Function) => void;
     getConstructor: (type: ConstructorType) => WebviewConstructor | undefined;
 };
-//# sourceMappingURL=constructorsRegistry.d.ts.map

package/lib/runtime/components/react/dist/mpx-canvas/html.d.ts

@@ -1,3 +1,2 @@
 declare const _default: "<html><head>\n    <meta content=\"width=device-width, initial-scale=1, maximum-scale=1, user-scaleable=no\" name=\"viewport\">\n    <style>\n      html {\n        -ms-content-zooming: none;\n        -ms-touch-action: pan-x pan-y;\n      }\n      body {\n        position: fixed;\n        top: 0;\n        right: 0;\n        bottom: 0;\n        left: 0;\n        margin: 0;\n        padding: 0;\n        overflow: hidden;\n      }\n      * {\n        user-select: none;\n        -ms-user-select: none;\n        -moz-user-select: none;\n        -webkit-user-select: none;\n      }\n    </style>\n  </head>\n  <body>\n  <script>\n  var scale = function (ratio) {\n    return function (item) {\n        if (typeof item === \"number\") {\n            return item * ratio;\n        }\n        return item;\n    };\n};\nfunction autoScaleCanvas(canvas) {\n    var ctx = canvas.getContext(\"2d\");\n    var ratio = window.devicePixelRatio || 1;\n    if (ratio !== 1) {\n        canvas.width *= ratio;\n        canvas.height *= ratio;\n        ctx.scale(ratio, ratio);\n        ctx.isPointInPath = function () {\n            var args = [];\n            for (var _i = 0; _i < arguments.length; _i++) {\n                args[_i] = arguments[_i];\n            }\n            return CanvasRenderingContext2D.prototype.isPointInPath.apply(ctx, args.map(scale(ratio)));\n        };\n    }\n    return canvas;\n}\nwindow.autoScaleCanvas = autoScaleCanvas;\n</script>\n<script>\n\nvar WEBVIEW_TARGET = '@@WEBVIEW_TARGET';\n\nvar ID = function () {\n  return Math.random().toString(32).slice(2);\n};\n\nvar flattenObjectCopyValue = function (flatObj, srcObj, key) {\n  var value = srcObj[key];\n  if (typeof value === 'function') {\n    return;\n  }\n  if (typeof value === 'object' && value instanceof Node) {\n    return;\n  }\n  flatObj[key] = flattenObject(value);\n};\n\nvar flattenObject = function (object) {\n  if (typeof object !== 'object' || object === null) {\n    return object;\n  }\n  // Handle TypedArray\n  if (object instanceof Uint8ClampedArray) {\n    return Array.from(object);\n  }\n  var flatObject = {};\n  for (var key in object) {\n    flattenObjectCopyValue(flatObject, object, key);\n  }\n  for (var key in Object.getOwnPropertyNames(object)) {\n    flattenObjectCopyValue(flatObject, object, key);\n  }\n  return flatObject;\n};\n\nvar AutoScaledCanvas = function (element) {\n  this.element = element;\n};\n\nAutoScaledCanvas.prototype.toDataURL = function () {\n  return this.element.toDataURL.apply(this.element, arguments);\n};\n\nAutoScaledCanvas.prototype.autoScale = function () {\n  if (this.savedHeight !== undefined) {\n    this.element.height = this.savedHeight;\n  }\n  if (this.savedWidth !== undefined) {\n    this.element.width = this.savedWidth;\n  }\n  window.autoScaleCanvas(this.element);\n};\n\nObject.defineProperty(AutoScaledCanvas.prototype, 'width', {\n  get: function () {\n    return this.element.width;\n  },\n  set: function (value) {\n    this.savedWidth = value;\n    this.autoScale();\n    return value;\n  },\n});\n\nObject.defineProperty(AutoScaledCanvas.prototype, 'height', {\n  get: function () {\n    return this.element.height;\n  },\n  set: function (value) {\n    this.savedHeight = value;\n    this.autoScale();\n    return value;\n  },\n});\nvar toMessage = function (result) {\n  if (result instanceof Blob) {\n    return {\n      type: 'blob',\n      payload: btoa(result),\n      meta: {},\n    };\n  }\n  if (result instanceof Object) {\n    if (!result[WEBVIEW_TARGET]) {\n      var id = ID();\n      result[WEBVIEW_TARGET] = id;\n      targets[id] = result;\n    }\n    return {\n      type: 'json',\n      payload: flattenObject(result),\n      args: toArgs(flattenObject(result)),\n      meta: {\n        target: result[WEBVIEW_TARGET],\n        constructor: result.__constructorName__ || result.constructor.name,\n      },\n    };\n  }\n  return {\n    type: 'json',\n    payload: typeof result === 'string' ? result : JSON.stringify(result),\n    meta: {},\n  };\n};\nvar toArgs = function (result) {\n    var args = [];\n    for (var key in result) {\n        if (result[key] !== undefined && key !== '@@WEBVIEW_TARGET') {\n            args.push(result[key]);\n        }\n    }\n    return args;\n};\n\nvar createObjectsFromArgs = function (args) {\n    for (var index = 0; index < args.length; index += 1) {\n        var currentArg = args[index];\n        if (currentArg && currentArg.className !== undefined) {\n            var className = currentArg.className, classArgs = currentArg.classArgs;\n            // new ImageData，第一个参数需要是 Uint8ClampedArray\n            var object = new (Function.prototype.bind.apply(constructors[className], [null].concat(classArgs)))();\n            args[index] = object;\n        }\n    }\n    return args;\n};\n\nvar canvas = document.createElement('canvas');\ncanvas.style.width = '100%';\ncanvas.style.height = '100%';\nvar autoScaledCanvas = new AutoScaledCanvas(canvas);\n\nvar targets = {\n  canvas: autoScaledCanvas,\n  context2D: canvas.getContext('2d'),\n};\n\nvar constructors = {\n  CanvasGradient: CanvasGradient,\n  Image: Image,\n  ImageData: ImageData,\n  Uint8ClampedArray: Uint8ClampedArray,\n};\n\nImage.bind =\n  Image.bind ||\n  function () {\n    return Image;\n  };\n\nImageData.bind =\n  ImageData.bind ||\n  function () {\n    return ImageData;\n  };\nUint8ClampedArray.bind =\n  Uint8ClampedArray.bind ||\n  function () {\n    return Uint8ClampedArray;\n  };\n\nvar populateRefs = function (arg) {\n  if (arg && arg.__ref__) {\n    return targets[arg.__ref__];\n  }\n  return arg;\n};\ndocument.body.appendChild(canvas);\n\nvar mergeObjects = function (target, source) {\n  for (var key in source) {\n    if (source.hasOwnProperty(key)) {\n      target[key] = source[key];\n    }\n  }\n  return target;\n};\n\nfunction handleMessage(message) {\n  var id = message.id,\n      type = message.type,\n      payload = message.payload;\n\n  switch (type) {\n    case 'exec': {\n      var target = payload.target,\n          method = payload.method,\n          args = payload.args;\n      var result = targets[target][method].apply(targets[target], args.map(populateRefs));\n      var msg = toMessage(result);\n\n      if (typeof result === 'object' && !msg.meta.constructor) {\n        for (var constructorName in constructors) {\n          if (result instanceof constructors[constructorName]) {\n            msg.meta.constructor = constructorName;\n          }\n        }\n      }\n      window.ReactNativeWebView.postMessage(JSON.stringify(mergeObjects({ id: id }, msg)));\n      break;\n    }\n    case 'set': {\n      var target = payload.target,\n          key = payload.key,\n          value = payload.value;\n      targets[target][key] = populateRefs(value);\n      break;\n    }\n        case 'construct': {\n            var constructor = payload.constructor,\n          target = payload.id,\n          args = payload.args || [];\n            var newArgs = createObjectsFromArgs(args);\n            var object;\n            try {\n                object = new (Function.prototype.bind.apply(constructors[constructor], [null].concat(newArgs)))();\n            }\n            catch (error) {\n                throw new Error('Error while constructing '.concat(constructor, ' ').concat(error.message));\n            }\n            object.__constructorName__ = constructor;\n            var msg = toMessage({});\n            targets[target] = object;\n            window.ReactNativeWebView.postMessage(JSON.stringify(mergeObjects({ id: id }, msg)));\n            break;\n        }\n            case 'listen': {\n      var types = payload.types,\n          target = payload.target;\n    for (var i = 0; i < types.length; i++) {\n    var eventType = types[i];\n    targets[target].addEventListener(eventType, function (e) {\n          const message = toMessage({\n            type: 'event',\n            payload: {\n                type: e.type,\n                target: mergeObjects(flattenObject(targets[target]), {\n                [WEBVIEW_TARGET]: target,\n            }),\n            },\n          });\n      window.ReactNativeWebView.postMessage(\n        JSON.stringify(mergeObjects({ id: id }, message))\n      );\n    });\n  }\n  break;\n}\n    }\n}\nvar handleError = function (err, message) {\n  window.ReactNativeWebView.postMessage(JSON.stringify({\n    id: message.id,\n    type: 'error',\n    payload: {\n      message: err.message,\n      stack: err.stack,\n    },\n  }));\n  document.removeEventListener('message', handleIncomingMessage);\n};\n\nfunction handleIncomingMessage(data) {\n  if (Array.isArray(data)) {\n    for (var i = 0; i < data.length; i++) {\n      try {\n        handleMessage(data[i]);\n      } catch (err) {\n        handleError(err, data[i]);\n      }\n    }\n  } else {\n    try {\n      handleMessage(data);\n    } catch (err) {\n      handleError(err, data);\n    }\n  }\n}\n\nwindow.mpxWebviewMessageCallback = handleIncomingMessage\n</script>\n  \n\n</body></html>";
 export default _default;
-//# sourceMappingURL=html.d.ts.map

package/lib/runtime/components/react/dist/mpx-canvas/index.d.ts

@@ -30,4 +30,3 @@ interface CanvasProps {
 }
 declare const _Canvas: import("react").ForwardRefExoticComponent<CanvasProps & import("react").RefAttributes<HandlerRef<CanvasProps & View, CanvasProps>>>;
 export default _Canvas;
-//# sourceMappingURL=index.d.ts.map

package/lib/runtime/components/react/dist/mpx-canvas/utils.d.ts

@@ -50,4 +50,3 @@ export declare const useWebviewBinding: ({ targetName, properties, methods }: {
     properties?: Record<string, any> | undefined;
     methods?: string[] | undefined;
 }) => import("react").MutableRefObject<{}>;
-//# sourceMappingURL=utils.d.ts.map

package/lib/runtime/components/react/dist/mpx-checkbox-group.d.ts

@@ -18,4 +18,3 @@ export interface CheckboxGroupProps {
 }
 declare const CheckboxGroup: import("react").ForwardRefExoticComponent<CheckboxGroupProps & import("react").RefAttributes<HandlerRef<View, CheckboxGroupProps>>>;
 export default CheckboxGroup;
-//# sourceMappingURL=mpx-checkbox-group.d.ts.map

package/lib/runtime/components/react/dist/mpx-checkbox.d.ts

@@ -30,4 +30,3 @@ export interface CheckboxProps extends Selection {
 }
 declare const Checkbox: import("react").ForwardRefExoticComponent<CheckboxProps & import("react").RefAttributes<HandlerRef<View, CheckboxProps>>>;
 export default Checkbox;
-//# sourceMappingURL=mpx-checkbox.d.ts.map

package/lib/runtime/components/react/dist/mpx-form.d.ts

@@ -25,4 +25,3 @@ interface FormProps {
 }
 declare const _Form: import("react").ForwardRefExoticComponent<FormProps & import("react").RefAttributes<HandlerRef<View, FormProps>>>;
 export default _Form;
-//# sourceMappingURL=mpx-form.d.ts.map

package/lib/runtime/components/react/dist/mpx-icon/index.d.ts

@@ -16,4 +16,3 @@ export interface IconProps {
 }
 declare const Icon: import("react").ForwardRefExoticComponent<IconProps & import("react").RefAttributes<HandlerRef<Text, IconProps>>>;
 export default Icon;
-//# sourceMappingURL=index.d.ts.map

package/lib/runtime/components/react/dist/mpx-image.d.ts

@@ -19,4 +19,3 @@ export interface ImageProps {
 }
 declare const Image: import("react").ForwardRefExoticComponent<ImageProps & import("react").RefAttributes<HandlerRef<RNImage, ImageProps>>>;
 export default Image;
-//# sourceMappingURL=mpx-image.d.ts.map

package/lib/runtime/components/react/dist/mpx-image.jsx

@@ -40,16 +40,7 @@ const ModeMap = new Map([
     ...cropMode.map(mode => [mode, 'stretch'])
 ]);
 const isNumber = (value) => typeof value === 'number';
-const relativeCenteredSize = (viewSize, imageSize) => {
-    return (viewSize - imageSize) / 2;
-};
-// 获取能完全显示图片的缩放比例：长宽方向的缩放比例最小值即为能完全展示的比例
-function getFitScale(width1, height1, width2, height2) {
-    return Math.min(width2 / width1, height2 / height1);
-}
-function getFillScale(width1, height1, width2, height2) {
-    return Math.max(width2 / width1, height2 / height1);
-}
+const relativeCenteredSize = (viewSize, imageSize) => (viewSize - imageSize) / 2;
 function noMeetCalcRule(isSvg, mode, viewWidth, viewHeight, ratio) {
     const isMeetSize = viewWidth && viewHeight && ratio;
     if (isSvg && !isMeetSize)
@@ -58,16 +49,6 @@ function noMeetCalcRule(isSvg, mode, viewWidth, viewHeight, ratio) {
         return true;
     return false;
 }
-const getFixedWidth = (viewWidth, viewHeight, ratio) => {
-    if (!ratio)
-        return viewWidth;
-    const fixed = viewHeight / ratio;
-    return !fixed ? viewWidth : fixed;
-};
-const getFixedHeight = (viewWidth, viewHeight, ratio) => {
-    const fixed = viewWidth * ratio;
-    return !fixed ? viewHeight : fixed;
-};
 const Image = forwardRef((props, ref) => {
     const { src = '', mode = 'scaleToFill', style = {}, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'enable-fast-image': enableFastImage, 'parent-width': parentWidth, 'parent-height': parentHeight, bindload, binderror } = props;
     const defaultStyle = {
@@ -75,6 +56,7 @@ const Image = forwardRef((props, ref) => {
         height: DEFAULT_IMAGE_HEIGHT
     };
     const styleObj = extendObject({}, defaultStyle, style, { overflow: 'hidden' });
+    const state = useRef({});
     const nodeRef = useRef(null);
     useNodesRef(props, ref, nodeRef, {
         defaultStyle
@@ -88,19 +70,13 @@ const Image = forwardRef((props, ref) => {
     const onLayout = ({ nativeEvent: { layout: { width, height } } }) => {
         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);
-            setViewSize(state.current.viewWidth, state.current.viewHeight, state.current.ratio);
+            state.current = {};
             setLoaded(true);
         }
     };
@@ -120,56 +96,43 @@ const Image = forwardRef((props, ref) => {
     const [imageHeight, setImageHeight] = useState(0);
     const [ratio, setRatio] = useState(0);
     const [loaded, setLoaded] = useState(!isLayoutMode);
-    const state = useRef({
-        viewWidth,
-        viewHeight
-    });
-    function setViewSize(viewWidth, viewHeight, ratio) {
-        // 在特定模式下可预测 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 fixedHeight = useMemo(() => {
+        const fixed = viewWidth * ratio;
+        return !fixed ? viewHeight : fixed;
+    }, [ratio, viewWidth, viewHeight]);
+    const fixedWidth = useMemo(() => {
+        if (!ratio)
+            return viewWidth;
+        const fixed = viewHeight / ratio;
+        return !fixed ? viewWidth : fixed;
+    }, [ratio, viewWidth, viewHeight]);
     const modeStyle = useMemo(() => {
         if (noMeetCalcRule(isSvg, mode, viewWidth, viewHeight, ratio))
             return {};
         switch (mode) {
-            case 'scaleToFill': // wx 中 svg 图片的 scaleToFill 模式效果与 aspectFit 一致，不会就行图片缩放，此处保持一致
+            case 'scaleToFill':
             case 'aspectFit':
                 if (isSvg) {
-                    const scale = getFitScale(imageWidth, imageHeight, viewWidth, viewHeight);
+                    const scale = ratio <= 1
+                        ? imageWidth >= viewWidth ? viewWidth / imageWidth : imageWidth / viewWidth
+                        : imageHeight >= viewHeight ? viewHeight / imageHeight : imageHeight / viewHeight;
                     return {
                         transform: [
-                            { translateY: relativeCenteredSize(viewHeight, imageHeight * scale) },
-                            { translateX: relativeCenteredSize(viewWidth, imageWidth * scale) },
-                            { scale }
+                            { scale },
+                            ratio <= 1 ? { translateY: -(imageHeight * scale - viewHeight) / 2 / scale } : { translateX: -(imageWidth * scale - viewWidth) / 2 / scale }
                         ]
                     };
                 }
                 return {};
             case 'aspectFill':
                 if (isSvg) {
-                    const scale = getFillScale(imageWidth, imageHeight, viewWidth, viewHeight);
+                    const scale = ratio >= 1
+                        ? imageWidth >= viewWidth ? viewWidth / imageWidth : imageWidth / viewWidth
+                        : imageHeight >= viewHeight ? viewHeight / imageHeight : imageHeight / viewHeight;
                     return {
                         transform: [
-                            { translateY: relativeCenteredSize(viewHeight, imageHeight * scale) },
-                            { translateX: relativeCenteredSize(viewWidth, imageWidth * scale) },
-                            { scale }
+                            { scale },
+                            ratio >= 1 ? { translateY: -(imageHeight * scale - viewHeight) / 2 / scale } : { translateX: -(imageWidth * scale - viewWidth) / 2 / scale }
                         ]
                     };
                 }
@@ -177,7 +140,9 @@ const Image = forwardRef((props, ref) => {
             case 'widthFix':
             case 'heightFix':
                 if (isSvg) {
-                    const scale = getFitScale(imageWidth, imageHeight, viewWidth, viewHeight);
+                    const scale = ratio >= 1
+                        ? imageWidth >= fixedWidth ? fixedWidth / imageWidth : imageWidth / fixedWidth
+                        : imageHeight >= fixedHeight ? fixedHeight / imageHeight : imageHeight / fixedHeight;
                     return {
                         transform: [{ scale }]
                     };
@@ -240,23 +205,12 @@ const Image = forwardRef((props, ref) => {
             default:
                 return {};
         }
-    }, [isSvg, mode, viewWidth, viewHeight, imageWidth, imageHeight, ratio]);
+    }, [isSvg, mode, viewWidth, viewHeight, imageWidth, imageHeight, ratio, fixedWidth, fixedHeight]);
     const onSvgLoad = (evt) => {
         const { width, height } = evt.nativeEvent.layout;
-        state.current.imageHeight = height;
+        setRatio(!width ? 0 : height / width);
+        setImageWidth(width);
         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('load', evt, {
             detail: { width, height },
             layoutRef
@@ -294,10 +248,12 @@ const Image = forwardRef((props, ref) => {
                     : isHeightFixMode
                         ? state.current.viewHeight
                         : state.current.viewWidth && state.current.viewHeight) {
-                    setRatio(state.current.ratio);
+                    state.current.viewWidth && setViewWidth(state.current.viewWidth);
+                    state.current.viewHeight && setViewHeight(state.current.viewHeight);
+                    setRatio(!width ? 0 : height / width);
                     setImageWidth(width);
                     setImageHeight(height);
-                    setViewSize(state.current.viewWidth, state.current.viewHeight, state.current.ratio);
+                    state.current = {};
                     setLoaded(true);
                 }
             }, () => {
@@ -307,7 +263,7 @@ const Image = forwardRef((props, ref) => {
     }, [src, isSvg, isLayoutMode]);
     const innerProps = useInnerProps(extendObject({}, props, layoutProps, {
         ref: nodeRef,
-        style: extendObject({}, normalStyle, layoutStyle, isHeightFixMode ? { width: viewWidth } : {}, isWidthFixMode ? { height: viewHeight } : {})
+        style: extendObject({}, normalStyle, layoutStyle, isHeightFixMode ? { width: fixedWidth } : {}, isWidthFixMode ? { height: fixedHeight } : {})
     }), [
         'src',
         'mode',

package/lib/runtime/components/react/dist/mpx-inline-text.d.ts

@@ -5,4 +5,3 @@ declare const InlineText: {
     displayName: string;
 };
 export default InlineText;
-//# sourceMappingURL=mpx-inline-text.d.ts.map

package/lib/runtime/components/react/dist/mpx-input.d.ts

@@ -32,7 +32,6 @@ 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;
@@ -48,4 +47,3 @@ export interface PrivateInputProps {
 type FinalInputProps = InputProps & PrivateInputProps;
 declare const Input: import("react").ForwardRefExoticComponent<InputProps & PrivateInputProps & import("react").RefAttributes<HandlerRef<TextInput, FinalInputProps>>>;
 export default Input;
-//# sourceMappingURL=mpx-input.d.ts.map

package/lib/runtime/components/react/dist/mpx-input.jsx

@@ -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
@@ -52,7 +52,7 @@ const keyboardTypeMap = {
     digit: isIOS ? 'decimal-pad' : 'numeric'
 };
 const Input = forwardRef((props, ref) => {
-    const { style = {}, allowFontScaling = false, type = 'text', value, password, 'placeholder-style': placeholderStyle = {}, disabled, maxlength = 140, 'cursor-spacing': cursorSpacing = 0, 'auto-focus': autoFocus, focus, 'confirm-type': confirmType = 'done', 'confirm-hold': confirmHold = false, cursor, 'cursor-color': cursorColor, 'selection-start': selectionStart = -1, 'selection-end': selectionEnd = -1, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'adjust-position': adjustPosition = true, 'hold-keyboard': holdKeyboard = false, bindinput, bindfocus, bindblur, bindconfirm, bindselectionchange, 
+    const { style = {}, allowFontScaling = false, type = 'text', value, password, 'placeholder-style': placeholderStyle = {}, disabled, maxlength = 140, 'cursor-spacing': cursorSpacing = 0, 'auto-focus': autoFocus, focus, 'confirm-type': confirmType = 'done', 'confirm-hold': confirmHold = false, cursor, 'cursor-color': cursorColor, 'selection-start': selectionStart = -1, 'selection-end': selectionEnd = -1, 'enable-var': enableVar, 'external-var-context': externalVarContext, 'parent-font-size': parentFontSize, 'parent-width': parentWidth, 'parent-height': parentHeight, 'adjust-position': adjustPosition = true, bindinput, bindfocus, bindblur, bindconfirm, bindselectionchange, 
     // private
     multiline, 'auto-height': autoHeight, bindlinechange } = props;
     const formContext = useContext(FormContext);
@@ -145,7 +145,7 @@ const Input = forwardRef((props, ref) => {
     };
     const setKeyboardAvoidContext = () => {
         if (keyboardAvoid) {
-            keyboardAvoid.current = { cursorSpacing, ref: nodeRef, adjustPosition, holdKeyboard };
+            keyboardAvoid.current = { cursorSpacing, ref: nodeRef, adjustPosition };
         }
     };
     const onTouchStart = () => {
@@ -159,34 +159,27 @@ const Input = forwardRef((props, ref) => {
         if (!keyboardAvoid?.current) {
             setKeyboardAvoidContext();
         }
-        if (bindfocus) {
+        if (bindfocus && keyboardAvoid?.current) {
             const focusAction = () => {
                 bindfocus(getCustomEvent('focus', evt, {
                     detail: {
                         value: tmpValue.current || '',
-                        height: keyboardAvoid?.current?.keyboardHeight
+                        height: keyboardAvoid.current?.keyboardHeight,
                     },
                     layoutRef
                 }, props));
-                if (keyboardAvoid?.current?.onKeyboardShow) {
+                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;
-                }
+            if (keyboardAvoid.current.keyboardHeight) {
+                // iOS: keyboard 获取高度时机 keyboardWillShow 在 input focus 之前，可以立即执行
+                focusAction();
             }
             else {
-                // 无 keyboardAvoiding，直接执行 focus 回调
-                focusAction();
+                // Android,Harmony: keyboard 获取高度时机 keyboardDidShow 在 input focus 之后，需要延迟回调
+                evt.persist();
+                keyboardAvoid.current.onKeyboardShow = focusAction;
             }
         }
     };

package/lib/runtime/components/react/dist/mpx-keyboard-avoiding-view.d.ts

@@ -10,4 +10,3 @@ declare const KeyboardAvoidingView: {
     displayName: string;
 };
 export default KeyboardAvoidingView;
-//# sourceMappingURL=mpx-keyboard-avoiding-view.d.ts.map