@tarojs/plugin-platform-harmony-ets 4.0.0-beta.74 → 4.0.0-beta.75

package/dist/apis/media/image/index.ts

@@ -112,7 +112,7 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
     photoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE // 过滤选择媒体文件类型为IMAGE
 
     photoViewPicker.select(photoSelectOptions).then((photoSelectResult) => {
-      callAsyncSuccess(resolve, { tempFilePaths: photoSelectResult.photoUris })
+      callAsyncSuccess(resolve, { tempFilePaths: photoSelectResult.photoUris }, options)
     }).catch((error) => {
       callAsyncFail(reject, error, options)
     })

package/dist/apis/ui/pull-down-refresh.ts

@@ -1,14 +1,17 @@
 import { Current } from '@tarojs/runtime'
 
-import { callAsyncSuccess } from '../utils'
+import { callAsyncFail, callAsyncSuccess } from '../utils'
 
 import type Taro from '@tarojs/taro/types'
 
 export const startPullDownRefresh: typeof Taro.startPullDownRefresh = function (options) {
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
 
+    if (!page) {
+      return callAsyncFail(reject, { errMsg: 'stopPullDownRefresh:fail' }, options)
+    }
     if (page.isRefreshing instanceof Array) {
       const index = page.tabBarCurrentIndex || 0
       page.isRefreshing[index] = true
@@ -23,10 +26,13 @@ export const startPullDownRefresh: typeof Taro.startPullDownRefresh = function (
 }
 
 export const stopPullDownRefresh: typeof Taro.stopPullDownRefresh = function (options) {
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
 
+    if (!page) {
+      return callAsyncFail(reject, { errMsg: 'stopPullDownRefresh:fail' }, options)
+    }
     if (page.isRefreshing instanceof Array) {
       const index = page.tabBarCurrentIndex || 0
       page.isRefreshing[index] = false

package/dist/apis/ui/scroll/index.ts

@@ -34,8 +34,8 @@ export const pageScrollTo: typeof Taro.pageScrollTo = (options) => {
     const page = taro.getCurrentInstance().page
 
     let scrollValue = -1
-    let scroller = getPageScrollerOrNode(page.scroller, page)
-    const currentPageNode = getPageScrollerOrNode(page.node, page)
+    let scroller = getPageScrollerOrNode(page?.scroller, page)
+    const currentPageNode = getPageScrollerOrNode(page?.node, page)
 
     if (scrollTop || typeof scrollTop === 'number') {
       scrollValue = scrollTop
@@ -66,14 +66,14 @@ export const pageScrollTo: typeof Taro.pageScrollTo = (options) => {
         scrollValue = areaInfo.globalPosition.y + yOffset + pxTransformHelper(offsetTop, 'px', true)
       }
     }
-    const { xOffset } = scroller.currentOffset()
-
-    if (scrollValue === -1) {
+    if (!scroller || scrollValue === -1) {
       return handle.fail({
         errMsg: '请检查传入的 scrollTop 或 selector 是否合法'
       }, { resolve, reject })
     }
 
+    const { xOffset } = scroller.currentOffset()
+
     try {
       scroller.scrollTo({
         xOffset,

package/dist/apis/ui/tab-bar.ts

@@ -22,7 +22,7 @@ const toggleTabBar = function<T extends ToggleAPIs['type']> (type: T): Extract<T
     return new Promise((resolve, reject) => {
       const taro = (Current as any).taro
       const page = taro.getCurrentInstance().page
-      const currentData = page._data?.taroTabBar || page.tabBar
+      const currentData = page?._data?.taroTabBar || page?.tabBar
       const res = { errMsg: `${type}TabBar:ok` }
       const error = { errMsg: `${type}TabBar:fail not TabBar page` }
 
@@ -49,7 +49,7 @@ export const setTabBarStyle: typeof Taro.setTabBarStyle = function (options = {}
   return new Promise((resolve, reject) => {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
-    const currentData = page._data?.taroTabBar || page.tabBar
+    const currentData = page?._data?.taroTabBar || page?.tabBar
     const res = { errMsg: 'setTabBarStyle:ok' }
     const error = { errMsg: 'setTabBarStyle:fail not TabBar page' }
 
@@ -74,7 +74,7 @@ export const setTabBarItem: typeof Taro.setTabBarItem = function (options) {
   return new Promise((resolve, reject) => {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
-    const currentData = page._data?.taroTabBar || page.tabBar
+    const currentData = page?._data?.taroTabBar || page?.tabBar
     const res = { errMsg: 'setTabBarItem:ok' }
     const error = { errMsg: 'setTabBarItem:fail not TabBar page' }
 

package/dist/apis/wxml/selectorQuery.ts

@@ -192,9 +192,9 @@ function queryBat (queue, cb) {
   const result: any = []
   const taro = (Current as any).taro
   const page = taro.getCurrentInstance().page
-  const element = getPageScrollerOrNode(page.node, page)
+  const element = getPageScrollerOrNode(page?.node, page)
 
-  if (element == null) return null
+  if (!element) return null
 
   arr = []
   traversalDFSDom(element)

package/dist/components-harmony-ets/label.ets

@@ -12,8 +12,8 @@ import { isUndefined } from '@tarojs/shared'
 function handleTargetChange (id: string) {
   const taro: TaroAny = Current.taro
   const page: TaroAny = taro.getCurrentInstance().page
-  const currentPageNode: TaroElement = getPageScrollerOrNode(page.node, page)
-  const node: TaroElement | null = currentPageNode.getElementById(id)
+  const currentPageNode: TaroElement = getPageScrollerOrNode(page?.node, page)
+  const node: TaroElement | null = currentPageNode?.getElementById(id)
 
   if (!node) return
 

package/dist/components-harmony-ets/movableView.ets

@@ -47,7 +47,7 @@ export default struct TaroMovableView {
     .visibility(this.node.visibility)
     .gesture(
       GestureGroup(GestureMode.Parallel,
-        PanGesture({ fingers: 1 }).onActionStart((e: GestureEvent) => {
+        PanGesture(getPanOption(this.node)).onActionStart((e: GestureEvent) => {
 
           this.node.startMove()
           this.node.callTouchEventFnFromGesture('touchstart', e)
@@ -71,3 +71,21 @@ export default struct TaroMovableView {
     )
   }
 }
+
+
+function getPanOption(node: TaroMovableViewElement) {
+  const attrDirection = node.getAttribute('direction')
+  let panDirection = PanDirection.All
+
+  if(node.getAttribute('disabled')) {
+    panDirection = PanDirection.None
+  } else if(attrDirection === 'horizontal') {
+    panDirection = PanDirection.Horizontal
+  } else if (attrDirection === 'vertical') {
+    panDirection = PanDirection.Vertical
+  }
+  return new PanGestureOptions({
+    direction: panDirection,
+    fingers: 1
+  })
+}

package/dist/runtime-ets/dom/document.ts

@@ -69,9 +69,9 @@ class TaroDocument extends TaroNode {
   public querySelector (selectors: string): TaroElement | null {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
-    const element = getPageScrollerOrNode(page.node, page)
+    const element = getPageScrollerOrNode(page?.node, page)
 
-    if (element == null) return null
+    if (!element) return null
 
     return findChildNodeWithDFS(element, selectors)
   }
@@ -79,7 +79,7 @@ class TaroDocument extends TaroNode {
   public querySelectorAll (selectors: string): TaroElement[] {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
-    const element = getPageScrollerOrNode(page.node, page)
+    const element = getPageScrollerOrNode(page?.node, page)
 
     if (element == null) return []
 

package/dist/runtime-utils.js

@@ -2352,7 +2352,7 @@ const chooseImage = function (options) {
         photoSelectOptions.maxSelectNumber = count; // 选择媒体文件的最大数目
         photoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE; // 过滤选择媒体文件类型为IMAGE
         photoViewPicker.select(photoSelectOptions).then((photoSelectResult) => {
-            callAsyncSuccess(resolve, { tempFilePaths: photoSelectResult.photoUris });
+            callAsyncSuccess(resolve, { tempFilePaths: photoSelectResult.photoUris }, options);
         }).catch((error) => {
             callAsyncFail(reject, error, options);
         });
@@ -3817,10 +3817,13 @@ const hideHomeButton = function (options) {
 };
 
 const startPullDownRefresh = function (options) {
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         var _a;
         const taro = Current.taro;
         const page = taro.getCurrentInstance().page;
+        if (!page) {
+            return callAsyncFail(reject, { errMsg: 'stopPullDownRefresh:fail' }, options);
+        }
         if (page.isRefreshing instanceof Array) {
             const index = page.tabBarCurrentIndex || 0;
             page.isRefreshing[index] = true;
@@ -3834,10 +3837,13 @@ const startPullDownRefresh = function (options) {
     });
 };
 const stopPullDownRefresh = function (options) {
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         var _a;
         const taro = Current.taro;
         const page = taro.getCurrentInstance().page;
+        if (!page) {
+            return callAsyncFail(reject, { errMsg: 'stopPullDownRefresh:fail' }, options);
+        }
         if (page.isRefreshing instanceof Array) {
             const index = page.tabBarCurrentIndex || 0;
             page.isRefreshing[index] = false;
@@ -3870,8 +3876,8 @@ const pageScrollTo = (options) => {
         const taro = Current.taro;
         const page = taro.getCurrentInstance().page;
         let scrollValue = -1;
-        let scroller = getPageScrollerOrNode(page.scroller, page);
-        const currentPageNode = getPageScrollerOrNode(page.node, page);
+        let scroller = getPageScrollerOrNode(page === null || page === void 0 ? void 0 : page.scroller, page);
+        const currentPageNode = getPageScrollerOrNode(page === null || page === void 0 ? void 0 : page.node, page);
         if (scrollTop || typeof scrollTop === 'number') {
             scrollValue = scrollTop;
         }
@@ -3896,12 +3902,12 @@ const pageScrollTo = (options) => {
                 scrollValue = areaInfo.globalPosition.y + yOffset + pxTransformHelper$1(offsetTop, 'px', true);
             }
         }
-        const { xOffset } = scroller.currentOffset();
-        if (scrollValue === -1) {
+        if (!scroller || scrollValue === -1) {
             return handle.fail({
                 errMsg: '请检查传入的 scrollTop 或 selector 是否合法'
             }, { resolve, reject });
         }
+        const { xOffset } = scroller.currentOffset();
         try {
             scroller.scrollTo({
                 xOffset,
@@ -3933,7 +3939,7 @@ const toggleTabBar = function (type) {
             var _a, _b;
             const taro = Current.taro;
             const page = taro.getCurrentInstance().page;
-            const currentData = ((_a = page._data) === null || _a === void 0 ? void 0 : _a.taroTabBar) || page.tabBar;
+            const currentData = ((_a = page === null || page === void 0 ? void 0 : page._data) === null || _a === void 0 ? void 0 : _a.taroTabBar) || (page === null || page === void 0 ? void 0 : page.tabBar);
             const res = { errMsg: `${type}TabBar:ok` };
             const error = { errMsg: `${type}TabBar:fail not TabBar page` };
             if (!currentData) {
@@ -3958,7 +3964,7 @@ const setTabBarStyle = function (options = {}) {
         var _a, _b;
         const taro = Current.taro;
         const page = taro.getCurrentInstance().page;
-        const currentData = ((_a = page._data) === null || _a === void 0 ? void 0 : _a.taroTabBar) || page.tabBar;
+        const currentData = ((_a = page === null || page === void 0 ? void 0 : page._data) === null || _a === void 0 ? void 0 : _a.taroTabBar) || (page === null || page === void 0 ? void 0 : page.tabBar);
         const res = { errMsg: 'setTabBarStyle:ok' };
         const error = { errMsg: 'setTabBarStyle:fail not TabBar page' };
         if (!currentData) {
@@ -3985,7 +3991,7 @@ const setTabBarItem = function (options) {
         var _a, _b;
         const taro = Current.taro;
         const page = taro.getCurrentInstance().page;
-        const currentData = ((_a = page._data) === null || _a === void 0 ? void 0 : _a.taroTabBar) || page.tabBar;
+        const currentData = ((_a = page === null || page === void 0 ? void 0 : page._data) === null || _a === void 0 ? void 0 : _a.taroTabBar) || (page === null || page === void 0 ? void 0 : page.tabBar);
         const res = { errMsg: 'setTabBarItem:ok' };
         const error = { errMsg: 'setTabBarItem:fail not TabBar page' };
         if (!currentData) {
@@ -4361,8 +4367,8 @@ function queryBat(queue, cb) {
     const result = [];
     const taro = Current.taro;
     const page = taro.getCurrentInstance().page;
-    const element = getPageScrollerOrNode(page.node, page);
-    if (element == null)
+    const element = getPageScrollerOrNode(page === null || page === void 0 ? void 0 : page.node, page);
+    if (!element)
         return null;
     arr = [];
     traversalDFSDom(element);