From 4a46bae0402cdd8ed2b1d60ebb585f722904776f Mon Sep 17 00:00:00 2001
From: n-peugnet <n.peugnet@free.fr>
Date: Tue, 22 Feb 2022 00:09:43 +0100
Subject: [PATCH] fix: some modal fixes

---
 public/global.css        |  2 +-
 src/view/FileList.svelte | 45 +++++++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/public/global.css b/public/global.css
index 15d7584..200829c 100644
--- a/public/global.css
+++ b/public/global.css
@@ -57,7 +57,7 @@ div.file-table td:last-child {
 }
 
 div.file-table td .bx--overflow-menu {
-	width: 1rem;
+	width: 1.5rem;
 }
 
 .bx--data-table--md .bx--overflow-menu {
diff --git a/src/view/FileList.svelte b/src/view/FileList.svelte
index dc32782..4c94208 100644
--- a/src/view/FileList.svelte
+++ b/src/view/FileList.svelte
@@ -84,6 +84,15 @@
 		newFolder = "";
 	}
 
+	async function renameFile() {
+		renameModal = false;
+		await fs.moveFile(
+			renameInode.path,
+			parent(renameInode.path) + renameValue
+		);
+		fileListUpdateIncr();
+	}
+
 	function copySelected() {
 		task = new CopyTask(fs, checked);
 		selectedRowIds = [];
@@ -205,8 +214,9 @@
 
 <Modal
 	bind:open={newFolderModal}
-	size="xs"
+	size="sm"
 	modalHeading="Create new folder"
+	hasForm
 	primaryButtonText="Create"
 	primaryButtonDisabled={!newFolder}
 	secondaryButtonText="Cancel"
@@ -215,13 +225,11 @@
 	on:close={() => (newFolder = "")}
 >
 	<p>Enter a name for the new folder.</p>
-	<Form on:submit={newDir}>
-		<TextInput
-			labelText="Name"
-			bind:value={newFolder}
-			data-modal-primary-focus
-		/>
-	</Form>
+	<TextInput
+		labelText="Name"
+		bind:value={newFolder}
+		data-modal-primary-focus
+	/>
 </Modal>
 
 <Modal
@@ -231,28 +239,27 @@
 	modalHeading="Delete selected files"
 	primaryButtonText="Delete"
 	secondaryButtonText="Cancel"
+	shouldSubmitOnEnter={false}
 	on:click:button--secondary={() => (deleteSelectedModal = false)}
 	on:submit={deleteSelected}
 >
 	<p>Are you sure you want to delete {checked.length} files?</p>
 </Modal>
 
-<ComposedModal
-	bind:open={renameModal}
-	on:submit={() => {
-		fs.moveFile(renameInode.path, parent(renameInode.path) + renameValue).then(
-			fileListUpdateIncr
-		);
-		renameModal = false;
-	}}
->
+<ComposedModal size="sm" bind:open={renameModal} on:submit={renameFile}>
 	<ModalHeader title="Rename file" />
 	<ModalBody hasForm>
-		<TextInput bind:value={renameValue} />
+		<Form on:submit={renameFile}>
+			<TextInput
+				labelText="New name"
+				bind:value={renameValue}
+				data-modal-primary-focus
+			/>
+		</Form>
 	</ModalBody>
 	<ModalFooter
 		primaryButtonText="Rename"
-		primaryButtonDisabled={renameValue.length <= 0}
+		primaryButtonDisabled={!renameValue}
 		secondaryButtonText="Cancel"
 		on:click:button--secondary={() => {
 			renameModal = false;