Skip to content

Commit 30aa6ad

Browse files
committed
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]>
1 parent dbca728 commit 30aa6ad

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

src/css/prosemirror.scss

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ div.ProseMirror {
5151
display: flex;
5252
align-items: start;
5353
// Leave space for checkbox (14px width + 2x 1px border + 6px margin-right)
54-
margin-left: -24px;
54+
margin-inline-start: -24px;
5555

5656
input[type='checkbox'] {
5757
display: none;
@@ -262,7 +262,7 @@ div.ProseMirror {
262262

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

268268
pre.frontmatter::before {
@@ -280,7 +280,7 @@ div.ProseMirror {
280280

281281
li {
282282
position: relative;
283-
padding-left: 3px;
283+
padding-inline-start: 3px;
284284

285285
p {
286286
position: relative;
@@ -298,8 +298,8 @@ div.ProseMirror {
298298

299299
ul,
300300
ol {
301-
padding-left: 10px;
302-
margin-left: 10px;
301+
padding-inline-start: 10px;
302+
margin-inline-start: 10px;
303303
margin-bottom: 1em;
304304
}
305305

@@ -318,11 +318,10 @@ div.ProseMirror {
318318
}
319319

320320
blockquote {
321-
padding-left: 1em;
322-
border-left: 4px solid var(--color-primary-element);
321+
padding-inline-start: 1em;
322+
border-inline-start: 4px solid var(--color-primary-element);
323323
color: var(--color-text-maxcontrast);
324-
margin-left: 0;
325-
margin-right: 0;
324+
margin-inline: 0;
326325
}
327326

328327
// table variables

src/extensions/RichText.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,13 @@ export default Extension.create({
120120
LinkBubble,
121121
TrailingNode,
122122
TextDirection.configure({
123-
types: ['heading', 'paragraph', 'listItem', 'orderedList'],
123+
types: [
124+
'heading',
125+
'paragraph',
126+
'listItem',
127+
'taskItem',
128+
'blockquote',
129+
],
124130
}),
125131
]
126132
const additionalExtensionNames = this.options.extensions.map((e) => e.name)

src/nodes/Callout.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ export default {
5151
<style lang="scss" scoped>
5252
.callout {
5353
background-color: var(--callout-background, var(--color-background-hover));
54-
border-left-color: var(--callout-border, var(--color-primary-element));
54+
border-inline-start-color: var(--callout-border, var(--color-primary-element));
5555
border-radius: var(--border-radius);
5656
padding: 1em;
57-
padding-left: 0.5em;
58-
border-left-width: 0.3em;
59-
border-left-style: solid;
57+
padding-inline-start: 0.5em;
58+
border-inline-start-width: 0.3em;
59+
border-inline-start-style: solid;
6060
position: relative;
6161
margin-bottom: 0.5em;
6262
@@ -69,7 +69,7 @@ export default {
6969
}
7070
7171
.callout__content {
72-
margin-left: 1em;
72+
margin-inline-start: 1em;
7373
&:deep(p) {
7474
&:last-child {
7575
margin-bottom: 0;

src/tests/tiptap.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('TipTap', () => {
3131
it('render taskList', () => {
3232
const markdown = '* [ ] item 1\n'
3333
expect(renderedHTML(markdown)).toEqual(
34-
'<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>',
34+
'<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>',
3535
)
3636
})
3737
})

0 commit comments

Comments
 (0)