Fix keyboard doesn't dismiss when opening the attach dialog with a co…

…mmand
personalizedrefrigerator · Dec 6, 2024 · 9b75591 · 9b75591
1 parent 862adef
commit 9b75591
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/app-mobile/components/screens/Note/Note.tsx b/packages/app-mobile/components/screens/Note/Note.tsx
@@ -322,7 +322,11 @@ class NoteScreenComponent extends BaseScreenComponent<ComponentProps, State> imp
 			{
 				attachFile: this.attachFile.bind(this),
 				hideKeyboard: () => {
-					this.editorRef?.current?.hideKeyboard();
+					if (this.useEditorBeta()) {
+						this.editorRef?.current?.hideKeyboard();
+					} else {
+						Keyboard.dismiss();
+					}
 				},
 				insertText: this.insertText.bind(this),
 				get dialogs() {
@@ -338,6 +342,7 @@ class NoteScreenComponent extends BaseScreenComponent<ComponentProps, State> imp
 				},
 			},
 			commands,
+			true,
 		);
 	}
 

diff --git a/packages/lib/services/commands/ToolbarButtonUtils.ts b/packages/lib/services/commands/ToolbarButtonUtils.ts
@@ -66,7 +66,7 @@ export default class ToolbarButtonUtils {
 			iconName: command.declaration.iconName,
 			enabled: newEnabled,
 			onClick: async () => {
-				void this.service.execute(commandName);
+				await this.service.execute(commandName);
 				void focusEditorIfEditorCommand(commandName, this.service);
 			},
 			title: newTitle,