moved selection to cursorUtils

Author: hannojg

src/MarkdownTextInput.web.tsx

@@ -174,7 +174,7 @@ const MarkdownTextInput = React.forwardRef<TextInput, MarkdownTextInputProps>(
     const pasteRef = useRef<boolean>(false);
     const divRef = useRef<HTMLDivElement | null>(null);
     const currentlyFocusedField = useRef<HTMLDivElement | null>(null);
-    const contentSelection = useRef<ParseUtils.Selection | null>(null);
+    const contentSelection = useRef<CursorUtils.Selection | null>(null);
     const className = `react-native-live-markdown-input-${multiline ? 'multiline' : 'singleline'}`;
     const history = useRef<InputHistory>();
     const dimensions = React.useRef<Dimensions | null>(null);
@@ -298,15 +298,15 @@ const MarkdownTextInput = React.forwardRef<TextInput, MarkdownTextInputProps>(
       [onSelectionChange, setEventProps],
     );
 
-    const updateRefSelectionVariables = useCallback((newSelection: ParseUtils.Selection) => {
+    const updateRefSelectionVariables = useCallback((newSelection: CursorUtils.Selection) => {
       const {start, end} = newSelection;
       const markdownHTMLInput = divRef.current as HTMLInputElement;
       markdownHTMLInput.selectionStart = start;
       markdownHTMLInput.selectionEnd = end;
     }, []);
 
     const updateSelection = useCallback(
-      (e: SyntheticEvent<HTMLDivElement> | null = null, predefinedSelection: ParseUtils.Selection | null = null) => {
+      (e: SyntheticEvent<HTMLDivElement> | null = null, predefinedSelection: CursorUtils.Selection | null = null) => {
         if (!divRef.current) {
           return;
         }
@@ -636,7 +636,7 @@ const MarkdownTextInput = React.forwardRef<TextInput, MarkdownTextInputProps>(
         return;
       }
 
-      const newSelection: ParseUtils.Selection = {start: selection.start, end: selection.end ?? selection.start};
+      const newSelection: CursorUtils.Selection = {start: selection.start, end: selection.end ?? selection.start};
       contentSelection.current = newSelection;
       updateRefSelectionVariables(newSelection);
       CursorUtils.setCursorPosition(divRef.current, newSelection.start, newSelection.end);

src/web/cursorUtils.ts

@@ -1,5 +1,10 @@
 import * as BrowserUtils from './browserUtils';
 
+type Selection = {
+  start: number;
+  end: number;
+};
+
 let prevTextLength: number | undefined;
 
 function getPrevTextLength() {
@@ -162,4 +167,4 @@ function scrollCursorIntoView(target: HTMLInputElement) {
   }
 }
 
-export {getCurrentCursorPosition, moveCursorToEnd, setCursorPosition, setPrevText, removeSelection, scrollCursorIntoView, getPrevTextLength};
+export {getCurrentCursorPosition, moveCursorToEnd, setCursorPosition, setPrevText, removeSelection, scrollCursorIntoView, getPrevTextLength, Selection};

src/web/parserUtils.ts

@@ -33,11 +33,6 @@ type TextChangeMetrics = {
   before: number;
 };
 
-type Selection = {
-  start: number;
-  end: number;
-};
-
 function addStyling(targetElement: HTMLElement, type: MarkdownType, markdownStyle: PartialMarkdownStyle) {
   const node = targetElement;
   switch (type) {
@@ -250,7 +245,7 @@ function parseText(target: HTMLElement, text: string, cursorPositionIndex: numbe
  * This is to align the onChange event with the native counter part:
  * - https://github.com/facebook/react-native/pull/45248
  */
-function calculateInputMetrics(inputType: string, prevSelection: Selection, prevTextLength: number, normalizedText: string, cursorPosition: number | null): TextChangeMetrics {
+function calculateInputMetrics(inputType: string, prevSelection: CursorUtils.Selection, prevTextLength: number, normalizedText: string, cursorPosition: number | null): TextChangeMetrics {
   // The new text is between the prev start selection and the new end selection, can be empty
   const addedText = normalizedText.slice(prevSelection.start, cursorPosition ?? 0);
   // The length of the text that replaced the "before" text
@@ -282,4 +277,4 @@ function calculateInputMetrics(inputType: string, prevSelection: Selection, prev
 
 export {parseText, parseRangesToHTMLNodes, calculateInputMetrics};
 
-export type {MarkdownRange, MarkdownType, Selection};
+export type {MarkdownRange, MarkdownType};