fix: 修复 onShareAppMessage 拿不到参数的问题

Close #169
remaxjs · Aug 27, 2019 · 9189f01 · 9189f01
1 parent 249fd07
commit 9189f01
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 18 deletions.
diff --git a/packages/remax/src/__tests__/alipay/helpers/Page.ts b/packages/remax/src/__tests__/alipay/helpers/Page.ts
@@ -46,7 +46,11 @@ class Page {
   }
 
   shareAppMessage() {
-    this.config.onShareAppMessage();
+    this.config.onShareAppMessage({
+      from: 'menu',
+      target: undefined,
+      webViewUrl: 'https://www.alipay.com',
+    });
   }
 
   titleClick() {

diff --git a/packages/remax/src/__tests__/alipay/page.test.tsx b/packages/remax/src/__tests__/alipay/page.test.tsx
@@ -50,7 +50,8 @@ describe('page', () => {
           log.push('usePageScroll');
         });
 
-        useShareAppMessage(() => {
+        useShareAppMessage(object => {
+          log.push(object.from);
           log.push('useShareAppMessage');
         });
 
@@ -90,6 +91,7 @@ describe('page', () => {
         'usePullIntercept',
         'useReachBottom',
         'usePageScroll',
+        'menu',
         'useShareAppMessage',
         'useTitleClick',
         'useOptionMenuClick',
@@ -170,7 +172,8 @@ describe('page', () => {
         log.push('onPageScroll');
       }
 
-      onShareAppMessage() {
+      onShareAppMessage(object: any) {
+        log.push(object.from);
         log.push('onShareAppMessage');
       }
 
@@ -216,6 +219,7 @@ describe('page', () => {
       'onPullIntercept',
       'onReachBottom',
       'onPageScroll',
+      'menu',
       'onShareAppMessage',
       'onTitleClick',
       'onOptionMenuClick',

diff --git a/packages/remax/src/createPageConfig.ts b/packages/remax/src/createPageConfig.ts
@@ -50,19 +50,19 @@ export default function createPageConfig(Page: React.ComponentType<any>) {
       };
     },
 
-    callLifecycle(lifecycle: Lifecycle) {
+    callLifecycle(lifecycle: Lifecycle, ...args: any[]) {
       const callbacks = this.lifecycleCallback[lifecycle] || [];
       let result;
       callbacks.forEach((callback: any) => {
-        result = callback();
+        result = callback.call(null, ...args);
       });
       if (result) {
         return result;
       }
 
       const callback = callbackName(lifecycle);
       if (this.wrapper[callback]) {
-        return this.wrapper[callback]();
+        return this.wrapper[callback](...args);
       }
     },
 
@@ -86,8 +86,8 @@ export default function createPageConfig(Page: React.ComponentType<any>) {
       return this.callLifecycle(Lifecycle.pageScroll);
     },
 
-    onShareAppMessage() {
-      return this.callLifecycle(Lifecycle.shareAppMessage);
+    onShareAppMessage(options: any) {
+      return this.callLifecycle(Lifecycle.shareAppMessage, options);
     },
 
     onTitleClick() {

diff --git a/packages/remax/src/createPageWrapper.ts b/packages/remax/src/createPageWrapper.ts
@@ -27,16 +27,16 @@ export default function createPageWrapper(
 
       Object.keys(Lifecycle).forEach(phase => {
         const callback = callbackName(phase);
-        (this as any)[callback] = () => {
-          return this.callLifecycle(phase);
+        (this as any)[callback] = (...args: any[]) => {
+          return this.callLifecycle(phase, ...args);
         };
       });
     }
 
-    callLifecycle(phase: string) {
+    callLifecycle(phase: string, ...args: any[]) {
       const callback = callbackName(phase);
       if (this.instance && typeof this.instance[callback] === 'function') {
-        return this.instance[callback]();
+        return this.instance[callback](...args);
       }
     }
 

diff --git a/packages/remax/src/hooks.ts b/packages/remax/src/hooks.ts
@@ -31,10 +31,14 @@ export function usePageScroll(callback: Callback) {
   }, []);
 }
 
-export function useShareAppMessage(callback: Callback) {
-  useLayoutEffect(() => {
-    return registerLifecycle(Lifecycle.shareAppMessage, callback);
-  }, []);
+export function useShareAppMessage(
+  callback: (o: {
+    from: 'button' | 'menu';
+    target: object | undefined;
+    webViewUrl: string;
+  }) => any
+) {
+  registerLifecycle(Lifecycle.shareAppMessage, callback);
 }
 
 export function useTitleClick(callback: Callback) {

diff --git a/packages/remax/src/lifecycle.ts b/packages/remax/src/lifecycle.ts
@@ -2,7 +2,7 @@ import capitalize from './utils/capitalize';
 
 declare const getCurrentPages: any;
 
-export type Callback = () => any;
+export type Callback = (...args: any[]) => any;
 
 export enum Lifecycle {
   show = 'show',
@@ -25,7 +25,7 @@ export function callbackName(name: string) {
   return 'on' + capitalize(name);
 }
 
-export function registerLifecycle(method: Lifecycle, callback: () => void) {
+export function registerLifecycle(method: Lifecycle, callback: Callback) {
   const pages = getCurrentPages();
   const currentPage = pages[pages.length - 1];
   return currentPage.registerLifecycle(method, callback);