react-router-dom-v5-compat 6.18.0-pre.0 → 6.18.0

package/CHANGELOG.md

@@ -1,12 +1,12 @@
 # `react-router-dom-v5-compat`
 
-## 6.18.0-pre.0
+## 6.18.0
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `react-router-dom@6.18.0-pre.0`
-  - `react-router@6.18.0-pre.0`
+  - `react-router-dom@6.18.0`
+  - `react-router@6.18.0`
 
 ## 6.17.0
 

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * React Router DOM v5 Compat v6.18.0-pre.0
+ * React Router DOM v5 Compat v6.18.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -296,7 +296,7 @@ const ViewTransitionContext = /*#__PURE__*/React.createContext({
 if (process.env.NODE_ENV !== "production") {
   ViewTransitionContext.displayName = "ViewTransition";
 }
-const FetchersContext = /*#__PURE__*/React.createContext(null);
+const FetchersContext = /*#__PURE__*/React.createContext(new Map());
 if (process.env.NODE_ENV !== "production") {
   FetchersContext.displayName = "Fetchers";
 }
@@ -362,10 +362,6 @@ function RouterProvider(_ref) {
     router,
     future
   } = _ref;
-  let {
-    fetcherContext,
-    fetcherData
-  } = useFetcherDataLayer();
   let [state, setStateImpl] = React.useState(router.state);
   let [pendingState, setPendingState] = React.useState();
   let [vtContext, setVtContext] = React.useState({
@@ -374,6 +370,7 @@ function RouterProvider(_ref) {
   let [renderDfd, setRenderDfd] = React.useState();
   let [transition, setTransition] = React.useState();
   let [interruption, setInterruption] = React.useState();
+  let fetcherData = React.useRef(new Map());
   let {
     v7_startTransition
   } = future || {};
@@ -386,8 +383,10 @@ function RouterProvider(_ref) {
   }, [v7_startTransition]);
   let setState = React.useCallback((newState, _ref2) => {
     let {
+      deletedFetchers,
       unstable_viewTransitionOpts: viewTransitionOpts
     } = _ref2;
+    deletedFetchers.forEach(key => fetcherData.current.delete(key));
     newState.fetchers.forEach((fetcher, key) => {
       if (fetcher.data !== undefined) {
         fetcherData.current.set(key, fetcher.data);
@@ -502,7 +501,7 @@ function RouterProvider(_ref) {
   }, /*#__PURE__*/React.createElement(UNSAFE_DataRouterStateContext.Provider, {
     value: state
   }, /*#__PURE__*/React.createElement(FetchersContext.Provider, {
-    value: fetcherContext
+    value: fetcherData.current
   }, /*#__PURE__*/React.createElement(ViewTransitionContext.Provider, {
     value: vtContext
   }, /*#__PURE__*/React.createElement(Router, {
@@ -879,36 +878,6 @@ function useDataRouterState(hookName) {
   !state ? process.env.NODE_ENV !== "production" ? UNSAFE_invariant(false, getDataRouterConsoleError(hookName)) : UNSAFE_invariant(false) : void 0;
   return state;
 }
-function useFetcherDataLayer() {
-  let fetcherRefs = React.useRef(new Map());
-  let fetcherData = React.useRef(new Map());
-  let registerFetcher = React.useCallback(key => {
-    let count = fetcherRefs.current.get(key);
-    if (count == null) {
-      fetcherRefs.current.set(key, 1);
-    } else {
-      fetcherRefs.current.set(key, count + 1);
-    }
-  }, [fetcherRefs]);
-  let unregisterFetcher = React.useCallback(key => {
-    let count = fetcherRefs.current.get(key);
-    if (count == null || count <= 1) {
-      fetcherRefs.current.delete(key);
-      fetcherData.current.delete(key);
-    } else {
-      fetcherRefs.current.set(key, count - 1);
-    }
-  }, [fetcherData, fetcherRefs]);
-  let fetcherContext = React.useMemo(() => ({
-    fetcherData: fetcherData.current,
-    register: registerFetcher,
-    unregister: unregisterFetcher
-  }), [fetcherData, registerFetcher, unregisterFetcher]);
-  return {
-    fetcherContext,
-    fetcherData
-  };
-}
 // External hooks
 /**
  * Handles the click behavior for router `<Link>` components. This is useful if
@@ -1084,10 +1053,10 @@ function useFetcher(_temp3) {
     router
   } = useDataRouterContext(DataRouterHook.UseFetcher);
   let state = useDataRouterState(DataRouterStateHook.UseFetcher);
-  let fetchersContext = React.useContext(FetchersContext);
+  let fetcherData = React.useContext(FetchersContext);
   let route = React.useContext(UNSAFE_RouteContext);
   let routeId = (_route$matches = route.matches[route.matches.length - 1]) == null ? void 0 : _route$matches.route.id;
-  !fetchersContext ? process.env.NODE_ENV !== "production" ? UNSAFE_invariant(false, "useFetcher must be used inside a FetchersContext") : UNSAFE_invariant(false) : void 0;
+  !fetcherData ? process.env.NODE_ENV !== "production" ? UNSAFE_invariant(false, "useFetcher must be used inside a FetchersContext") : UNSAFE_invariant(false) : void 0;
   !route ? process.env.NODE_ENV !== "production" ? UNSAFE_invariant(false, "useFetcher must be used inside a RouteContext") : UNSAFE_invariant(false) : void 0;
   !(routeId != null) ? process.env.NODE_ENV !== "production" ? UNSAFE_invariant(false, "useFetcher can only be used on routes that contain a unique \"id\"") : UNSAFE_invariant(false) : void 0;
   // Fetcher key handling
@@ -1096,22 +1065,15 @@ function useFetcher(_temp3) {
     setFetcherKey(getUniqueFetcherId());
   }
   // Registration/cleanup
-  let {
-    fetcherData,
-    register,
-    unregister
-  } = fetchersContext;
   React.useEffect(() => {
-    register(fetcherKey);
+    router.getFetcher(fetcherKey);
     return () => {
-      // Unregister from ref counting for the data layer
-      unregister(fetcherKey);
       // Tell the router we've unmounted - if v7_fetcherPersist is enabled this
       // will not delete immediately but instead queue up a delete after the
       // fetcher returns to an `idle` state
       router.deleteFetcher(fetcherKey);
     };
-  }, [router, fetcherKey, register, unregister]);
+  }, [router, fetcherKey]);
   // Fetcher additions
   let load = React.useCallback(href => {
     !routeId ? process.env.NODE_ENV !== "production" ? UNSAFE_invariant(false, "No routeId available for fetcher.load()") : UNSAFE_invariant(false) : void 0;