Skip to content

Fixes for TextDirection extension #7509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mejo- merged 4 commits into from
Jul 29, 2025
+198 −35
Merged

Fixes for TextDirection extension #7509

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf8ff09
chore: Use local copy of tiptap-text-direction extension
mejo- Jul 28, 2025
34043b7
fix(TextDirection): Adjust to our code style
mejo- Jul 28, 2025
dbca728
fix(TextDirection): Ignore unchanged nodes in appendTransaction
mejo- Jul 28, 2025
30aa6ad
fix(TextDirection): Add taskItem and blockquote to regarded node types
mejo- Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(TextDirection): Add taskItem and blockquote to regarded node types 
Also fix some CSS rules to work with rtl script.

Signed-off-by: Jonas <[email protected]>
  • Loading branch information
@mejo-
mejo- committed Jul 28, 2025
commit 30aa6ad5be87a05de3c487fc6f23ff2c36a4fdf6
17 changes: 8 additions & 9 deletions src/css/prosemirror.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ div.ProseMirror {
display: flex;
align-items: start;
// Leave space for checkbox (14px width + 2x 1px border + 6px margin-right)
margin-left: -24px;
margin-inline-start: -24px;

input[type='checkbox'] {
display: none;
Expand Down Expand Up @@ -262,7 +262,7 @@ div.ProseMirror {

pre.frontmatter {
margin-bottom: 2em;
border-left: 4px solid var(--color-primary-element);
border-inline-start: 4px solid var(--color-primary-element);
}

pre.frontmatter::before {
Expand All @@ -280,7 +280,7 @@ div.ProseMirror {

li {
position: relative;
padding-left: 3px;
padding-inline-start: 3px;

p {
position: relative;
Expand All @@ -298,8 +298,8 @@ div.ProseMirror {

ul,
ol {
padding-left: 10px;
margin-left: 10px;
padding-inline-start: 10px;
margin-inline-start: 10px;
margin-bottom: 1em;
}

Expand All @@ -318,11 +318,10 @@ div.ProseMirror {
}

blockquote {
padding-left: 1em;
border-left: 4px solid var(--color-primary-element);
padding-inline-start: 1em;
border-inline-start: 4px solid var(--color-primary-element);
color: var(--color-text-maxcontrast);
margin-left: 0;
margin-right: 0;
margin-inline: 0;
}

// table variables
Expand Down
8 changes: 7 additions & 1 deletion src/extensions/RichText.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,13 @@ export default Extension.create({
LinkBubble,
TrailingNode,
TextDirection.configure({
types: ['heading', 'paragraph', 'listItem', 'orderedList'],
types: [
'heading',
'paragraph',
'listItem',
'taskItem',
'blockquote',
],
}),
]
const additionalExtensionNames = this.options.extensions.map((e) => e.name)
Expand Down
10 changes: 5 additions & 5 deletions src/nodes/Callout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ export default {
<style lang="scss" scoped>
.callout {
background-color: var(--callout-background, var(--color-background-hover));
border-left-color: var(--callout-border, var(--color-primary-element));
border-inline-start-color: var(--callout-border, var(--color-primary-element));
border-radius: var(--border-radius);
padding: 1em;
padding-left: 0.5em;
border-left-width: 0.3em;
border-left-style: solid;
padding-inline-start: 0.5em;
border-inline-start-width: 0.3em;
border-inline-start-style: solid;
position: relative;
margin-bottom: 0.5em;

Expand All @@ -69,7 +69,7 @@ export default {
}

.callout__content {
margin-left: 1em;
margin-inline-start: 1em;
&:deep(p) {
&:last-child {
margin-bottom: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/tests/tiptap.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('TipTap', () => {
it('render taskList', () => {
const markdown = '* [ ] item 1\n'
expect(renderedHTML(markdown)).toEqual(
'<ul class="contains-task-list"><li data-checked="false" class="task-list-item checkbox-item"><input type="checkbox" class="" contenteditable="false"><label><p dir="ltr">item 1</p></label></li></ul>',
'<ul class="contains-task-list"><li dir="ltr" data-checked="false" class="task-list-item checkbox-item"><input type="checkbox" class="" contenteditable="false"><label><p dir="ltr">item 1</p></label></li></ul>',
)
})
})
Loading