From 485fb8c74c831256aaa2cefdf130e05438c2e476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Tue, 1 Jun 2021 18:57:46 +0200 Subject: [PATCH] fix: remove custom coordsAtPos method, fix #583 --- packages/core/src/helpers/coordsAtPos.ts | 72 ----------------------- packages/core/src/helpers/posToDOMRect.ts | 5 +- packages/core/src/index.ts | 1 - 3 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 packages/core/src/helpers/coordsAtPos.ts diff --git a/packages/core/src/helpers/coordsAtPos.ts b/packages/core/src/helpers/coordsAtPos.ts deleted file mode 100644 index 00db08a2..00000000 --- a/packages/core/src/helpers/coordsAtPos.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { EditorView } from 'prosemirror-view' - -type DOMRectSide = 'bottom' | 'left' | 'right' | 'top'; - -function textRange(node: Node, from?: number, to?: number) { - const range = document.createRange() - range.setEnd(node, typeof to === 'number' ? to : (node.nodeValue || '').length) - range.setStart(node, Math.max(from || 0, 0)) - - return range -} - -function singleRect(object: Range | Element, bias: number) { - const rects = object.getClientRects() - return !rects.length - ? object.getBoundingClientRect() - : rects[bias < 0 ? 0 : rects.length - 1] -} - -export default function coordsAtPos(view: EditorView, pos: number, end = false) { - const { node, offset } = view.domAtPos(pos) // view.docView.domFromPos(pos); - let side: DOMRectSide | null = null - let rect: DOMRect | null = null - if (node.nodeType === 3) { - const nodeValue = node.nodeValue || '' - if (end && offset < nodeValue.length) { - rect = singleRect(textRange(node, offset - 1, offset), -1) - side = 'right' - } else if (offset < nodeValue.length) { - rect = singleRect(textRange(node, offset, offset + 1), -1) - side = 'left' - } - } else if (node.firstChild) { - if (offset < node.childNodes.length) { - const child = node.childNodes[offset] - rect = singleRect( - child.nodeType === 3 ? textRange(child) : (child as Element), - -1, - ) - side = 'left' - } - if ((!rect || rect.top === rect.bottom) && offset) { - const child = node.childNodes[offset - 1] - rect = singleRect( - child.nodeType === 3 ? textRange(child) : (child as Element), - 1, - ) - side = 'right' - } - } else { - const element = node as Element - rect = element.getBoundingClientRect() - side = 'left' - } - - if (rect && side) { - const x = rect[side] - - return { - top: rect.top, - bottom: rect.bottom, - left: x, - right: x, - } - } - return { - top: 0, - bottom: 0, - left: 0, - right: 0, - } -} diff --git a/packages/core/src/helpers/posToDOMRect.ts b/packages/core/src/helpers/posToDOMRect.ts index 46f791f1..70e4de08 100644 --- a/packages/core/src/helpers/posToDOMRect.ts +++ b/packages/core/src/helpers/posToDOMRect.ts @@ -1,9 +1,8 @@ import { EditorView } from 'prosemirror-view' -import coordsAtPos from './coordsAtPos' export default function posToDOMRect(view: EditorView, from: number, to: number): DOMRect { - const start = coordsAtPos(view, from) - const end = coordsAtPos(view, to, true) + const start = view.coordsAtPos(from) + const end = view.coordsAtPos(to, -1) const top = Math.min(start.top, end.top) const bottom = Math.max(start.bottom, end.bottom) const left = Math.min(start.left, end.left) diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 728cf8ff..9b51a996 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -12,7 +12,6 @@ export { default as markPasteRule } from './pasteRules/markPasteRule' export { default as callOrReturn } from './utilities/callOrReturn' export { default as mergeAttributes } from './utilities/mergeAttributes' -export { default as coordsAtPos } from './helpers/coordsAtPos' export { default as getExtensionField } from './helpers/getExtensionField' export { default as findChildren } from './helpers/findChildren' export { default as findChildrenInRange } from './helpers/findChildrenInRange'