github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-05 01:24:38 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

WYSIWYG: Updated code handling to respect direction

Browse Source 
Specifically supports "dir" attribute being on top level "pre" element,
and handles application/switching of this within the editor.

For #4809
This commit is contained in:
Dan Brown
2024-02-18 17:55:56 +00:00
parent 9ff9b9c805
commit 999d41a7f5
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/js/code/index.mjs
View File

@ -1,4 +1,4 @@
import {EditorView, keymap} from '@codemirror/view';
import {EditorView, keymap, Direction} from '@codemirror/view';
import {copyTextToClipboard} from '../services/clipboard';
import {viewerExtensions, editorExtensions} from './setups';
@ -55,6 +55,11 @@ function highlightElem(elem) {
const wrapper = document.createElement('div');
elem.parentNode.insertBefore(wrapper, elem);
const direction = innerCodeElem.getAttribute('dir') || elem.getAttribute('dir') || '';
if (direction) {
wrapper.setAttribute('dir', direction);
}
const ev = createView('content-code-block', {
parent: wrapper,
doc: content,

12
resources/js/wysiwyg/plugin-codeeditor.js
View File

@ -205,6 +205,11 @@ function register(editor) {
contenteditable: 'false',
});
const direction = el.attr('dir');
if (direction) {
wrapper.attr('dir', direction);
}
const spans = el.getAll('span');
for (const span of spans) {
span.unwrap();
@ -222,6 +227,13 @@ function register(editor) {
editor.serializer.addNodeFilter('code-block', elms => {
for (const el of elms) {
const direction = el.attr('dir');
if (direction && el.firstChild) {
el.firstChild.attr('dir', direction);
} else if (el.firstChild) {
el.firstChild.attr('dir', null);
}
el.unwrap();
}
});