fix: make file renaming consistent with tag & note renaming (#920)

This commit is contained in:
Aman Harwara
2022-03-12 19:27:07 +05:30
committed by GitHub
parent 772079338f
commit fc2a350cca

View File

@@ -72,16 +72,14 @@ export const PopoverFileItem: FunctionComponent<PopoverFileItemProps> = ({
}, [isRenamingFile]); }, [isRenamingFile]);
const renameFile = async (file: SNFile, name: string) => { const renameFile = async (file: SNFile, name: string) => {
const didRename = await handleFileAction({ await handleFileAction({
type: PopoverFileItemActionType.RenameFile, type: PopoverFileItemActionType.RenameFile,
payload: { payload: {
file, file,
name, name,
}, },
}); });
if (didRename) { setIsRenamingFile(false);
setIsRenamingFile(false);
}
}; };
const handleFileNameInput = (event: Event) => { const handleFileNameInput = (event: Event) => {
@@ -90,11 +88,14 @@ export const PopoverFileItem: FunctionComponent<PopoverFileItemProps> = ({
const handleFileNameInputKeyDown = (event: KeyboardEvent) => { const handleFileNameInputKeyDown = (event: KeyboardEvent) => {
if (event.key === KeyboardKey.Enter) { if (event.key === KeyboardKey.Enter) {
renameFile(file, fileName); fileNameInputRef.current?.blur();
return;
} }
}; };
const handleFileNameInputBlur = () => {
renameFile(file, fileName);
};
return ( return (
<div className="flex items-center justify-between p-3"> <div className="flex items-center justify-between p-3">
<div className="flex items-center"> <div className="flex items-center">
@@ -108,6 +109,7 @@ export const PopoverFileItem: FunctionComponent<PopoverFileItemProps> = ({
ref={fileNameInputRef} ref={fileNameInputRef}
onInput={handleFileNameInput} onInput={handleFileNameInput}
onKeyDown={handleFileNameInputKeyDown} onKeyDown={handleFileNameInputKeyDown}
onBlur={handleFileNameInputBlur}
/> />
) : ( ) : (
<div className="text-sm mb-1">{file.nameWithExt}</div> <div className="text-sm mb-1">{file.nameWithExt}</div>