Skip to content

fix(core): fix getClosestPosition error when component nesting #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bcguan2008 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(core): fix getClosestPosition error when component nesting #285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions packages/core/src/models/MoveHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ export class MoveHelper {
const closestNode = this.closestNode
if (!closestNode || !viewport.isPointInViewport(point))
return ClosestPosition.Forbid
const closestRect = viewport.getValidNodeRect(closestNode)
let closestRect = viewport.getValidNodeRect(closestNode)
const isInline = this.getClosestLayout(viewport) === 'horizontal'
if (!closestRect) {
return
}
const isAfter = isNearAfter(
let isAfter = isNearAfter(
point,
closestRect,
viewport.moveInsertionType === 'block' ? false : isInline
Expand All @@ -132,7 +132,14 @@ export class MoveHelper {
const parentClosestNode = getValidParent(closestNode)
if (parentClosestNode) {
this.closestNode = parentClosestNode
closestRect = viewport.getValidNodeRect(this.closestNode)
isAfter = isNearAfter(
point,
closestRect,
viewport.moveInsertionType === 'block' ? false : isInline
)
}

if (isInline) {
if (parentClosestNode) {
if (isAfter) {
Expand Down Expand Up @@ -177,9 +184,17 @@ export class MoveHelper {
} else {
if (!closestNode.allowSibling(this.dragNodes)) {
const parentClosestNode = getValidParent(closestNode)

if (parentClosestNode) {
this.closestNode = parentClosestNode
closestRect = viewport.getValidNodeRect(this.closestNode)
isAfter = isNearAfter(
point,
closestRect,
viewport.moveInsertionType === 'block' ? false : isInline
)
}

if (isInline) {
if (parentClosestNode) {
if (isAfter) {
Expand Down