Upgraded packages and added a unmount fix

techbech · Jan 14, 2021 · 87bc310 · 87bc310
1 parent 4fd82ff
commit 87bc310
Show file tree

Hide file tree

Showing 10 changed files with 3,388 additions and 3,050 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/index.modern.js b/dist/index.modern.js
diff --git a/dist/index.modern.js.map b/dist/index.modern.js.map
diff --git a/dist/types.d.ts b/dist/types.d.ts
@@ -1,10 +1,9 @@
-import { Dispatch, SetStateAction } from "react";
 import { Dispatcher } from "./dispatcher";
 export declare type SessionValueType = {} | null | undefined;
 export declare type SessionGenericData = {
     [key: string]: SessionValueType;
 };
-export declare type SessionDispatchFunc = Dispatch<SetStateAction<any>>;
+export declare type SessionDispatchFunc = (value: any) => void;
 export declare type SessionContextKey = string;
 export declare type SessionOnChange<DataType extends SessionGenericData> = (data: DataType) => void;
 export declare type SessionGenericContext<DataType extends SessionGenericData = SessionGenericData> = {

diff --git a/example/yarn.lock b/example/yarn.lock
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@peteck/react-context-session",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "description": "Arbitrary session data with support for multiple contexts",
     "author": "Peteck",
     "license": "MIT",

diff --git a/src/types.ts b/src/types.ts
@@ -1,9 +1,8 @@
-import { Dispatch, SetStateAction } from "react";
 import { Dispatcher } from "./dispatcher";
 
 export type SessionValueType = {} | null | undefined;
 export type SessionGenericData = { [key: string]: SessionValueType };
-export type SessionDispatchFunc = Dispatch<SetStateAction<any>>;
+export type SessionDispatchFunc = (value: any) => void;
 export type SessionContextKey = string;
 export type SessionOnChange<DataType extends SessionGenericData> = (
     data: DataType,

diff --git a/src/use-session.ts b/src/use-session.ts
@@ -47,14 +47,19 @@ export function useSessionBase<
     }
 
     useEffect(() => {
+        let didUnmount = false;
+
         for (let i = 0; i < k.length; i++) {
-            context.dispatcher.register(
-                k[i] as string,
-                states[k[i] as string][1],
-            );
+            context.dispatcher.register(k[i] as string, (value) => {
+                if (!didUnmount) {
+                    states[k[i] as string][1](value);
+                }
+            });
         }
 
         return () => {
+            didUnmount = true;
+
             for (let i = 0; i < k.length; i++) {
                 context.dispatcher.unregister(
                     k[i] as string,

diff --git a/yarn.lock b/yarn.lock