Merge branch 'master' into update-logging-infra

wix · Apr 10, 2024 · fc827fc · fc827fc
2 parents 65ba7d5 + 35e177f
commit fc827fc
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 22 deletions.
diff --git a/detox/ios/Detox/Invocation/WebCodeBuilder+createMoveCursorToEndAction.swift b/detox/ios/Detox/Invocation/WebCodeBuilder+createMoveCursorToEndAction.swift
@@ -27,17 +27,21 @@ extension WebCodeBuilder {
 		}
 	};
 
+	if (document.activeElement !== element) {
+		element.focus();
+	}
 
 	if (typeof element.setSelectionRange === 'function') {
-		const length = getLength(element);
-
-		/* This is a workaround. See: https://w3.org/Bugs/Public/show_bug.cgi?id=24796 */
-		const originalType = element.getAttribute('type');
-		element.setAttribute('type', 'text');
+		if (element.nodeName.toLowerCase() === 'input' &&
+			['text', 'search', 'tel', 'url', 'password'].includes(element.type.toLowerCase()) === false) {
+		  /* Some input types do not support `setSelectionRange`. See:
+		  * https://html.spec.whatwg.org/multipage/input.html#:~:text=%C2%B7-,setSelectionRange(),-%C2%B7
+		  */
+		  return;
+		}
 
+		const length = getLength(element);
 		element.setSelectionRange(length, length);
-
-		element.setAttribute('type', originalType);
 	} else {
 		var range = element.ownerDocument.createRange();
 

diff --git a/detox/package.json b/detox/package.json
@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.20.0",
+  "version": "20.20.1",
   "bin": {
     "detox": "local-cli/cli.js"
   },

diff --git a/detox/test/package.json b/detox/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "detox-test",
-  "version": "20.20.0",
+  "version": "20.20.1",
   "private": true,
   "engines": {
     "node": ">=18"
@@ -60,7 +60,7 @@
     "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.16.0",
     "cross-env": "^7.0.3",
-    "detox": "^20.20.0",
+    "detox": "^20.20.1",
     "detox-allure2-adapter": "^1.0.0-alpha.3",
     "eslint": "^8.56.0",
     "eslint-plugin-unicorn": "^50.0.1",

diff --git a/examples/demo-native-android/package.json b/examples/demo-native-android/package.json
@@ -1,13 +1,13 @@
 {
   "name": "detox-demo-native-android",
-  "version": "20.20.0",
+  "version": "20.20.1",
   "private": true,
   "scripts": {
     "packager": "react-native start",
     "detox-server": "detox run-server"
   },
   "devDependencies": {
-    "detox": "^20.20.0"
+    "detox": "^20.20.1"
   },
   "detox": {}
 }
diff --git a/examples/demo-native-ios/package.json b/examples/demo-native-ios/package.json
@@ -1,9 +1,9 @@
 {
   "name": "detox-demo-native-ios",
-  "version": "20.20.0",
+  "version": "20.20.1",
   "private": true,
   "devDependencies": {
-    "detox": "^20.20.0"
+    "detox": "^20.20.1"
   },
   "detox": {
     "specs": "",

diff --git a/examples/demo-plugin/package.json b/examples/demo-plugin/package.json
@@ -1,12 +1,12 @@
 {
   "name": "demo-plugin",
-  "version": "20.20.0",
+  "version": "20.20.1",
   "private": true,
   "scripts": {
     "test:plugin": "detox test --configuration plugin -l verbose"
   },
   "devDependencies": {
-    "detox": "^20.20.0",
+    "detox": "^20.20.1",
     "jest": "^29.0.0"
   },
   "detox": {

diff --git a/examples/demo-react-native-detox-instruments/package.json b/examples/demo-react-native-detox-instruments/package.json
@@ -1,10 +1,10 @@
 {
   "name": "demo-react-native-detox-instruments",
-  "version": "20.20.0",
+  "version": "20.20.1",
   "private": true,
   "scripts": {},
   "devDependencies": {
-    "detox": "^20.20.0"
+    "detox": "^20.20.1"
   },
   "detox": {
     "configurations": {

diff --git a/examples/demo-react-native/package.json b/examples/demo-react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example",
-  "version": "20.20.0",
+  "version": "20.20.1",
   "private": true,
   "scripts": {
     "start": "react-native start",
@@ -35,7 +35,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.2.1",
     "@types/react": "^18.0.24",
-    "detox": "^20.20.0",
+    "detox": "^20.20.1",
     "fs-extra": "^9.1.0",
     "jest": "^29.6.3",
     "ts-jest": "^29.0.3",

diff --git a/lerna.json b/lerna.json
@@ -14,7 +14,7 @@
     "generation",
     "."
   ],
-  "version": "20.20.0",
+  "version": "20.20.1",
   "npmClient": "npm",
   "command": {
     "publish": {

diff --git a/package.json b/package.json
@@ -53,5 +53,5 @@
     "shell-utils": "1.x.x",
     "unified": "^10.1.0"
   },
-  "version": "20.20.0"
+  "version": "20.20.1"
 }