fix(wechat): 修复 onUnhandledRejection onThemeChange 生命周期不生效的问题

remaxjs · May 8, 2020 · e7a7556 · e7a7556
1 parent 3d3dbe5
commit e7a7556
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 1 deletion.
diff --git a/packages/remax-runtime/jest.config.js b/packages/remax-runtime/jest.config.js
@@ -20,7 +20,16 @@ module.exports = {
  },
  ],
  __REMAX_APP_ENTRY_INFO__: {},
- __REMAX_APP_EVENTS__: ['onLaunch', 'onShow', 'onHide', 'onShareAppMessage', 'onPageNotFound', 'onError'],
+ __REMAX_APP_EVENTS__: [
+ 'onLaunch',
+ 'onShow',
+ 'onHide',
+ 'onShareAppMessage',
+ 'onPageNotFound',
+ 'onError',
+ 'onUnhandledRejection',
+ 'onThemeChange',
+ ],
  __REMAX_PAGE_EVENTS__: {
  '/path/to/test/index': ['onShow'],
  '/path/to/test/index2': [

diff --git a/packages/remax-runtime/src/__tests__/app.test.tsx b/packages/remax-runtime/src/__tests__/app.test.tsx
@@ -35,6 +35,14 @@ describe('app', () => {
  log.push('onPageNotFound');
  }
 
+ onUnhandledRejection() {
+ log.push('onUnhandledRejection');
+ }
+
+ onThemeChange() {
+ log.push('onThemeChange');
+ }
+
  render() {
  return <React.Fragment>{this.props.children}</React.Fragment>;
  }
@@ -46,6 +54,8 @@ describe('app', () => {
  app.shareAppMessage();
  app.pageNotFound();
  app.error();
+ app.unhandledRejection();
+ app.themeChange();
  app.hide();
 
  expect(log).toEqual([
@@ -57,6 +67,8 @@ describe('app', () => {
  'onPageNotFound',
  'error',
  'onError',
+ 'onUnhandledRejection',
+ 'onThemeChange',
  'onHide',
  ]);
  });
@@ -100,6 +112,8 @@ describe('app', () => {
  app.pageNotFound();
  app.shareAppMessage();
  app.error();
+ app.unhandledRejection();
+ app.themeChange();
  app.hide();
 
  expect(log).toEqual(['launch', 'show', 'appEventShow', 'pageNotFound', 'shareAppMessage', 'error', 'hide']);

diff --git a/packages/remax-runtime/src/__tests__/helpers/App.ts b/packages/remax-runtime/src/__tests__/helpers/App.ts
@@ -21,6 +21,14 @@ class App {
  this.config.onError('error');
  }
 
+ themeChange() {
+ this.config.onThemeChange();
+ }
+
+ unhandledRejection() {
+ this.config.onUnhandledRejection();
+ }
+
  pageNotFound() {
  this.config.onPageNotFound({
  path: 'path',

diff --git a/packages/remax-runtime/src/createAppConfig.ts b/packages/remax-runtime/src/createAppConfig.ts
@@ -94,6 +94,16 @@ export default function createAppConfig(this: any, App: any) {
  onPageNotFound(options: any) {
  return this.callLifecycle(AppLifecycle.pageNotFound, options);
  },
+
+ // 微信
+ onUnhandledRejection(options: any) {
+ return this.callLifecycle(AppLifecycle.unhandledRejection, options);
+ },
+
+ // 微信
+ onThemeChange(options: any) {
+ return this.callLifecycle(AppLifecycle.themeChange, options);
+ },
  };
 
  appEvents().forEach(eventName => {

diff --git a/packages/remax-runtime/src/lifecycle/index.ts b/packages/remax-runtime/src/lifecycle/index.ts
@@ -31,6 +31,8 @@ export enum AppLifecycle {
  error = 'error',
  shareAppMessage = 'shareAppMessage',
  pageNotFound = 'pageNotFound',
+ unhandledRejection = 'unhandledRejection',
+ themeChange = 'themeChange',
 }
 
 export function lifeCycleName(name: string): Lifecycle {