@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.2 → 4.0.0-alpha.21

package/dist/runtime-utils.js

@@ -1,14 +1,15 @@
 import { isFunction, isString, isArray, isObject, isNull, isNumber, isUndefined, queryToJson, PLATFORM_TYPE, singleQuote, internalComponents } from '@tarojs/shared';
 import _display from '@ohos.display';
-import { Current, window, hooks, document as document$1, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime';
+import { Current, window, eventSource, hooks, document as document$1, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME, getCurrentInstance } from '@tarojs/runtime';
 import { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm';
+import ConfigurationConstant from '@ohos.app.ability.ConfigurationConstant';
 import deviceInfo from '@ohos.deviceInfo';
 import i18n from '@ohos.i18n';
-import deviceMethod from '@system.device';
 import errorManager from '@ohos.app.ability.errorManager';
 import sensor from '@ohos.sensor';
 import batteryInfo, { BatteryChargeState } from '@ohos.batteryInfo';
 import pasteboard from '@ohos.pasteboard';
+import promptAction from '@ohos.promptAction';
 import inputMethodEngine from '@ohos.inputMethodEngine';
 import network from '@system.network';
 import call from '@ohos.telephony.call';
@@ -28,11 +29,9 @@ import http from '@ohos.net.http';
 import webSocket from '@ohos.net.webSocket';
 import router from '@ohos.router';
 import bundleManager from '@ohos.bundle.bundleManager';
-import dataPreferences from '@ohos.data.preferences';
-import hilog from '@ohos.hilog';
+import distributedKVStore from '@ohos.data.distributedKVStore';
 import matrix4 from '@ohos.matrix4';
-import prompt from '@ohos.prompt';
-import { pxTransformHelper } from '@tarojs/taro';
+import { pxTransformHelper as pxTransformHelper$1 } from '@tarojs/taro';
 
 class MethodHandler {
     constructor({ name, success, fail, complete }) {
@@ -186,7 +185,7 @@ function temporarilyNotSupport(name, recommended) {
     return (option = {}, ...args) => {
         const { success, fail, complete } = option;
         const handle = new MethodHandler({ name, success, fail, complete });
-        let errMsg = '暂时不支持 API';
+        let errMsg = `暂时不支持 API ${name}`;
         if (recommended) {
             errMsg += `, 请使用 ${recommended}`;
         }
@@ -266,16 +265,63 @@ const preloadWebview = /* @__PURE__ */ temporarilyNotSupport('preloadWebview');
 const preloadSkylineView = /* @__PURE__ */ temporarilyNotSupport('preloadSkylineView');
 const preloadAssets = /* @__PURE__ */ temporarilyNotSupport('preloadAssets');
 
-// 设备信息,从 API Version 6 开始支持
-const display = _display.getDefaultDisplaySync();
-let device;
-deviceMethod.getInfo({
-    success: data => {
-        device = data;
-    }
+let display$1;
+let navigationIndicatorRect;
+let safeArea = null;
+let statusBarHeight;
+let windowRect;
+Current.contextPromise.then((context) => {
+    const win = window.__ohos.getLastWindow(context);
+    win.then(mainWindow => {
+        const topRect = mainWindow.getWindowAvoidArea(window.__ohos.AvoidAreaType.TYPE_SYSTEM).topRect;
+        navigationIndicatorRect = mainWindow.getWindowAvoidArea(window.__ohos.AvoidAreaType.TYPE_NAVIGATION_INDICATOR).bottomRect;
+        statusBarHeight = topRect.top + topRect.height;
+        windowRect = mainWindow.getWindowProperties().windowRect;
+        try {
+            display$1 = _display.getDefaultDisplaySync();
+            setSafeArea({
+                top: statusBarHeight,
+                left: 0,
+                right: display$1.width,
+                bottom: navigationIndicatorRect === null || navigationIndicatorRect === void 0 ? void 0 : navigationIndicatorRect.top
+            });
+            // @ts-ignore
+            display$1.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} } = {}) => {
+                var _a, _b, _c, _d, _e, _f;
+                if (err === null || err === void 0 ? void 0 : err.code) {
+                    console.error('Failed to get cutout info', JSON.stringify(err));
+                    return;
+                }
+                const top = Math.max(...boundingRects.map(rect => rect.top + rect.height), ((_a = waterfallDisplayAreaRects.top) === null || _a === void 0 ? void 0 : _a.top) + ((_b = waterfallDisplayAreaRects.top) === null || _b === void 0 ? void 0 : _b.height), statusBarHeight);
+                const bottom = Math.min(display$1.height - ((_c = waterfallDisplayAreaRects.bottom) === null || _c === void 0 ? void 0 : _c.top), navigationIndicatorRect === null || navigationIndicatorRect === void 0 ? void 0 : navigationIndicatorRect.top);
+                const left = ((_d = waterfallDisplayAreaRects.left) === null || _d === void 0 ? void 0 : _d.left) + ((_e = waterfallDisplayAreaRects.left) === null || _e === void 0 ? void 0 : _e.width);
+                const right = display$1.width - ((_f = waterfallDisplayAreaRects.right) === null || _f === void 0 ? void 0 : _f.left);
+                setSafeArea({
+                    top,
+                    left,
+                    right,
+                    bottom
+                });
+            });
+        }
+        catch (e) {
+            console.error('Failed to get display', e);
+        }
+    });
 });
+function setSafeArea({ top, left, right, bottom }) {
+    safeArea = {
+        top,
+        bottom,
+        left,
+        right,
+        height: bottom - top,
+        width: right - left,
+    };
+}
 /* 同步版本 */
 const getSystemInfoSync = function () {
+    var _a, _b;
     const res = {};
     res.SDKVersion = deviceInfo && deviceInfo.sdkApiVersion; // 客户端基础库版本 string
     res.albumAuthorized = false; // 允许使用相册的开关（仅 iOS 有效） boolean
@@ -285,7 +331,7 @@ const getSystemInfoSync = function () {
     res.cameraAuthorized = null; // 允许使用摄像头的开关 boolean
     res.enableDebug = null; // 是否已打开调试 boolean
     res.fontSizeSetting = null; // 用户字体大小（单位px） number
-    res.language = i18n && i18n.getSystemLanguage && i18n.getSystemLanguage(); // string
+    res.language = (_a = i18n === null || i18n === void 0 ? void 0 : i18n.getSystemLanguage) === null || _a === void 0 ? void 0 : _a.call(i18n); // string
     res.locationAuthorized = null; // 定位的开关 boolean
     res.locationEnabled = null; // 地理位置的系统开关 boolean
     res.microphoneAuthorized = null; // 麦克风的开关 boolean
@@ -296,17 +342,18 @@ const getSystemInfoSync = function () {
     res.notificationSoundAuthorized = false; // 通知带有声音的开关（仅 iOS 有效）boolean
     res.phoneCalendarAuthorized = null; // 使用日历的开关 boolean
     res.wifiEnabled = false; // Wi-Fi 的系统开关 boolean
-    res.pixelRatio = null; // 设备像素比,number
-    res.platform = 'android'; // 客户端平台 string
-    res.safeArea = null; // 在竖屏正方向下的安全区域 General.SafeAreaResult
-    res.screenHeight = display && display.height; // 屏幕高度，单位px number
-    res.screenWidth = display && display.width; // 屏幕宽度，单位px number
-    res.statusBarHeight = null; // 状态栏的高度，单位px number
-    res.system = deviceInfo && deviceInfo.osFullName; // 操作系统及版本 string
-    res.theme = null; // 系统当前主题，取值为light或dark 'light' | 'dark'
-    res.windowWidth = device && device.windowWidth; // 可使用窗口宽度，单位px number
-    res.windowHeight = device && device.windowHeight; // 可使用窗口高度，单位px number
-    res.version = deviceInfo && deviceInfo.displayVersion; // 版本号 string
+    res.pixelRatio = display$1 && display$1.densityPixels; // 设备像素比,number
+    res.platform = 'harmony'; // 客户端平台 string
+    res.safeArea = safeArea; // 在竖屏正方向下的安全区域 General.SafeAreaResult
+    res.screenHeight = display$1 === null || display$1 === void 0 ? void 0 : display$1.height; // 屏幕高度，单位px number
+    res.screenWidth = display$1 === null || display$1 === void 0 ? void 0 : display$1.width; // 屏幕宽度，单位px number
+    res.statusBarHeight = statusBarHeight; // 状态栏的高度，单位px number
+    res.system = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.osFullName; // 操作系统及版本 string
+    // Note: 更新配置时才能记录
+    res.theme = ((_b = AppStorage.get('__TARO_APP_CONFIG')) === null || _b === void 0 ? void 0 : _b.colorMode) === ConfigurationConstant.ColorMode.COLOR_MODE_DARK ? 'dark' : 'light'; // 系统当前主题，取值为light或dark 'light' | 'dark'
+    res.windowHeight = windowRect === null || windowRect === void 0 ? void 0 : windowRect.height; // 可使用窗口高度，单位px number
+    res.windowWidth = windowRect === null || windowRect === void 0 ? void 0 : windowRect.width; // 可使用窗口宽度，单位px number
+    res.version = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.displayVersion; // 版本号 string
     return res;
 };
 /* 异步版本 */
@@ -412,7 +459,13 @@ const base64ToArrayBuffer = /* @__PURE__ */ temporarilyNotSupport('base64ToArray
 /** 创建离屏 canvas 实例 */
 const createOffscreenCanvas = /* @__PURE__ */ temporarilyNotSupport('createOffscreenCanvas');
 /** 创建 canvas 的绘图上下文 CanvasContext 对象 */
-const createCanvasContext = /* @__PURE__ */ temporarilyNotSupport('createOffscreenCanvas');
+// export const createCanvasContext = /* @__PURE__ */ temporarilyNotSupport('createOffscreenCanvas')
+const createCanvasContext = (canvasId) => {
+    const dom = eventSource.get(`canvasId-${canvasId}`);
+    // return dom as TaroCanvasElement
+    if (dom)
+        return dom.context;
+};
 /** 把当前画布指定区域的内容导出生成指定大小的图片 */
 const canvasToTempFilePath = /* @__PURE__ */ temporarilyNotSupport('createOffscreenCanvas');
 /** 将像素数据绘制到画布 */
@@ -533,7 +586,7 @@ const getBatteryInfoSync = () => ({
     isCharging: [BatteryChargeState.ENABLE, BatteryChargeState.FULL].includes(batteryInfo.chargingStatus),
     level: batteryInfo.batterySOC
 });
-const getBatteryInfo = ({ success, fail, complete } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const getBatteryInfo = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* ({ success, fail, complete } = {}) {
     const handle = new MethodHandler({ name: 'getBatteryInfo', success, fail, complete });
     try {
         return handle.success(getBatteryInfoSync());
@@ -606,8 +659,20 @@ const setClipboardData = function (options) {
     }
     return new Promise((resolve, reject) => {
         const systemPasteboard = pasteboard.getSystemPasteboard();
-        const pasteData = pasteboard.createPlainTextData(data);
-        systemPasteboard.setPasteData(pasteData, (error, data) => {
+        const pasteData = pasteboard.createData(pasteboard.MIMETYPE_TEXT_PLAIN, data);
+        try {
+            systemPasteboard.setDataSync(pasteData);
+            promptAction.showToast({
+                message: '内容已复制',
+                duration: 1500,
+                bottom: '50%',
+                showMode: 1 // 设置弹窗显示模式，显示在应用之上。
+            });
+            return handle.success({
+                data,
+            }, { resolve, reject });
+        }
+        catch (error) {
             if (error) {
                 console.error('Failed to set PasteData. Cause: ' + JSON.stringify(error));
                 res = {
@@ -616,12 +681,7 @@ const setClipboardData = function (options) {
                 };
                 callAsyncFail(reject, res, options);
             }
-            else {
-                return handle.success({
-                    data,
-                }, { resolve, reject });
-            }
-        });
+        }
     });
 };
 /**
@@ -632,7 +692,7 @@ const getClipboardData = function (options) {
     const handle = new MethodHandler({ name: 'getClipboardData', success, fail, complete });
     return new Promise((resolve, reject) => {
         const systemPasteboard = pasteboard.getSystemPasteboard();
-        systemPasteboard.getPasteData((error, pasteData) => {
+        systemPasteboard.getData((error, pasteData) => {
             if (error) {
                 console.error('Failed to obtain PasteData. Cause: ' + JSON.stringify(error));
                 return handle.fail({
@@ -771,7 +831,7 @@ const getNetworkType = (options = {}) => {
     });
 };
 const networkStatusManager = new CallbackManager();
-const networkStatusListener = (data, code = 0) => __awaiter(void 0, void 0, void 0, function* () {
+const networkStatusListener = (data_1, ...args_1) => __awaiter(void 0, [data_1, ...args_1], void 0, function* (data, code = 0) {
     if (code > 0) {
         return networkStatusManager.trigger({ isConnected: false, networkType: 'none' });
     }
@@ -1984,7 +2044,6 @@ function getEnv() {
 }
 // TODO
 const getCurrentPages = () => [];
-const getCurrentInstance = () => Current;
 const requirePlugin$1 = temporarilyNotSupport('requirePlugin');
 
 // @ts-nocheck
@@ -2014,7 +2073,7 @@ function formatLocation(location) {
         altitude: location.altitude,
         accuracy: location.accuracy,
         speed: location.speed,
-        verticalAccuracy: 0,
+        verticalAccuracy: 0, // OHOS 不支持返回此参数，直接设置为默认值
         horizontalAccuracy: 0 // OHOS 不支持返回此参数，直接设置为默认值
     };
     return wxLocate;
@@ -2293,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);
         });
@@ -3190,113 +3249,172 @@ const getBackgroundFetchData = /* @__PURE__ */ temporarilyNotSupport('getBackgro
 // 周期性更新
 const createCacheManager = /* @__PURE__ */ temporarilyNotSupport('createCacheManager');
 
-const preferencesPromise = Current.contextPromise
-    .then((context) => {
-    return bundleManager
-        .getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION)
-        .then(data => {
-        return dataPreferences
-            .getPreferences(context, `${data.appInfo.uid}Store`);
-    });
-})
-    .catch((error) => {
-    hilog.error(0x0000, 'TaroFailedTag', 'Failed to load the storage. Cause: %{public}s', error.code ? JSON.stringify(error) : error.message || error);
+/**
+ * 从API Version 6开始，该模块不再维护，可以使用模块@ohos.data.storage。在API Version 9后，推荐使用新模块@ohos.data.preferences。
+ * https://developer.harmonyos.com/cn/docs/documentation/doc-references-V3/js-apis-data-preferences-0000001427745052-V3
+*/
+let context;
+let kvManager;
+let kvStore;
+let kvStorePromise;
+Current.contextPromise.then((ctx) => {
+    context = ctx;
+    const kvManagerConfig = {
+        context: context,
+        bundleName: 'com.example.taro'
+    };
+    try {
+        // 创建KVManager实例
+        kvManager = distributedKVStore.createKVManager(kvManagerConfig);
+        // 继续创建获取数据库
+        const options = {
+            createIfMissing: true,
+            encrypt: false,
+            backup: false,
+            autoSync: false,
+            // kvStoreType不填时，默认创建多设备协同数据库
+            kvStoreType: distributedKVStore.KVStoreType.SINGLE_VERSION,
+            // 多设备协同数据库：kvStoreType: distributedKVStore.KVStoreType.DEVICE_COLLABORATION,
+            securityLevel: distributedKVStore.SecurityLevel.S1
+        };
+        const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION);
+        kvStorePromise = new Promise(resolve => {
+            kvManager.getKVStore(`${data.appInfo.uid}Store`, options, (err, store) => {
+                if (err) {
+                    console.error(`Failed to get KVStore: Code:${err.code},message:${err.message}`);
+                    return;
+                }
+                kvStore = store;
+                // 请确保获取到键值数据库实例后，再进行相关数据操作
+                resolve();
+            });
+        });
+    }
+    catch (e) {
+        console.error(`Failed to create KVManager. Code:${e.code},message:${e.message}`);
+    }
+    return context;
 });
-function getItem(key) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const preferences = yield preferencesPromise;
-            const item = yield preferences.get(key, null);
-            return { result: true, data: item };
-        }
-        catch (error) {
-            return { result: false };
-        }
-    });
-}
 const storageSchema = {
     key: 'String'
 };
-function getStorage(options) {
-    return new Promise((resolve, reject) => {
-        try {
-            validateParams('getStorage', options, storageSchema);
+function checkContextExist(api, isAsync = false) {
+    if (!context) {
+        const message = `${api} 调用失败，Taro 不支持过早地调用 ${api}，请确保页面已经渲染完成再调用此 API`;
+        if (isAsync) {
+            return {
+                isExist: false,
+                error: Promise.reject(new Error(message))
+            };
         }
-        catch (error) {
-            const res = { errMsg: error.message };
-            return callAsyncFail(reject, res, options);
+        else {
+            console.warn(message);
+            return {
+                isExist: false,
+            };
         }
-        getItem(options.key).then(({ result, data }) => {
-            const res = { errMsg: 'getStorage:ok' };
-            if (result) {
-                res.data = data;
-                callAsyncSuccess(resolve, res, options);
+    }
+    return {
+        isExist: true,
+    };
+}
+function getStorage(options) {
+    const name = 'getStorage';
+    const { isExist, error } = checkContextExist(name, true);
+    if (!isExist) {
+        return error;
+    }
+    const { key, success, fail, complete } = options || {};
+    const handle = new MethodHandler({ name, success, fail, complete });
+    return new Promise((resolve, reject) => {
+        kvStorePromise.then(() => {
+            try {
+                validateParams(name, options, storageSchema);
             }
-            else {
-                res.errMsg = 'getStorage:fail data not found';
-                callAsyncFail(reject, res, options);
+            catch (error) {
+                const res = { errMsg: error.message };
+                return handle.fail(res, { resolve, reject });
             }
+            kvStore = kvStore;
+            kvStore.get(key, (err, data) => {
+                if (err) {
+                    handle.fail({ errMsg: `Failed to get data. Code:${err.code},message:${err.message}` }, { resolve, reject });
+                    return;
+                }
+                handle.success({ data }, { resolve, reject });
+            });
         });
     });
 }
 function setStorage(options) {
+    const name = 'setStorage';
+    const { isExist, error } = checkContextExist(name, true);
+    if (!isExist) {
+        return error;
+    }
+    const { key, data, success, fail, complete } = options || {};
+    const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
-        try {
-            validateParams('setStorage', options, storageSchema);
-        }
-        catch (error) {
-            const res = { errMsg: error.message };
-            return callAsyncFail(reject, res, options);
-        }
-        const { key, data } = options;
-        const res = { errMsg: 'setStorage:ok' };
-        preferencesPromise.then((preferences) => __awaiter(this, void 0, void 0, function* () {
-            yield preferences.put(key, data);
-            yield preferences.flush();
-            callAsyncSuccess(resolve, res, options);
-        }));
+        kvStorePromise.then(() => {
+            try {
+                validateParams(name, options, storageSchema);
+            }
+            catch (error) {
+                const res = { errMsg: error.message };
+                return handle.fail(res, { resolve, reject });
+            }
+            kvStore = kvStore;
+            kvStore.put(key, data, (err) => {
+                if (err) {
+                    handle.fail({ errMsg: `Failed to put data. Code:${err.code},message:${err.message}` }, { resolve, reject });
+                    return;
+                }
+                handle.success({}, { resolve, reject });
+            });
+        });
     });
 }
 function removeStorage(options) {
+    const name = 'removeStorage';
+    const { isExist, error } = checkContextExist(name, true);
+    if (!isExist) {
+        return error;
+    }
+    const { key, success, fail, complete } = options || {};
+    const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
-        try {
-            validateParams('removeStorage', options, storageSchema);
-        }
-        catch (error) {
-            const res = { errMsg: error.message };
-            return callAsyncFail(reject, res, options);
-        }
-        const { key } = options;
-        preferencesPromise.then((preferences) => __awaiter(this, void 0, void 0, function* () {
-            yield preferences.delete(key);
-            yield preferences.flush();
-            const res = { errMsg: 'removeStorage:ok' };
-            callAsyncSuccess(resolve, res, options);
-        }));
-    });
-}
-function clearStorage(options) {
-    return new Promise(resolve => {
-        preferencesPromise.then((preferences) => __awaiter(this, void 0, void 0, function* () {
-            yield preferences.clear();
-            yield preferences.flush();
-            const res = { errMsg: 'clearStorage:ok' };
-            callAsyncSuccess(resolve, res, options);
-        }));
+        kvStorePromise.then(() => {
+            try {
+                validateParams(name, options, storageSchema);
+            }
+            catch (error) {
+                const res = { errMsg: error.message };
+                return handle.fail(res, { resolve, reject });
+            }
+            kvStore = kvStore;
+            kvStore.delete(key, (err) => {
+                if (err) {
+                    handle.fail({ errMsg: `Failed to delete data. Code:${err.code},message:${err.message}` }, { resolve, reject });
+                    return;
+                }
+                handle.success({}, { resolve, reject });
+            });
+        });
     });
 }
 const getStorageInfoSync = temporarilyNotSupport('getStorageInfoSync');
 const getStorageInfo = temporarilyNotSupport('getStorageInfo');
-const getStorageSync = temporarilyNotSupport('getStorageSync', 'getStorage');
-const setStorageSync = temporarilyNotSupport('setStorageSync', 'setStorage');
-const clearStorageSync = temporarilyNotSupport('clearStorageSync', 'clearStorage');
-const removeStorageSync = temporarilyNotSupport('removeStorageSync', 'removeStorage');
 const createBufferURL = /* @__PURE__ */ temporarilyNotSupport('createBufferURL');
 const revokeBufferURL = /* @__PURE__ */ temporarilyNotSupport('revokeBufferURL');
 const batchSetStorageSync = /* @__PURE__ */ temporarilyNotSupport('batchSetStorageSync');
 const batchSetStorage = /* @__PURE__ */ temporarilyNotSupport('batchSetStorage');
 const batchGetStorageSync = /* @__PURE__ */ temporarilyNotSupport('batchGetStorageSync');
 const batchGetStorage = /* @__PURE__ */ temporarilyNotSupport('batchGetStorage');
+const clearStorage = temporarilyNotSupport('clearStorage');
+const getStorageSync = temporarilyNotSupport('getStorageSync', 'getStorage');
+const setStorageSync = temporarilyNotSupport('setStorageSync', 'setStorage');
+const clearStorageSync = temporarilyNotSupport('clearStorageSync', 'clearStorage');
+const removeStorageSync = temporarilyNotSupport('removeStorageSync', 'removeStorage');
 
 class Animation {
     constructor({ duration = 400, delay = 0, timingFunction = 'linear', transformOrigin = '50% 50% 0', unit = 'px' } = {}) {
@@ -3329,6 +3447,9 @@ class Animation {
             transformOrigin,
             rule: Object.assign({}, this.rule)
         });
+        if (this.rule.transform) {
+            this.rule.transform = Object.assign({}, this.rule.transform);
+        }
         return this;
     }
     matrix(a, b, c, d, tx, ty) {
@@ -3340,75 +3461,120 @@ class Animation {
         return this;
     }
     rotate(angle) {
-        this.rule.rotate = { x: 0, y: 0, z: 1, angle };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Rotate = { x: 0, y: 0, z: 1, angle };
         return this;
     }
     rotate3d(x, y, z, angle) {
-        this.rule.rotate = { x, y, z, angle };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Rotate = { x, y, z, angle };
         return this;
     }
     rotateX(angle) {
-        this.rule.rotate = { x: 1, y: 0, z: 0, angle };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Rotate = { x: 1, y: 0, z: 0, angle };
         return this;
     }
     rotateY(angle) {
-        this.rule.rotate = { x: 0, y: 1, z: 0, angle };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Rotate = { x: 0, y: 1, z: 0, angle };
         return this;
     }
     rotateZ(angle) {
-        this.rule.rotate = { x: 0, y: 0, z: 1, angle };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Rotate = { x: 0, y: 0, z: 1, angle };
         return this;
     }
     scale(sx, sy) {
-        this.rule.scale = { x: sx, y: sy };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Scale = { x: sx, y: isUndefined(sy) ? sx : sy };
         return this;
     }
     scale3d(sx, sy, sz) {
-        this.rule.scale = { x: sx, y: sy, z: sz };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Scale = { x: sx, y: sy, z: sz };
         return this;
     }
     scaleX(scale) {
-        this.rule.scale = { x: scale };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Scale = { x: scale };
         return this;
     }
     scaleY(scale) {
-        this.rule.scale = { y: scale };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Scale = { y: scale };
         return this;
     }
     scaleZ(scale) {
-        this.rule.scale = { z: scale };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Scale = { z: scale };
         return this;
     }
     skew(ax, ay) {
-        this.rule.skew = { x: ax, y: ay };
+        temporarilyNotSupport('animation.skew:' + `${ax}, ${ay}`)(ax, ay);
         return this;
     }
     skewX(angle) {
-        this.rule.skew = { x: angle };
+        temporarilyNotSupport('animation.skewX:' + angle)(angle);
         return this;
     }
     skewY(angle) {
-        this.rule.skew = { y: angle };
+        temporarilyNotSupport('animation.skewY:' + angle)(angle);
         return this;
     }
     translate(tx, ty) {
-        this.rule.translate = { x: tx, y: ty };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Translate = { x: tx, y: ty };
         return this;
     }
     translate3d(tx, ty, tz) {
-        this.rule.translate = { x: tx, y: ty, z: tz };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Translate = { x: tx, y: ty, z: tz };
         return this;
     }
     translateX(translation) {
-        this.rule.translate = { x: translation };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Translate = { x: translation };
         return this;
     }
     translateY(translation) {
-        this.rule.translate = { y: translation };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Translate = { y: translation };
         return this;
     }
     translateZ(translation) {
-        this.rule.translate = { z: translation };
+        if (!this.rule.transform) {
+            this.rule.transform = {};
+        }
+        this.rule.transform.Translate = { z: translation };
         return this;
     }
     opacity(value) {
@@ -3420,15 +3586,15 @@ class Animation {
         return this;
     }
     width(value) {
-        this.rule.size = Object.assign(Object.assign({}, this.rule.size), { width: value });
+        this.rule.width = value;
         return this;
     }
     height(value) {
-        this.rule.size = Object.assign(Object.assign({}, this.rule.size), { height: value });
+        this.rule.height = value;
         return this;
     }
     left(value) {
-        temporarilyNotSupport('animation.left:' + value)(value);
+        this.rule.left = value;
         return this;
     }
     right(value) {
@@ -3436,7 +3602,7 @@ class Animation {
         return this;
     }
     top(value) {
-        temporarilyNotSupport('animation.top:' + value)(value);
+        this.rule.top = value;
         return this;
     }
     bottom(value) {
@@ -3455,7 +3621,8 @@ function setBackgroundColor(options) {
     const handle = new MethodHandler({ name: 'setBackgroundColor', success, fail, complete });
     return new Promise((resolve, reject) => {
         eventCenter.trigger('__taroPageStyle', {
-            backgroundColor: options.backgroundColor || options.backgroundColorTop || options.backgroundColorBottom,
+            backgroundColor: options.backgroundColorBottom || options.backgroundColor,
+            backgroundColorContext: options.backgroundColorTop || options.backgroundColor
         });
         return handle.success({}, { resolve, reject });
     });
@@ -3494,10 +3661,11 @@ function showToast(options) {
             const res = { errMsg: error.message };
             return callAsyncFail(reject, res, options);
         }
-        prompt.showToast({
+        promptAction.showToast({
             message: options.title,
             duration: options.duration,
-            bottom: options.bottom
+            bottom: options.bottom,
+            showMode: 1 // 设置弹窗显示模式，显示在应用之上。
         });
         callAsyncSuccess(resolve, resCallback('showToast'), options);
     });
@@ -3527,25 +3695,24 @@ function showModal(options) {
             color: confirmColor
         });
     }
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         const modalOptions = {
             title,
             message: content,
             buttons: buttons,
-            success: (data) => {
-                if (data.index === 1 || !showCancel) {
-                    callAsyncSuccess(resolve, Object.assign(Object.assign({}, resCallback('showModal')), { confirm: true, cancel: false, content: null }), options);
-                }
-                else {
-                    callAsyncSuccess(resolve, Object.assign(Object.assign({}, resCallback('showModal')), { confirm: false, cancel: true }), options);
-                }
-            },
-            // 鸿蒙没有失败方法，只有取消
-            cancel: (_) => {
+        };
+        promptAction.showDialog(modalOptions, (error, data) => {
+            if (error) {
+                const res = { errMsg: error };
+                callAsyncFail(reject, res, options);
+            }
+            if (data.index === 0 && showCancel) {
                 callAsyncSuccess(resolve, Object.assign(Object.assign({}, resCallback('showModal')), { confirm: false, cancel: true }), options);
             }
-        };
-        prompt.showDialog(modalOptions);
+            else {
+                callAsyncSuccess(resolve, Object.assign(Object.assign({}, resCallback('showModal')), { confirm: true, cancel: false, content: null }), options);
+            }
+        });
     });
 }
 const showActionSheetSchema = {
@@ -3576,28 +3743,18 @@ function showActionSheet(options) {
         });
         const actionSheetOptions = {
             title,
-            buttons,
-            success: (data) => {
-                callAsyncSuccess(resolve, Object.assign(Object.assign({}, data), resCallback('showActionSheet')), options);
-            },
-            // 取消方法，并非失败
-            fail: (data) => {
-                callAsyncFail(reject, Object.assign(Object.assign({}, data), { errMsg: data.errMsg.replace('showActionMenu', 'showActionSheet') }), options);
-            }
+            buttons
         };
-        prompt.showActionMenu(actionSheetOptions);
-    });
-}
-function hideToast(options) {
-    return new Promise(resolve => {
-        prompt.showToast({
-            message: '关闭中',
-            duration: 10,
-            bottom: '9999px'
+        promptAction.showActionMenu(actionSheetOptions, (error, data) => {
+            var _a;
+            if (error) {
+                callAsyncFail(reject, Object.assign(Object.assign({}, data), { errMsg: (_a = data.errMsg) === null || _a === void 0 ? void 0 : _a.replace('showActionMenu', 'showActionSheet') }), options);
+            }
+            callAsyncSuccess(resolve, Object.assign(Object.assign({}, data), resCallback('showActionSheet')), options);
         });
-        callAsyncSuccess(resolve, resCallback('hideToast'), options);
     });
 }
+const hideToast = /* @__PURE__ */ temporarilyNotSupport('hideToast');
 const showLoading = temporarilyNotSupport('showLoading');
 const hideLoading = temporarilyNotSupport('hideLoading');
 const enableAlertBeforeUnload = /* @__PURE__ */ temporarilyNotSupport('enableAlertBeforeUnload');
@@ -3618,7 +3775,7 @@ const setNavigationBarTitle = function (options) {
 };
 const setNavigationBarColor = function (options) {
     const { success, fail, complete } = options || {};
-    const handle = new MethodHandler({ name: 'setNavigationBarTitle', success, fail, complete });
+    const handle = new MethodHandler({ name: 'setNavigationBarColor', success, fail, complete });
     return new Promise((resolve, reject) => {
         eventCenter.trigger('__taroNavigationStyle', {
             animation: options.animation,
@@ -3660,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;
@@ -3677,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;
@@ -3713,8 +3876,8 @@ const pageScrollTo = (options) => {
         const taro = Current.taro;
         const page = taro.getCurrentInstance().page;
         let scrollValue = -1;
-        let scroller = page.scroller;
-        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;
         }
@@ -3736,15 +3899,15 @@ const pageScrollTo = (options) => {
             scroller = getPageScrollerOrNode(scroller, page);
             const { yOffset } = scroller.currentOffset();
             if (areaInfo) {
-                scrollValue = areaInfo.globalPosition.y + yOffset + pxTransformHelper(offsetTop, 'px', true);
+                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,
@@ -3776,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) {
@@ -3801,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) {
@@ -3828,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) {
@@ -3921,19 +4084,16 @@ 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;
                     disconnectEvent(n, VISIBLE_CHANGE_EVENT_NAME);
                     // @ts-ignore
-                    (_a = n._nodeInfo) === null || _a === void 0 ? void 0 : _a.thresholds = null;
+                    n._nodeInfo.thresholds = null;
                 });
             }
             else {
@@ -3941,35 +4101,40 @@ class IntersectionObserver {
                 // @ts-ignore
                 if (this._observerNodes._nodeInfo) {
                     // @ts-ignore
-                    (_a = this._observerNodes._nodeInfo) === null || _a === void 0 ? void 0 : _a.thresholds = null;
+                    this._observerNodes._nodeInfo.thresholds = null;
                 }
             }
         }
     }
     observe(targetSelector, callback) {
-        var _a;
+        if (!this._component)
+            return;
         const { observeAll, thresholds } = this._options;
         const node = findChildNodeWithDFS(this._component, targetSelector, observeAll);
         this._observerNodes = node;
         if (node) {
             if (node instanceof Array) {
                 node.forEach(n => {
-                    var _a;
                     // @ts-ignore
-                    (_a = n._nodeInfo) === null || _a === void 0 ? void 0 : _a.thresholds = thresholds;
+                    n._nodeInfo.thresholds = thresholds;
                     setNodeEventCallbackAndTriggerComponentUpdate(n, VISIBLE_CHANGE_EVENT_NAME, (isVisible, currentRatio) => {
-                        callback(this.handleResult(isVisible, currentRatio));
+                        callback(this.handleResult(isVisible, currentRatio, n));
                     });
                 });
             }
             else {
                 // @ts-ignore
-                (_a = node._nodeInfo) === null || _a === void 0 ? void 0 : _a.thresholds = thresholds;
+                node._nodeInfo.thresholds = thresholds;
                 setNodeEventCallbackAndTriggerComponentUpdate(node, VISIBLE_CHANGE_EVENT_NAME, (isVisible, currentRatio) => {
-                    callback(this.handleResult(isVisible, currentRatio));
+                    callback(this.handleResult(isVisible, currentRatio, node));
                 });
             }
         }
+        else {
+            callback({
+                errMsg: 'IntersectionObserver.observe:fail cannot find the node for selector.'
+            });
+        }
     }
     relativeTo() {
         temporarilyNotSupport('relativeTo')();
@@ -3980,8 +4145,10 @@ class IntersectionObserver {
         return this;
     }
     // @ts-ignore
-    handleResult(isVisible, currentRatio) {
+    handleResult(isVisible, currentRatio, node) {
         const result = {
+            id: node.id,
+            dataset: node.dataset,
             intersectionRatio: currentRatio,
             // TODO 未做，等待能拿到element的info信息
             boundingClientRect: {
@@ -4189,32 +4356,45 @@ function filter(fields, dom) {
 }
 function querySelector(selector, selectAll) {
     if (typeof selector === 'string') {
-        return parseHandler(selector, selectAll);
+        return selector.split(',').reduce((prev, current) => {
+            const item = current.trim();
+            return prev.concat(parseHandler(item, selectAll));
+        }, []);
     }
-    return null;
+    return [];
 }
 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);
-    queue.forEach(item => {
+    queue.forEach((item) => {
         const { selector, single, fields } = item;
-        const nodeList = querySelector(selector, !single);
-        result.push(nodeList.map(dom => {
+        if (single) {
+            const dom = querySelector(selector, !single)[0];
             // eslint-disable-next-line no-async-promise-executor
-            return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+            result.push(new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                 yield setNodeEventCallbackAndTriggerComponentUpdate(dom, AREA_CHANGE_EVENT_NAME, null, true);
                 resolve(filter(fields, dom));
+            })));
+        }
+        else {
+            const nodeList = querySelector(selector, !single);
+            result.push(nodeList.map(dom => {
+                // eslint-disable-next-line no-async-promise-executor
+                return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+                    yield setNodeEventCallbackAndTriggerComponentUpdate(dom, AREA_CHANGE_EVENT_NAME, null, true);
+                    resolve(filter(fields, dom));
+                }));
             }));
-        }));
+        }
     });
     Promise.all(result.map(item => {
-        return Promise.all(item);
+        return item instanceof Array ? Promise.all(item) : item;
     })).then(data => {
         cb(data);
     });
@@ -4707,7 +4887,7 @@ const defaultBaseFontSize = 20;
 const defaultUnitPrecision = 5;
 const defaultTargetUnit = 'vp';
 function getApp$1() {
-    return Current.app;
+    return Current.app || {};
 }
 function initPxTransform({ designWidth = defaultDesignWidth, deviceRatio = defaultDesignRatio, baseFontSize = defaultBaseFontSize, unitPrecision = defaultUnitPrecision, targetUnit = defaultTargetUnit }) {
     const taro = Current.taro;
@@ -4721,19 +4901,56 @@ function initPxTransform({ designWidth = defaultDesignWidth, deviceRatio = defau
         config.unitPrecision = unitPrecision;
     }
 }
-_display.getDefaultDisplaySync();
+const display = _display.getDefaultDisplaySync();
+let displayWidth = display.width;
+let ratioCache = false;
+let designWidthFunc;
+let designWidth = defaultDesignWidth;
+function getRatio(value) {
+    var _a;
+    // Note: 提前调用 display 可能无法获取正确值
+    if (ratioCache === false || displayWidth !== display.width) {
+        const config = ((_a = Current.taro) === null || _a === void 0 ? void 0 : _a.config) || {};
+        if (!isFunction(designWidthFunc)) {
+            designWidthFunc = isFunction(config.designWidth)
+                ? config.designWidth
+                : () => config.designWidth;
+            designWidth = designWidthFunc(value) || defaultDesignWidth;
+        }
+        displayWidth = display.width;
+        ratioCache = Math.min(display.width, display.height) / designWidth;
+    }
+    return ratioCache;
+}
+// Note: 设置为 style 单位时会自动完成设计稿转换，设计开发者调用 API 时也许抹平差异，例如 pageScrollTo[option.offsetTop]
+function pxTransformHelper(size, unit, isNumber = false) {
+    var _a;
+    const config = ((_a = Current.taro) === null || _a === void 0 ? void 0 : _a.config) || {};
+    const targetUnit = unit || config.targetUnit || defaultTargetUnit;
+    if (targetUnit === 'PX') {
+        return px2vp(size * display.scaledDensity) + 'vp';
+    }
+    const ratio = getRatio(size);
+    let val = size * ratio;
+    switch (targetUnit) {
+        case 'vp':
+            // Note: 在应用创建前调用无效
+            val = px2vp(val);
+            break;
+    }
+    return isNumber ? val : val + targetUnit;
+}
 function pxTransform(size) {
     var _a;
     const config = ((_a = Current.taro) === null || _a === void 0 ? void 0 : _a.config) || {};
     const targetUnit = config.targetUnit || defaultTargetUnit;
-    let val = size;
+    const val = size;
     switch (targetUnit) {
         case 'vp':
-            val = px2vp(size);
-            break;
+            return pxTransformHelper(size, 'px');
         // NOTE: 鸿蒙环境下 style 会自动完成设计稿转换，无需在方法内二次调整
     }
-    return val + config.targetUnit;
+    return val + targetUnit;
 }
 function canIUseWebp() {
     return true;