feat(x-app): 页面跳转时，触发 dialogPage hide 生命周期 (issues/detail?id=26530)

Author: zhenyuWang

packages/shims-uni-app.d.ts

@@ -592,8 +592,8 @@ declare class UniNormalPageImpl implements UniPage {
   readonly width: number
   readonly height: number
   readonly statusBarHeight: number
-  getParentPage: () => UniPage | null
-  getParentPageByJS: () => UniPage | null
+  getParentPage(): UniPage | null
+  getParentPageByJS(): UniPage | null
   getDialogPages(): UniDialogPage[]
   $getSystemDialogPages(): UniDialogPage[]
   __$$getSystemDialogPages(): UniDialogPage[]
@@ -610,6 +610,17 @@ declare class UniNormalPageImpl implements UniPage {
   getAndroidActivity(): Activity | null
   exitFullscreen(options: ExitFullscreenOptions | null): void
   createElement(tagName: string): UniElement
+  querySelector(selector: string): UniElement | null
+  querySelectorAll(selector: string): UniElement[]
+  onLayoutChange(): number
+  offLayoutChange(): void
+  onRenderChange(): number
+  offRenderChange(): void
+  onTouchStart(): number
+  offTouchStart(): void
+  onTouchEnd(): number
+  offTouchEnd(): void
+  takeSnapshot(): void
 }
 
 declare class UniDialogPageImpl implements UniPage {
@@ -624,8 +635,8 @@ declare class UniDialogPageImpl implements UniPage {
   readonly width: number
   readonly height: number
   readonly statusBarHeight: number
-  getParentPage: () => UniPage | null
-  getParentPageByJS: () => UniPage | null
+  getParentPage(): UniPage | null
+  getParentPageByJS(): UniPage | null
   getDialogPages(): UniDialogPage[]
   $getSystemDialogPages(): UniDialogPage[]
   __$$getSystemDialogPages(): UniDialogPage[]
@@ -639,9 +650,20 @@ declare class UniDialogPageImpl implements UniPage {
   getAndroidView(): null
   getIOSView(): null
   getHTMLElement(): null
-  getAndroidActivity: () => Activity | null
+  getAndroidActivity(): Activity | null
   exitFullscreen(options: ExitFullscreenOptions | null): void
   createElement(tagName: string): UniElement
+  querySelector(selector: string): UniElement | null
+  querySelectorAll(selector: string): UniElement[]
+  onLayoutChange(): number
+  offLayoutChange(): void
+  onRenderChange(): number
+  offRenderChange(): void
+  onTouchStart(): number
+  offTouchStart(): void
+  onTouchEnd(): number
+  offTouchEnd(): void
+  takeSnapshot(): void
   $component: any | null
   $disableEscBack: boolean
   $triggerParentHide: boolean

packages/uni-app-harmony/src/service/api/route/navigateBack.ts

@@ -10,6 +10,7 @@ import {
   getCurrentPage,
   initI18nAppMsgsOnce,
   invokeHook,
+  invokeLastDialogPageHookByUniPage,
   useI18n,
 } from '@dcloudio/uni-core'
 import { ON_BACK_PRESS, ON_SHOW } from '@dcloudio/uni-shared'
@@ -131,6 +132,10 @@ function back(
     setStatusBarStyle()
     // 前一个页面触发 onShow
     invokeHook(ON_SHOW)
+    invokeLastDialogPageHookByUniPage(
+      getCurrentPage() as unknown as UniPage,
+      ON_SHOW
+    )
   }
 
   _backWebview(currentPage, backPage)

packages/uni-app-harmony/src/service/api/route/navigateTo.ts

@@ -1,5 +1,9 @@
 import { EventChannel, ON_HIDE, parseUrl } from '@dcloudio/uni-shared'
-import { invokeHook } from '@dcloudio/uni-core'
+import {
+  getCurrentPage,
+  invokeHook,
+  invokeLastDialogPageHookByUniPage,
+} from '@dcloudio/uni-core'
 import {
   API_NAVIGATE_TO,
   type API_TYPE_NAVIGATE_TO,
@@ -67,6 +71,10 @@ function _navigateTo({
 }: NavigateToOptions): Promise<void | { eventChannel: EventChannel }> {
   // 当前页面触发 onHide
   invokeHook(ON_HIDE)
+  invokeLastDialogPageHookByUniPage(
+    getCurrentPage() as unknown as UniPage,
+    ON_HIDE
+  )
   const eventChannel = new EventChannel(getWebviewId() + 1, events)
   return new Promise((resolve) => {
     showWebview(

packages/uni-app-plus/src/x/api/route/navigateBack.ts

@@ -6,7 +6,11 @@ import {
   NavigateBackProtocol,
   defineAsyncApi,
 } from '@dcloudio/uni-api'
-import { getCurrentPage, invokeHook } from '@dcloudio/uni-core'
+import {
+  getCurrentPage,
+  invokeHook,
+  invokeLastDialogPageHookByUniPage,
+} from '@dcloudio/uni-core'
 import {
   ON_BACK_PRESS,
   ON_LAST_PAGE_BACK_PRESS,
@@ -128,6 +132,10 @@ function back(
         .forEach((page) => removePage(page as ComponentPublicInstance))
       // 前一个页面触发 onShow
       invokeHook(ON_SHOW)
+      invokeLastDialogPageHookByUniPage(
+        getCurrentPage() as unknown as UniPage,
+        ON_SHOW
+      )
       setStatusBarStyle()
     })
   }

packages/uni-app-plus/src/x/api/route/navigateTo.ts

@@ -1,5 +1,10 @@
 import { EventChannel, ON_HIDE, parseUrl } from '@dcloudio/uni-shared'
-import { getCurrentPage, getRouteMeta, invokeHook } from '@dcloudio/uni-core'
+import {
+  getCurrentPage,
+  getRouteMeta,
+  invokeHook,
+  invokeLastDialogPageHookByUniPage,
+} from '@dcloudio/uni-core'
 import {
   API_NAVIGATE_TO,
   type API_TYPE_NAVIGATE_TO,
@@ -82,6 +87,7 @@ function _navigateTo({
   invokeBeforeRouteHooks(currentRouteType)
   // 当前页面触发 onHide
   invokeHook(ON_HIDE)
+  currentPage && invokeLastDialogPageHookByUniPage(currentPage.$page, ON_HIDE)
   const eventChannel = new EventChannel(getWebviewId() + 1, events)
   return new Promise((resolve) => {
     setTimeout(() => {

packages/uni-core/src/helpers/dialogPage.ts

@@ -133,6 +133,10 @@ export function invokeNewDialogPageHook(page: UniDialogPage, hook: string) {
 }
 
 export function getPageInstanceByChild(child: ComponentInternalInstance) {
+  if (__PLATFORM__ === 'app') {
+    // @ts-expect-error
+    return child.ctx.$basePage
+  }
   let pageInstance: ComponentInternalInstance | null = child
   while (pageInstance && pageInstance.type?.name !== 'Page') {
     pageInstance = pageInstance.parent
@@ -145,6 +149,11 @@ export const SYSTEM_DIALOG_TAG = 'systemDialog'
 
 export function isDialogPageInstance(vm: ComponentInternalInstance | null) {
   if (!vm) return false
+  if (__PLATFORM__ === 'app') {
+    // @ts-expect-error
+    return vm.openType === 'openDialogPage'
+  }
+
   return isNormalDialogPageInstance(vm) || isSystemDialogPageInstance(vm)
 }
 export function isNormalDialogPageInstance(vm: ComponentInternalInstance) {