@tarojs/plugin-platform-harmony-ets 4.0.0-beta.45 → 4.0.0-beta.47

package/dist/runtime-ets/dom/stylesheet/type.ts

@@ -103,6 +103,16 @@ export interface TaroStyleType {
     type: TextDecorationType
   }
 
+  // animation
+  animationName?: {
+    percentage: number
+    event: TaroStyleType
+  }[]
+  animationDuration?: number
+  animationTimingFunction?: string
+  animationDelay?: number
+  animationIterationCount?: number
+
   // other
   opacity?: number | Resource
   zIndex?: number

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

@@ -1,5 +1,5 @@
 import _display from '@ohos.display'
-import { pxTransformHelper } from '@tarojs/taro'
+import { getSystemInfoSync, pxTransformHelper } from '@tarojs/taro'
 
 import { NodeType } from '../dom/node'
 import convertWebStyle2HmStyle from '../dom/stylesheet/covertWeb2Hm'
@@ -60,16 +60,12 @@ export function parseClasses (classNames: string | string[] = []): string[] {
 }
 
 // 合并静态样式，从样式表里面找到对应的样式
-export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, classNames: string | string[] = [], style: CSSProperties): CSSProperties {
+export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, classNames: string | string[] = []): CSSProperties {
   const obj: CSSProperties[] = []
   const classes = parseClasses(classNames)
   if (classes.length === 1) {
-    if (style) {
-      return Object.assign({}, styleSheet[classes[0]], style)
-    } else {
-      // 同一个引用
-      return styleSheet[classes[0]]
-    }
+    // 同一个引用
+    return styleSheet[classes[0]]
   } else {
     for (let i = 0; i < classes.length; i++) {
       const className = classes[i]
@@ -77,9 +73,6 @@ export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, clas
         obj.push(styleSheet[className])
       }
     }
-    if (style) {
-      obj.push(style)
-    }
     return Object.assign.apply(null, [{}].concat(obj))
   }
 }
@@ -92,6 +85,27 @@ export function calcDynamicStyle (style: CSSProperties): CSSProperties {
   return {}
 }
 
