Skip to content

Commit 2807485

Browse files
matthewlipskimatthewlipski
committed
Merge branch 'main' into new-release
# Conflicts: # package-lock.json # tests/package.json
2 parents 377bcf8 + 8a51a79 commit 2807485

File tree

106 files changed

+1196
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1196
-179
lines changed

‎package-lock.json

+31-31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/ariakit/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"declarationDir": "types",
2020
"composite": true,
2121
"skipLibCheck": true,
22+
"emitDeclarationOnly": true
2223
},
2324
"include": ["src"],
2425
"references": [

‎packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"prosemirror-model": "^1.23.0",
8585
"prosemirror-state": "^1.4.3",
8686
"prosemirror-tables": "^1.6.1",
87-
"prosemirror-transform": "^1.9.0",
87+
"prosemirror-transform": "^1.10.2",
8888
"prosemirror-view": "^1.33.7",
8989
"rehype-format": "^5.0.0",
9090
"rehype-parse": "^8.0.4",

‎packages/core/src/api/clipboard/__snapshots__/external/pasteEndOfParagraph.html

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
[
2+
{
3+
"children": [],
4+
"content": [
5+
{
6+
"styles": {},
7+
"text": "ParagraphParagraph",
8+
"type": "text",
9+
},
10+
],
11+
"id": "0",
12+
"props": {
13+
"backgroundColor": "default",
14+
"textAlignment": "left",
15+
"textColor": "default",
16+
},
17+
"type": "paragraph",
18+
},
19+
{
20+
"children": [],
21+
"content": {
22+
"columnWidths": [
23+
undefined,
24+
undefined,
25+
],
26+
"rows": [
27+
{
28+
"cells": [
29+
[
30+
{
31+
"styles": {},
32+
"text": "Table Cell",
33+
"type": "text",
34+
},
35+
],
36+
[
37+
{
38+
"styles": {},
39+
"text": "Table Cell",
40+
"type": "text",
41+
},
42+
],
43+
],
44+
},
45+
{
46+
"cells": [
47+
[
48+
{
49+
"styles": {},
50+
"text": "Table Cell",
51+
"type": "text",
52+
},
53+
],
54+
[
55+
{
56+
"styles": {},
57+
"text": "Table Cell",
58+
"type": "text",
59+
},
60+
],
61+
],
62+
},
63+
],
64+
"type": "tableContent",
65+
},
66+
"id": "1",
67+
"props": {
68+
"textColor": "default",
69+
},
70+
"type": "table",
71+
},
72+
{
73+
"children": [],
74+
"content": [
75+
{
76+
"styles": {},
77+
"text": "Custom Paragraph",
78+
"type": "text",
79+
},
80+
],
81+
"id": "2",
82+
"props": {},
83+
"type": "customParagraph",
84+
},
85+
{
86+
"children": [],
87+
"content": [],
88+
"id": "3",
89+
"props": {
90+
"backgroundColor": "default",
91+
"textAlignment": "left",
92+
"textColor": "default",
93+
},
94+
"type": "paragraph",
95+
},
96+
]

‎packages/core/src/api/clipboard/__snapshots__/external/pasteEndOfParagraphText.html

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
[
2+
{
3+
"children": [],
4+
"content": [
5+
{
6+
"styles": {},
7+
"text": "ParagraphParagraph",
8+
"type": "text",
9+
},
10+
],
11+
"id": "0",
12+
"props": {
13+
"backgroundColor": "default",
14+
"textAlignment": "left",
15+
"textColor": "default",
16+
},
17+
"type": "paragraph",
18+
},
19+
{
20+
"children": [],
21+
"content": {
22+
"columnWidths": [
23+
undefined,
24+
undefined,
25+
],
26+
"rows": [
27+
{
28+
"cells": [
29+
[
30+
{
31+
"styles": {},
32+
"text": "Table Cell",
33+
"type": "text",
34+
},
35+
],
36+
[
37+
{
38+
"styles": {},
39+
"text": "Table Cell",
40+
"type": "text",
41+
},
42+
],
43+
],
44+
},
45+
{
46+
"cells": [
47+
[
48+
{
49+
"styles": {},
50+
"text": "Table Cell",
51+
"type": "text",
52+
},
53+
],
54+
[
55+
{
56+
"styles": {},
57+
"text": "Table Cell",
58+
"type": "text",
59+
},
60+
],
61+
],
62+
},
63+
],
64+
"type": "tableContent",
65+
},
66+
"id": "1",
67+
"props": {
68+
"textColor": "default",
69+
},
70+
"type": "table",
71+
},
72+
{
73+
"children": [],
74+
"content": [
75+
{
76+
"styles": {},
77+
"text": "Custom Paragraph",
78+
"type": "text",
79+
},
80+
],
81+
"id": "2",
82+
"props": {},
83+
"type": "customParagraph",
84+
},
85+
{
86+
"children": [],
87+
"content": [],
88+
"id": "3",
89+
"props": {
90+
"backgroundColor": "default",
91+
"textAlignment": "left",
92+
"textColor": "default",
93+
},
94+
"type": "paragraph",
95+
},
96+
]

0 commit comments

Comments
 (0)