@xfe-repo/web-micro 1.1.7 → 1.2.1

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import * as _micro_zoe_micro_app from '@micro-zoe/micro-app';
 export * from '@micro-zoe/micro-app';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
+import { LinkProps } from '@xfe-repo/web-router';
 
 type MicroAppProps = {
     name: string;
@@ -15,6 +16,12 @@ type MicroAppProps = {
 };
 declare const MicroAppRoute: React.MemoExoticComponent<(props: MicroAppProps) => react_jsx_runtime.JSX.Element>;
 
+type MicroAppLinkProps = LinkProps & {
+    to?: string;
+    microApp?: string;
+};
+declare const MicroAppLink: React.MemoExoticComponent<(props: MicroAppLinkProps) => react_jsx_runtime.JSX.Element>;
+
 declare enum MicroAppEventEnum {
     DISPATCH_ACTION = "dispatchAction"
 }
@@ -51,4 +58,4 @@ declare class MicroAppEventCenter {
 
 declare const microApp: _micro_zoe_micro_app.MicroApp;
 
-export { type MicroAppActionMetaType, type MicroAppActionType, type MicroAppDispatchListener, MicroAppEventCenter, type MicroAppEventCenterConfig, MicroAppEventEnum, type MicroAppGlobalDataType, type MicroAppProps, MicroAppRoute, microApp };
+export { type MicroAppActionMetaType, type MicroAppActionType, type MicroAppDispatchListener, MicroAppEventCenter, type MicroAppEventCenterConfig, MicroAppEventEnum, type MicroAppGlobalDataType, MicroAppLink, type MicroAppProps, MicroAppRoute, microApp };

package/dist/index.js

@@ -286,6 +286,9 @@ __export(src_exports, {
     MicroAppEventEnum: function() {
         return MicroAppEventEnum;
     },
+    MicroAppLink: function() {
+        return MicroAppLink;
+    },
     MicroAppRoute: function() {
         return MicroAppRoute;
     },
@@ -305,13 +308,19 @@ var import_micro_app = __toESM(require("@micro-zoe/micro-app"));
 var import_jsx_custom_event = __toESM(require("@micro-zoe/micro-app/polyfill/jsx-custom-event.js"));
 var MicroAppRoute = (0, import_react.memo)(function(props) {
     var name = props.name, baseRoute = props.baseRoute, url = props.url, keepAlive = props.keepAlive, className = props.className, data = props.data, loadingFallback = props.loadingFallback, errorFallback = props.errorFallback;
+    var navigate = (0, import_web_router.useNavigate)();
     var location = (0, import_web_router.useLocation)();
-    var defaultPage = location.pathname + location.search;
     var _ref = _sliced_to_array((0, import_react.useState)(false), 2), microAppIsShow = _ref[0], setMicroAppIsShow = _ref[1];
     var _ref1 = _sliced_to_array((0, import_react.useState)(false), 2), microAppIsError = _ref1[0], setMicroAppIsError = _ref1[1];
     var handleMicroAppMounted = (0, import_react.useCallback)(function() {
+        var path = location.pathname + location.search;
+        navigate(path, {
+            replace: true
+        });
         setMicroAppIsShow(true);
-    }, []);
+    }, [
+        location
+    ]);
     var handleMicroAppAfterShow = (0, import_react.useCallback)(function() {
         var path = location.pathname + location.search;
         import_micro_app.default.router.push({
@@ -319,7 +328,7 @@ var MicroAppRoute = (0, import_react.memo)(function(props) {
             path: path,
             replace: true
         }).catch(function(e) {
-            return e;
+            return console.error(e);
         });
         setMicroAppIsShow(true);
     }, [
@@ -332,6 +341,8 @@ var MicroAppRoute = (0, import_react.memo)(function(props) {
         className: className
     }, microAppIsError && errorFallback, !microAppIsShow && !microAppIsError && loadingFallback, /* @__PURE__ */ (0, import_jsx_custom_event.default)("micro-app", {
         style: {
+            width: "100%",
+            height: "100%",
             display: microAppIsShow ? "block" : "none"
         },
         url: url,
@@ -339,13 +350,48 @@ var MicroAppRoute = (0, import_react.memo)(function(props) {
         "router-mode": "native",
         baseroute: baseRoute ? baseRoute : "/".concat(name),
         "keep-alive": keepAlive,
-        "default-page": defaultPage,
         data: data,
         onMounted: handleMicroAppMounted,
         onAftershow: keepAlive ? handleMicroAppAfterShow : void 0,
         onError: handleMicroAppError
     }));
 });
+// src/MicroAppLink.tsx
+var import_react2 = require("react");
+var import_web_router2 = require("@xfe-repo/web-router");
+var import_jsx_runtime = require("react/jsx-runtime");
+var MicroAppLink = (0, import_react2.memo)(function(props) {
+    var microAppBaseName = props.microApp, to = props.to, children = props.children, replace = props.replace, className = props.className;
+    var navigate = (0, import_web_router2.useNavigate)();
+    var handleLink = (0, import_react2.useCallback)(function(e) {
+        e.preventDefault();
+        navigate(to, {
+            replace: replace
+        });
+        if (!microAppBaseName) return;
+        var activeApps = microApp2.getActiveApps({
+            excludeHiddenApp: true
+        });
+        if (activeApps.includes(microAppBaseName)) microApp2.router.push({
+            name: microAppBaseName,
+            path: to,
+            replace: replace
+        }).catch(function(e2) {
+            return e2;
+        });
+    }, [
+        navigate,
+        microAppBaseName,
+        to,
+        replace
+    ]);
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
+        className: className,
+        href: to,
+        onClick: handleLink,
+        children: children
+    });
+});
 // src/index.ts
 var MicroAppEventEnum = /* @__PURE__ */ function(MicroAppEventEnum2) {
     MicroAppEventEnum2["DISPATCH_ACTION"] = "dispatchAction";
@@ -529,6 +575,7 @@ var microApp2 = import_micro_app2.default;
 0 && (module.exports = _object_spread({
     MicroAppEventCenter: MicroAppEventCenter,
     MicroAppEventEnum: MicroAppEventEnum,
+    MicroAppLink: MicroAppLink,
     MicroAppRoute: MicroAppRoute,
     microApp: microApp
 }, require("@micro-zoe/micro-app")));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-micro",
-  "version": "1.1.7",
+  "version": "1.2.1",
   "sideEffects": false,
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,13 +9,13 @@
   ],
   "dependencies": {
     "@micro-zoe/micro-app": "1.0.0-rc.13",
-    "@xfe-repo/web-router": "1.1.5",
-    "@xfe-repo/web-utils": "1.1.4"
+    "@xfe-repo/web-router": "1.2.1",
+    "@xfe-repo/web-utils": "1.2.1"
   },
   "devDependencies": {
     "@types/node": "^20.16.5",
     "@types/react": "^18",
-    "@xfe-repo/eslint-config": "0.0.4",
+    "@xfe-repo/eslint-config": "0.0.5",
     "@xfe-repo/typescript-config": "0.0.6"
   },
   "scripts": {