Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-11 23:22:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

♻️ https://github.com/siyuan-note/siyuan/pull/15347

Browse source
This commit is contained in:
Vanessa 2025-07-23 13:08:38 +08:00
parent c88f99646c
commit 508eb93183
33 changed files with 111 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/layout/Wnd.ts
View file

@ -220,7 +220,7 @@ export class Wnd {
return;
}
it.classList.remove("layout-tab-bars--drag");
if ((newTabHeaderElement !== oldTabHeaderElement) &&
if (newTabHeaderElement !== oldTabHeaderElement &&
((oldTabHeaderElement.classList.contains("item--pin") && newTabHeaderElement.classList.contains("item--pin")) ||
(!oldTabHeaderElement.classList.contains("item--pin") && !newTabHeaderElement.classList.contains("item--pin")))) {
const rect = newTabHeaderElement.getClientRects()[0];
@ -816,7 +816,7 @@ export class Wnd {
if (item.headElement.classList.contains("item--focus")) {
let latestHeadElement: HTMLElement;
Array.from(item.headElement.parentElement.children).forEach((headItem: HTMLElement) => {
if ((headItem !== item.headElement) &&
if (headItem !== item.headElement &&
headItem.style.maxWidth !== "0px" // 不对比已移除但还在动画效果中的元素 https://github.com/siyuan-note/siyuan/issues/7878
) {
if (!latestHeadElement) {

4
app/src/layout/dock/Backlink.ts
View file

@ -278,7 +278,7 @@ export class Backlink extends Model {
this.setFocus();
let target = event.target as HTMLElement;
while (target && !target.isEqualNode(this.element)) {
if (target.classList.contains("block__icon") && (target.parentElement.parentElement === this.element)) {
if (target.classList.contains("block__icon") && target.parentElement.parentElement === this.element) {
const type = target.getAttribute("data-type");
switch (type) {
case "refresh":
@ -433,7 +433,7 @@ export class Backlink extends Model {
if (svgElement.classList.contains("b3-list-item__arrow--open")) {
svgElement.classList.remove("b3-list-item__arrow--open");
this.editors.find((item, index) => {
if (item.protyle.block.rootID === docId && liElement.nextElementSibling && (item.protyle.element === liElement.nextElementSibling)) {
if (item.protyle.block.rootID === docId && liElement.nextElementSibling && item.protyle.element === liElement.nextElementSibling) {
item.destroy();
this.editors.splice(index, 1);
liElement.nextElementSibling.remove();

2
app/src/layout/dock/Outline.ts
View file

@ -178,7 +178,7 @@ export class Outline extends Model {
break;
}
break;
} else if (this.blockId && ((target === this.headerElement.nextElementSibling) || target.classList.contains("block__icons"))) {
} else if (this.blockId && (target === this.headerElement.nextElementSibling || target.classList.contains("block__icons"))) {
openFileById({
app: options.app,
id: this.blockId,

18
app/src/layout/dock/index.ts
View file

@ -186,13 +186,13 @@ export class Dock {
const targetItem = hasClosestByClassName(moveEvent.target as HTMLElement, "dock__item") ||
hasClosestByClassName(moveEvent.target as HTMLElement, "dock__items") as HTMLElement ||
hasClosestByClassName(moveEvent.target as HTMLElement, "dock__item--space") as HTMLElement;
if (targetItem && selectItem && (targetItem === selectItem)) {
if (targetItem && selectItem && targetItem === selectItem) {
if (selectItem.classList.contains("dock__item--space")) {
const selectRect = selectItem.getBoundingClientRect();
if (selectItem.parentElement.id === "dockBottom") {
if (moveEvent.clientX < selectRect.right && moveEvent.clientX > selectRect.right - 40) {
const lastFirstElement = selectItem.nextElementSibling.firstElementChild;
if (lastFirstElement && (lastFirstElement === item)) {
if (lastFirstElement && lastFirstElement === item) {
moveItem.classList.add("fn__none");
} else {
moveItem.classList.remove("fn__none");
@ -202,7 +202,7 @@ export class Dock {
} else {
if (moveEvent.clientY < selectRect.bottom && moveEvent.clientY > selectRect.bottom - 40) {
const lastFirstElement = selectItem.nextElementSibling.firstElementChild;
if (lastFirstElement && (lastFirstElement === item)) {
if (lastFirstElement && lastFirstElement === item) {
moveItem.classList.add("fn__none");
} else {
moveItem.classList.remove("fn__none");
@ -211,7 +211,7 @@ export class Dock {
}
}
} else if (selectItem.classList.contains("dock__item--pin")) {
if (item.nextElementSibling && (item.nextElementSibling === selectItem)) {
if (item.nextElementSibling && item.nextElementSibling === selectItem) {
moveItem.classList.add("fn__none");
} else {
moveItem.classList.remove("fn__none");
@ -221,14 +221,14 @@ export class Dock {
const selectRect = selectItem.getBoundingClientRect();
if (selectItem.parentElement.parentElement.id === "dockBottom") {
if (selectRect.left + selectRect.width / 2 > moveEvent.clientX) {
if (item.nextElementSibling && (item.nextElementSibling === selectItem)) {
if (item.nextElementSibling && item.nextElementSibling === selectItem) {
moveItem.classList.add("fn__none");
} else {
moveItem.classList.remove("fn__none");
selectItem.before(moveItem);
}
} else {
if (item.previousElementSibling && (item.previousElementSibling === selectItem)) {
if (item.previousElementSibling && item.previousElementSibling === selectItem) {
moveItem.classList.add("fn__none");
} else {
moveItem.classList.remove("fn__none");
@ -237,14 +237,14 @@ export class Dock {
}
} else {
if (selectRect.top + selectRect.height / 2 > moveEvent.clientY) {
if (item.nextElementSibling && (item.nextElementSibling === selectItem)) {
if (item.nextElementSibling && item.nextElementSibling === selectItem) {
moveItem.classList.add("fn__none");
} else {
moveItem.classList.remove("fn__none");
selectItem.before(moveItem);
}
} else {
if (item.previousElementSibling && (item.previousElementSibling === selectItem)) {
if (item.previousElementSibling && item.previousElementSibling === selectItem) {
moveItem.classList.add("fn__none");
} else {
moveItem.classList.remove("fn__none");
@ -267,7 +267,7 @@ export class Dock {
return;
}
if (!targetItem || targetItem.style.position === "fixed" || (targetItem === item) || targetItem.id === "dockMoveItem") {
if (targetItem && (targetItem === item)) {
if (targetItem && targetItem === item) {
moveItem.classList.add("fn__none");
}
return;

6
app/src/layout/util.ts
View file

@ -857,17 +857,17 @@ export const addResize = (obj: Layout | Wnd) => {
if (previousNowSize < 8 || nextNowSize < 8) {
return;
}
if (window.siyuan.layout.leftDock && (window.siyuan.layout.leftDock.layout.element === previousElement) &&
if (window.siyuan.layout.leftDock && window.siyuan.layout.leftDock.layout.element === previousElement &&
previousNowSize < getMinSize(previousElement) &&
// https://github.com/siyuan-note/siyuan/issues/10506
previousNowSize < previousSize) {
return;
}
if (window.siyuan.layout.rightDock && (window.siyuan.layout.rightDock.layout.element === nextElement) &&
if (window.siyuan.layout.rightDock && window.siyuan.layout.rightDock.layout.element === nextElement &&
nextNowSize < getMinSize(nextElement) && nextNowSize < nextSize) {
return;
}
if (window.siyuan.layout.bottomDock && (window.siyuan.layout.bottomDock.layout.element === nextElement) &&
if (window.siyuan.layout.bottomDock && window.siyuan.layout.bottomDock.layout.element === nextElement &&
nextNowSize < 64 && nextNowSize < nextSize) {
return;
}