@umijs/renderer-react 4.0.18 → 4.0.19

package/dist/appContext.d.ts

@@ -10,6 +10,7 @@ interface IAppContextType {
     clientLoaderData: ILoaderData;
     preloadRoute?: (to: string) => void;
     serverLoaderData: ILoaderData;
+    history?: any;
 }
 export declare const AppContext: React.Context<IAppContextType>;
 export declare function useAppData(): IAppContextType;

package/dist/browser.js

@@ -203,7 +203,8 @@ export function renderClient(opts) {
         basename: basename,
         clientLoaderData: clientLoaderData,
         serverLoaderData: serverLoaderData,
-        preloadRoute: handleRouteChange
+        preloadRoute: handleRouteChange,
+        history: opts.history
       }
     }, rootContainer);
   };

package/dist/routes.js

@@ -3,9 +3,10 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 var _excluded = ["redirect"];
 // @ts-ignore
-import React, { useMemo } from 'react';
-import { generatePath, Navigate, useParams, useLocation, useNavigate, Outlet } from 'react-router-dom';
+import React from 'react';
+import { generatePath, Navigate, useParams, Outlet } from 'react-router-dom';
 import { RouteContext, useRouteData } from "./routeContext";
+import { useAppData } from "./appContext";
 export function createClientRoutes(opts) {
   var routesById = opts.routesById,
       parentId = opts.parentId,
@@ -82,52 +83,31 @@ function DefaultLoading() {
 }
 
 function RemoteComponentReactRouter5(props) {
-  var location = useLocation();
-  var navigate = useNavigate();
-  var params = useParams();
-
   var _useRouteData = useRouteData(),
       route = _useRouteData.route;
 
-  var match = useMemo(function () {
-    return {
-      params: params,
-      isExact: true,
-      path: route.path,
-      url: location.pathname
-    };
-  }, [location.pathname, route.path, params]);
-  var history = useMemo(function () {
-    return {
-      back: function back() {
-        return navigate(-1);
-      },
-      goBack: function goBack() {
-        return navigate(-1);
-      },
-      location: location,
-      push: function push(url, state) {
-        return navigate(url, {
-          state: state
-        });
-      },
-      replace: function replace(url, state) {
-        return navigate(url, {
-          replace: true,
-          state: state
-        });
-      }
-    };
-  }, [location, navigate]); // staticContext 没有兼容 好像没看到对应的兼容写法
+  var _useAppData = useAppData(),
+      history = _useAppData.history,
+      clientRoutes = _useAppData.clientRoutes;
+
+  var params = useParams();
+  var match = {
+    params: params,
+    isExact: true,
+    path: route.path,
+    url: history.location.pathname
+  }; // staticContext 没有兼容 好像没看到对应的兼容写法
 
   var Component = props.loader;
   return /*#__PURE__*/React.createElement(React.Suspense, {
     fallback: /*#__PURE__*/React.createElement(props.loadingComponent, null)
   }, /*#__PURE__*/React.createElement(Component, {
-    location: location,
+    location: history.location,
     match: match,
     history: history,
-    params: params
+    params: params,
+    route: route,
+    routes: clientRoutes
   }, props.hasChildren && /*#__PURE__*/React.createElement(Outlet, null)));
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.18",
+  "version": "4.0.19",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",