From d289f3960b99b67167c366dd60d4acaaeef6ad9b Mon Sep 17 00:00:00 2001 From: corinli Date: Mon, 11 Jul 2022 11:36:10 +0800 Subject: [PATCH] fix(hippy-react-web): fix error handler --- packages/hippy-react-web/src/components/image.tsx | 2 +- packages/hippy-react-web/src/global.ts | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/hippy-react-web/src/components/image.tsx b/packages/hippy-react-web/src/components/image.tsx index 05436a181..21bbbf552 100644 --- a/packages/hippy-react-web/src/components/image.tsx +++ b/packages/hippy-react-web/src/components/image.tsx @@ -186,7 +186,7 @@ const Image: React.FC = React.forwardRef((props: ImageProps, ref) => // delete unsupported props delete restProps.tintColor; - delete restProps.ononProgress; + delete restProps.onProgress; delete restProps.capInsets; return ( diff --git a/packages/hippy-react-web/src/global.ts b/packages/hippy-react-web/src/global.ts index 76aadbc28..c928ce906 100644 --- a/packages/hippy-react-web/src/global.ts +++ b/packages/hippy-react-web/src/global.ts @@ -25,11 +25,16 @@ global.Hippy = { // @ts-ignore Device, on: (eventName: string, handler: Function) => { - if (eventName === 'unhandleRejection') { + if (eventName.toUpperCase() === 'UNHANDLEDREJECTION') { window.addEventListener('unhandledrejection', (event) => { - handler(event); + handler(event.reason, event.promise); }); } + if (eventName.toUpperCase() === 'UNCAUGHTEXCEPTION') { + window.onerror = (message, source, lineno, colno, error) => { + handler(error, message, source, lineno, colno); + }; + } }, }; global.getTurboModule = () => {