Skip to content

Commit

Permalink
🎨 fix Vanessa219#1302
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vanessa219
Vanessa219 committed Apr 4, 2023
1 parent 4911426 commit bd23660
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 45 deletions.
94 changes: 53 additions & 41 deletions src/ts/wysiwyg/highlightToolbarWYSIWYG.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,12 @@ export const highlightToolbarWYSIWYG = (vditor: IVditor) => {
event.preventDefault();
return;
}
removeBlockElement(vditor, event);
if (removeBlockElement(vditor, event)) {
return;
}
if (focusToElement(event, range)) {
return;
}
};

const input2Wrap = document.createElement("span");
Expand Down Expand Up @@ -517,7 +522,12 @@ export const highlightToolbarWYSIWYG = (vditor: IVditor) => {
event.preventDefault();
return;
}
removeBlockElement(vditor, event);
if (removeBlockElement(vditor, event)) {
return;
}
if (focusToElement(event, range)) {
return;
}
};

genUp(range, tableElement, vditor);
Expand All @@ -541,7 +551,7 @@ export const highlightToolbarWYSIWYG = (vditor: IVditor) => {
// link ref popover
const linkRefElement = hasClosestByAttribute(typeElement, "data-type", "link-ref");
if (linkRefElement) {
genLinkRefPopover(vditor, linkRefElement);
genLinkRefPopover(vditor, linkRefElement, range);
}

// footnote popover
Expand Down Expand Up @@ -569,19 +579,12 @@ export const highlightToolbarWYSIWYG = (vditor: IVditor) => {
if (event.isComposing) {
return;
}
if (
!isCtrl(event) &&
!event.shiftKey &&
event.altKey &&
event.key === "Enter"
) {
range.selectNodeContents(footnotesRefElement);
range.collapse(false);
setSelectionFocus(range);
event.preventDefault();
if (removeBlockElement(vditor, event)) {
return;
}
if (focusToElement(event, range)) {
return;
}
removeBlockElement(vditor, event);
};

genClose(footnotesRefElement, vditor);
Expand Down Expand Up @@ -660,17 +663,7 @@ export const highlightToolbarWYSIWYG = (vditor: IVditor) => {
return;
}
vditor.hint.select(event, vditor);
if (
!isCtrl(event) &&
!event.shiftKey &&
event.key === "Enter"
) {
range.setStart(codeElement.firstChild, 0);
range.collapse(true);
setSelectionFocus(range);
event.preventDefault();
event.stopPropagation();
}
focusToElement(event, range);
};
language.onkeyup = (event: KeyboardEvent) => {
if (
Expand Down Expand Up @@ -720,19 +713,12 @@ export const highlightToolbarWYSIWYG = (vditor: IVditor) => {
if (event.isComposing) {
return;
}
if (
!isCtrl(event) &&
!event.shiftKey &&
event.altKey &&
event.key === "Enter"
) {
range.selectNodeContents(headingElement);
range.collapse(false);
setSelectionFocus(range);
event.preventDefault();
if (removeBlockElement(vditor, event)) {
return;
}
if (focusToElement(event, range)) {
return;
}
removeBlockElement(vditor, event);
};

genUp(range, headingElement, vditor);
Expand All @@ -744,7 +730,7 @@ export const highlightToolbarWYSIWYG = (vditor: IVditor) => {

// a popover
if (aElement) {
genAPopover(vditor, aElement);
genAPopover(vditor, aElement, range);
}

if (
Expand Down Expand Up @@ -802,9 +788,8 @@ const setPopoverPosition = (vditor: IVditor, element: HTMLElement) => {
vditor.wysiwyg.popover.setAttribute("data-top", (targetElement.offsetTop - 21).toString());
};

export const genLinkRefPopover = (vditor: IVditor, linkRefElement: HTMLElement) => {
export const genLinkRefPopover = (vditor: IVditor, linkRefElement: HTMLElement, range = getSelection().getRangeAt(0)) => {
vditor.wysiwyg.popover.innerHTML = "";

const updateLinkRef = () => {
if (input.value.trim() !== "") {
if (linkRefElement.tagName === "IMG") {
Expand Down Expand Up @@ -836,6 +821,9 @@ export const genLinkRefPopover = (vditor: IVditor, linkRefElement: HTMLElement)
if (removeBlockElement(vditor, event)) {
return;
}
if (focusToElement(event, range)) {
return;
}
linkHotkey(vditor, linkRefElement, event, input1);
};

Expand All @@ -854,6 +842,9 @@ export const genLinkRefPopover = (vditor: IVditor, linkRefElement: HTMLElement)
if (removeBlockElement(vditor, event)) {
return;
}
if (focusToElement(event, range)) {
return;
}
linkHotkey(vditor, linkRefElement, event, input);
};

Expand Down Expand Up @@ -932,7 +923,7 @@ const genClose = (element: HTMLElement, vditor: IVditor) => {
element.remove();
afterRenderEvent(vditor);
highlightToolbarWYSIWYG(vditor);
if (["H1", "H2", "H3", "H4", "H5" ,"H6"].includes(element.tagName)) {
if (["H1", "H2", "H3", "H4", "H5", "H6"].includes(element.tagName)) {
renderToc(vditor);
}
};
Expand Down Expand Up @@ -970,7 +961,7 @@ const linkHotkey = (
}
};

export const genAPopover = (vditor: IVditor, aElement: HTMLElement) => {
export const genAPopover = (vditor: IVditor, aElement: HTMLElement, range: Range) => {
vditor.wysiwyg.popover.innerHTML = "";

const updateA = () => {
Expand Down Expand Up @@ -1001,6 +992,9 @@ export const genAPopover = (vditor: IVditor, aElement: HTMLElement) => {
if (removeBlockElement(vditor, event)) {
return;
}
if (focusToElement(event, range)) {
return;
}
linkHotkey(vditor, aElement, event, input1);
};

Expand All @@ -1019,6 +1013,9 @@ export const genAPopover = (vditor: IVditor, aElement: HTMLElement) => {
if (removeBlockElement(vditor, event)) {
return;
}
if (focusToElement(event, range)) {
return;
}
linkHotkey(vditor, aElement, event, input2);
};

Expand All @@ -1038,6 +1035,9 @@ export const genAPopover = (vditor: IVditor, aElement: HTMLElement) => {
if (removeBlockElement(vditor, event)) {
return;
}
if (focusToElement(event, range)) {
return;
}
linkHotkey(vditor, aElement, event, input);
};

Expand Down Expand Up @@ -1109,3 +1109,15 @@ export const genImagePopover = (event: Event, vditor: IVditor) => {

setPopoverPosition(vditor, imgElement);
};


const focusToElement = (event: KeyboardEvent, range: Range) => {
if ((!isCtrl(event) && !event.shiftKey && event.key === "Enter") || event.key === "Escape") {
if (range) {
setSelectionFocus(range);
}
event.preventDefault();
event.stopPropagation();
return true;
}
};
4 changes: 2 additions & 2 deletions src/ts/wysiwyg/processKeydown.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@ export const removeBlockElement = (vditor: IVditor, event: KeyboardEvent) => {
const itemElement: HTMLElement = vditor.wysiwyg.popover.querySelector('[data-type="remove"]');
if (itemElement) {
itemElement.click();
event.preventDefault();
return true;
}
event.preventDefault();
return true;
}
};
4 changes: 2 additions & 2 deletions src/ts/wysiwyg/toolbarEvent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export const toolbarEvent = (vditor: IVditor, actionBtn: Element, event: Event)
range.insertNode(aElement);
range.setStart(aElement.firstChild, 1);
range.collapse(true);
genAPopover(vditor, aElement);
genAPopover(vditor, aElement, range);
const textInputElement = vditor.wysiwyg.popover.querySelector("input");
textInputElement.value = "";
textInputElement.focus();
Expand All @@ -228,7 +228,7 @@ export const toolbarEvent = (vditor: IVditor, actionBtn: Element, event: Event)
range.surroundContents(node);
range.insertNode(node);
setSelectionFocus(range);
genAPopover(vditor, node);
genAPopover(vditor, node, range);
const textInputElements = vditor.wysiwyg.popover.querySelectorAll("input");
textInputElements[0].value = node.innerText;
textInputElements[1].focus();
Expand Down

0 comments on commit bd23660

Please sign in to comment.