Test e.inputType

zcorpan · zcorpan · commit 3afeb04de5a7 · 2024-04-02T14:10:37.000+02:00
diff --git a/html/editing/dnd/drop/events-contenteditable-manual.tentative.html b/html/editing/dnd/drop/events-contenteditable-manual.tentative.html
@@ -6,7 +6,13 @@
 <style>
 [data-placeholder]:empty::before { content: attr(data-placeholder); }
 </style>
-<body data-expected-events="b:drop,a:beforeinput,a:input,b:beforeinput,b:textInput,b:input">
+<body data-expected-events="
+  b:drop:,
+  a:beforeinput:deleteByDrag,
+  a:input:deleteByDrag,
+  b:beforeinput:insertFromDrop,
+  b:textInput:,
+  b:input:insertFromDrop">
 <div><input id=a data-select="0,7" value="Drag me"></div>
 <div contenteditable=true id=b data-placeholder="...to here"></div>
 <script src="/uievents/textInput/support/common.js"></script>
diff --git a/html/editing/dnd/drop/events-contenteditable-same-element-manual.tentative.html b/html/editing/dnd/drop/events-contenteditable-same-element-manual.tentative.html
@@ -3,7 +3,13 @@
 <title>Selection drag and drop: events for contenteditable (same element)</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body data-expected-events="b:drop,b:beforeinput,b:input,b:beforeinput,b:textInput,b:input">
+<body data-expected-events="
+  b:drop:,
+  b:beforeinput:deleteByDrag,
+  b:input:deleteByDrag,
+  b:beforeinput:insertFromDrop,
+  b:textInput:,
+  b:input:insertFromDrop">
 <div contenteditable=true id=b data-select="0,7">Drag me ...to here:</div>
 <script src="/uievents/textInput/support/common.js"></script>
 <script src="support/events.js"></script>
diff --git a/html/editing/dnd/drop/events-input-manual.tentative.html b/html/editing/dnd/drop/events-input-manual.tentative.html
@@ -3,7 +3,13 @@
 <title>Selection drag and drop: events for &lt;input></title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body data-expected-events="b:drop,a:beforeinput,a:input,b:beforeinput,b:textInput,b:input">
+<body data-expected-events="
+  b:drop:,
+  a:beforeinput:deleteByDrag,
+  a:input:deleteByDrag,
+  b:beforeinput:insertFromDrop,
+  b:textInput:,
+  b:input:insertFromDrop">
 <div><input id=a data-select="0,7" value="Drag me"></div>
 <div><input id=b placeholder="...to here"></div>
 <script src="/uievents/textInput/support/common.js"></script>
diff --git a/html/editing/dnd/drop/events-input-same-element-manual.tentative.html b/html/editing/dnd/drop/events-input-same-element-manual.tentative.html
@@ -3,7 +3,13 @@
 <title>Selection drag and drop: events for &lt;input> (same element)</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body data-expected-events="b:drop,b:beforeinput,b:input,b:beforeinput,b:textInput,b:input">
+<body data-expected-events="
+  b:drop:,
+  b:beforeinput:deleteByDrag,
+  b:input:deleteByDrag,
+  b:beforeinput:insertFromDrop,
+  b:textInput:,
+  b:input:insertFromDrop">
 <input id=b data-select="0,7" value="Drag me ...to here:">
 <script src="/uievents/textInput/support/common.js"></script>
 <script src="support/events.js"></script>
diff --git a/html/editing/dnd/drop/events-textarea-manual.tentative.html b/html/editing/dnd/drop/events-textarea-manual.tentative.html
@@ -3,7 +3,13 @@
 <title>Selection drag and drop: events for &lt;textarea></title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body data-expected-events="b:drop,a:beforeinput,a:input,b:beforeinput,b:textInput,b:input">
+<body data-expected-events="
+  b:drop:,
+  a:beforeinput:deleteByDrag,
+  a:input:deleteByDrag,
+  b:beforeinput:insertFromDrop,
+  b:textInput:,
+  b:input:insertFromDrop">
 <div><input id=a data-select="0,7" value="Drag me"></div>
 <div><textarea id=b placeholder="...to here"></textarea></div>
 <script src="/uievents/textInput/support/common.js"></script>
diff --git a/html/editing/dnd/drop/events-textarea-same-element-manual.tentative.html b/html/editing/dnd/drop/events-textarea-same-element-manual.tentative.html
@@ -3,7 +3,13 @@
 <title>Selection drag and drop: events for &lt;textarea> (same element)</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body data-expected-events="b:drop,b:beforeinput,b:input,b:beforeinput,b:textInput,b:input">
+<body data-expected-events="
+  b:drop:,
+  b:beforeinput:deleteByDrag,
+  b:input:deleteByDrag,
+  b:beforeinput:insertFromDrop,
+  b:textInput:,
+  b:input:insertFromDrop">
 <textarea id=b data-select="0,7">Drag me ...to here:</textarea>
 <script src="/uievents/textInput/support/common.js"></script>
 <script src="support/events.js"></script>
diff --git a/html/editing/dnd/drop/support/events.js b/html/editing/dnd/drop/support/events.js
@@ -7,16 +7,16 @@ function rAF() {
 const a = document.getElementById('a');
 const b = document.getElementById('b');
 const actualEvents = [];
-const expectedEvents = document.body.dataset.expectedEvents.split(',');
+const expectedEvents = document.body.dataset.expectedEvents.replace(/\s+/g, '').split(',');
 const eventTypes = new Set(expectedEvents.map(s => s.split(':')[1]));
 for (const eventType of eventTypes) {
   if (a) {
     a.addEventListener(eventType, e => {
-      actualEvents.push(`a:${e.type}`);
+      actualEvents.push(`a:${e.type}:${e.inputType || ''}`);
     });
   }
   b.addEventListener(eventType, async (e) => {
-    actualEvents.push(`b:${e.type}`);
+    actualEvents.push(`b:${e.type}:${e.inputType || ''}`);
     if (e.type === "input") {
       await rAF();
       await rAF();
