Merge pull request #6916 from nextcloud/backport/6915/stable31

[stable31] fix/6871 smart add to next line
nextcloud · Feb 27, 2025 · 22717e5 · 22717e5
2 parents 795edc6 + c86e121
commit 22717e5
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -140,7 +140,7 @@
     "raw-loader": "^4.0.2",
     "rollup-plugin-webpack-stats": "^1.2.3",
     "typescript": "^5.7.2",
-    "vite": "^5.4.11",
+    "vite": "^5.4.14",
     "vite-plugin-commonjs": "^0.10.4",
     "vitest": "^2.1.8",
     "vue-demi": "^0.14.10",

diff --git a/src/plugins/currentLineMenu.js b/src/plugins/currentLineMenu.js
@@ -157,12 +157,12 @@ function menuForCurrentParagraph(editor) {
 		const { selection } = editor.state
 		const { textContent } = selection.$anchor.parent
 		const eol = selection.$anchor.end()
-		const contentToInsert = textContent.match(/(^| )$/) ? '/' : ' /'
-		editor.chain()
-			.focus()
-			.setTextSelection(eol)
-			.insertContent(contentToInsert)
-			.run()
+		const chain = editor.chain().focus().setTextSelection(eol)
+		if (textContent.trim() === '') {
+			chain.insertContent('/').run()
+		} else {
+			chain.splitBlock().insertContent('/').run()
+		}
 	})
 	return menu.$el
 }
diff --git a/vite.config.ts b/vite.config.ts
@@ -77,6 +77,9 @@ const config = createAppConfig({
 				}
 			},
 		},
+		server: {
+			allowedHosts: ['host.docker.internal', 'localhost', 'nextcloud.local'],
+		},
 	},
 })
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,6 +77,9 @@ const config = createAppConfig({ @@
     				}
     			},
     		},
+    		server: {
+    			allowedHosts: ['host.docker.internal', 'localhost', 'nextcloud.local'],
+    		},
     	},
     })
@@ Expand Down @@