fix(wechat): 微信增加 onShareTimeline 生命周期

remaxjs · Aug 10, 2020 · 3e5f3cb · 3e5f3cb · vercel · Aug 10, 2020
1 parent 5946163
commit 3e5f3cb
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 1 deletion.
diff --git a/packages/remax-cli/src/build/babel/pageEvent.ts b/packages/remax-cli/src/build/babel/pageEvent.ts
@@ -5,7 +5,7 @@ import { pageClassEvents } from '../webpack/plugins/RuntimeOptions';
 import { Options } from '@remax/types';
 import { slash } from '@remax/shared';
 
-const lifecycleEvents = ['onPageScroll', 'onShareAppMessage'];
+const lifecycleEvents = ['onPageScroll', 'onShareAppMessage', 'onShareTimeline'];
 
 export default (options: Options) => {
  let skip = false;

diff --git a/packages/remax-macro/src/macro.ts b/packages/remax-macro/src/macro.ts
@@ -46,6 +46,7 @@ type PageEventName =
  | 'onReachBottom'
  | 'onPageScroll'
  | 'onShareAppMessage'
+ | 'onShareTimeline'
  | 'onTitleClick'
  | 'onOptionMenuClick'
  | 'onPopMenuClick'

diff --git a/packages/remax-runtime/src/__tests__/app.test.tsx b/packages/remax-runtime/src/__tests__/app.test.tsx
@@ -28,6 +28,7 @@ describe('app', () => {
  'onReachBottom',
  'onPageScroll',
  'onShareAppMessage',
+ 'onShareTimeline',
  'onTitleClick',
  'onOptionMenuClick',
  'onPopMenuClick',

diff --git a/packages/remax-runtime/src/__tests__/helpers/Page.ts b/packages/remax-runtime/src/__tests__/helpers/Page.ts
@@ -57,6 +57,14 @@ class Page {
  });
  }
 
+ shareTimeline() {
+ this.config.onShareTimeline({
+ from: 'menu',
+ target: undefined,
+ webViewUrl: 'https://www.alipay.com',
+ });
+ }
+
  titleClick() {
  this.config.onTitleClick();
  }

diff --git a/packages/remax-runtime/src/__tests__/page.test.tsx b/packages/remax-runtime/src/__tests__/page.test.tsx
@@ -32,6 +32,7 @@ describe('page', () => {
  'onReachBottom',
  'onPageScroll',
  'onShareAppMessage',
+ 'onShareTimeline',
  'onTitleClick',
  'onOptionMenuClick',
  'onPopMenuClick',
@@ -97,6 +98,13 @@ describe('page', () => {
  return {};
  });
 
+ usePageEvent('onShareTimeline', object => {
+ log.push(object.from);
+ log.push('useShareTimeline');
+
+ return {};
+ });
+
  usePageEvent('onTitleClick', () => {
  log.push('useTitleClick');
  });
@@ -147,6 +155,7 @@ describe('page', () => {
  page.reachBottom();
  page.pageScroll();
  page.shareAppMessage();
+ page.shareTimeline();
  page.titleClick();
  page.optionMenuClick();
  page.popMenuClick();
@@ -169,6 +178,8 @@ describe('page', () => {
  'usePageScroll',
  'menu',
  'useShareAppMessage',
+ 'menu',
+ 'useShareTimeline',
  'useTitleClick',
  'useOptionMenuClick',
  'usePopMenuClick',
@@ -276,6 +287,11 @@ describe('page', () => {
  log.push('onShareAppMessage');
  }
 
+ onShareTimeline(object: any) {
+ log.push(object.from);
+ log.push('onShareTimeline');
+ }
+
  onTitleClick() {
  log.push('onTitleClick');
  }
@@ -324,6 +340,7 @@ describe('page', () => {
  page.reachBottom();
  page.pageScroll();
  page.shareAppMessage();
+ page.shareTimeline();
  page.titleClick();
  page.optionMenuClick();
  page.popMenuClick();
@@ -346,6 +363,8 @@ describe('page', () => {
  'onPageScroll',
  'menu',
  'onShareAppMessage',
+ 'menu',
+ 'onShareTimeline',
  'onTitleClick',
  'onOptionMenuClick',
  'onPopMenuClick',

diff --git a/packages/remax-runtime/src/createPageConfig.ts b/packages/remax-runtime/src/createPageConfig.ts
@@ -184,6 +184,10 @@ export default function createPageConfig(Page: React.ComponentType<any>, name: s
  onShareAppMessage(options: any) {
  return this.callLifecycle(Lifecycle.shareAppMessage, options) || {};
  },
+
+ onShareTimeline(options: any) {
+ return this.callLifecycle(Lifecycle.shareTimeline, options) || {};
+ },
  };
 
  pageEvents(name).forEach(eventName => {

diff --git a/packages/remax-runtime/src/lifecycle/index.ts b/packages/remax-runtime/src/lifecycle/index.ts
@@ -12,6 +12,7 @@ export enum Lifecycle {
  reachBottom = 'reachBottom',
  pageScroll = 'pageScroll',
  shareAppMessage = 'shareAppMessage',
+ shareTimeline = 'shareTimeline',
  titleClick = 'titleClick',
  optionMenuClick = 'optionMenuClick',
  popMenuClick = 'popMenuClick',