Public normalizeRect function

demo/scripts/controlsV2/roosterjsReact/pasteOptions/utils/getPositionRect.ts

@@ -1,4 +1,4 @@
-import { isNodeOfType } from 'roosterjs-content-model-dom';
+import { isNodeOfType, normalizeRect } from 'roosterjs-content-model-dom';
 import { Rect } from 'roosterjs-content-model-types';
 
 /**
@@ -59,16 +59,3 @@ export function getPositionRect(container: Node, offset: number): Rect | null {
 
     return null;
 }
-
-function normalizeRect(clientRect: DOMRect): Rect | null {
-    const { left, right, top, bottom } =
-        clientRect || <DOMRect>{ left: 0, right: 0, top: 0, bottom: 0 };
-    return left === 0 && right === 0 && top === 0 && bottom === 0
-        ? null
-        : {
-              left: Math.round(left),
-              right: Math.round(right),
-              top: Math.round(top),
-              bottom: Math.round(bottom),
-          };
-}

packages/roosterjs-content-model-core/lib/coreApi/getVisibleViewport.ts

@@ -1,3 +1,4 @@
+import { normalizeRect } from 'roosterjs-content-model-dom';
 import type { GetVisibleViewport, Rect } from 'roosterjs-content-model-types';
 
 /**
@@ -55,16 +56,3 @@ function getIntersectedRect(elements: HTMLElement[], additionalRects: Rect[] = [
 
     return result.top < result.bottom && result.left < result.right ? result : null;
 }
-
-function normalizeRect(clientRect: DOMRect): Rect | null {
-    const { left, right, top, bottom } =
-        clientRect || <DOMRect>{ left: 0, right: 0, top: 0, bottom: 0 };
-    return left === 0 && right === 0 && top === 0 && bottom === 0
-        ? null
-        : {
-              left: Math.round(left),
-              right: Math.round(right),
-              top: Math.round(top),
-              bottom: Math.round(bottom),
-          };
-}

packages/roosterjs-content-model-plugins/lib/pluginUtils/Rect/normalizeRect.ts → packages/roosterjs-content-model-dom/lib/domUtils/normalizeRect.ts

@@ -1,9 +1,9 @@
 import type { Rect } from 'roosterjs-content-model-types';
 
 /**
- * @internal
  * A ClientRect of all 0 is possible. i.e. chrome returns a ClientRect of 0 when the cursor is on an empty p
  * We validate that and only return a rect when the passed in ClientRect is valid
+ * @param clientRect Client rect object normally retrieved from getBoundingClientRect function
  */
 export function normalizeRect(clientRect: DOMRect): Rect | null {
     const { left, right, top, bottom } =

packages/roosterjs-content-model-dom/lib/index.ts

@@ -31,6 +31,7 @@ export {
 } from './domUtils/entityUtils';
 export { reuseCachedElement } from './domUtils/reuseCachedElement';
 export { isWhiteSpacePreserved } from './domUtils/isWhiteSpacePreserved';
+export { normalizeRect } from './domUtils/normalizeRect';
 
 export { createBr } from './modelApi/creators/createBr';
 export { createListItem } from './modelApi/creators/createListItem';

packages/roosterjs-content-model-dom/test/domUtils/normalizeRectTest.ts

@@ -0,0 +1,52 @@
+import { normalizeRect } from '../../lib/domUtils/normalizeRect';
+
+describe('normalizeRect', () => {
+    it('valid rect - all have positive values', () => {
+        const rect: DOMRect = {
+            left: 1,
+            right: 2,
+            top: 3,
+            bottom: 4,
+        } as any;
+
+        const result = normalizeRect(rect);
+
+        expect(result).toEqual({
+            left: 1,
+            right: 2,
+            top: 3,
+            bottom: 4,
+        });
+    });
+
+    it('valid rect - some have 0 values', () => {
+        const rect: DOMRect = {
+            left: 1,
+            right: 0,
+            top: 0,
+            bottom: 0,
+        } as any;
+
+        const result = normalizeRect(rect);
+
+        expect(result).toEqual({
+            left: 1,
+            right: 0,
+            top: 0,
+            bottom: 0,
+        });
+    });
+
+    it('invalid rect', () => {
+        const rect: DOMRect = {
+            left: 0,
+            right: 0,
+            top: 0,
+            bottom: 0,
+        } as any;
+
+        const result = normalizeRect(rect);
+
+        expect(result).toBeNull();
+    });
+});

packages/roosterjs-content-model-plugins/lib/pluginUtils/Rect/getIntersectedRect.ts

@@ -1,4 +1,4 @@
-import { normalizeRect } from './normalizeRect';
+import { normalizeRect } from 'roosterjs-content-model-dom';
 import type { Rect } from 'roosterjs-content-model-types';
 
 /**

packages/roosterjs-content-model-plugins/lib/tableEdit/TableEditPlugin.ts

@@ -1,5 +1,4 @@
-import { isNodeOfType } from 'roosterjs-content-model-dom';
-import { normalizeRect } from '../pluginUtils/Rect/normalizeRect';
+import { isNodeOfType, normalizeRect } from 'roosterjs-content-model-dom';
 import { TableEditor } from './editors/TableEditor';
 import type { EditorPlugin, IEditor, PluginEvent, Rect } from 'roosterjs-content-model-types';
 

packages/roosterjs-content-model-plugins/lib/tableEdit/editors/TableEditor.ts

@@ -3,8 +3,7 @@ import { createTableInserter } from './features/TableInserter';
 import { createTableMover } from './features/TableMover';
 import { createTableResizer } from './features/TableResizer';
 import { disposeTableEditFeature } from './features/TableEditFeature';
-import { isNodeOfType } from 'roosterjs-content-model-dom';
-import { normalizeRect } from '../../pluginUtils/Rect/normalizeRect';
+import { isNodeOfType, normalizeRect } from 'roosterjs-content-model-dom';
 import type { TableEditFeature } from './features/TableEditFeature';
 import type { IEditor, TableSelection } from 'roosterjs-content-model-types';
 

packages/roosterjs-content-model-plugins/lib/tableEdit/editors/features/CellResizer.ts

@@ -1,7 +1,6 @@
 import { createElement } from '../../../pluginUtils/CreateElement/createElement';
 import { DragAndDropHelper } from '../../../pluginUtils/DragAndDrop/DragAndDropHelper';
-import { isElementOfType } from 'roosterjs-content-model-dom';
-import { normalizeRect } from '../../../pluginUtils/Rect/normalizeRect';
+import { isElementOfType, normalizeRect } from 'roosterjs-content-model-dom';
 import {
     getFirstSelectedTable,
     MIN_ALLOWED_TABLE_CELL_WIDTH,

packages/roosterjs-content-model-plugins/lib/tableEdit/editors/features/TableInserter.ts

@@ -1,7 +1,6 @@
 import { createElement } from '../../../pluginUtils/CreateElement/createElement';
 import { getIntersectedRect } from '../../../pluginUtils/Rect/getIntersectedRect';
-import { isElementOfType } from 'roosterjs-content-model-dom';
-import { normalizeRect } from '../../../pluginUtils/Rect/normalizeRect';
+import { isElementOfType, normalizeRect } from 'roosterjs-content-model-dom';
 import {
     formatTableWithContentModel,
     insertTableColumn,

packages/roosterjs-content-model-plugins/lib/tableEdit/editors/features/TableMover.ts

@@ -1,7 +1,6 @@
 import { createElement } from '../../../pluginUtils/CreateElement/createElement';
 import { DragAndDropHelper } from '../../../pluginUtils/DragAndDrop/DragAndDropHelper';
-import { isNodeOfType } from 'roosterjs-content-model-dom';
-import { normalizeRect } from '../../../pluginUtils/Rect/normalizeRect';
+import { isNodeOfType, normalizeRect } from 'roosterjs-content-model-dom';
 import type { DragAndDropHandler } from '../../../pluginUtils/DragAndDrop/DragAndDropHandler';
 import type { IEditor, Rect } from 'roosterjs-content-model-types';
 import type { TableEditFeature } from './TableEditFeature';

packages/roosterjs-content-model-plugins/lib/tableEdit/editors/features/TableResizer.ts

@@ -1,8 +1,7 @@
 import { createElement } from '../../../pluginUtils/CreateElement/createElement';
 import { DragAndDropHelper } from '../../../pluginUtils/DragAndDrop/DragAndDropHelper';
 import { getFirstSelectedTable, normalizeTable } from 'roosterjs-content-model-core';
-import { isNodeOfType } from 'roosterjs-content-model-dom';
-import { normalizeRect } from '../../../pluginUtils/Rect/normalizeRect';
+import { isNodeOfType, normalizeRect } from 'roosterjs-content-model-dom';
 import type { ContentModelTable, IEditor, Rect } from 'roosterjs-content-model-types';
 import type { TableEditFeature } from './TableEditFeature';