backport: fix crash when rendering and email UI field (#9752)

openstreetmap · Jul 12, 2023 · 59c8b79 · 59c8b79
1 parent 1234cca
commit 59c8b79
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,6 +35,15 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [@xxxx]: https://github.com/xxxx
 -->
 
+
+# 2.26.1
+##### 2023-Jul-12
+
+* Fix crash when rendering and `email` UI field ([#9752])
+
+[#9752]: https://github.com/openstreetmap/iD/issues/9752
+
+
 # 2.26.0
 #### :tada: New Features
 * Combo fields for tags with `yes/no` values now also display the `no` state and allow to toggle between the two states ([#7427])

diff --git a/dist/iD.js b/dist/iD.js
@@ -22762,7 +22762,7 @@
   // package.json
   var package_default = {
     name: "iD",
-    version: "2.26.0",
+    version: "2.26.1",
     description: "A friendly editor for OpenStreetMap",
     main: "dist/iD.min.js",
     repository: "github:openstreetmap/iD",
@@ -25793,7 +25793,11 @@
       return value2 === null || value2 === void 0 ? valueNull : typeof value2 === "function" ? valueFunction : valueConstant;
     }
     function stickyCursor(func) {
+      const supportedTypes = ["text", "search", "url", "tel", "password"];
       return function() {
+        if (!supportedTypes.includes(this.type)) {
+          return;
+        }
         const cursor = { start: this.selectionStart, end: this.selectionEnd };
         func.apply(this, arguments);
         this.setSelectionRange(cursor.start, cursor.end);

diff --git a/dist/iD.js.map b/dist/iD.js.map
diff --git a/dist/iD.min.js b/dist/iD.min.js
diff --git a/dist/iD.min.js.map b/dist/iD.min.js.map
diff --git a/modules/util/get_set_value.js b/modules/util/get_set_value.js
@@ -28,7 +28,13 @@ export function utilGetSetValue(selection, value, shouldUpdate) {
     }
 
     function stickyCursor(func) {
+        // only certain input element types allow manipulating the cursor
+        // see https://html.spec.whatwg.org/multipage/input.html#concept-input-apply
+        const supportedTypes = ['text', 'search', 'url', 'tel', 'password'];
         return function() {
+            if (!supportedTypes.includes(this.type)) {
+                return;
+            }
             const cursor = { start: this.selectionStart, end: this.selectionEnd };
             func.apply(this, arguments);
             this.setSelectionRange(cursor.start, cursor.end);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "2.26.0",
+  "version": "2.26.1",
   "description": "A friendly editor for OpenStreetMap",
   "main": "dist/iD.min.js",
   "repository": "github:openstreetmap/iD",