Skip to content

Commit 4438faf

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 3a79819 commit 4438faf

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
@@ -50,7 +50,7 @@ div.ProseMirror {
5050
display: flex;
5151
align-items: start;
5252
// Leave space for checkbox (14px width + 2x 1px border + 6px margin-right)
53-
margin-left: -24px;
53+
margin-inline-start: -24px;
5454

5555
input[type=checkbox] {
5656
display: none;
@@ -256,7 +256,7 @@ div.ProseMirror {
256256

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

262262
pre.frontmatter::before {
@@ -274,7 +274,7 @@ div.ProseMirror {
274274

275275
li {
276276
position: relative;
277-
padding-left: 3px;
277+
padding-inline-start: 3px;
278278

279279
p {
280280
position: relative;
@@ -291,8 +291,8 @@ div.ProseMirror {
291291
}
292292

293293
ul, ol {
294-
padding-left: 10px;
295-
margin-left: 10px;
294+
padding-inline-start: 10px;
295+
margin-inline-start: 10px;
296296
margin-bottom: 1em;
297297
}
298298

@@ -311,11 +311,10 @@ div.ProseMirror {
311311
}
312312

313313
blockquote {
314-
padding-left: 1em;
315-
border-left: 4px solid var(--color-primary-element);
314+
padding-inline-start: 1em;
315+
border-inline-start: 4px solid var(--color-primary-element);
316316
color: var(--color-text-maxcontrast);
317-
margin-left: 0;
318-
margin-right: 0;
317+
margin-inline: 0;
319318
}
320319

321320
// table variables

src/extensions/RichText.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,13 @@ export default Extension.create({
117117
: null,
118118
TrailingNode,
119119
TextDirection.configure({
120-
types: ['heading', 'paragraph', 'listItem', 'orderedList'],
120+
types: [
121+
'heading',
122+
'paragraph',
123+
'listItem',
124+
'taskItem',
125+
'blockquote',
126+
],
121127
}),
122128
]
123129
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
@@ -50,12 +50,12 @@ export default {
5050
<style lang="scss" scoped>
5151
.callout {
5252
background-color: var(--callout-background, var(--color-background-hover));
53-
border-left-color: var(--callout-border, var(--color-primary-element));
53+
border-inline-start-color: var(--callout-border, var(--color-primary-element));
5454
border-radius: var(--border-radius);
5555
padding: 1em;
56-
padding-left: 0.5em;
57-
border-left-width: 0.3em;
58-
border-left-style: solid;
56+
padding-inline-start: 0.5em;
57+
border-inline-start-width: 0.3em;
58+
border-inline-start-style: solid;
5959
position: relative;
6060
margin-bottom: 0.5em;
6161
@@ -68,7 +68,7 @@ export default {
6868
}
6969
7070
.callout__content {
71-
margin-left: 1em;
71+
margin-inline-start: 1em;
7272
&:deep(p) {
7373
&:last-child {
7474
margin-bottom: 0;

src/tests/tiptap.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ describe('TipTap', () => {
2828

2929
it('render taskList', () => {
3030
const markdown = '* [ ] item 1\n'
31-
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>')
31+
expect(renderedHTML(markdown)).toEqual('<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>')
3232
})
3333
})

0 commit comments

Comments
 (0)