Merge pull request #102 from inokawa/range-at-index

Fix deprecated warning caused by range-at-index

jest.config.js

@@ -2,6 +2,6 @@ module.exports = {
   roots: ["<rootDir>/src"],
   testEnvironment: "jsdom",
   transform: {
-    "^.+\\.(ts|tsx)$": "ts-jest",
+    "^.+\\.(js|ts|tsx)$": "ts-jest",
   },
 };

package.json

@@ -30,9 +30,7 @@
     "size": "size-limit",
     "prepublishOnly": "npm run typedoc && rimraf lib && npm run build"
   },
-  "dependencies": {
-    "range-at-index": "^1.0.4"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@babel/plugin-transform-react-pure-annotations": "7.22.5",
     "@playwright/test": "^1.36.1",

src/input.tsx

@@ -9,8 +9,7 @@ import {
   memo,
   RefObject,
 } from "react";
-// @ts-expect-error no type definition
-import rangeAtIndex from "range-at-index";
+import rangeAtIndex from "./vendor/range-at-index";
 import {
   hasPercentageUnit,
   isSafari,
@@ -269,7 +268,7 @@ export const RichInput = forwardRef<RichInputHandle, RichInputProps>(
         });
       } else {
         const range = rangeAtIndex(
-          backdropRef[refKey],
+          backdropRef[refKey]!,
           selectionStart,
           selectionStart + 1
         ) as Range;

src/textarea.tsx

@@ -9,8 +9,7 @@ import {
   memo,
   RefObject,
 } from "react";
-// @ts-expect-error no type definition
-import rangeAtIndex from "range-at-index";
+import rangeAtIndex from "./vendor/range-at-index";
 import { hasPercentageUnit, stopPropagation, syncBackdropStyle } from "./dom";
 import { SelectionRange, initSelectionStore } from "./selection";
 import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect";
@@ -247,7 +246,7 @@ export const RichTextarea = forwardRef<RichTextareaHandle, RichTextareaProps>(
         });
       } else {
         const range = rangeAtIndex(
-          backdropRef[refKey],
+          backdropRef[refKey]!,
           selectionStart,
           selectionStart + 1
         ) as Range;

src/vendor/range-at-index.d.ts

@@ -0,0 +1,8 @@
+declare function RangeAtIndex(
+  el: HTMLElement,
+  index: number,
+  offset: number,
+  range?: Range
+): Range;
+
+export default RangeAtIndex;

src/vendor/range-at-index.js

@@ -0,0 +1,53 @@
+/**
+ * range-at-index
+ * https://github.com/webmodules/range-at-index/
+ * Nathan Rajlich
+ *
+ * Forked from version 1.0.4; includes the following modifications:
+ * 1) Change module.exports to export default.
+ **/
+
+/**
+ * Returns a Range instance selecting text within HTML Element `el`,
+ * at the given `start` and `end` offsets.
+ *
+ * @param {HTMLElement} el - DOM element to select text within
+ * @public
+ */
+
+function RangeAtIndex(el, index, offset, range) {
+  var doc = el.ownerDocument;
+  if (!range) range = doc.createRange();
+
+  let iterator = doc.createNodeIterator(el, NodeFilter.SHOW_TEXT, null, false);
+
+  let start = {};
+  let end = {};
+  let node, val, len;
+
+  while ((node = iterator.nextNode())) {
+    val = node.nodeValue;
+    len = val.length;
+
+    if (!start.node && len > index) {
+      start.node = node;
+      start.offset = index;
+    }
+
+    if (!end.node && len >= offset) {
+      end.node = node;
+      end.offset = offset;
+    }
+
+    index -= len;
+    offset -= len;
+  }
+
+  // update the range with the start and end offsets
+  if (start.node) range.setStart(start.node, start.offset);
+  if (end.node) range.setEnd(end.node, end.offset);
+
+  return range;
+}
+
+export default RangeAtIndex;