0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 drag

Browse source
This commit is contained in:
Vanessa 2023-10-26 17:28:22 +08:00
parent e3c610aa3b
commit af651215a9
3 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/assets/scss/business/_av.scss
View file

@ -379,3 +379,10 @@ img.av__cellassetimg {
max-width: none;
}
html[data-theme-mode="dark"] .av__panel .b3-menu__item {
mix-blend-mode: lighten;
}
html[data-theme-mode="light"] .av__panel .b3-menu__item {
mix-blend-mode: darken;
}

3
app/src/layout/dock/Files.ts
View file

@ -423,8 +423,7 @@ export class Files extends Model {
}
let liElement = hasClosestByTag(event.target, "LI");
if (!liElement) {
liElement = document.elementFromPoint(event.clientX, event.clientY - 1) as HTMLElement;
liElement = hasClosestByTag(liElement, "LI");
liElement = hasClosestByTag(document.elementFromPoint(event.clientX, event.clientY - 1), "LI");
}
if (!liElement || !window.siyuan.dragElement) {
event.preventDefault();

18
app/src/protyle/render/av/openMenuPanel.ts
View file

@ -296,13 +296,17 @@ export const openMenuPanel = (options: {
let dragoverElement: HTMLElement;
avPanelElement.addEventListener("dragover", (event: DragEvent) => {
const target = event.target as HTMLElement;
const targetElement = hasClosestByAttribute(target, "draggable", "true");
let targetElement = hasClosestByAttribute(target, "draggable", "true");
if (!targetElement) {
targetElement = hasClosestByAttribute(document.elementFromPoint(event.clientX, event.clientY - 1), "draggable", "true")
}
if (!targetElement || targetElement.isSameNode(window.siyuan.dragElement)) {
return;
}
event.preventDefault();
if (dragoverElement && targetElement.isSameNode(dragoverElement)) {
const nodeRect = targetElement.getBoundingClientRect();
targetElement.classList.remove("dragover__bottom", "dragover__top");
if (event.clientY > nodeRect.top + nodeRect.height / 2) {
targetElement.classList.add("dragover__bottom");
} else {
@ -312,12 +316,10 @@ export const openMenuPanel = (options: {
}
dragoverElement = targetElement;
});
avPanelElement.addEventListener("dragleave", (event) => {
const target = event.target as HTMLElement;
const targetElement = hasClosestByAttribute(target, "draggable", "true");
if (targetElement) {
targetElement.classList.remove("dragover__top", "dragover__bottom");
}
avPanelElement.addEventListener("dragleave", () => {
avPanelElement.querySelectorAll(".dragover__bottom, .dragover__top").forEach((item: HTMLElement) => {
item.classList.remove("dragover__bottom", "dragover__top");
});
});
avPanelElement.addEventListener("dragend", () => {
if (window.siyuan.dragElement) {
@ -752,7 +754,7 @@ export const openMenuPanel = (options: {
/// #if !MOBILE
if (isLocalPath(assetLink) && (
[".pdf"].concat(Constants.SIYUAN_ASSETS_AUDIO).concat(Constants.SIYUAN_ASSETS_VIDEO).includes(suffix) && (
suffix !== ".pdf" || ( suffix === ".pdf" && !assetLink.startsWith("file://"))
suffix !== ".pdf" || (suffix === ".pdf" && !assetLink.startsWith("file://"))
)
)) {
openAsset(options.protyle.app, assetLink.trim(), parseInt(getSearch("page", assetLink)), "right");