From 0ca398e3f7541a6f28a281ac1f688b4e4244e23b Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 27 Oct 2023 11:34:53 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/9528 --- app/src/assets/scss/business/_av.scss | 4 ++++ app/src/assets/scss/business/_drag.scss | 6 +++--- app/src/protyle/util/editorCommonEvent.ts | 6 +++--- app/src/protyle/wysiwyg/index.ts | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index 9931be13d..3ba8c8a90 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -215,6 +215,10 @@ top: 8px; } + &.dragover__right { + border-right-color: var(--b3-theme-primary-lighter); + } + &--select { background-color: var(--b3-theme-primary-lightest); box-shadow: 2px 2px 0 var(--b3-theme-primary-lighter) inset, -2px -2px 0px var(--b3-theme-primary-lighter) inset; diff --git a/app/src/assets/scss/business/_drag.scss b/app/src/assets/scss/business/_drag.scss index 58a6cce10..75e3df422 100644 --- a/app/src/assets/scss/business/_drag.scss +++ b/app/src/assets/scss/business/_drag.scss @@ -9,16 +9,16 @@ &__bottom { border-radius: 0 !important; - box-shadow: 0 2px 0 var(--b3-theme-primary-lighter), inset 0px -2px 0 var(--b3-theme-primary-lighter) !important; + box-shadow: 0 2px 0 var(--b3-theme-primary-lighter), inset 0 -2px 0 var(--b3-theme-primary-lighter) !important; } &__left { border-radius: 0 !important; - box-shadow: -4px 0 0 var(--b3-theme-primary-lighter) !important; + box-shadow: -3px 0 0 var(--b3-theme-primary-lighter), inset 1px 0 0 var(--b3-theme-primary-lighter) !important; } &__right { border-radius: 0 !important; - box-shadow: 4px 0 0 var(--b3-theme-primary-lighter) !important; + box-shadow: 1px 0 0 var(--b3-theme-primary-lighter), inset -2px 0 0 var(--b3-theme-primary-lighter) !important; } } diff --git a/app/src/protyle/util/editorCommonEvent.ts b/app/src/protyle/util/editorCommonEvent.ts index 5767bb28c..dd4b3a890 100644 --- a/app/src/protyle/util/editorCommonEvent.ts +++ b/app/src/protyle/util/editorCommonEvent.ts @@ -1070,7 +1070,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => { // 左侧 point.x = editorPosition.left; point.className = "dragover__left"; - } else if (event.clientX > editorPosition.right) { + } else if (event.clientX >= editorPosition.right) { // 右侧 point.x = editorPosition.right - 6; point.className = "dragover__right"; @@ -1121,13 +1121,13 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => { if (event.clientX < nodeRect.left + nodeRect.width / 2 && event.clientX > nodeRect.left && !targetElement.classList.contains("av__row")) { targetElement.classList.add("dragover__left"); - } else if (event.clientX > nodeRect.right - nodeRect.width / 2 && event.clientX < nodeRect.right && + } else if (event.clientX > nodeRect.right - nodeRect.width / 2 && event.clientX <= nodeRect.right + 1 && !targetElement.classList.contains("av__row")) { targetElement.classList.add("dragover__right"); } return; } - if (event.clientX < nodeRect.left + 32 && event.clientX > nodeRect.left && + if (event.clientX < nodeRect.left + 32 && event.clientX >= nodeRect.left - 1 && !targetElement.classList.contains("av__row")) { targetElement.classList.add("dragover__left"); } else if (event.clientX > nodeRect.right - 32 && event.clientX < nodeRect.right && diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index 80b1ead9c..b88e9f476 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -395,6 +395,9 @@ export class WYSIWYG { documentSelf.ondragstart = null; documentSelf.onselectstart = null; documentSelf.onselect = null; + if (!newWidth || newWidth !== oldWidth + "px") { + return; + } transaction(protyle, [{ action: "setAttrViewColWidth", id: dragColId,