Merge pull request #38 from koordinates/useIsRouteActive

koordinates · Dec 6, 2022 · 8f9a4d4 · 8f9a4d4
2 parents 277866f + 9b7b689
commit 8f9a4d4
Show file tree

Hide file tree

Showing 17 changed files with 153 additions and 201 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -9,7 +9,7 @@ module.exports = {
   setupFilesAfterEnv: ["./src/setupScript.ts"],
   globals: {
     "ts-jest": {
-      tsConfig: "./tsconfig.json",
+      tsconfig: "./tsconfig.json",
       isolatedModules: true,
     },
   },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "@saithodev/semantic-release-backmerge": "^2.1.2",
     "@testing-library/dom": "^8.14.0",
     "@testing-library/jest-dom": "^5.16.1",
-    "@testing-library/react": "^10.4.8",
+    "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "@types/history": "^4.7.7",
     "@types/jest": "^28.1.4",
@@ -73,7 +73,8 @@
   "peerDependencies": {
     "@xstate/react": "^3.x",
     "xstate": ">= 4.20 < 5.0.0",
-    "zod": "^3.x"
+    "zod": "^3.x",
+    "react": ">= 16.8.0 < 19.0.0"
   },
   "scripts": {
     "lint": "eslint 'src/**/*'",

diff --git a/src/routing/index.ts b/src/routing/index.ts
@@ -20,5 +20,6 @@ export {
   handleLocationChange,
   type Routing404Event,
 } from "./handleLocationChange";
+export { useIsRouteActive } from "./useIsRouteActive";
 
 export { RoutingContext } from "./providers";
diff --git a/src/routing/providers.ts b/src/routing/providers.ts
@@ -1,7 +1,9 @@
 import { createContext, MutableRefObject, useContext } from "react";
 
+import { RoutingEvent } from "./routingEvent";
+
 type RoutingContext = {
-  activeRouteEvents?: MutableRefObject<any[]>;
+  activeRouteEvents?: MutableRefObject<RoutingEvent<any>[]>;
 };
 
 export const RoutingContext = createContext<RoutingContext | undefined>(