Merge pull request #55 from github/use-dom-input-range

Use `dom-input-range` instead of internal implementation
github · May 15, 2024 · 8245b85 · 8245b85
2 parents eee5f70 + 8824151
commit 8245b85
Show file tree

Hide file tree

Showing 10 changed files with 2,162 additions and 1,314 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
 		// Update 'VARIANT' to pick a Node version: 16, 14, 12.
 		// Append -bullseye or -buster to pin to an OS version.
 		// Use -bullseye variants on local arm64/Apple Silicon.
-		"args": { "VARIANT": "16" }
+		"args": { "VARIANT": "20" }
 	},
 
 	// Set *default* container specific settings.json values on container create.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,14 +29,15 @@
   ],
   "prettier": "@github/prettier-config",
   "dependencies": {
-    "@github/combobox-nav": "^2.0.2"
+    "@github/combobox-nav": "^2.0.2",
+    "dom-input-range": "^1.1.3"
   },
   "devDependencies": {
     "@github/prettier-config": "0.0.4",
     "chai": "^4.3.4",
     "chromium": "^3.0.3",
-    "eslint": "^7.24.0",
-    "eslint-plugin-github": "^4.1.3",
+    "eslint": "^8.0.1",
+    "eslint-plugin-github": "^4.10.2",
     "karma": "^6.3.2",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.0",
@@ -45,7 +46,7 @@
     "mocha": "^8.3.2",
     "rollup": "^2.45.1",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "typescript": "^4.2.4"
+    "typescript": "^5.4.5"
   },
   "eslintIgnore": [
     "build/",

diff --git a/src/text-expander-element.ts b/src/text-expander-element.ts
@@ -1,6 +1,6 @@
 import Combobox from '@github/combobox-nav'
 import query from './query'
-import textFieldSelectionPosition from './text-field-selection-position'
+import {InputRange} from 'dom-input-range'
 
 type Match = {
   text: string
@@ -103,7 +103,7 @@ class TextExpander {
 
     this.expander.dispatchEvent(new Event('text-expander-activate'))
 
-    let {top, left} = textFieldSelectionPosition(this.input, match.position)
+    let {top, left} = new InputRange(this.input, match.position).getBoundingClientRect()
     if (isTopLayer(menu)) {
       const rect = this.input.getBoundingClientRect()
       top += rect.top

diff --git a/src/text-field-mirror.ts b/src/text-field-mirror.ts
diff --git a/src/text-field-selection-position.ts b/src/text-field-selection-position.ts
diff --git a/test/.eslintrc b/test/.eslintrc
@@ -8,5 +8,11 @@
   },
   "globals": {
     "assert": true
+  },
+  "rules": {
+    "github/no-inner-html": "off",
+    "filenames/match-regex": "off",
+    // Linting currently runs as a pre-build step, so the dependent files may not exist yet by the time linting is run
+    "import/no-unresolved": "off"
   }
 }
diff --git a/test/test.js b/test/test.js
@@ -1,4 +1,2 @@
 import './query-test'
 import './text-expander-element-test'
-import './text-field-mirror-test'
-import './textarea-contents-height-test'
diff --git a/test/text-field-mirror-test.js b/test/text-field-mirror-test.js
diff --git a/test/textarea-contents-height-test.js b/test/textarea-contents-height-test.js