@mpxjs/webpack-plugin 2.10.15-3 → 2.10.15-5

package/lib/runtime/components/react/dist/mpx-movable-view.jsx

@@ -100,15 +100,6 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
             layoutRef
         }, propsRef.current));
     }, []);
-    // 节流版本的 change 事件触发
-    const handleTriggerChangeThrottled = useCallback(({ x, y, type }) => {
-        'worklet';
-        const now = Date.now();
-        if (now - lastChangeTime.value >= changeThrottleTime) {
-            lastChangeTime.value = now;
-            runOnJS(runOnJSCallback)('handleTriggerChange', { x, y, type });
-        }
-    }, [changeThrottleTime]);
     useEffect(() => {
         runOnUI(() => {
             if (offsetX.value !== x || offsetY.value !== y) {
@@ -302,6 +293,15 @@ const _MovableView = forwardRef((movableViewProps, ref) => {
         triggerEndOnJS
     });
     const runOnJSCallback = useRunOnJSCallback(runOnJSCallbackRef);
+    // 节流版本的 change 事件触发
+    const handleTriggerChangeThrottled = useCallback(({ x, y, type }) => {
+        'worklet';
+        const now = Date.now();
+        if (now - lastChangeTime.value >= changeThrottleTime) {
+            lastChangeTime.value = now;
+            runOnJS(runOnJSCallback)('handleTriggerChange', { x, y, type });
+        }
+    }, [changeThrottleTime]);
     const gesture = useMemo(() => {
         const handleTriggerMove = (e) => {
             'worklet';

package/lib/runtime/components/react/dist/mpx-scroll-view.jsx

@@ -79,6 +79,16 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     const { normalStyle, hasVarDec, varContextRef, hasSelfPercent, hasPositionFixed, setWidth, setHeight } = useTransformStyle(style, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const { textStyle, innerStyle = {} } = splitStyle(normalStyle);
     const scrollViewRef = useRef(null);
+    const propsRef = useRef(props);
+    const refresherStateRef = useRef({
+        hasRefresher,
+        refresherTriggered
+    });
+    propsRef.current = props;
+    refresherStateRef.current = {
+        hasRefresher,
+        refresherTriggered
+    };
     const runOnJSCallbackRef = useRef({
         setEnableScroll,
         setScrollBounces,
@@ -347,6 +357,7 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
     }
     // 处理刷新
     function onRefresh() {
+        const { hasRefresher, refresherTriggered } = refresherStateRef.current;
         if (hasRefresher && refresherTriggered === undefined) {
             // 处理使用了自定义刷新组件，又没设置 refresherTriggered 的情况
             setRefreshing(true);
@@ -358,9 +369,9 @@ const _ScrollView = forwardRef((scrollViewProps = {}, ref) => {
                 }
             }, 500);
         }
-        const { bindrefresherrefresh } = props;
+        const { bindrefresherrefresh } = propsRef.current;
         bindrefresherrefresh &&
-            bindrefresherrefresh(getCustomEvent('refresherrefresh', {}, { layoutRef }, props));
+            bindrefresherrefresh(getCustomEvent('refresherrefresh', {}, { layoutRef }, propsRef.current));
     }
     function getRefresherContent(children) {
         let refresherContent = null;

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

@@ -200,16 +200,6 @@ const _MovableView = forwardRef<HandlerRef<View, MovableViewProps>, MovableViewP
     )
   }, [])
 
-  // 节流版本的 change 事件触发
-  const handleTriggerChangeThrottled = useCallback(({ x, y, type }: { x: number; y: number; type?: string }) => {
-    'worklet'
-    const now = Date.now()
-    if (now - lastChangeTime.value >= changeThrottleTime) {
-      lastChangeTime.value = now
-      runOnJS(runOnJSCallback)('handleTriggerChange', { x, y, type })
-    }
-  }, [changeThrottleTime])
-
   useEffect(() => {
     runOnUI(() => {
       if (offsetX.value !== x || offsetY.value !== y) {
@@ -414,6 +404,16 @@ const _MovableView = forwardRef<HandlerRef<View, MovableViewProps>, MovableViewP
   })
   const runOnJSCallback = useRunOnJSCallback(runOnJSCallbackRef)
 
+  // 节流版本的 change 事件触发
+  const handleTriggerChangeThrottled = useCallback(({ x, y, type }: { x: number; y: number; type?: string }) => {
+    'worklet'
+    const now = Date.now()
+    if (now - lastChangeTime.value >= changeThrottleTime) {
+      lastChangeTime.value = now
+      runOnJS(runOnJSCallback)('handleTriggerChange', { x, y, type })
+    }
+  }, [changeThrottleTime])
+
   const gesture = useMemo(() => {
     const handleTriggerMove = (e: GestureTouchEvent) => {
       'worklet'

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

@@ -211,6 +211,18 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
 
   const scrollViewRef = useRef<ScrollView>(null)
 
+  const propsRef = useRef(props)
+  const refresherStateRef = useRef({
+    hasRefresher,
+    refresherTriggered
+  })
+
+  propsRef.current = props
+  refresherStateRef.current = {
+    hasRefresher,
+    refresherTriggered
+  }
+
   const runOnJSCallbackRef = useRef({
     setEnableScroll,
     setScrollBounces,
@@ -524,6 +536,7 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
 
   // 处理刷新
   function onRefresh () {
+    const { hasRefresher, refresherTriggered } = refresherStateRef.current
     if (hasRefresher && refresherTriggered === undefined) {
       // 处理使用了自定义刷新组件，又没设置 refresherTriggered 的情况
       setRefreshing(true)
@@ -535,10 +548,10 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
         }
       }, 500)
     }
-    const { bindrefresherrefresh } = props
+    const { bindrefresherrefresh } = propsRef.current
     bindrefresherrefresh &&
       bindrefresherrefresh(
-        getCustomEvent('refresherrefresh', {}, { layoutRef }, props)
+        getCustomEvent('refresherrefresh', {}, { layoutRef }, propsRef.current)
       )
   }
 

package/lib/runtime/components/web/filterTag.js

@@ -88,7 +88,16 @@ function parseHTML (html, options) {
           match.end = index
           handleStartTag(match)
         }
+        continue
+      }
+
+      // If we reach here, the `<` at position 0 does not start a valid tag/comment/end tag
+      // Treat it as plain text to avoid infinite loop on stray '<'
+      if (options.chars) {
+        options.chars('<')
       }
+      advance(1)
+      continue
     }
     let text, rest, next
     if (textEnd >= 0) {

package/lib/runtime/optionProcessor.js

@@ -14,7 +14,8 @@ export function processComponentOption (
     componentGenerics,
     genericsInfo,
     wxsMixin,
-    hasApp
+    hasApp,
+    disablePageTransition
   }
 ) {
   // 局部注册页面和组件中依赖的组件
@@ -79,7 +80,7 @@ registered in parent context!`)
         transitionName: ''
       }
     }
-    if (!global.__mpx.config.webConfig.disablePageTransition) {
+    if (!disablePageTransition) {
       option.watch = {
         $route: {
           handler () {

package/lib/template-compiler/compiler.js

@@ -1936,7 +1936,18 @@ function processAttrs (el, options) {
   el.attrsList.forEach((attr) => {
     const isTemplateData = el.tag === 'template' && attr.name === 'data'
     const needWrap = isTemplateData && mode !== 'swan'
-    const value = needWrap ? `{${attr.value}}` : attr.value
+    let value = needWrap ? `{${attr.value}}` : attr.value
+
+    // 修复React Native环境下属性值中插值表达式带空格的问题
+    if (isReact(mode) && typeof value === 'string') {
+      // 检查是否为带空格的插值表达式
+      const trimmedValue = value.trim()
+      if (trimmedValue.startsWith('{{') && trimmedValue.endsWith('}}')) {
+        // 如果是纯插值表达式但带有前后空格，则使用去除空格后的值进行解析
+        value = trimmedValue
+      }
+    }
+
     const parsed = parseMustacheWithContext(value)
     if (parsed.hasBinding) {
       // 该属性判断用于提供给运行时对于计算属性作为props传递时提出警告

package/lib/web/processScript.js

@@ -27,6 +27,8 @@ module.exports = function (script, {
 }, callback) {
   const { projectRoot, appInfo, webConfig, i18n } = loaderContext.getMpx()
 
+  const { disablePageTransition = true } = webConfig
+
   let output = '/* script */\n'
 
   let scriptSrcMode = srcMode
@@ -86,7 +88,8 @@ module.exports = function (script, {
     componentGenerics: ${JSON.stringify(componentGenerics)},
     genericsInfo: ${JSON.stringify(genericsInfo)},
     wxsMixin: getWxsMixin(wxsModules),
-    hasApp: ${hasApp}
+    hasApp: ${hasApp},
+    disablePageTransition: ${JSON.stringify(disablePageTransition)},
   })\n`
       return content
     }

package/lib/web/processTemplate.js

@@ -35,11 +35,13 @@ module.exports = function (template, {
   let output = '/* template */\n'
 
   if (ctorType === 'app') {
-    const { el } = webConfig
+    const { el, disablePageTransition = true } = webConfig
     const idName = (el && el.match(/#(.*)/) && el.match(/#(.*)/)[1]) || 'app'
     template = {
       tag: 'template',
-      content: `<div id="${idName}"><transition :name="transitionName"><mpx-keep-alive><router-view></router-view></mpx-keep-alive></transition></div>`
+      content: disablePageTransition
+        ? `<div id="${idName}"><mpx-keep-alive><router-view></router-view></mpx-keep-alive></div>`
+        : `<div id="${idName}"><transition :name="transitionName"><mpx-keep-alive><router-view></router-view></mpx-keep-alive></transition></div>`
     }
     builtInComponentsMap['mpx-keep-alive'] = {
       resource: addQuery('@mpxjs/webpack-plugin/lib/runtime/components/web/mpx-keep-alive.vue', { isComponent: true })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.15-3",
+  "version": "2.10.15-5",
   "description": "mpx compile core",
   "keywords": [
     "mpx"