Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-27 18:56:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/9479

Browse source
This commit is contained in:
Vanessa 2023-10-22 23:17:56 +08:00
parent d978386651
commit b91b7e12bf
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/assets/scss/protyle/_protyle.scss
View file

@ -73,6 +73,7 @@
padding: 4px;
transition: var(--b3-transition);
cursor: pointer;
position: relative;
&:hover svg {
color: var(--b3-theme-on-surface);
@ -81,6 +82,15 @@
&:active {
cursor: grabbing;
}
span {
z-index: 2;
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
}
}
svg {

15
app/src/protyle/gutter/index.ts
View file

@ -55,7 +55,8 @@ export class Gutter {
this.element.setAttribute("data-position", "right");
this.element.addEventListener("dragstart", (event: DragEvent & { target: HTMLElement }) => {
hideTooltip();
let selectIds: string[] = [event.target.getAttribute("data-node-id")];
const buttonElement = event.target.parentElement
let selectIds: string[] = [buttonElement.getAttribute("data-node-id")];
const selectElements = protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select");
if (selectElements.length > 0) {
selectIds = [];
@ -66,9 +67,9 @@ export class Gutter {
if (selectElements.length === 0) {
event.dataTransfer.setDragImage(protyle.wysiwyg.element.querySelector(`[data-node-id="${selectIds[0]}"]`), 0, 0);
}
event.target.style.opacity = "0.1";
buttonElement.style.opacity = "0.1";
window.siyuan.dragElement = protyle.wysiwyg.element;
event.dataTransfer.setData(`${Constants.SIYUAN_DROP_GUTTER}${event.target.getAttribute("data-type")}${Constants.ZWSP}${event.target.getAttribute("data-subtype")}${Constants.ZWSP}${selectIds}`,
event.dataTransfer.setData(`${Constants.SIYUAN_DROP_GUTTER}${buttonElement.getAttribute("data-type")}${Constants.ZWSP}${buttonElement.getAttribute("data-subtype")}${Constants.ZWSP}${selectIds}`,
protyle.wysiwyg.element.innerHTML);
});
this.element.addEventListener("dragend", () => {
@ -1842,8 +1843,12 @@ export class Gutter {
html = "";
}
index += 1;
const buttonHTML = `<button data-type="${type}" data-subtype="${nodeElement.getAttribute("data-subtype")}" data-node-id="${nodeElement.getAttribute("data-node-id")}">
<svg><use xlink:href="#${getIconByType(type, nodeElement.getAttribute("data-subtype"))}"></use></svg>
<span ${protyle.disabled ? "" : 'draggable="true"'}></span>
</button>`
if (isShow) {
html = `<button ${protyle.disabled ? "" : 'draggable="true"'} data-type="${type}" data-subtype="${nodeElement.getAttribute("data-subtype")}" data-node-id="${nodeElement.getAttribute("data-node-id")}"><svg><use xlink:href="#${getIconByType(type, nodeElement.getAttribute("data-subtype"))}"></use></svg></button>` + html;
html = buttonHTML + html;
}
let foldHTML = "";
if (type === "NodeListItem" && nodeElement.childElementCount > 3 || type === "NodeHeading") {
@ -1853,7 +1858,7 @@ export class Gutter {
if (type === "NodeListItem" || type === "NodeList") {
listItem = nodeElement;
if (type === "NodeListItem" && nodeElement.childElementCount > 3) {
html = `<button ${protyle.disabled ? "" : 'draggable="true"'} data-type="${type}" data-subtype="${nodeElement.getAttribute("data-subtype")}" data-node-id="${nodeElement.getAttribute("data-node-id")}"><svg><use xlink:href="#${getIconByType(type, nodeElement.getAttribute("data-subtype"))}"></use></svg></button>${foldHTML}`;
html = buttonHTML + foldHTML;
}
}
if (type === "NodeHeading") {