remove unneeded changes and improve name of tests

microsoft · Apr 4, 2024 · ce82f11 · ce82f11
1 parent 2fd8242
commit ce82f11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 76 deletions.
diff --git a/packages/roosterjs-content-model-core/lib/corePlugin/selection/SelectionPlugin.ts b/packages/roosterjs-content-model-core/lib/corePlugin/selection/SelectionPlugin.ts
@@ -22,6 +22,7 @@ import type {
     ParsedTable,
     TableSelectionInfo,
     TableCellCoordinate,
+    RangeSelection,
 } from 'roosterjs-content-model-types';
 
 const MouseLeftButton = 0;
@@ -257,8 +258,7 @@ class SelectionPlugin implements PluginWithState<SelectionPluginState> {
     private onKeyDown(editor: IEditor, rawEvent: KeyboardEvent) {
         const key = rawEvent.key;
         const selection = editor.getDOMSelection();
-        const doc = editor.getDocument();
-        const win = doc.defaultView;
+        const win = editor.getDocument().defaultView;
 
         switch (selection?.type) {
             case 'image':
@@ -617,8 +617,8 @@ class SelectionPlugin implements PluginWithState<SelectionPluginState> {
         }
     }
 
-    private trySelectSingleImage(selection: DOMSelection) {
-        if (selection?.type == 'range' && !selection.range.collapsed) {
+    private trySelectSingleImage(selection: RangeSelection) {
+        if (!selection.range.collapsed) {
             const image = isSingleImageInSelection(selection.range);
             if (image) {
                 this.selectImage(image, selection.isReverted);

diff --git a/...es/roosterjs-content-model-core/test/corePlugin/selection/isSingleImageInSelectionTest.ts b/...es/roosterjs-content-model-core/test/corePlugin/selection/isSingleImageInSelectionTest.ts
@@ -33,23 +33,7 @@ describe('isSingleImageInSelection |', () => {
             expect(result).toBeNull();
         });
 
-        it('Is not single image in Selection: Containers are not the same', () => {
-            const focusNode: any = {};
-            const anchorNode: any = { test: '' };
-            const selection: any = <Partial<Selection>>{
-                focusNode,
-                anchorNode,
-                focusOffset: 0,
-                anchorOffset: 1,
-                getRangeAt: () => <any>{},
-            };
-
-            const result = isSingleImageInSelection(selection);
-
-            expect(result).toBeNull();
-        });
-
-        it('Is not single image in Selection: Element is not the same', () => {
+        it('Is not single image in Selection: Element is not image', () => {
             const mockedElement = document.createElement('div');
             const focusNode: any = <Partial<Node>>{
                 childNodes: <any>{
@@ -69,26 +53,6 @@ describe('isSingleImageInSelection |', () => {
             expect(result).toBeNull();
         });
 
-        it('Is not single image in Selection: Element is not the element', () => {
-            const mockedElement = document.createTextNode('div');
-            const focusNode: any = <Partial<Node>>{
-                childNodes: <any>{
-                    item: () => mockedElement,
-                },
-            };
-            const selection: any = <Partial<Selection>>{
-                focusNode,
-                anchorNode: focusNode,
-                focusOffset: 0,
-                anchorOffset: 1,
-                getRangeAt: () => <any>{},
-            };
-
-            const result = isSingleImageInSelection(selection);
-
-            expect(result).toBeNull();
-        });
-
         it('Is single image in selection', () => {
             const mockedElement = document.createElement('img');
             const focusNode: any = <Partial<Node>>{
@@ -140,22 +104,7 @@ describe('isSingleImageInSelection |', () => {
             expect(result).toBeNull();
         });
 
-        it('Is not single image in Selection: Containers are not the same', () => {
-            const endContainer: any = {};
-            const startContainer: any = { test: '' };
-            const selection: any = <Partial<Range>>{
-                endContainer,
-                startContainer,
-                endOffset: 0,
-                startOffset: 1,
-            };
-
-            const result = isSingleImageInSelection(selection);
-
-            expect(result).toBeNull();
-        });
-
-        it('Is not single image in Selection: Element is not the same', () => {
+        it('Is not single image in Selection: Element is not image', () => {
             const mockedElement = document.createElement('div');
             const endContainer: any = <Partial<Node>>{
                 childNodes: <any>{
@@ -174,25 +123,6 @@ describe('isSingleImageInSelection |', () => {
             expect(result).toBeNull();
         });
 
-        it('Is not single image in Selection: Element is not the element', () => {
-            const mockedElement = document.createTextNode('div');
-            const endContainer: any = <Partial<Node>>{
-                childNodes: <any>{
-                    item: () => mockedElement,
-                },
-            };
-            const selection: any = <Partial<Range>>{
-                endContainer,
-                startContainer: endContainer,
-                endOffset: 0,
-                startOffset: 1,
-            };
-
-            const result = isSingleImageInSelection(selection);
-
-            expect(result).toBeNull();
-        });
-
         it('Is single image in selection', () => {
             const mockedElement = document.createElement('img');
             const endContainer: any = <Partial<Node>>{