From 9e12bbf558b8a3e667714c58000055cbd22ff70a Mon Sep 17 00:00:00 2001
From: Misode <Misoloo64@gmail.com>
Date: Mon, 9 May 2022 03:16:15 +0200
Subject: [PATCH] Fix history index tracking

---
 src/app/contexts/Version.tsx | 5 +++++
 src/app/pages/Generator.tsx  | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/contexts/Version.tsx b/src/app/contexts/Version.tsx
index 1f43183d..d829cd5c 100644
--- a/src/app/contexts/Version.tsx
+++ b/src/app/contexts/Version.tsx
@@ -31,6 +31,7 @@ export function VersionProvider({ children }: { children: ComponentChildren }) {
 
 	useEffect(() => {
 		if (VersionIds.includes(targetVersion as VersionId) && version !== targetVersion) {
+			Analytics.setVersion(targetVersion as VersionId)
 			setVersion(targetVersion as VersionId)
 		}
 	}, [version, targetVersion])
@@ -46,6 +47,10 @@ export function VersionProvider({ children }: { children: ComponentChildren }) {
 		setVersion(newVersion)
 	}, [targetVersion])
 
+	useEffect(() => {
+		Analytics.setVersion(version)
+	}, [])
+
 	const value: Version = {
 		version,
 		changeVersion,
diff --git a/src/app/pages/Generator.tsx b/src/app/pages/Generator.tsx
index a9d904c2..8651a273 100644
--- a/src/app/pages/Generator.tsx
+++ b/src/app/pages/Generator.tsx
@@ -168,21 +168,21 @@ export function Generator({}: Props) {
 	}
 	const undo = (e: MouseEvent) => {
 		e.stopPropagation()
-		Analytics.undoGenerator(gen.id, (model?.historyIndex ?? 1) - 1, 'menu')
+		Analytics.undoGenerator(gen.id, model?.historyIndex ?? 1, 'menu')
 		model?.undo()
 	}
 	const redo = (e: MouseEvent) => {
 		e.stopPropagation()
-		Analytics.redoGenerator(gen.id, (model?.historyIndex ?? 1) + 1, 'menu')
+		Analytics.redoGenerator(gen.id, model?.historyIndex ?? 1, 'menu')
 		model?.redo()
 	}
 
 	const onKeyUp = (e: KeyboardEvent) => {
 		if (e.ctrlKey && e.key === 'z') {
-			Analytics.undoGenerator(gen.id, (model?.historyIndex ?? 1) - 1, 'hotkey')
+			Analytics.undoGenerator(gen.id, model?.historyIndex ?? 1, 'hotkey')
 			model?.undo()
 		} else if (e.ctrlKey && e.key === 'y') {
-			Analytics.redoGenerator(gen.id, (model?.historyIndex ?? 1) + 1, 'hotkey')
+			Analytics.redoGenerator(gen.id, model?.historyIndex ?? 1, 'hotkey')
 			model?.redo()
 		}
 	}