@tarojs/plugin-platform-harmony-ets 4.0.0-beta.19 → 4.0.0-beta.20

package/dist/runtime-ets/utils/index.ts

@@ -45,21 +45,37 @@ export function convertNumber2VP (value: number, unit = 'px') {
   return pxTransformHelper(value, 'vp')
 }
 
-export function calcDynamicStyle (styleSheet: Record<string, CSSProperties>, classNames: string, style: CSSProperties): CSSProperties {
+// 合并静态样式，从样式表里面找到对应的样式
+export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, classNames: string, style: CSSProperties): CSSProperties {
   const obj: CSSProperties[] = []
   const classes = typeof classNames === 'string' ? classNames.split(' ') : []
-  for (let i = 0; i < classes.length; i++) {
-    const className = classes[i]
-    if (styleSheet[className]) {
-      obj.push(styleSheet[className])
+  if (classes.length === 1) {
+    if (style) {
+      return Object.assign({}, styleSheet[classNames], style)
+    } else {
+      // 同一个引用
+      return styleSheet[classNames]
     }
+  } else {
+    for (let i = 0; i < classes.length; i++) {
+      const className = classes[i]
+      if (styleSheet[className]) {
+        obj.push(styleSheet[className])
+      }
+    }
+    if (style) {
+      obj.push(style)
+    }
+    return Object.assign.apply(null, [{}].concat(obj))
   }
+}
 
+// 动态样式计算，需要经过web2harmony进行反转
+export function calcDynamicStyle (style: CSSProperties): CSSProperties {
   if (style) {
-    obj.push(convertWebStyle2HmStyle(style))
+    return convertWebStyle2HmStyle(style)
   }
-  
-  return Object.assign.apply(null, [{}].concat(obj))
+  return {}
 }
 
 export function getPageScrollerOrNode (scrollerOrNode: any, page: any) {

package/dist/runtime-framework/react/native-page.ts

@@ -257,7 +257,7 @@ export function createNativePageConfig (Component, pageName: string, react: type
       window.trigger(CONTEXT_ACTIONS.DESTORY, $taroPath)
       // 触发onUnload生命周期
       safeExecute($taroPath, ONUNLOAD)
-      resetCurrent()
+      resetCurrent.call(this)
       unmounting = true
       Current.app!.unmount!($taroPath, () => {
         unmounting = false
@@ -310,9 +310,11 @@ export function createNativePageConfig (Component, pageName: string, react: type
   }
 
   function resetCurrent () {
-    // 小程序插件页面卸载之后返回到宿主页面时，需重置Current页面和路由。否则引发插件组件二次加载异常 fix:#11991
-    Current.page = null
-    Current.router = null
+    if (Current.page === this) {
+      // 小程序插件页面卸载之后返回到宿主页面时，需重置Current页面和路由。否则引发插件组件二次加载异常 fix:#11991
+      Current.page = null
+      Current.router = null
+    }
   }
 
   LIFECYCLES.forEach((lifecycle) => {

package/dist/runtime-utils.js

@@ -3999,13 +3999,12 @@ class IntersectionObserver {
         };
         const taro = Current.taro;
         const page = taro.getCurrentInstance().page;
-        const currentPage = getPageScrollerOrNode(page.node, page);
-        this._component = component || currentPage;
+        this._component = component || getPageScrollerOrNode(page === null || page === void 0 ? void 0 : page.node, page);
         Object.assign(this._options, options);
     }
     disconnect() {
         var _a;
-        if (this._observerNodes) {
+        if (this._observerNodes && this._component) {
             if (this._observerNodes instanceof Array) {
                 this._observerNodes.forEach((n) => {
                     var _a;
@@ -4026,6 +4025,8 @@ class IntersectionObserver {
     }
     observe(targetSelector, callback) {
         var _a;
+        if (!this._component)
+            return;
         const { observeAll, thresholds } = this._options;
         const node = findChildNodeWithDFS(this._component, targetSelector, observeAll);
         this._observerNodes = node;