chore: *

NgXPlatform · Jan 8, 2025 · b8c04d8 · b8c04d8
1 parent 2540fbe
commit b8c04d8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 34 deletions.
diff --git a/projects/ngrx-extension/src/lib/with-history/with-history.ts b/projects/ngrx-extension/src/lib/with-history/with-history.ts
@@ -1,13 +1,5 @@
 import { effect } from '@angular/core';
-import {
-	type SignalStoreFeature,
-	type SignalStoreFeatureResult,
-	getState,
-	patchState,
-	signalStoreFeature,
-	withHooks,
-	withMethods,
-} from '@ngrx/signals';
+import { getState, patchState, signalStoreFeature, withHooks, withMethods } from '@ngrx/signals';
 
 export const STATE_HISTORY = Symbol('STATE_HISTORY');
 
@@ -16,23 +8,18 @@ export type TStateHistory<State> = {
 	currentVersionIndex: number;
 };
 
-export function withHistory<State extends object>({
-	maxLength = 100,
-	sync = true,
-}: {
+export type Config = {
 	maxLength?: number;
 	sync?: boolean;
-}): SignalStoreFeature<
-	SignalStoreFeatureResult,
-	{
-		state: {};
-		props: {};
-		methods: {
-			undo: () => void;
-			redo: () => void;
-		};
-	}
-> {
+};
+
+// todo next　reference
+// historiesChangeDetFn?: (
+//   store: Prettify<StateSignals<Input['state']> & Input['props'] & Input['methods'] & WritableSignal<Input['state']>>,
+//   histories: State[],
+// ) => void;
+
+export function withHistory<State extends object>({ maxLength = 100, sync = true }: Config) {
 	/** このオブジェクトにstateの変更履歴を保存する */
 	const stateHistory: { [STATE_HISTORY]: TStateHistory<State> } = {
 		[STATE_HISTORY]: {
@@ -81,15 +68,12 @@ export function withHistory<State extends object>({
 				patchState(store, stateVersions[currentVersionIndex - 1]);
 			},
 
-			/** 履歴全てを返却する */
-			getHistories() {
-				return stateHistory[STATE_HISTORY].stateVersions;
-			},
-
 			/** 履歴を削除する */
 			clearHistories() {
-				stateHistory[STATE_HISTORY].stateVersions = [];
-				stateHistory[STATE_HISTORY].currentVersionIndex = 0;
+				stateHistory[STATE_HISTORY].stateVersions = stateHistory[STATE_HISTORY].stateVersions.filter(
+					(_, index) => index + 1 === stateHistory[STATE_HISTORY].currentVersionIndex,
+				);
+				stateHistory[STATE_HISTORY].currentVersionIndex = 1;
 			},
 		})),
 

diff --git a/src/app/pages/with-history/with-history.component.ts b/src/app/pages/with-history/with-history.component.ts
@@ -11,12 +11,11 @@ export type TUser = {
 
 export type TUserState = {
 	user: TUser;
-	histories: TUser[];
 };
 
 export const UserSignalStore = signalStore(
-	withState<TUserState>({ user: { name: 'John Doe', age: 30 }, histories: [] }),
-	withHistory<TUserState>({}),
+	withState<TUserState>({ user: { name: 'John Doe', age: 30 } }),
+	withHistory({}),
 	withMethods((store) => ({
 		editName(name: string): void {
 			patchStateWithImmer(store, (state) => {
@@ -38,6 +37,8 @@ export const UserSignalStore = signalStore(
         <button (click)="editName()" class="bg-green-500 rounded-lg p-2 text-white">change name</button>
         <button (click)="userSignalStore.undo()" class="bg-red-500 rounded-lg p-2 text-white">undo</button>
         <button (click)="userSignalStore.redo()" class="bg-blue-500 rounded-lg p-2 text-white">redo</button>
+        <button (click)="userSignalStore.clearHistories()" class="bg-purple-500 rounded-lg p-2 text-white">clear
+        </button>
       </div>
     </div>
   `,