[PR 1] Swap instance selection for BaseSelection in most cases

packages/lexical-clipboard/flow/LexicalClipboard.js.flow

@@ -8,9 +8,9 @@
  */
 
 import type {
+  BaseSelection,
   GridSelection,
   LexicalEditor,
-  NodeSelection,
   RangeSelection,
   LexicalNode,
 } from 'lexical';
@@ -58,7 +58,7 @@ declare export function $generateJSONFromSelectedNodes<
   SerializedNode: BaseSerializedNode,
 >(
   editor: LexicalEditor,
-  selection: RangeSelection | NodeSelection | GridSelection | null,
+  selection: BaseSelection | null,
 ): {
   namespace: string,
   nodes: Array<SerializedNode>,

packages/lexical-clipboard/src/clipboard.ts

@@ -25,6 +25,7 @@ import {
   $isTextNode,
   $parseSerializedNode,
   $setSelection,
+  BaseSelection,
   COMMAND_PRIORITY_CRITICAL,
   COPY_COMMAND,
   DEPRECATED_$createGridSelection,
@@ -37,7 +38,6 @@ import {
   isSelectionWithinEditor,
   LexicalEditor,
   LexicalNode,
-  NodeSelection,
   RangeSelection,
   SELECTION_CHANGE_COMMAND,
   SerializedTextNode,
@@ -435,7 +435,7 @@ function exportNodeToJSON<T extends LexicalNode>(node: T): BaseSerializedNode {
 
 function $appendNodesToJSON(
   editor: LexicalEditor,
-  selection: RangeSelection | NodeSelection | GridSelection | null,
+  selection: BaseSelection | null,
   currentNode: LexicalNode,
   targetArray: Array<BaseSerializedNode> = [],
 ): boolean {
@@ -518,7 +518,7 @@ export function $generateJSONFromSelectedNodes<
   SerializedNode extends BaseSerializedNode,
 >(
   editor: LexicalEditor,
-  selection: RangeSelection | NodeSelection | GridSelection | null,
+  selection: BaseSelection | null,
 ): {
   namespace: string;
   nodes: Array<SerializedNode>;

packages/lexical-code/src/CodeHighlighter.ts

@@ -12,10 +12,9 @@ import type {
   LexicalEditor,
   LexicalNode,
   RangeSelection,
-  NodeSelection,
   LineBreakNode,
-  GridSelection,
   NodeKey,
+  BaseSelection,
 } from 'lexical';
 
 import * as Prism from 'prismjs';
@@ -487,9 +486,7 @@ function isEqual(nodeA: LexicalNode, nodeB: LexicalNode): boolean {
   );
 }
 
-function $isSelectionInCode(
-  selection: null | RangeSelection | NodeSelection | GridSelection,
-): boolean {
+function $isSelectionInCode(selection: null | BaseSelection): boolean {
   if (!$isRangeSelection(selection)) {
     return false;
   }

packages/lexical-history/flow/LexicalHistory.js.flow

@@ -6,18 +6,12 @@
  *
  * @flow strict
  */
-import type {
-  EditorState,
-  GridSelection,
-  LexicalEditor,
-  NodeSelection,
-  RangeSelection,
-} from 'lexical';
+import type {EditorState, BaseSelection, LexicalEditor} from 'lexical';
 
 export type HistoryStateEntry = {
   editor: LexicalEditor,
   editorState: EditorState,
-  undoSelection?: RangeSelection | NodeSelection | GridSelection | null,
+  undoSelection?: BaseSelection | null,
 };
 export type HistoryState = {
   current: null | HistoryStateEntry,

packages/lexical-html/flow/LexicalHtml.js.flow

@@ -8,13 +8,11 @@
  */
 
 import type {
+  BaseSelection,
   LexicalEditor,
   LexicalNode,
   EditorState,
   EditorThemeClasses,
-  RangeSelection,
-  NodeSelection,
-  GridSelection,
 } from 'lexical';
 
 export type FindCachedParentDOMNode = (
@@ -25,7 +23,7 @@ export type FindCachedParentDOMNodeSearchFn = (node: Node) => boolean;
 
 declare export function $generateHtmlFromNodes(
   editor: LexicalEditor,
-  selection?: RangeSelection | NodeSelection | GridSelection | null,
+  selection?: BaseSelection | null,
 ): string;
 
 declare export function $generateNodesFromDOM(

packages/lexical-html/src/index.ts

@@ -8,14 +8,12 @@
  */
 
 import type {
+  BaseSelection,
   DOMChildConversion,
   DOMConversion,
   DOMConversionFn,
-  GridSelection,
   LexicalEditor,
   LexicalNode,
-  NodeSelection,
-  RangeSelection,
 } from 'lexical';
 
 import {
@@ -51,7 +49,7 @@ export function $generateNodesFromDOM(
 
 export function $generateHtmlFromNodes(
   editor: LexicalEditor,
-  selection?: RangeSelection | NodeSelection | GridSelection | null,
+  selection?: BaseSelection | null,
 ): string {
   if (typeof document === 'undefined' || typeof window === 'undefined') {
     throw new Error(
@@ -75,7 +73,7 @@ function $appendNodesToHTML(
   editor: LexicalEditor,
   currentNode: LexicalNode,
   parentElement: HTMLElement | DocumentFragment,
-  selection: RangeSelection | NodeSelection | GridSelection | null = null,
+  selection: BaseSelection | null = null,
 ): boolean {
   let shouldInclude =
     selection != null ? currentNode.isSelected(selection) : true;

packages/lexical-link/src/index.ts

@@ -8,14 +8,13 @@
  */
 
 import type {
+  BaseSelection,
   DOMConversionMap,
   DOMConversionOutput,
   EditorConfig,
-  GridSelection,
   LexicalCommand,
   LexicalNode,
   NodeKey,
-  NodeSelection,
   RangeSelection,
   SerializedElementNode,
 } from 'lexical';
@@ -254,7 +253,7 @@ export class LinkNode extends ElementNode {
 
   extractWithChild(
     child: LexicalNode,
-    selection: RangeSelection | NodeSelection | GridSelection,
+    selection: BaseSelection,
     destination: 'clone' | 'html',
   ): boolean {
     if (!$isRangeSelection(selection)) {

packages/lexical-list/src/LexicalListItemNode.ts

@@ -8,15 +8,14 @@
 
 import type {ListNode} from './';
 import type {
+  BaseSelection,
   DOMConversionMap,
   DOMConversionOutput,
   DOMExportOutput,
   EditorConfig,
   EditorThemeClasses,
-  GridSelection,
   LexicalNode,
   NodeKey,
-  NodeSelection,
   ParagraphNode,
   RangeSelection,
   SerializedElementNode,
@@ -419,10 +418,7 @@ export class ListItemNode extends ElementNode {
     return $isParagraphNode(node) || $isListItemNode(node);
   }
 
-  extractWithChild(
-    child: LexicalNode,
-    selection: RangeSelection | NodeSelection | GridSelection,
-  ): boolean {
+  extractWithChild(child: LexicalNode, selection: BaseSelection): boolean {
     if (!$isRangeSelection(selection)) {
       return false;
     }

packages/lexical-mark/src/MarkNode.ts

@@ -7,11 +7,10 @@
  */
 
 import type {
+  BaseSelection,
   EditorConfig,
-  GridSelection,
   LexicalNode,
   NodeKey,
-  NodeSelection,
   RangeSelection,
   SerializedElementNode,
   Spread,
@@ -182,7 +181,7 @@ export class MarkNode extends ElementNode {
 
   extractWithChild(
     child: LexicalNode,
-    selection: RangeSelection | NodeSelection | GridSelection,
+    selection: BaseSelection,
     destination: 'clone' | 'html',
   ): boolean {
     if (!$isRangeSelection(selection) || destination === 'html') {

packages/lexical-playground/src/nodes/ImageComponent.tsx

@@ -7,12 +7,10 @@
  */
 
 import type {
-  GridSelection,
+  BaseSelection,
   LexicalCommand,
   LexicalEditor,
   NodeKey,
-  NodeSelection,
-  RangeSelection,
 } from 'lexical';
 
 import './ImageNode.css';
@@ -142,9 +140,7 @@ export default function ImageComponent({
   const [isResizing, setIsResizing] = useState<boolean>(false);
   const {isCollabActive} = useCollaborationContext();
   const [editor] = useLexicalComposerContext();
-  const [selection, setSelection] = useState<
-    RangeSelection | NodeSelection | GridSelection | null
-  >(null);
+  const [selection, setSelection] = useState<BaseSelection | null>(null);
   const activeEditorRef = useRef<LexicalEditor | null>(null);
 
   const onDelete = useCallback(

packages/lexical-playground/src/nodes/InlineImageComponent.tsx

@@ -6,13 +6,7 @@
  *
  */
 import type {Position} from './InlineImageNode';
-import type {
-  GridSelection,
-  LexicalEditor,
-  NodeKey,
-  NodeSelection,
-  RangeSelection,
-} from 'lexical';
+import type {BaseSelection, LexicalEditor, NodeKey} from 'lexical';
 
 import './InlineImageNode.css';
 
@@ -207,9 +201,7 @@ export default function InlineImageComponent({
   const [isSelected, setSelected, clearSelection] =
     useLexicalNodeSelection(nodeKey);
   const [editor] = useLexicalComposerContext();
-  const [selection, setSelection] = useState<
-    RangeSelection | NodeSelection | GridSelection | null
-  >(null);
+  const [selection, setSelection] = useState<BaseSelection | null>(null);
   const activeEditorRef = useRef<LexicalEditor | null>(null);
 
   const onDelete = useCallback(

packages/lexical-playground/src/nodes/PollComponent.tsx

@@ -18,14 +18,12 @@ import {
   $getNodeByKey,
   $getSelection,
   $isNodeSelection,
+  BaseSelection,
   CLICK_COMMAND,
   COMMAND_PRIORITY_LOW,
-  GridSelection,
   KEY_BACKSPACE_COMMAND,
   KEY_DELETE_COMMAND,
   NodeKey,
-  NodeSelection,
-  RangeSelection,
 } from 'lexical';
 import * as React from 'react';
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
@@ -143,9 +141,7 @@ export default function PollComponent({
   const totalVotes = useMemo(() => getTotalVotes(options), [options]);
   const [isSelected, setSelected, clearSelection] =
     useLexicalNodeSelection(nodeKey);
-  const [selection, setSelection] = useState<
-    RangeSelection | NodeSelection | GridSelection | null
-  >(null);
+  const [selection, setSelection] = useState<BaseSelection | null>(null);
   const ref = useRef(null);
 
   const onDelete = useCallback(

packages/lexical-playground/src/plugins/AutocompletePlugin/index.tsx

@@ -6,12 +6,7 @@
  *
  */
 
-import type {
-  GridSelection,
-  NodeKey,
-  NodeSelection,
-  RangeSelection,
-} from 'lexical';
+import type {BaseSelection, NodeKey} from 'lexical';
 
 import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
 import {$isAtNodeEnd} from '@lexical/selection';
@@ -47,9 +42,7 @@ export const uuid = Math.random()
   .substr(0, 5);
 
 // TODO lookup should be custom
-function $search(
-  selection: null | RangeSelection | NodeSelection | GridSelection,
-): [boolean, string] {
+function $search(selection: null | BaseSelection): [boolean, string] {
   if (!$isRangeSelection(selection) || !selection.isCollapsed()) {
     return [false, ''];
   }

packages/lexical-playground/src/plugins/FloatingLinkEditorPlugin/index.tsx

@@ -13,15 +13,13 @@ import {$findMatchingParent, mergeRegister} from '@lexical/utils';
 import {
   $getSelection,
   $isRangeSelection,
+  BaseSelection,
   CLICK_COMMAND,
   COMMAND_PRIORITY_CRITICAL,
   COMMAND_PRIORITY_HIGH,
   COMMAND_PRIORITY_LOW,
-  GridSelection,
   KEY_ESCAPE_COMMAND,
   LexicalEditor,
-  NodeSelection,
-  RangeSelection,
   SELECTION_CHANGE_COMMAND,
 } from 'lexical';
 import {Dispatch, useCallback, useEffect, useRef, useState} from 'react';
@@ -51,9 +49,9 @@ function FloatingLinkEditor({
   const inputRef = useRef<HTMLInputElement>(null);
   const [linkUrl, setLinkUrl] = useState('');
   const [editedLinkUrl, setEditedLinkUrl] = useState('https://');
-  const [lastSelection, setLastSelection] = useState<
-    RangeSelection | GridSelection | NodeSelection | null
-  >(null);
+  const [lastSelection, setLastSelection] = useState<BaseSelection | null>(
+    null,
+  );
 
   const updateLinkEditor = useCallback(() => {
     const selection = $getSelection();

packages/lexical-playground/src/plugins/TestRecorderPlugin/index.tsx

@@ -6,12 +6,7 @@
  *
  */
 
-import type {
-  GridSelection,
-  LexicalEditor,
-  NodeSelection,
-  RangeSelection,
-} from 'lexical';
+import type {BaseSelection, LexicalEditor} from 'lexical';
 
 import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
 import {$createParagraphNode, $createTextNode, $getRoot} from 'lexical';
@@ -159,9 +154,7 @@ function useTestRecorder(
   const [isRecording, setIsRecording] = useState(false);
   const [, setCurrentInnerHTML] = useState('');
   const [templatedTest, setTemplatedTest] = useState('');
-  const previousSelectionRef = useRef<
-    RangeSelection | GridSelection | NodeSelection | null
-  >(null);
+  const previousSelectionRef = useRef<BaseSelection | null>(null);
   const skipNextSelectionChangeRef = useRef(false);
   const preRef = useRef<HTMLPreElement>(null);