Merge branch 'main' into fix/env

TheKonka · Mar 14, 2024 · 61c1ce4 · 61c1ce4
2 parents 5af0009 + 66d9fbb
commit 61c1ce4
Show file tree

Hide file tree

Showing 45 changed files with 1,166 additions and 155 deletions.
diff --git a/examples/taro-list/config/dev.ts b/examples/taro-list/config/dev.ts
@@ -1,4 +1,5 @@
 import type { UserConfigExport } from "@tarojs/cli";
+
 export default {
    logger: {
     quiet: false,

diff --git a/examples/taro-list/config/prod.ts b/examples/taro-list/config/prod.ts
@@ -1,4 +1,5 @@
 import type { UserConfigExport } from "@tarojs/cli";
+
 export default {
   mini: {},
   h5: {

diff --git a/packages/taro-h5/__tests__/ui/navigation.test.ts b/packages/taro-h5/__tests__/ui/navigation.test.ts
@@ -1,5 +1,7 @@
 import * as Taro from '@tarojs/taro-h5'
 
+import { buildApp } from '../utils'
+
 const mockConsole = require('jest-mock-console')
 
 describe('navigation', () => {
@@ -73,4 +75,25 @@ describe('navigation', () => {
         })
     })
   })
+  describe('showNavigationBarLoading / hideNavigationBarLoading', () => {
+    beforeEach(() => {
+      mockConsole()
+      buildApp()
+    })
+
+    test('should be able to showNavigationBarLoading / hideNavigationBarLoading', done => {
+      Taro.showNavigationBarLoading().then(res => {
+        expect(res.errMsg).toBe('showNavigationBarLoading:ok')
+        const loadingElement = document.querySelector('.taro-navigation-bar-loading-show')
+        expect(loadingElement).toBeTruthy()
+
+        Taro.hideNavigationBarLoading().then(res => {
+          expect(res.errMsg).toBe('hideNavigationBarLoading:ok')
+          const loadingElement = document.querySelector('.taro-navigation-bar-loading-show')
+          expect(loadingElement).toBeFalsy()
+          done()
+        })
+      })
+    })
+  })
 })
diff --git a/packages/taro-h5/src/api/ui/navigation-bar/index.ts b/packages/taro-h5/src/api/ui/navigation-bar/index.ts
@@ -1,11 +1,19 @@
 import Taro from '@tarojs/api'
-import { setNavigationBarStyle, setTitle } from '@tarojs/router'
+import { setNavigationBarLoading, setNavigationBarStyle, setTitle } from '@tarojs/router'
 
 import { getParameterError, shouldBeObject, temporarilyNotSupport } from '../../../utils'
 import { MethodHandler } from '../../../utils/handler'
 
 // 导航栏
-export const showNavigationBarLoading = /* @__PURE__ */ temporarilyNotSupport('showNavigationBarLoading')
+/**
+ * 展示导航栏 loading 状态
+*/
+export function showNavigationBarLoading (options: Taro.showNavigationBarLoading.Option = {}) {
+  const { success, fail, complete } = options
+  const handle = new MethodHandler({ name: 'showNavigationBarLoading', success, fail, complete })
+  setNavigationBarLoading(true)
+  return handle.success()
+}
 
 export function setNavigationBarTitle (options?: Taro.setNavigationBarTitle.Option) {
   // options must be an Object
@@ -48,5 +56,14 @@ export const setNavigationBarColor: typeof Taro.setNavigationBarColor = (options
   return handle.success()
 }
 
-export const hideNavigationBarLoading = /* @__PURE__ */ temporarilyNotSupport('hideNavigationBarLoading')
+/**
+ * 隐藏导航栏 loading 状态
+*/
+export function hideNavigationBarLoading (options: Taro.hideNavigationBarLoading.Option = {}) {
+  const { success, fail, complete } = options
+  const handle = new MethodHandler({ name: 'hideNavigationBarLoading', success, fail, complete })
+  setNavigationBarLoading(false)
+  return handle.success()
+}
+
 export const hideHomeButton = /* @__PURE__ */ temporarilyNotSupport('hideHomeButton')
diff --git a/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json b/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json
@@ -234,6 +234,13 @@
     "NfcB": false,
     "NfcF": false,
     "NfcV": false,
+    "NodesRef": {
+      "boundingClientRect": true,
+      "context": true,
+      "node": true,
+      "fields": true,
+      "scrollOffset": true
+    },
     "OffscreenCanvas": false,
     "Path2D": true,
     "Performance": false,
@@ -1232,6 +1239,12 @@
           "TRACE": true,
           "CONNECT": true
         },
+        "dataType": {
+          "json": true,
+          "text": true,
+          "base64": true,
+          "arraybuffer": true
+        },
         "responseType": {
           "text": true,
           "arraybuffer": true
@@ -2112,6 +2125,7 @@
     },
     "rtc-room": false,
     "rtc-room-item": false,
+    "script.ts": false,
     "scroll-view": {
       "scroll-x": true,
       "scroll-y": true,
@@ -2157,7 +2171,8 @@
       "refresher-two-level-close-threshold": false,
       "refresher-two-level-scroll-enabled": false,
       "refresher-ballistic-refresh-enabled": false,
-      "refresher-two-level-pinned": false
+      "refresher-two-level-pinned": false,
+      "using-sticky": false
     },
     "share-element": {
       "key": false,