@mpxjs/core 2.9.5 → 2.9.6

package/@types/index.d.ts

@@ -31,13 +31,18 @@ type ArrayType<T extends any[]> = T extends Array<infer R> ? R : never;
 // Mpx types
 type Data = object | (() => object)
 
-type PropConstructor<T = any> = {
-  new (...args: any[]): T & {};
-} | {
-  (): T;
-}
-
-export type PropType<T> = PropConstructor<T>
+export type PropType<T> = T & (
+  T extends string 
+    ? StringConstructor
+    : T extends number 
+      ? NumberConstructor
+      : T extends boolean
+        ? BooleanConstructor
+        : T extends any[]
+          ? ArrayConstructor
+          : T extends object 
+            ? ObjectConstructor
+            : never )
 
 type FullPropType<T> = {
   type: PropType<T>;
@@ -75,17 +80,17 @@ interface WatchField {
 
 type GetDataType<T> = T extends () => any ? ReturnType<T> : T
 
-type PropValueType<Def> = Def extends {
-    type: (...args: any[]) => infer T;
-    optionalType?: ((...args: any[]) => infer T)[];
-    value?: infer T;
-  }
+type PropValueType<Def> = Def extends FullPropType<infer T>
   ? T
-  : Def extends (...args: any[]) => infer T
+  : Def extends PropType<infer T>
     ? T
-    : Def extends FullPropType<infer T>
+    : Def extends {
+      type: (...args: any[]) => infer T;
+      optionalType?: ((...args: any[]) => infer T)[];
+      value?: infer T;
+    }
       ? T
-      : Def extends PropType<infer T>
+      : Def extends (...args: any[]) => infer T
         ? T
         : any;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.5",
+  "version": "2.9.6",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "beefb0935f3aa9d3605dd6f31b8cd37094186488"
+  "gitHead": "9034343edacc95da66b6e8ddb5c2f64a4be97231"
 }

package/src/platform/builtInMixins/pageScrollMixin.web.js

@@ -41,6 +41,7 @@ export default function pageScrollMixin (mixinType) {
   return {
     mounted () {
       this.__lastScrollY = 0
+      this.__originalOverflow = document.body.style.overflow
     },
     activated () {
       if (!refreshMs()) {
@@ -72,19 +73,22 @@ export default function pageScrollMixin (mixinType) {
       }
     },
     deactivated () {
-      if (ms) {
+      if (ms) { // 保存滚动位置, 用于 keep-alive
         this.__lastScrollY = getScrollTop()
-        ms.destroy()
-        hideLoading(this)
       }
+      this.__uninstallMpxScroll()
     },
     beforeDestroy () {
-      if (ms) {
-        ms.destroy()
-        hideLoading(this)
-      }
+      this.__uninstallMpxScroll()
     },
     methods: {
+      __uninstallMpxScroll () {
+        if (ms) {
+          ms.destroy()
+          hideLoading(this)
+          document.body.style.overflow = this.__originalOverflow // 恢复原有 overflow, 避免影响其他页面
+        }
+      },
       __mpxPullDownHandler (autoStop = false, isRefresh = false) {
         this.__pullingDown = true
         // 同微信保持一致