presets and sets: trim names

Cycling74 · Jan 8, 2025 · 28ab953 · 28ab953
1 parent 0ea5d8c
commit 28ab953
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/src/components/presets/item.tsx b/src/components/presets/item.tsx
@@ -53,14 +53,15 @@ export const PresetItem: FunctionComponent<PresetItemProps> = memo(function Wrap
 	const onRenamePreset = useCallback((e: FormEvent<HTMLFormElement>) => {
 		e.preventDefault();
 		inputRef.current?.focus();
-		if (preset.name === name) {
+		const trimmedName = name.trim();
+		if (preset.name === trimmedName) {
 			setIsEditing(false);
-		} else if (!name?.length) {
+		} else if (!trimmedName?.length) {
 			setError("Please provide a valid preset name");
-		} else if (!validateUniqueName(name)) {
-			setError(`A preset with the name "${name}" already exists`);
+		} else if (!validateUniqueName(trimmedName)) {
+			setError(`A preset with the name "${trimmedName}" already exists`);
 		} else {
-			onRename(preset, name);
+			onRename(preset, trimmedName);
 		}
 	}, [name, onRename, preset, setError, inputRef, setIsEditing, validateUniqueName]);
 

diff --git a/src/components/presets/save.tsx b/src/components/presets/save.tsx
@@ -20,11 +20,12 @@ export const SavePresetForm: FunctionComponent<SavePresetFormProps> = memo(funct
 
 	const onSavePreset = (e: FormEvent<HTMLFormElement>): void => {
 		e.preventDefault();
-		if (!name?.length) {
+		const trimmedName = name.trim();
+		if (!trimmedName?.length) {
 			setError("Please provide a valid preset name");
 		} else {
 			setError(undefined);
-			onSave(name);
+			onSave(trimmedName);
 			setName("");
 		}
 	};

diff --git a/src/components/sets/item.tsx b/src/components/sets/item.tsx
@@ -39,14 +39,15 @@ export const GraphSetItem: FunctionComponent<GraphSetItemProps> = memo(function
 	const onRenameSet = useCallback((e: FormEvent<HTMLFormElement>) => {
 		e.preventDefault();
 		inputRef.current?.focus();
-		if (set.name === name) {
+		const trimmedName = name.trim();
+		if (set.name === trimmedName) {
 			setIsEditing(false);
-		} else if (!name?.length) {
+		} else if (!trimmedName?.length) {
 			setError("Please provide a valid set name");
-		} else if (!validateUniqueName(name)) {
-			setError((`A set with the name "${name} already exists"`));
+		} else if (!validateUniqueName(trimmedName)) {
+			setError((`A set with the name "${trimmedName} already exists"`));
 		} else {
-			onRename(set, name);
+			onRename(set, trimmedName);
 		}
 	}, [name, onRename, set, setError, inputRef, setIsEditing, validateUniqueName]);
 

diff --git a/src/components/sets/save.tsx b/src/components/sets/save.tsx
@@ -19,11 +19,12 @@ export const SaveGraphSetForm: FunctionComponent<SaveGraphSetFormProps> = memo(f
 
 	const onSaveSet = (e: FormEvent<HTMLFormElement>): void => {
 		e.preventDefault();
-		if (!name?.length) {
+		const trimmedName = name.trim();
+		if (!trimmedName?.length) {
 			setError("Please provide a valid set name");
 		} else {
 			setError(undefined);
-			onSave(name);
+			onSave(trimmedName);
 			setName("");
 		}
 	};