From 00972914fd8471436dea80ea06c14aa63c5268f1 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Sun, 2 Apr 2023 22:23:12 +0800 Subject: [PATCH] :iphone: --- app/src/assets/scss/mobile.scss | 7 +++++++ app/src/mobile/util/touch.ts | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index bbf1e47f3..1b3d56c98 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -426,6 +426,13 @@ @extend .fn__ellipsis; } +// iPhone 右上角属性中对不齐 +.protyle-wysiwyg--attr .protyle-attr > div:not(.protyle-attr--memo):not(.protyle-attr--refcount) { + max-width: 26vw; + white-space: nowrap; + display: block; +} + @media (max-width: 620px) { .protyle-wysiwyg [data-node-id].sb[data-sb-layout="col"] { flex-direction: column; diff --git a/app/src/mobile/util/touch.ts b/app/src/mobile/util/touch.ts index b6afc577e..a4adb1246 100644 --- a/app/src/mobile/util/touch.ts +++ b/app/src/mobile/util/touch.ts @@ -48,6 +48,8 @@ export const handleTouchEnd = (event: TouchEvent) => { scrollElement = scrollElement.classList.contains("table") ? (scrollElement.firstElementChild as HTMLElement) : (scrollElement.firstElementChild.nextElementSibling as HTMLElement); if ((xDiff <= 0 && scrollElement.scrollLeft > 0) || (xDiff >= 0 && scrollElement.clientWidth + scrollElement.scrollLeft < scrollElement.scrollWidth)) { + // 左滑拉出菜单后右滑至代码块右侧有空间时,需关闭菜单 + closePanel(); return; } } @@ -151,6 +153,13 @@ export const handleTouchMove = (event: TouchEvent) => { hasClosestByAttribute(target, "id", "model")) { return; } + if (getSelection().rangeCount > 0) { + // 选中后扩选的情况 + const range = getSelection().getRangeAt(0); + if (range.toString() !== "" && window.siyuan.mobile.editor.protyle.wysiwyg.element.contains(range.startContainer)) { + return; + } + } xDiff = Math.floor(clientX - event.touches[0].clientX); yDiff = Math.floor(clientY - event.touches[0].clientY);