www.spaceplanner.app

commit 5a3b616fea9769eab7bab12f3526b0e3a2f3b211
parent fa45914c76bb80618f9c40f7af5a818ec53347c1
Author: Jacob R. Edwards <jacob@jacobedwards.org>
Date:   Thu, 19 Sep 2024 10:27:27 -0700

Implement easier interface to unit inputs

Diffstat:
M
files/floorplans/floorplan/main.js
 | 
30
+++++++++++++++++++-----------

1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/files/floorplans/floorplan/main.js b/files/floorplans/floorplan/main.js
@@ -413,18 +413,10 @@ function precisePointHandler(event, editor, state) {
 		state.len.value = 0
 		state.len.addEventListener("input", function(event) {
 			let vecs = state.line.vecs()
-			let len
-			try {
-				len = editor.units.snapTo(
-					parseUserLength(editor, event.target.value), editor.unit
-				)
-			}
-			catch (err) {
-				state.len.classList.add("invalid")
-				console.log("Invalid input length", err)
+			let len =  editor.units.snapTo(unitInput(editor, event.target.value), editor.unit)
+			if (len == null) {
 				return
 			}
-			state.len.classList.remove("invalid")
 			if (len> 0) {
 				vecs[1] = setLength(vecs[0], vecs[1], len)
 				updatePoint(vecs[1], { leave_input: true })
@@ -484,7 +476,7 @@ function precisePointHandler(event, editor, state) {
 		}
 
 		if (!options.leave_input) {
-			state.len.value = userLength(editor,
+			unitInput(editor, state.len,
 			    editor.units.snapTo(state.origin.distanceTo(p), editor.unit))
 		}
 	}
@@ -949,6 +941,22 @@ function menuItem(name, label, options) {
 	}
 }
 
+function unitInput(editor, input, value) {
+	if (value != null) {
+		input.value = userLength(editor, value)
+		return
+	}
+
+	try {
+		return parseUserLength(editor, input.value)
+	}
+	catch(err) {
+		input.setCustomValidity(err)
+		input.reportValidity()
+	}
+}
+
+
 function parseUserLength(editor, length) {
 	let a = length.replaceAll(" ", "").split(/([0-9]+)/)
 	let amount