react-usectx 1.2.2 → 1.2.3

package/context.js

@@ -6,11 +6,6 @@ const getInstance = (name, initialState) => {
     if (!cache[name]) {
         cache[name] = new CreateContext(initialState);
     }
-    else {
-        if (typeof initialState !== "undefined") {
-            cache[name].commit(initialState);
-        }
-    }
     return cache[name];
 };
 export function updateCtx(name, initialState) {
@@ -26,7 +21,8 @@ export function getCtx(name) {
     return useSyncExternalStore(subscription, context.getState.bind(context), context.getState.bind(context));
 }
 export function useCtx(name, initialState) {
-    return [getCtx(name), updateCtx(name, initialState)];
+    const initializeFirst = updateCtx(name, initialState);
+    return [getCtx(name), initializeFirst];
 }
 const reducerCache = {};
 export function useReducer(name, modiFier, useCache = false) {

package/create-context.js

@@ -1,7 +1,7 @@
 export class CreateContext {
     constructor(initialState, options = {}) {
         const defaults = {
-            historySize: 99
+            historySize: 999
         };
         this.settings = Object.assign({}, defaults, options);
         if (initialState !== undefined) {
@@ -13,6 +13,7 @@ export class CreateContext {
     #state = null;
     #history = [];
     #activeVersion = -1;
+    #needsReset = false;
     subscribe(handler) {
         this.#eventHandlers.push(handler);
     }
@@ -24,26 +25,32 @@ export class CreateContext {
     }
     commit(state) {
         this.setState(state);
-        this.#eventHandlers.forEach((callback) => callback.call(undefined, state));
+        this.#trigger();
+    }
+    #trigger() {
+        this.#eventHandlers.forEach((callback) => callback.call(undefined, this.getState()));
     }
     undo() {
         const prev = this.#history[this.#activeVersion - 1];
         if (prev) {
             this.setState(prev, this.#history.indexOf(prev));
+            this.#needsReset = true;
+            this.#trigger();
         }
     }
     redo() {
         const next = this.#history[this.#activeVersion + 1];
         if (next) {
             this.setState(next, this.#history.indexOf(next));
+            this.#needsReset = true;
+            this.#trigger();
         }
     }
     setState(state, _av) {
         if (typeof _av === 'undefined') {
-            if ((this.#history.length - 1) > this.#activeVersion) {
+            if ((this.#history.length - 1) > this.#activeVersion && this.#needsReset) {
                 this.#history.splice(this.#activeVersion + 1, this.#history.length);
             }
-            this.#activeVersion = this.#history.length - 1;
         }
         this.#history.push(state);
         if (this.#history.length > this.settings.historySize) {
@@ -52,6 +59,9 @@ export class CreateContext {
         if (typeof _av === 'number') {
             this.#activeVersion = _av;
         }
+        else {
+            this.#activeVersion = this.#history.length - 1;
+        }
         this.#state = state;
     }
     getState() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-usectx",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "main": "index.js",
   "type": "module",
   "repository": {

package/src/context.ts

@@ -14,10 +14,6 @@ const getInstance = (
 ): InstanceType<typeof CreateContext> => {
   if (!cache[name]) {
     cache[name] = new CreateContext(initialState);
-  } else {
-    if (typeof initialState !== "undefined") {
-      cache[name].commit(initialState);
-    }
   }
   return cache[name];
 };
@@ -44,7 +40,8 @@ export function useCtx(
   name: string,
   initialState?: state
 ): [ReactNode, Function] {
-  return [getCtx(name), updateCtx(name, initialState)];
+  const initializeFirst = updateCtx(name, initialState)
+  return [getCtx(name), initializeFirst];
 }
 
 const reducerCache: { [key: string]: WeakMap<any, any> } = {};

package/src/create-context.ts

@@ -24,6 +24,7 @@ export class CreateContext {
 
   #history: any[] = [];
   #activeVersion:number = -1;
+  #needsReset: boolean = false;
 
   subscribe(handler: Function): void {
     this.#eventHandlers.push(handler);
@@ -38,29 +39,36 @@ export class CreateContext {
 
   commit(state: state): void {
     this.setState(state);
-    this.#eventHandlers.forEach((callback) => callback.call(undefined, state));
+    this.#trigger();
   }
 
-  undo(){
-    const prev = this.#history[this.#activeVersion - 1];
-    if(prev) {
-      this.setState(prev, this.#history.indexOf(prev))
-    }
+  #trigger(): void  {
+      this.#eventHandlers.forEach((callback) => callback.call(undefined, this.getState()));
   }
 
+  undo() {
+      const prev = this.#history[this.#activeVersion - 1];
+      if (prev) {
+          this.setState(prev, this.#history.indexOf(prev));
+          this.#needsReset = true;
+          this.#trigger()
+      }
+      
+  }
   redo() {
-    const next = this.#history[this.#activeVersion + 1];
-    if(next) {
-      this.setState(next, this.#history.indexOf(next))
-    }
+      const next = this.#history[this.#activeVersion + 1];
+      if (next) {
+          this.setState(next, this.#history.indexOf(next));
+          this.#needsReset = true;
+          this.#trigger()
+      } 
   }
 
   setState(state: state, _av?: number): void {
     if (typeof _av === 'undefined') {
-        if((this.#history.length - 1) > this.#activeVersion) {
+        if((this.#history.length - 1) > this.#activeVersion && this.#needsReset) {
             this.#history.splice(this.#activeVersion + 1, this.#history.length)
         }
-        this.#activeVersion = this.#history.length - 1;
     }
     this.#history.push(state);
     if (this.#history.length > this.settings.historySize!) {
@@ -68,6 +76,8 @@ export class CreateContext {
     }
     if (typeof _av === 'number') {
         this.#activeVersion = _av;
+    } else {
+        this.#activeVersion = this.#history.length - 1;
     }
 
     this.#state = state;

package/types.js

@@ -0,0 +1 @@
+export {};