github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 09:41:49 +08:00
Code Issues Actions 46 Packages Projects Releases Wiki Activity

improve selected text stylization

Browse Source
This commit is contained in:
Hasan Özbey 2021-07-13 14:14:15 +03:00 committed by Alexander Skvortsov
parent 5d8964584b
commit c8055090ca
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
framework/core/js/src/common/utils/styleSelectedText.ts
View File

@ -140,7 +140,7 @@ function blockStyle(textarea: HTMLTextAreaElement, arg: StyleArgs): SelectionRan
let selectedText = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd); let selectedText = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd);
let prefixToUse = isMultipleLines(selectedText) && blockPrefix.length > 0 ? `${blockPrefix}\n` : prefix; let prefixToUse = isMultipleLines(selectedText) && blockPrefix.length > 0 ? `${blockPrefix}\n` : prefix;
let suffixToUse = isMultipleLines(selectedText) && blockSuffix.length > 0 ? `\n${blockSuffix}` : suffix; let suffixToUse = isMultipleLines(selectedText) && blockSuffix.length > 0 ? `\n${blockSuffix}` : prefixToUse === prefix ? suffix : '';
if (prefixSpace) { if (prefixSpace) {
const beforeSelection = textarea.value[textarea.selectionStart - 1]; const beforeSelection = textarea.value[textarea.selectionStart - 1];
@ -198,19 +198,21 @@ function blockStyle(textarea: HTMLTextAreaElement, arg: StyleArgs): SelectionRan
} }
function multilineStyle(textarea: HTMLTextAreaElement, arg: StyleArgs) { function multilineStyle(textarea: HTMLTextAreaElement, arg: StyleArgs) {
const { prefix, suffix, surroundWithNewlines } = arg; const { prefix, suffix, blockPrefix, blockSuffix, surroundWithNewlines } = arg;
let text = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd); let text = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd);
let selectionStart = textarea.selectionStart; let selectionStart = textarea.selectionStart;
let selectionEnd = textarea.selectionEnd; let selectionEnd = textarea.selectionEnd;
const lines = text.split('\n'); const lines = text.split('\n');
const undoStyle = lines.every((line) => line.startsWith(prefix) && line.endsWith(suffix)); let prefixToUse = blockPrefix.length > 0 ? blockPrefix : prefix;
let suffixToUse = blockSuffix.length > 0 ? blockSuffix : prefixToUse == prefix ? suffix : '';
const undoStyle = lines.every((line) => line.startsWith(prefixToUse) && line.endsWith(suffixToUse));
if (undoStyle) { if (undoStyle) {
text = lines.map((line) => line.slice(prefix.length, line.length - suffix.length)).join('\n'); text = lines.map((line) => line.slice(prefixToUse.length, line.length - suffixToUse.length)).join('\n');
selectionEnd = selectionStart + text.length; selectionEnd = selectionStart + text.length;
} else { } else {
text = lines.map((line) => prefix + line + suffix).join('\n'); text = lines.map((line) => prefixToUse + line + suffixToUse).join('\n');
if (surroundWithNewlines) { if (surroundWithNewlines || suffixToUse === '') {
const { newlinesToAppend, newlinesToPrepend } = newlinesToSurroundSelectedText(textarea); const { newlinesToAppend, newlinesToPrepend } = newlinesToSurroundSelectedText(textarea);
selectionStart += newlinesToAppend.length; selectionStart += newlinesToAppend.length;
selectionEnd = selectionStart + text.length; selectionEnd = selectionStart + text.length;