@alicloud/alfa-react 1.4.17 → 1.4.19

package/es/createApplication.js

@@ -43,8 +43,8 @@ export default function createApplication(loader) {
 
     var _useState = useState(null),
         _useState2 = _slicedToArray(_useState, 2),
-        app = _useState2[0],
-        setApp = _useState2[1];
+        appInstance = _useState2[0],
+        setAppInstance = _useState2[1];
 
     var _useState3 = useState(null),
         _useState4 = _slicedToArray(_useState3, 2),
@@ -99,6 +99,7 @@ export default function createApplication(loader) {
       };
     }, []);
     useEffect(function () {
+      var isUnmounted = false;
       var App;
 
       _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -119,21 +120,29 @@ export default function createApplication(loader) {
                 _yield$loader$registe = _context.sent;
                 app = _yield$loader$registe.app;
                 logger = _yield$loader$registe.logger;
-                App = app;
+                App = app; // container has been unmounted
 
-                if (app) {
+                if (!isUnmounted) {
                   _context.next = 8;
                   break;
                 }
 
+                return _context.abrupt("return");
+
+              case 8:
+                if (app) {
+                  _context.next = 10;
+                  break;
+                }
+
                 return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                   E_CODE: 'RuntimeError',
                   E_MSG: 'load app failed.'
                 }));
 
-              case 8:
+              case 10:
                 if (appRef.current) {
-                  _context.next = 10;
+                  _context.next = 12;
                   break;
                 }
 
@@ -142,18 +151,18 @@ export default function createApplication(loader) {
                   E_MSG: 'cannot find container.'
                 }));
 
-              case 10:
+              case 12:
                 // update body in sandbox context
                 (_app$context$updateBo = (_app$context = app.context).updateBody) === null || _app$context$updateBo === void 0 ? void 0 : _app$context$updateBo.call(_app$context, memoOptions.sandbox.disableFakeBody ? document.body : appRef.current);
-                _context.next = 13;
+                _context.next = 15;
                 return app.mount(appRef.current, {
                   customProps: customProps
                 });
 
-              case 13:
-                setApp(app);
+              case 15:
+                setAppInstance(app);
 
-              case 14:
+              case 16:
               case "end":
                 return _context.stop();
             }
@@ -166,12 +175,13 @@ export default function createApplication(loader) {
       });
 
       return function () {
+        isUnmounted = true;
         App && App.unmount();
       };
     }, [memoOptions]);
 
-    if (app) {
-      app.update(customProps);
+    if (appInstance) {
+      appInstance.update(customProps);
     }
 
     var dataAttrs = {
@@ -179,7 +189,7 @@ export default function createApplication(loader) {
       'data-version': version,
       'data-loader': loaderVersion
     };
-    return /*#__PURE__*/React.createElement(React.Fragment, null, !app ? /*#__PURE__*/React.createElement(Loading, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, !appInstance ? /*#__PURE__*/React.createElement(Loading, {
       loading: loading
     }) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/React.createElement(tagName, _objectSpread({
       style: style,

package/es/version.js

@@ -1 +1 @@
-export var version = '1.4.17';
+export var version = '1.4.19';

package/lib/createApplication.js

@@ -65,8 +65,8 @@ function createApplication(loader) {
 
     var _useState = (0, _react.useState)(null),
         _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-        app = _useState2[0],
-        setApp = _useState2[1];
+        appInstance = _useState2[0],
+        setAppInstance = _useState2[1];
 
     var _useState3 = (0, _react.useState)(null),
         _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
@@ -121,6 +121,7 @@ function createApplication(loader) {
       };
     }, []);
     (0, _react.useEffect)(function () {
+      var isUnmounted = false;
       var App;
       (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _app$context$updateBo, _app$context;
@@ -140,21 +141,29 @@ function createApplication(loader) {
                 _yield$loader$registe = _context.sent;
                 app = _yield$loader$registe.app;
                 logger = _yield$loader$registe.logger;
-                App = app;
+                App = app; // container has been unmounted
 
-                if (app) {
+                if (!isUnmounted) {
                   _context.next = 8;
                   break;
                 }
 
+                return _context.abrupt("return");
+
+              case 8:
+                if (app) {
+                  _context.next = 10;
+                  break;
+                }
+
                 return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                   E_CODE: 'RuntimeError',
                   E_MSG: 'load app failed.'
                 }));
 
-              case 8:
+              case 10:
                 if (appRef.current) {
-                  _context.next = 10;
+                  _context.next = 12;
                   break;
                 }
 
@@ -163,18 +172,18 @@ function createApplication(loader) {
                   E_MSG: 'cannot find container.'
                 }));
 
-              case 10:
+              case 12:
                 // update body in sandbox context
                 (_app$context$updateBo = (_app$context = app.context).updateBody) === null || _app$context$updateBo === void 0 ? void 0 : _app$context$updateBo.call(_app$context, memoOptions.sandbox.disableFakeBody ? document.body : appRef.current);
-                _context.next = 13;
+                _context.next = 15;
                 return app.mount(appRef.current, {
                   customProps: customProps
                 });
 
-              case 13:
-                setApp(app);
+              case 15:
+                setAppInstance(app);
 
-              case 14:
+              case 16:
               case "end":
                 return _context.stop();
             }
@@ -186,12 +195,13 @@ function createApplication(loader) {
         });
       });
       return function () {
+        isUnmounted = true;
         App && App.unmount();
       };
     }, [memoOptions]);
 
-    if (app) {
-      app.update(customProps);
+    if (appInstance) {
+      appInstance.update(customProps);
     }
 
     var dataAttrs = {
@@ -199,7 +209,7 @@ function createApplication(loader) {
       'data-version': version,
       'data-loader': _version.version
     };
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !app ? /*#__PURE__*/_react.default.createElement(_Loading.default, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !appInstance ? /*#__PURE__*/_react.default.createElement(_Loading.default, {
       loading: loading
     }) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/_react.default.createElement(tagName, _objectSpread({
       style: style,

package/lib/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-var version = '1.4.17';
+var version = '1.4.19';
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.4.17",
+  "version": "1.4.19",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -42,7 +42,7 @@
     "typescript": "^3.0.3"
   },
   "dependencies": {
-    "@alicloud/alfa-core": "^1.4.14",
+    "@alicloud/alfa-core": "^1.4.19",
     "@alicloud/console-os-loader": "^1.4.14-alpha.1",
     "@alicloud/widget-utils-console": "^0.1.6",
     "classnames": "^2.2.6",
@@ -51,5 +51,5 @@
   "peerDependencies": {
     "react": "^16 | ^17"
   },
-  "gitHead": "58ccc6a6b1126f84da4a55cf78de8d30ce7d664a"
+  "gitHead": "d1ecada612cd3864854c775a04665f00a4f8b05c"
 }

package/types/components/ErrorBoundary/index.d.ts

@@ -1,7 +1,7 @@
 import React, { ErrorInfo } from 'react';
 import { AlfaLogger } from '@alicloud/alfa-core';
 interface IProps {
-    fallbackRender?: (error?: Error) => Element;
+    fallbackRender?: (error?: Error) => React.ReactNode;
     appDidCatch?: (error?: Error, info?: ErrorInfo) => void;
     logger?: AlfaLogger;
 }

package/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.4.17";
+export declare const version = "1.4.19";