+// css env()环境样式获取
+export function __env__(safeAreaType: string, fallback?: string | number) {
+  const sysInfo = getSystemInfoSync()
+  
+  switch (safeAreaType) {
+    case 'safe-area-inset-top': {
+      return sysInfo.safeArea?.top ? `${sysInfo.safeArea?.top}px` : fallback
+    }
+    case 'safe-area-inset-right': {
+      return sysInfo.safeArea?.right ? `${sysInfo.screenWidth - sysInfo.safeArea?.right}px` : fallback
+    }
+    case 'safe-area-inset-bottom': {
+      return sysInfo.safeArea?.bottom ? `${sysInfo.screenHeight - sysInfo.safeArea?.bottom}px` : fallback
+    }
+    case 'safe-area-inset-left': {
+      return sysInfo.safeArea?.left ? `${sysInfo.safeArea?.left}px` : fallback
+    }
+  }
+  return fallback
+}
+
 export function getPageScrollerOrNode (scrollerOrNode: any, page: any) {
   if (!page) return scrollerOrNode
 

package/dist/runtime-utils.js

@@ -9,6 +9,7 @@ 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';
@@ -30,7 +31,6 @@ import router from '@ohos.router';
 import bundleManager from '@ohos.bundle.bundleManager';
 import distributedKVStore from '@ohos.data.distributedKVStore';
 import matrix4 from '@ohos.matrix4';
-import prompt from '@ohos.prompt';
 import { pxTransformHelper as pxTransformHelper$1 } from '@tarojs/taro';
 
 class MethodHandler {
@@ -656,6 +656,7 @@ const setClipboardData = function (options) {
                 callAsyncFail(reject, res, options);
             }
             else {
+                promptAction.showToast({ message: '内容已复制' });
                 return handle.success({
                     data,
                 }, { resolve, reject });
@@ -3235,6 +3236,7 @@ const createCacheManager = /* @__PURE__ */ temporarilyNotSupport('createCacheMan
 let context;
 let kvManager;
 let kvStore;
+let kvStorePromise;
 Current.contextPromise.then((ctx) => {
     context = ctx;
     const kvManagerConfig = {
@@ -3256,13 +3258,16 @@ Current.contextPromise.then((ctx) => {
             securityLevel: distributedKVStore.SecurityLevel.S1
         };
         const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION);
-        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;
-            // 请确保获取到键值数据库实例后，再进行相关数据操作
+        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) {
@@ -3274,7 +3279,7 @@ const storageSchema = {
     key: 'String'
 };
 function checkContextExist(api, isAsync = false) {
-    if (!context || !kvStore) {
+    if (!context) {
         const message = `${api} 调用失败，Taro 不支持过早地调用 ${api}，请确保页面已经渲染完成再调用此 API`;
         if (isAsync) {
             return {
@@ -3302,20 +3307,22 @@ function getStorage(options) {
     const { key, success, fail, complete } = options || {};
     const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
-        try {
-            validateParams(name, options, storageSchema);
-        }
-        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;
+        kvStorePromise.then(() => {
+            try {
+                validateParams(name, options, storageSchema);
             }
-            handle.success({ data }, { resolve, reject });
+            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 });
+            });
         });
     });
 }
@@ -3328,20 +3335,22 @@ function setStorage(options) {
     const { key, data, success, fail, complete } = options || {};
     const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
-        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;
+        kvStorePromise.then(() => {
+            try {
+                validateParams(name, options, storageSchema);
+            }
+            catch (error) {
+                const res = { errMsg: error.message };
+                return handle.fail(res, { resolve, reject });
             }
-            handle.success({}, { 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 });
+            });
         });
     });
 }
@@ -3354,20 +3363,22 @@ function removeStorage(options) {
     const { key, success, fail, complete } = options || {};
     const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
-        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;
+        kvStorePromise.then(() => {
+            try {
+                validateParams(name, options, storageSchema);
             }
-            handle.success({}, { resolve, reject });
+            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 });
+            });
         });
     });
 }
@@ -3379,7 +3390,7 @@ const batchSetStorageSync = /* @__PURE__ */ temporarilyNotSupport('batchSetStora
 const batchSetStorage = /* @__PURE__ */ temporarilyNotSupport('batchSetStorage');
 const batchGetStorageSync = /* @__PURE__ */ temporarilyNotSupport('batchGetStorageSync');
 const batchGetStorage = /* @__PURE__ */ temporarilyNotSupport('batchGetStorage');
-const clearStorage = temporarilyNotSupport('removeStorageSync');
+const clearStorage = temporarilyNotSupport('clearStorage');
 const getStorageSync = temporarilyNotSupport('getStorageSync', 'getStorage');
 const setStorageSync = temporarilyNotSupport('setStorageSync', 'setStorage');
 const clearStorageSync = temporarilyNotSupport('clearStorageSync', 'clearStorage');
@@ -3629,7 +3640,7 @@ 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
@@ -3662,25 +3673,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 = {
@@ -3711,21 +3721,19 @@ function showActionSheet(options) {
         });
         const actionSheetOptions = {
             title,
-            buttons,
-            success: (data) => {
-                callAsyncSuccess(resolve, Object.assign(Object.assign({}, data), resCallback('showActionSheet')), options);
-            },
-            // 取消方法，并非失败
-            fail: (data) => {
+            buttons
+        };
+        promptAction.showActionMenu(actionSheetOptions, (error, data) => {
+            if (error) {
                 callAsyncFail(reject, Object.assign(Object.assign({}, data), { errMsg: data.errMsg.replace('showActionMenu', 'showActionSheet') }), options);
             }
-        };
-        prompt.showActionMenu(actionSheetOptions);
+            callAsyncSuccess(resolve, Object.assign(Object.assign({}, data), resCallback('showActionSheet')), options);
+        });
     });
 }
 function hideToast(options) {
     return new Promise(resolve => {
-        prompt.showToast({
+        promptAction.showToast({
             message: '关闭中',
             duration: 10,
             bottom: '9999px'