Use lodash merge instead

RooVetGit · Mar 2, 2025 · 618bf97 · 618bf97
1 parent f50e9a6
commit 618bf97
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 26 deletions.
diff --git a/webview-ui/package-lock.json b/webview-ui/package-lock.json
diff --git a/webview-ui/package.json b/webview-ui/package.json
@@ -34,6 +34,7 @@
 		"debounce": "^2.1.1",
 		"fast-deep-equal": "^3.1.3",
 		"fzf": "^0.5.2",
+		"lodash": "^4.17.21",
 		"lucide-react": "^0.475.0",
 		"mermaid": "^11.4.1",
 		"react": "^18.3.1",
@@ -61,6 +62,7 @@
 		"@testing-library/react": "^16.2.0",
 		"@testing-library/user-event": "^14.6.1",
 		"@types/jest": "^27.5.2",
+		"@types/lodash": "^4.17.16",
 		"@types/node": "^18.0.0",
 		"@types/react": "^18.3.18",
 		"@types/react-dom": "^18.3.5",

diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx
@@ -1,5 +1,7 @@
 import React, { createContext, useCallback, useContext, useEffect, useState } from "react"
 import { useEvent } from "react-use"
+import { merge } from "lodash"
+
 import { ApiConfigMeta, ExtensionMessage, ExtensionState } from "../../../src/shared/ExtensionMessage"
 import { ApiConfiguration } from "../../../src/shared/api"
 import { vscode } from "../utils/vscode"
@@ -252,28 +254,5 @@ export const useExtensionState = () => {
 	return context
 }
 
-export const mergeExtensionState = (prevState: ExtensionState, newState: ExtensionState) => {
-	const {
-		apiConfiguration: prevApiConfiguration,
-		customModePrompts: prevCustomModePrompts,
-		customSupportPrompts: prevCustomSupportPrompts,
-		experiments: prevExperiments,
-		...prevRest
-	} = prevState
-
-	const {
-		apiConfiguration: newApiConfiguration,
-		customModePrompts: newCustomModePrompts,
-		customSupportPrompts: newCustomSupportPrompts,
-		experiments: newExperiments,
-		...newRest
-	} = newState
-
-	const apiConfiguration = { ...prevApiConfiguration, ...newApiConfiguration }
-	const customModePrompts = { ...prevCustomModePrompts, ...newCustomModePrompts }
-	const customSupportPrompts = { ...prevCustomSupportPrompts, ...newCustomSupportPrompts }
-	const experiments = { ...prevExperiments, ...newExperiments }
-	const rest = { ...prevRest, ...newRest }
-
-	return { ...rest, apiConfiguration, customModePrompts, customSupportPrompts, experiments }
-}
+export const mergeExtensionState = (prevState: ExtensionState, newState: ExtensionState): ExtensionState =>
+	merge(prevState, newState)