@tinacms/app 0.0.0-e024aec-20250526035050 → 0.0.0-e0bbd2e-20251203224419
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +143 -4
- package/index.html +1 -1
- package/package.json +5 -3
- package/src/Playground.tsx +2 -4
- package/src/fields/rich-text/monaco/error-message.tsx +8 -8
- package/src/fields/rich-text/monaco/index.tsx +21 -27
- package/src/index.css +9 -0
- package/src/lib/expand-query.ts +8 -8
- package/src/lib/graphql-reducer.ts +12 -7
- package/src/lib/util.ts +17 -22
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,151 @@
|
|
|
1
1
|
# @tinacms/app
|
|
2
2
|
|
|
3
|
-
## 0.0.0-
|
|
3
|
+
## 0.0.0-e0bbd2e-20251203224419
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
- Updated dependencies [[`
|
|
8
|
-
- tinacms@0.0.0-
|
|
9
|
-
|
|
7
|
+
- Updated dependencies [[`50fa9f4`](https://github.com/tinacms/tinacms/commit/50fa9f4bf932a3dc45b88d245e35917efe8d3423), [`428ec7e`](https://github.com/tinacms/tinacms/commit/428ec7eca20603e2cb666d562fd4cc16dda4cbed), [`6946476`](https://github.com/tinacms/tinacms/commit/69464767d339a5df3c6c530ece94ef80049e534f), [`f99bbbc`](https://github.com/tinacms/tinacms/commit/f99bbbc221eead8d714b3791348d415dd8fcd063), [`429f01a`](https://github.com/tinacms/tinacms/commit/429f01a16366778277515d7462a064e56358606e)]:
|
|
8
|
+
- tinacms@0.0.0-e0bbd2e-20251203224419
|
|
9
|
+
|
|
10
|
+
## 2.3.12
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- Updated dependencies [[`2e1535d`](https://github.com/tinacms/tinacms/commit/2e1535dd5495dc390902f2db6ef1f26afb072396), [`ed6025e`](https://github.com/tinacms/tinacms/commit/ed6025ee87ebe051957fc93e987ba8de8b003995), [`3bf79e1`](https://github.com/tinacms/tinacms/commit/3bf79e19c005dca745a8ddd46546190741b322a5), [`bb1ad6a`](https://github.com/tinacms/tinacms/commit/bb1ad6a11d10976074453ed218b178935ec96fd3)]:
|
|
15
|
+
- @tinacms/mdx@2.0.0
|
|
16
|
+
- tinacms@3.0.0
|
|
17
|
+
|
|
18
|
+
## 2.3.11
|
|
19
|
+
|
|
20
|
+
### Patch Changes
|
|
21
|
+
|
|
22
|
+
- Updated dependencies [[`a76fdb6`](https://github.com/tinacms/tinacms/commit/a76fdb639b94cfefa169ebbd184f55d62e4a8a76), [`dd2089d`](https://github.com/tinacms/tinacms/commit/dd2089dbde4a7b1a0116cce096f50a97fdca9d81)]:
|
|
23
|
+
- tinacms@2.10.1
|
|
24
|
+
- @tinacms/mdx@1.8.3
|
|
25
|
+
|
|
26
|
+
## 2.3.10
|
|
27
|
+
|
|
28
|
+
### Patch Changes
|
|
29
|
+
|
|
30
|
+
- [#5822](https://github.com/tinacms/tinacms/pull/5822) [`4b824be`](https://github.com/tinacms/tinacms/commit/4b824be53572f9231753ebd3b5f14fd778fd73d6) Thanks [@copilot-swe-agent](https://github.com/apps/copilot-swe-agent)! - Migrate from react-beautiful-dnd to dnd-kit to fix deprecation error.
|
|
31
|
+
|
|
32
|
+
- Updated dependencies [[`f2577b9`](https://github.com/tinacms/tinacms/commit/f2577b911a97ecc1c3f53a98ae8218cc33bc9867), [`3ffa092`](https://github.com/tinacms/tinacms/commit/3ffa0929e4964f17d5ffa05e0d4cbbff5d9ef4d9), [`38920ce`](https://github.com/tinacms/tinacms/commit/38920ce29a9b63c54b04f39537f19beab62d2c86), [`d1bd1a1`](https://github.com/tinacms/tinacms/commit/d1bd1a1312fa910e237ec06608e7c11830c78346), [`67e1a3d`](https://github.com/tinacms/tinacms/commit/67e1a3d4c52e0acdab0a8dc53956e39f2e3075fa), [`9fb1402`](https://github.com/tinacms/tinacms/commit/9fb1402491f52d16e763c875ee550f7d879c83c8), [`3fa1098`](https://github.com/tinacms/tinacms/commit/3fa109849f552406dd0059041afe0bf09edadb25), [`ccab7a5`](https://github.com/tinacms/tinacms/commit/ccab7a5d0fd1f4167e8f72306e9d32e8750ed9bf), [`4b824be`](https://github.com/tinacms/tinacms/commit/4b824be53572f9231753ebd3b5f14fd778fd73d6), [`d9487bf`](https://github.com/tinacms/tinacms/commit/d9487bff276ba20a84b76944c5a7a333666f4984)]:
|
|
33
|
+
- tinacms@2.10.0
|
|
34
|
+
- @tinacms/mdx@1.8.2
|
|
35
|
+
|
|
36
|
+
## 2.3.9
|
|
37
|
+
|
|
38
|
+
### Patch Changes
|
|
39
|
+
|
|
40
|
+
- Updated dependencies [[`d900f4e`](https://github.com/tinacms/tinacms/commit/d900f4e6c6f0a86c94bba5f0925bbaa54eeb90db)]:
|
|
41
|
+
- tinacms@2.9.5
|
|
42
|
+
|
|
43
|
+
## 2.3.8
|
|
44
|
+
|
|
45
|
+
### Patch Changes
|
|
46
|
+
|
|
47
|
+
- Updated dependencies [[`e1b6d05`](https://github.com/tinacms/tinacms/commit/e1b6d05c6b31c5c0928633064a065ddd331667ca), [`4ee0dd9`](https://github.com/tinacms/tinacms/commit/4ee0dd95913392b0da12dd5c9344909e5292e911), [`27e5ca9`](https://github.com/tinacms/tinacms/commit/27e5ca9b18a90f13f92425ebb2628b143d6a81be)]:
|
|
48
|
+
- tinacms@2.9.4
|
|
49
|
+
|
|
50
|
+
## 2.3.7
|
|
51
|
+
|
|
52
|
+
### Patch Changes
|
|
53
|
+
|
|
54
|
+
- Updated dependencies [[`9e8bc37`](https://github.com/tinacms/tinacms/commit/9e8bc37402c8aa4d408c38e00d4402d596b0d896), [`0f265aa`](https://github.com/tinacms/tinacms/commit/0f265aadf918ae6f5b789e298fc2c406a6df0b16), [`32bd9b2`](https://github.com/tinacms/tinacms/commit/32bd9b21b54462be3e83b2d3e4b4237a48758bb1), [`ce1414c`](https://github.com/tinacms/tinacms/commit/ce1414ce1b82e6755a96c9c12949cd469b43e283)]:
|
|
55
|
+
- tinacms@2.9.3
|
|
56
|
+
|
|
57
|
+
## 2.3.6
|
|
58
|
+
|
|
59
|
+
### Patch Changes
|
|
60
|
+
|
|
61
|
+
- [#6087](https://github.com/tinacms/tinacms/pull/6087) [`1286e87`](https://github.com/tinacms/tinacms/commit/1286e87323694dc819edc56360613dc654f3d3ca) Thanks [@kulesy](https://github.com/kulesy)! - feat: Enhance branch creation modal with improved UI/UX and dropdown button component
|
|
62
|
+
|
|
63
|
+
- [#6098](https://github.com/tinacms/tinacms/pull/6098) [`a2d983e`](https://github.com/tinacms/tinacms/commit/a2d983ed886f66db2c133e902eacaa8d07e88bdb) Thanks [@Pat-Stuart](https://github.com/Pat-Stuart)! - Change from blue accent coloring to orange
|
|
64
|
+
|
|
65
|
+
- Updated dependencies [[`1286e87`](https://github.com/tinacms/tinacms/commit/1286e87323694dc819edc56360613dc654f3d3ca), [`4416a28`](https://github.com/tinacms/tinacms/commit/4416a283ac1cfea5e9c4890cd71f2edf3b704344), [`6cba118`](https://github.com/tinacms/tinacms/commit/6cba118c90f7c7ab6356c0ef83fca18526e47f8d), [`572fb28`](https://github.com/tinacms/tinacms/commit/572fb28236b56db4ede5fe53b177b80323ae7284), [`f224124`](https://github.com/tinacms/tinacms/commit/f224124220811fb44749122d46eb7100af89ee77), [`a2d983e`](https://github.com/tinacms/tinacms/commit/a2d983ed886f66db2c133e902eacaa8d07e88bdb), [`bc35474`](https://github.com/tinacms/tinacms/commit/bc354740d0cb359c372ba287974e7e9db3c5119c)]:
|
|
66
|
+
- tinacms@2.9.2
|
|
67
|
+
|
|
68
|
+
## 2.3.5
|
|
69
|
+
|
|
70
|
+
### Patch Changes
|
|
71
|
+
|
|
72
|
+
- Updated dependencies [[`003e348`](https://github.com/tinacms/tinacms/commit/003e348472ddc08eee63d78190038097542b6311), [`5527e8a`](https://github.com/tinacms/tinacms/commit/5527e8ab5821c8613fcfd1b0b8bc6d93291a6d03), [`5ffd60e`](https://github.com/tinacms/tinacms/commit/5ffd60e7b07b19cde6fab36a911503276c83715f), [`b23aa0c`](https://github.com/tinacms/tinacms/commit/b23aa0c5defc51b8f9fe00a59dd87e1d2f8b9f0b), [`5d13c0d`](https://github.com/tinacms/tinacms/commit/5d13c0d023373692233c8be2127ae6e3d7d68b47)]:
|
|
73
|
+
- tinacms@2.9.1
|
|
74
|
+
|
|
75
|
+
## 2.3.4
|
|
76
|
+
|
|
77
|
+
### Patch Changes
|
|
78
|
+
|
|
79
|
+
- Updated dependencies [[`0bbe080`](https://github.com/tinacms/tinacms/commit/0bbe0804e334238850a4f8f33be5cd123ff68ab3), [`98fbc94`](https://github.com/tinacms/tinacms/commit/98fbc941a07fbc52edafaeb43b49b5ea30ea4172), [`ced9076`](https://github.com/tinacms/tinacms/commit/ced9076d25d7177bd8d9ae3c6133d0560366511c)]:
|
|
80
|
+
- tinacms@2.9.0
|
|
81
|
+
|
|
82
|
+
## 2.3.3
|
|
83
|
+
|
|
84
|
+
### Patch Changes
|
|
85
|
+
|
|
86
|
+
- Updated dependencies [[`ea917dd`](https://github.com/tinacms/tinacms/commit/ea917dd2840c955d462b66b58009d2a16da39377), [`b012b6c`](https://github.com/tinacms/tinacms/commit/b012b6c7fae2674c613fd4c54e1819a86c6d2c3e), [`39e5b05`](https://github.com/tinacms/tinacms/commit/39e5b0562af7bca1e2923fc94b7c8119e12a0133), [`55e018b`](https://github.com/tinacms/tinacms/commit/55e018b9826a540005bbadf8fd51e9bac456d531)]:
|
|
87
|
+
- tinacms@2.8.3
|
|
88
|
+
|
|
89
|
+
## 2.3.2
|
|
90
|
+
|
|
91
|
+
### Patch Changes
|
|
92
|
+
|
|
93
|
+
- Updated dependencies [[`eaa6ed5`](https://github.com/tinacms/tinacms/commit/eaa6ed551c76349c5849cd1e19a8066ecbbe205c), [`60a15d5`](https://github.com/tinacms/tinacms/commit/60a15d533b85a0c3f9f483f6f0f0b6824616284b), [`2fb1c4e`](https://github.com/tinacms/tinacms/commit/2fb1c4e79d1cae5ab29c3f93b0867214e193f59c)]:
|
|
94
|
+
- tinacms@2.8.2
|
|
95
|
+
- @tinacms/mdx@1.8.1
|
|
96
|
+
|
|
97
|
+
## 2.3.1
|
|
98
|
+
|
|
99
|
+
### Patch Changes
|
|
100
|
+
|
|
101
|
+
- Updated dependencies [[`41359ed`](https://github.com/tinacms/tinacms/commit/41359edaf08def7a5e26969ec114155038c09752), [`b20a2c4`](https://github.com/tinacms/tinacms/commit/b20a2c4fd64fa2d06711850db63fb317302ee361), [`41359ed`](https://github.com/tinacms/tinacms/commit/41359edaf08def7a5e26969ec114155038c09752)]:
|
|
102
|
+
- tinacms@2.8.1
|
|
103
|
+
|
|
104
|
+
## 2.3.0
|
|
105
|
+
|
|
106
|
+
### Minor Changes
|
|
107
|
+
|
|
108
|
+
- [#5744](https://github.com/tinacms/tinacms/pull/5744) [`98a61e2`](https://github.com/tinacms/tinacms/commit/98a61e2d263978a7096cc23ac7e94aa0039981be) Thanks [@Ben0189](https://github.com/Ben0189)! - Upgrade Plate editor to v48 beta, integrating latest features and improvements.
|
|
109
|
+
|
|
110
|
+
### Patch Changes
|
|
111
|
+
|
|
112
|
+
- Updated dependencies [[`98a61e2`](https://github.com/tinacms/tinacms/commit/98a61e2d263978a7096cc23ac7e94aa0039981be)]:
|
|
113
|
+
- @tinacms/mdx@1.8.0
|
|
114
|
+
- tinacms@2.8.0
|
|
115
|
+
|
|
116
|
+
## 2.2.10
|
|
117
|
+
|
|
118
|
+
### Patch Changes
|
|
119
|
+
|
|
120
|
+
- [#5833](https://github.com/tinacms/tinacms/pull/5833) [`5269d65`](https://github.com/tinacms/tinacms/commit/5269d6578d361c55326f39375eaa175707342d51) Thanks [@JackDevAU](https://github.com/JackDevAU)! - 🐛 FIX - Visual Editor Webpack HMR loading issue
|
|
121
|
+
|
|
122
|
+
- Updated dependencies [[`5269d65`](https://github.com/tinacms/tinacms/commit/5269d6578d361c55326f39375eaa175707342d51), [`3026a2b`](https://github.com/tinacms/tinacms/commit/3026a2b492113a53c036e43d5d85837cea4a6de3), [`28a94a6`](https://github.com/tinacms/tinacms/commit/28a94a602186f48b528b91236007839e5d02a9de)]:
|
|
123
|
+
- tinacms@2.7.10
|
|
124
|
+
|
|
125
|
+
## 2.2.9
|
|
126
|
+
|
|
127
|
+
### Patch Changes
|
|
128
|
+
|
|
129
|
+
- [#5741](https://github.com/tinacms/tinacms/pull/5741) [`0e9de37`](https://github.com/tinacms/tinacms/commit/0e9de379dab2970206b9b60eb014808662f67287) Thanks [@wicksipedia](https://github.com/wicksipedia)! - CMS admin UI - Refactor Sidebar and Branch Button Components
|
|
130
|
+
Forms header - Adds breadcrumb navigation
|
|
131
|
+
|
|
132
|
+
- [#5784](https://github.com/tinacms/tinacms/pull/5784) [`b25c5f0`](https://github.com/tinacms/tinacms/commit/b25c5f0b0e1d3f37870b780230b41dbc56bef1ab) Thanks [@JackDevAU](https://github.com/JackDevAU)! - - Fixed padding issues in FormLists
|
|
133
|
+
|
|
134
|
+
- Fixed Visual Editing's "Edit" button (Reference Fields)
|
|
135
|
+
|
|
136
|
+
- [#5789](https://github.com/tinacms/tinacms/pull/5789) [`5040a6a`](https://github.com/tinacms/tinacms/commit/5040a6aa24e62166d942c47b61a3f18585caded6) Thanks [@JackDevAU](https://github.com/JackDevAU)! - ✨ Adds click to focus for nested objects
|
|
137
|
+
|
|
138
|
+
- Updated dependencies [[`2a3ed6c`](https://github.com/tinacms/tinacms/commit/2a3ed6c3ec3233fd90fd94f3dd3d0243aaad079a), [`bc47f93`](https://github.com/tinacms/tinacms/commit/bc47f938431c400714808613f633b05659a87be1), [`0e9de37`](https://github.com/tinacms/tinacms/commit/0e9de379dab2970206b9b60eb014808662f67287), [`468f0ee`](https://github.com/tinacms/tinacms/commit/468f0eefc0a15a9a9a23737d29ea9a5cb5c6aef6), [`e27c017`](https://github.com/tinacms/tinacms/commit/e27c0172005797af93b908152d51b2966c0cf059), [`b25c5f0`](https://github.com/tinacms/tinacms/commit/b25c5f0b0e1d3f37870b780230b41dbc56bef1ab), [`5040a6a`](https://github.com/tinacms/tinacms/commit/5040a6aa24e62166d942c47b61a3f18585caded6), [`dbef36f`](https://github.com/tinacms/tinacms/commit/dbef36f594b949024d5525184b6a9e1b9085b759), [`3ba6d78`](https://github.com/tinacms/tinacms/commit/3ba6d78f35f817d55bfc3d12b750e54b7e0d11f2)]:
|
|
139
|
+
- tinacms@2.7.9
|
|
140
|
+
- @tinacms/mdx@1.7.0
|
|
141
|
+
|
|
142
|
+
## 2.2.8
|
|
143
|
+
|
|
144
|
+
### Patch Changes
|
|
145
|
+
|
|
146
|
+
- Updated dependencies [[`5e36123`](https://github.com/tinacms/tinacms/commit/5e361239a372e21dda624d17b4ff274bab23ce90), [`856e07a`](https://github.com/tinacms/tinacms/commit/856e07a0b8d742ee78d5eba565623cf081a61534), [`4d9c8ab`](https://github.com/tinacms/tinacms/commit/4d9c8abf6badd1bcc833bda432ab22dace4925ae), [`7346dc9`](https://github.com/tinacms/tinacms/commit/7346dc996fd81ecb395b62f373976512e8224c21)]:
|
|
147
|
+
- tinacms@2.7.8
|
|
148
|
+
- @tinacms/mdx@1.6.3
|
|
10
149
|
|
|
11
150
|
## 2.2.7
|
|
12
151
|
|
package/index.html
CHANGED
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
the assets for this page.\
|
|
52
52
|
</p>\
|
|
53
53
|
<p>\
|
|
54
|
-
Please visit <a href="https://tina.io/docs/
|
|
54
|
+
Please visit <a href="https://tina.io/docs/r/FAQ/#13-how-do-i-resolve-failed-loading-tinacms-assets-error">this doc</a> for help.\
|
|
55
55
|
</p>\
|
|
56
56
|
</div>'
|
|
57
57
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tinacms/app",
|
|
3
|
-
"version": "0.0.0-
|
|
3
|
+
"version": "0.0.0-e0bbd2e-20251203224419",
|
|
4
4
|
"main": "src/main.tsx",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"devDependencies": {
|
|
@@ -21,10 +21,12 @@
|
|
|
21
21
|
"graphiql": "3.0.0-alpha.1",
|
|
22
22
|
"graphql": "15.8.0",
|
|
23
23
|
"monaco-editor": "0.31.0",
|
|
24
|
+
"react": "^18.3.1",
|
|
25
|
+
"react-dom": "^18.3.1",
|
|
24
26
|
"react-router-dom": "6.3.0",
|
|
25
27
|
"typescript": "^5.7.3",
|
|
26
28
|
"zod": "^3.24.2",
|
|
27
|
-
"@tinacms/mdx": "
|
|
28
|
-
"tinacms": "0.0.0-
|
|
29
|
+
"@tinacms/mdx": "2.0.0",
|
|
30
|
+
"tinacms": "0.0.0-e0bbd2e-20251203224419"
|
|
29
31
|
}
|
|
30
32
|
}
|
package/src/Playground.tsx
CHANGED
|
@@ -74,9 +74,7 @@ const Playground = () => {
|
|
|
74
74
|
{noAutoQueries
|
|
75
75
|
? 'No auto-generated queries found, the Tina config is likely set to client.skip = true'
|
|
76
76
|
: "Tina's auto-generated queries can be found here as well as any queries you may have defined yourself."}{' '}
|
|
77
|
-
<a href='https://tina.io/docs/
|
|
78
|
-
Learn more here
|
|
79
|
-
</a>
|
|
77
|
+
<a href='https://tina.io/docs/r/custom-queries/'>Learn more here</a>
|
|
80
78
|
</div>
|
|
81
79
|
<nav className='space-y-1' aria-label='Sidebar'>
|
|
82
80
|
<ul>
|
|
@@ -100,7 +98,7 @@ const Playground = () => {
|
|
|
100
98
|
false
|
|
101
99
|
? 'bg-gray-100 text-gray-900'
|
|
102
100
|
: 'text-gray-600 hover:bg-gray-50 hover:text-gray-900',
|
|
103
|
-
'flex items-center rounded
|
|
101
|
+
'flex items-center rounded px-3 py-2 text-sm font-medium w-full text-left'
|
|
104
102
|
)}
|
|
105
103
|
onClick={async () => {
|
|
106
104
|
if (typeof value === 'function') {
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
/**
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
*/
|
|
6
|
-
import React from 'react';
|
|
7
|
-
import { XCircleIcon } from '@heroicons/react/solid';
|
|
8
1
|
import {
|
|
9
2
|
Popover,
|
|
10
3
|
PopoverButton,
|
|
11
4
|
PopoverPanel,
|
|
12
5
|
Transition,
|
|
13
6
|
} from '@headlessui/react';
|
|
7
|
+
import { XCircleIcon } from '@heroicons/react/solid';
|
|
8
|
+
/**
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
*/
|
|
13
|
+
import React from 'react';
|
|
14
14
|
import { Fragment } from 'react';
|
|
15
15
|
// import { InvalidMarkdownElement } from '@tinacms/mdx/src/parse/plate'
|
|
16
16
|
export type EmptyTextElement = { type: 'text'; text: '' };
|
|
@@ -93,7 +93,7 @@ export function ErrorMessage({ error }: { error: InvalidMarkdownElement }) {
|
|
|
93
93
|
>
|
|
94
94
|
<PopoverPanel className='absolute top-8 w-[300px] -right-3 z-10 mt-3 px-4 sm:px-0'>
|
|
95
95
|
<div className='overflow-hidden rounded-lg shadow-lg ring-1 ring-black ring-opacity-5'>
|
|
96
|
-
<div className='rounded
|
|
96
|
+
<div className='rounded bg-red-50 p-4 overflow-scroll'>
|
|
97
97
|
<div className='flex'>
|
|
98
98
|
<div className='flex-shrink-0'>
|
|
99
99
|
<XCircleIcon
|
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
*/
|
|
6
|
-
|
|
7
1
|
import React from 'react';
|
|
8
2
|
import MonacoEditor, { useMonaco, loader } from '@monaco-editor/react';
|
|
9
3
|
/**
|
|
@@ -12,15 +6,15 @@ import MonacoEditor, { useMonaco, loader } from '@monaco-editor/react';
|
|
|
12
6
|
* easily install the current version of the mdx package in all scenarios
|
|
13
7
|
* (when we're working in the monorepo, or working with a tagged npm version)
|
|
14
8
|
*/
|
|
15
|
-
import { parseMDX,
|
|
16
|
-
import { useDebounce } from './use-debounce';
|
|
9
|
+
import { parseMDX, serializeMDX } from '@tinacms/mdx';
|
|
17
10
|
import type * as monaco from 'monaco-editor';
|
|
11
|
+
import { RichTextType } from 'tinacms';
|
|
18
12
|
import {
|
|
19
|
-
buildError,
|
|
20
13
|
ErrorMessage,
|
|
21
14
|
InvalidMarkdownElement,
|
|
15
|
+
buildError,
|
|
22
16
|
} from './error-message';
|
|
23
|
-
import {
|
|
17
|
+
import { useDebounce } from './use-debounce';
|
|
24
18
|
|
|
25
19
|
export const uuid = () => {
|
|
26
20
|
// @ts-ignore
|
|
@@ -34,11 +28,6 @@ export const uuid = () => {
|
|
|
34
28
|
|
|
35
29
|
type Monaco = typeof monaco;
|
|
36
30
|
|
|
37
|
-
// 0.33.0 has a bug https://github.com/microsoft/monaco-editor/issues/2947
|
|
38
|
-
loader.config({
|
|
39
|
-
paths: { vs: 'https://cdn.jsdelivr.net/npm/monaco-editor@0.31.1/min/vs' },
|
|
40
|
-
});
|
|
41
|
-
|
|
42
31
|
/**
|
|
43
32
|
* Since monaco lazy-loads we may have a delay from when the block is inserted
|
|
44
33
|
* to when monaco has intantiated, keep trying to focus on it.
|
|
@@ -68,7 +57,7 @@ export const RawEditor = (props: RichTextType) => {
|
|
|
68
57
|
const field = props.field;
|
|
69
58
|
const inputValue = React.useMemo(() => {
|
|
70
59
|
// @ts-ignore no access to the rich-text type from this package
|
|
71
|
-
const res =
|
|
60
|
+
const res = serializeMDX(props.input.value, field, (value) => value);
|
|
72
61
|
return typeof props.input.value === 'string' ? props.input.value : res;
|
|
73
62
|
}, []);
|
|
74
63
|
const [value, setValue] = React.useState(inputValue);
|
|
@@ -149,13 +138,17 @@ export const RawEditor = (props: RichTextType) => {
|
|
|
149
138
|
monacoEditor: monaco.editor.IStandaloneCodeEditor,
|
|
150
139
|
monaco: Monaco
|
|
151
140
|
) {
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
141
|
+
if (monacoEditor) {
|
|
142
|
+
monacoEditorRef.current = monacoEditor;
|
|
143
|
+
monacoEditor.onDidContentSizeChange(() => {
|
|
144
|
+
// FIXME: if the window is too tall the performance degrades, come up with a nice
|
|
145
|
+
// balance between the two
|
|
146
|
+
setHeight(
|
|
147
|
+
Math.min(Math.max(100, monacoEditor.getContentHeight()), 1000)
|
|
148
|
+
);
|
|
149
|
+
monacoEditor.layout();
|
|
150
|
+
});
|
|
151
|
+
}
|
|
159
152
|
}
|
|
160
153
|
|
|
161
154
|
return (
|
|
@@ -168,6 +161,9 @@ export const RawEditor = (props: RichTextType) => {
|
|
|
168
161
|
</div>
|
|
169
162
|
<div style={{ height: `${height}px` }}>
|
|
170
163
|
<MonacoEditor
|
|
164
|
+
beforeMount={() => {}}
|
|
165
|
+
height='100%'
|
|
166
|
+
width='100%'
|
|
171
167
|
path={id}
|
|
172
168
|
onMount={handleEditorDidMount}
|
|
173
169
|
// Setting a custom theme is kind of buggy because it doesn't get defined until monaco has mounted.
|
|
@@ -219,10 +215,8 @@ const Button = (props) => {
|
|
|
219
215
|
return (
|
|
220
216
|
<button
|
|
221
217
|
className={`${
|
|
222
|
-
props.align === 'left'
|
|
223
|
-
|
|
224
|
-
: 'rounded-r-md border-l-0'
|
|
225
|
-
} flex justify-center w-full shadow rounded-md bg-white cursor-pointer relative inline-flex items-center px-2 py-2 border border-gray-200 hover:text-white text-sm font-medium transition-all ease-out duration-150 hover:bg-blue-500 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500`}
|
|
218
|
+
props.align === 'left' ? 'rounded-l border-r-0' : 'rounded-r border-l-0'
|
|
219
|
+
} flex justify-center w-full shadow rounded bg-white cursor-pointer relative inline-flex items-center px-2 py-2 border border-gray-200 hover:text-white text-sm font-medium transition-all ease-out duration-150 hover:bg-blue-500 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500`}
|
|
226
220
|
type='button'
|
|
227
221
|
onClick={props.onClick}
|
|
228
222
|
>
|
package/src/index.css
CHANGED
|
@@ -13,6 +13,10 @@
|
|
|
13
13
|
fill: currentColor;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
+
.font-libre-baskerville {
|
|
17
|
+
font-family: "Libre Baskerville", serif;
|
|
18
|
+
}
|
|
19
|
+
|
|
16
20
|
body {
|
|
17
21
|
margin: 0;
|
|
18
22
|
padding: 0;
|
|
@@ -382,3 +386,8 @@ td.rdtYear:hover {
|
|
|
382
386
|
.tina-date-field .rdtTime td {
|
|
383
387
|
cursor: default;
|
|
384
388
|
}
|
|
389
|
+
|
|
390
|
+
/* Override Radix UI Portal wrapper z-index for dropdown menus */
|
|
391
|
+
[data-radix-popper-content-wrapper] {
|
|
392
|
+
z-index: 10800 !important;
|
|
393
|
+
}
|
package/src/lib/expand-query.ts
CHANGED
|
@@ -103,12 +103,11 @@ const addMetadataField = (
|
|
|
103
103
|
kind: 'SelectionSet',
|
|
104
104
|
selections: [],
|
|
105
105
|
}),
|
|
106
|
-
selections:
|
|
107
|
-
[
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
] || [],
|
|
106
|
+
selections: [
|
|
107
|
+
...(node.selectionSet?.selections || []),
|
|
108
|
+
METADATA_FIELD,
|
|
109
|
+
CONTENT_SOURCE_FIELD,
|
|
110
|
+
],
|
|
112
111
|
},
|
|
113
112
|
};
|
|
114
113
|
};
|
|
@@ -127,8 +126,7 @@ const addMetaFieldsToQuery = (
|
|
|
127
126
|
kind: 'SelectionSet',
|
|
128
127
|
selections: [],
|
|
129
128
|
}),
|
|
130
|
-
selections:
|
|
131
|
-
[...(node.selectionSet?.selections || []), ...metaFields] || [],
|
|
129
|
+
selections: [...(node.selectionSet?.selections || []), ...metaFields],
|
|
132
130
|
},
|
|
133
131
|
};
|
|
134
132
|
};
|
|
@@ -242,6 +240,7 @@ export const isNodeType = (type: G.GraphQLOutputType) => {
|
|
|
242
240
|
return true;
|
|
243
241
|
}
|
|
244
242
|
}
|
|
243
|
+
return false;
|
|
245
244
|
};
|
|
246
245
|
|
|
247
246
|
export const isConnectionType = (type: G.GraphQLOutputType) => {
|
|
@@ -270,4 +269,5 @@ export const isConnectionType = (type: G.GraphQLOutputType) => {
|
|
|
270
269
|
return true;
|
|
271
270
|
}
|
|
272
271
|
}
|
|
272
|
+
return false;
|
|
273
273
|
};
|
|
@@ -45,7 +45,7 @@ const sysSchema = z.object({
|
|
|
45
45
|
collection: z.object({
|
|
46
46
|
name: z.string(),
|
|
47
47
|
slug: z.string(),
|
|
48
|
-
label: z.string(),
|
|
48
|
+
label: z.string().optional().nullable(),
|
|
49
49
|
path: z.string(),
|
|
50
50
|
format: z.string().optional().nullable(),
|
|
51
51
|
matches: z.string().optional().nullable(),
|
|
@@ -305,6 +305,7 @@ export const useGraphQLReducer = (
|
|
|
305
305
|
prefix: '',
|
|
306
306
|
};
|
|
307
307
|
}
|
|
308
|
+
|
|
308
309
|
if (isConnectionType(info.returnType)) {
|
|
309
310
|
const name = G.getNamedType(info.returnType).name;
|
|
310
311
|
const connectionCollection = tinaSchema
|
|
@@ -339,6 +340,7 @@ export const useGraphQLReducer = (
|
|
|
339
340
|
const maybeResolvedDocument = resolvedDocuments.find(
|
|
340
341
|
(doc) => doc._internalSys.path === value
|
|
341
342
|
);
|
|
343
|
+
|
|
342
344
|
// If we already have this document, use it.
|
|
343
345
|
if (maybeResolvedDocument) {
|
|
344
346
|
resolvedDocument = maybeResolvedDocument;
|
|
@@ -349,6 +351,7 @@ export const useGraphQLReducer = (
|
|
|
349
351
|
// here and just grab it from the response
|
|
350
352
|
const maybeResolvedDocument =
|
|
351
353
|
documentSchema.parse(valueFromSetup);
|
|
354
|
+
|
|
352
355
|
if (maybeResolvedDocument._internalSys.path === value) {
|
|
353
356
|
resolvedDocument = maybeResolvedDocument;
|
|
354
357
|
} else {
|
|
@@ -559,12 +562,14 @@ export const useGraphQLReducer = (
|
|
|
559
562
|
payload,
|
|
560
563
|
]);
|
|
561
564
|
}
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
565
|
+
// TODO: This is causing a webpack HMR issue - look into refactoring this logic
|
|
566
|
+
// if (event.data.type === 'url-changed') {
|
|
567
|
+
// console.log('[EVENT_TRIGGERED] url-changed: ', event);
|
|
568
|
+
// cms.dispatch({
|
|
569
|
+
// type: 'sidebar:set-loading-state',
|
|
570
|
+
// value: true,
|
|
571
|
+
// });
|
|
572
|
+
// }
|
|
568
573
|
},
|
|
569
574
|
[cms, JSON.stringify(results)]
|
|
570
575
|
);
|
package/src/lib/util.ts
CHANGED
|
@@ -108,27 +108,22 @@ export const getFormAndFieldNameFromMetadata = (
|
|
|
108
108
|
object: object,
|
|
109
109
|
eventFieldName: string
|
|
110
110
|
) => {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
: fieldName;
|
|
120
|
-
if (localFieldName) {
|
|
121
|
-
// If localFieldName is tags.2, just use `tags`
|
|
122
|
-
if (!isNaN(Number(localFieldName.split('.')[1]))) {
|
|
123
|
-
n = value.fields[localFieldName.split('.')[0]];
|
|
124
|
-
} else {
|
|
125
|
-
n = value.fields[localFieldName];
|
|
126
|
-
}
|
|
127
|
-
} else {
|
|
128
|
-
n = value.name;
|
|
129
|
-
}
|
|
130
|
-
formId = value.id;
|
|
131
|
-
}
|
|
111
|
+
const metadata = getDeepestMetadata(object, eventFieldName);
|
|
112
|
+
|
|
113
|
+
if (!metadata) {
|
|
114
|
+
console.warn(
|
|
115
|
+
'[getFormAndFieldNameFromMetadata] No metadata found for:',
|
|
116
|
+
eventFieldName
|
|
117
|
+
);
|
|
118
|
+
return { formId: undefined, fieldName: undefined };
|
|
132
119
|
}
|
|
133
|
-
|
|
120
|
+
|
|
121
|
+
const { id: formId, prefix } = metadata;
|
|
122
|
+
const prefixLength = prefix?.length ?? 0;
|
|
123
|
+
const localFieldName = eventFieldName.slice(prefixLength + 1);
|
|
124
|
+
|
|
125
|
+
return {
|
|
126
|
+
formId,
|
|
127
|
+
fieldName: localFieldName,
|
|
128
|
+
};
|
|
134
129
|
};
|