Merge branch 'bug/textarea_enter_of_lastone'

RafaelGB · May 1, 2024 · d46847f · d46847f
2 parents 3ce4654 + 7ef63e2
commit d46847f
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 17 deletions.
diff --git a/WorkFlow Test/Workflow of new notes.canvas b/WorkFlow Test/Workflow of new notes.canvas
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "zettelflow",
 	"name": "ZettelFlow",
-	"version": "2.3.2",
+	"version": "2.3.3",
 	"minAppVersion": "1.4.11",
 	"description": "Helps you to create and manage your notes in a Zettelkasten way via Canvas.",
 	"author": "RafaelGB",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zettelflow",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "A plugin for Obsidian that allows you to create and manage notes in a ZettelFlow-like way.",
   "main": "main.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "codemirror": "6.0.1",
     "esbuild": "0.20.2",
     "esbuild-sass-plugin": "3.2.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-plugin-react": "7.34.1",
     "jest": "29.7.0",
     "obsidian": "1.5.7-1",

diff --git a/src/actions/number/NumberComponent.tsx b/src/actions/number/NumberComponent.tsx
@@ -10,6 +10,8 @@ export function NumberWrapper(props: WrappedActionBuilderProps) {
         type="number"
         onKeyDown={(e) => {
           if (e.key === "Enter") {
+            e.preventDefault();
+            e.stopPropagation();
             callback(parseFloat(e.currentTarget.value));
           }
         }}

diff --git a/src/actions/prompt/PromptComponent.tsx b/src/actions/prompt/PromptComponent.tsx
@@ -11,8 +11,10 @@ export function PromptWrapper(props: WrappedActionBuilderProps) {
       placeholder={
         TypeService.isString(action.placeholder) ? action.placeholder : ""
       }
-      onKeyDown={(key, value) => {
-        if (key === "Enter") {
+      onKeyDown={(event, value) => {
+        if (event.key === "Enter") {
+          event.preventDefault();
+          event.stopPropagation();
           callback(value);
         }
       }}

diff --git a/src/architecture/components/core/input/TextArea.tsx b/src/architecture/components/core/input/TextArea.tsx
@@ -30,7 +30,7 @@ export function TextArea(info: InputType) {
         }}
         onKeyDown={(event) => {
           if (onKeyDown) {
-            onKeyDown(event.key, valueState || "");
+            onKeyDown(event, valueState || "");
           }
         }}
         autoFocus={autofocus}

diff --git a/src/architecture/components/core/input/typing.ts b/src/architecture/components/core/input/typing.ts
@@ -6,5 +6,5 @@ export type InputType = {
     value?: string,
     required?: boolean,
     onChange?: (value: string) => void
-    onKeyDown?: (key: string, currentValue: string) => void
+    onKeyDown?: (event: React.KeyboardEvent<HTMLTextAreaElement>, currentValue: string) => void
 }