@payloadcms/richtext-slate 3.0.0-beta.9 → 3.0.0-canary.f6e77b8
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/dist/data/populate.d.ts +4 -3
- package/dist/data/populate.d.ts.map +1 -1
- package/dist/data/populate.js +13 -11
- package/dist/data/populate.js.map +1 -1
- package/dist/data/recurseNestedFields.d.ts +5 -4
- package/dist/data/recurseNestedFields.d.ts.map +1 -1
- package/dist/data/recurseNestedFields.js +21 -11
- package/dist/data/recurseNestedFields.js.map +1 -1
- package/dist/data/richTextRelationshipPromise.d.ts +7 -6
- package/dist/data/richTextRelationshipPromise.d.ts.map +1 -1
- package/dist/data/richTextRelationshipPromise.js +14 -10
- package/dist/data/richTextRelationshipPromise.js.map +1 -1
- package/dist/data/validation.js +3 -3
- package/dist/data/validation.js.map +1 -1
- package/dist/field/RichText.d.ts +0 -2
- package/dist/field/RichText.d.ts.map +1 -1
- package/dist/field/RichText.js +5 -1
- package/dist/field/RichText.js.map +1 -1
- package/dist/field/elements/link/LinkDrawer/baseFields.d.ts +2 -2
- package/dist/field/elements/link/LinkDrawer/baseFields.d.ts.map +1 -1
- package/dist/field/elements/link/LinkDrawer/baseFields.js.map +1 -1
- package/dist/field/elements/link/utilities.d.ts +1 -3
- package/dist/field/elements/link/utilities.d.ts.map +1 -1
- package/dist/field/elements/link/utilities.js +3 -4
- package/dist/field/elements/link/utilities.js.map +1 -1
- package/dist/generateComponentMap.d.ts.map +1 -1
- package/dist/generateComponentMap.js +2 -15
- package/dist/generateComponentMap.js.map +1 -1
- package/dist/generateSchemaMap.d.ts.map +1 -1
- package/dist/generateSchemaMap.js +3 -16
- package/dist/generateSchemaMap.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +61 -30
- package/dist/index.js.map +1 -1
- package/dist/types.d.ts +0 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +23 -17
- package/src/index.tsx +0 -82
package/dist/data/populate.d.ts
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { PayloadRequestWithData } from 'payload/types';
|
|
2
2
|
import type { Collection, Field, RichTextField } from 'payload/types';
|
|
3
3
|
import type { AdapterArguments } from '../types.js';
|
|
4
4
|
type Arguments = {
|
|
5
5
|
currentDepth?: number;
|
|
6
6
|
data: unknown;
|
|
7
7
|
depth: number;
|
|
8
|
+
draft: boolean;
|
|
8
9
|
field: RichTextField<any[], AdapterArguments, AdapterArguments>;
|
|
9
10
|
key: number | string;
|
|
10
11
|
overrideAccess?: boolean;
|
|
11
|
-
req:
|
|
12
|
+
req: PayloadRequestWithData;
|
|
12
13
|
showHiddenFields: boolean;
|
|
13
14
|
};
|
|
14
|
-
export declare const populate: ({ id, collection, currentDepth, data, depth, key, overrideAccess, req, showHiddenFields, }: Omit<Arguments, 'field'> & {
|
|
15
|
+
export declare const populate: ({ id, collection, currentDepth, data, depth, draft, key, overrideAccess, req, showHiddenFields, }: Omit<Arguments, 'field'> & {
|
|
15
16
|
collection: Collection;
|
|
16
17
|
field: Field;
|
|
17
18
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../src/data/populate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../src/data/populate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAIrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,KAAK,SAAS,GAAG;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,KAAK,EAAE,aAAa,CAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;IAC/D,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,sBAAsB,CAAA;IAC3B,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,QAAQ,sGAWlB,KAAK,SAAS,EAAE,OAAO,CAAC,GAAG;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,KAAK,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;CACX,KAAG,QAAQ,IAAI,CAuBf,CAAA"}
|
package/dist/data/populate.js
CHANGED
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
|
|
1
|
+
import { createDataloaderCacheKey } from 'payload/utilities';
|
|
2
|
+
export const populate = async ({ id, collection, currentDepth, data, depth, draft, key, overrideAccess, req, showHiddenFields })=>{
|
|
2
3
|
const dataRef = data;
|
|
3
|
-
const doc = await req.payloadDataLoader.load(
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
id,
|
|
4
|
+
const doc = await req.payloadDataLoader.load(createDataloaderCacheKey({
|
|
5
|
+
collectionSlug: collection.config.slug,
|
|
6
|
+
currentDepth: currentDepth + 1,
|
|
7
7
|
depth,
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
req.
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
8
|
+
docID: id,
|
|
9
|
+
draft,
|
|
10
|
+
fallbackLocale: req.locale,
|
|
11
|
+
locale: req.fallbackLocale,
|
|
12
|
+
overrideAccess: typeof overrideAccess === 'undefined' ? false : overrideAccess,
|
|
13
|
+
showHiddenFields,
|
|
14
|
+
transactionID: req.transactionID
|
|
15
|
+
}));
|
|
14
16
|
if (doc) {
|
|
15
17
|
dataRef[key] = doc;
|
|
16
18
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/data/populate.ts"],"sourcesContent":["import type {
|
|
1
|
+
{"version":3,"sources":["../../src/data/populate.ts"],"sourcesContent":["import type { PayloadRequestWithData } from 'payload/types'\nimport type { Collection, Field, RichTextField } from 'payload/types'\n\nimport { createDataloaderCacheKey } from 'payload/utilities'\n\nimport type { AdapterArguments } from '../types.js'\n\ntype Arguments = {\n currentDepth?: number\n data: unknown\n depth: number\n draft: boolean\n field: RichTextField<any[], AdapterArguments, AdapterArguments>\n key: number | string\n overrideAccess?: boolean\n req: PayloadRequestWithData\n showHiddenFields: boolean\n}\n\nexport const populate = async ({\n id,\n collection,\n currentDepth,\n data,\n depth,\n draft,\n key,\n overrideAccess,\n req,\n showHiddenFields,\n}: Omit<Arguments, 'field'> & {\n collection: Collection\n field: Field\n id: string\n}): Promise<void> => {\n const dataRef = data as Record<string, unknown>\n\n const doc = await req.payloadDataLoader.load(\n createDataloaderCacheKey({\n collectionSlug: collection.config.slug,\n currentDepth: currentDepth + 1,\n depth,\n docID: id,\n draft,\n fallbackLocale: req.locale,\n locale: req.fallbackLocale,\n overrideAccess: typeof overrideAccess === 'undefined' ? false : overrideAccess,\n showHiddenFields,\n transactionID: req.transactionID,\n }),\n )\n\n if (doc) {\n dataRef[key] = doc\n } else {\n dataRef[key] = null\n }\n}\n"],"names":["createDataloaderCacheKey","populate","id","collection","currentDepth","data","depth","draft","key","overrideAccess","req","showHiddenFields","dataRef","doc","payloadDataLoader","load","collectionSlug","config","slug","docID","fallbackLocale","locale","transactionID"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,wBAAwB,QAAQ,oBAAmB;AAgB5D,OAAO,MAAMC,WAAW,OAAO,EAC7BC,EAAE,EACFC,UAAU,EACVC,YAAY,EACZC,IAAI,EACJC,KAAK,EACLC,KAAK,EACLC,GAAG,EACHC,cAAc,EACdC,GAAG,EACHC,gBAAgB,EAKjB;IACC,MAAMC,UAAUP;IAEhB,MAAMQ,MAAM,MAAMH,IAAII,iBAAiB,CAACC,IAAI,CAC1Cf,yBAAyB;QACvBgB,gBAAgBb,WAAWc,MAAM,CAACC,IAAI;QACtCd,cAAcA,eAAe;QAC7BE;QACAa,OAAOjB;QACPK;QACAa,gBAAgBV,IAAIW,MAAM;QAC1BA,QAAQX,IAAIU,cAAc;QAC1BX,gBAAgB,OAAOA,mBAAmB,cAAc,QAAQA;QAChEE;QACAW,eAAeZ,IAAIY,aAAa;IAClC;IAGF,IAAIT,KAAK;QACPD,OAAO,CAACJ,IAAI,GAAGK;IACjB,OAAO;QACLD,OAAO,CAACJ,IAAI,GAAG;IACjB;AACF,EAAC"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
import type { Field,
|
|
1
|
+
import type { Field, PayloadRequestWithData } from 'payload/types';
|
|
2
2
|
type NestedRichTextFieldsArgs = {
|
|
3
3
|
currentDepth?: number;
|
|
4
4
|
data: unknown;
|
|
5
5
|
depth: number;
|
|
6
|
+
draft: boolean;
|
|
6
7
|
fields: Field[];
|
|
7
8
|
overrideAccess: boolean;
|
|
8
|
-
|
|
9
|
-
req:
|
|
9
|
+
populationPromises: Promise<void>[];
|
|
10
|
+
req: PayloadRequestWithData;
|
|
10
11
|
showHiddenFields: boolean;
|
|
11
12
|
};
|
|
12
|
-
export declare const recurseNestedFields: ({ currentDepth, data, depth, fields, overrideAccess,
|
|
13
|
+
export declare const recurseNestedFields: ({ currentDepth, data, depth, draft, fields, overrideAccess, populationPromises, req, showHiddenFields, }: NestedRichTextFieldsArgs) => void;
|
|
13
14
|
export {};
|
|
14
15
|
//# sourceMappingURL=recurseNestedFields.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recurseNestedFields.d.ts","sourceRoot":"","sources":["../../src/data/recurseNestedFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"recurseNestedFields.d.ts","sourceRoot":"","sources":["../../src/data/recurseNestedFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAOlE,KAAK,wBAAwB,GAAG;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,cAAc,EAAE,OAAO,CAAA;IACvB,kBAAkB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;IACnC,GAAG,EAAE,sBAAsB,CAAA;IAC3B,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,mBAAmB,6GAU7B,wBAAwB,KAAG,IA0L7B,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { fieldAffectsData, fieldHasSubFields, fieldIsArrayType } from 'payload/types';
|
|
2
2
|
import { populate } from './populate.js';
|
|
3
3
|
import { recurseRichText } from './richTextRelationshipPromise.js';
|
|
4
|
-
export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, overrideAccess = false,
|
|
4
|
+
export const recurseNestedFields = ({ currentDepth = 0, data, depth, draft, fields, overrideAccess = false, populationPromises, req, showHiddenFields })=>{
|
|
5
5
|
fields.forEach((field)=>{
|
|
6
6
|
if (field.type === 'relationship' || field.type === 'upload') {
|
|
7
7
|
if (field.type === 'relationship') {
|
|
@@ -10,12 +10,13 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
|
|
|
10
10
|
data[field.name].forEach(({ relationTo, value }, i)=>{
|
|
11
11
|
const collection = req.payload.collections[relationTo];
|
|
12
12
|
if (collection) {
|
|
13
|
-
|
|
13
|
+
populationPromises.push(populate({
|
|
14
14
|
id: value,
|
|
15
15
|
collection,
|
|
16
16
|
currentDepth,
|
|
17
17
|
data: data[field.name],
|
|
18
18
|
depth,
|
|
19
|
+
draft,
|
|
19
20
|
field,
|
|
20
21
|
key: i,
|
|
21
22
|
overrideAccess,
|
|
@@ -28,12 +29,13 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
|
|
|
28
29
|
data[field.name].forEach((id, i)=>{
|
|
29
30
|
const collection = req.payload.collections[field.relationTo];
|
|
30
31
|
if (collection) {
|
|
31
|
-
|
|
32
|
+
populationPromises.push(populate({
|
|
32
33
|
id,
|
|
33
34
|
collection,
|
|
34
35
|
currentDepth,
|
|
35
36
|
data: data[field.name],
|
|
36
37
|
depth,
|
|
38
|
+
draft,
|
|
37
39
|
field,
|
|
38
40
|
key: i,
|
|
39
41
|
overrideAccess,
|
|
@@ -46,12 +48,13 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
|
|
|
46
48
|
} else if (Array.isArray(field.relationTo) && data[field.name]?.value && data[field.name]?.relationTo) {
|
|
47
49
|
if (!('hasMany' in field) || !field.hasMany) {
|
|
48
50
|
const collection = req.payload.collections[data[field.name].relationTo];
|
|
49
|
-
|
|
51
|
+
populationPromises.push(populate({
|
|
50
52
|
id: data[field.name].value,
|
|
51
53
|
collection,
|
|
52
54
|
currentDepth,
|
|
53
55
|
data: data[field.name],
|
|
54
56
|
depth,
|
|
57
|
+
draft,
|
|
55
58
|
field,
|
|
56
59
|
key: 'value',
|
|
57
60
|
overrideAccess,
|
|
@@ -63,12 +66,13 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
|
|
|
63
66
|
}
|
|
64
67
|
if (typeof data[field.name] !== 'undefined' && typeof field.relationTo === 'string') {
|
|
65
68
|
const collection = req.payload.collections[field.relationTo];
|
|
66
|
-
|
|
69
|
+
populationPromises.push(populate({
|
|
67
70
|
id: data[field.name],
|
|
68
71
|
collection,
|
|
69
72
|
currentDepth,
|
|
70
73
|
data,
|
|
71
74
|
depth,
|
|
75
|
+
draft,
|
|
72
76
|
field,
|
|
73
77
|
key: field.name,
|
|
74
78
|
overrideAccess,
|
|
@@ -82,9 +86,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
|
|
|
82
86
|
currentDepth,
|
|
83
87
|
data: data[field.name],
|
|
84
88
|
depth,
|
|
89
|
+
draft,
|
|
85
90
|
fields: field.fields,
|
|
86
91
|
overrideAccess,
|
|
87
|
-
|
|
92
|
+
populationPromises,
|
|
88
93
|
req,
|
|
89
94
|
showHiddenFields
|
|
90
95
|
});
|
|
@@ -93,9 +98,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
|
|
|
93
98
|
currentDepth,
|
|
94
99
|
data,
|
|
95
100
|
depth,
|
|
101
|
+
draft,
|
|
96
102
|
fields: field.fields,
|
|
97
103
|
overrideAccess,
|
|
98
|
-
|
|
104
|
+
populationPromises,
|
|
99
105
|
req,
|
|
100
106
|
showHiddenFields
|
|
101
107
|
});
|
|
@@ -106,9 +112,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
|
|
|
106
112
|
currentDepth,
|
|
107
113
|
data,
|
|
108
114
|
depth,
|
|
115
|
+
draft,
|
|
109
116
|
fields: tab.fields,
|
|
110
117
|
overrideAccess,
|
|
111
|
-
|
|
118
|
+
populationPromises,
|
|
112
119
|
req,
|
|
113
120
|
showHiddenFields
|
|
114
121
|
});
|
|
@@ -122,9 +129,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
|
|
|
122
129
|
currentDepth,
|
|
123
130
|
data: data[field.name][i],
|
|
124
131
|
depth,
|
|
132
|
+
draft,
|
|
125
133
|
fields: block.fields,
|
|
126
134
|
overrideAccess,
|
|
127
|
-
|
|
135
|
+
populationPromises,
|
|
128
136
|
req,
|
|
129
137
|
showHiddenFields
|
|
130
138
|
});
|
|
@@ -137,9 +145,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
|
|
|
137
145
|
currentDepth,
|
|
138
146
|
data: data[field.name][i],
|
|
139
147
|
depth,
|
|
148
|
+
draft,
|
|
140
149
|
fields: field.fields,
|
|
141
150
|
overrideAccess,
|
|
142
|
-
|
|
151
|
+
populationPromises,
|
|
143
152
|
req,
|
|
144
153
|
showHiddenFields
|
|
145
154
|
});
|
|
@@ -153,9 +162,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
|
|
|
153
162
|
children: node.children,
|
|
154
163
|
currentDepth,
|
|
155
164
|
depth,
|
|
165
|
+
draft,
|
|
156
166
|
field,
|
|
157
167
|
overrideAccess,
|
|
158
|
-
|
|
168
|
+
populationPromises,
|
|
159
169
|
req,
|
|
160
170
|
showHiddenFields
|
|
161
171
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/data/recurseNestedFields.ts"],"sourcesContent":["import type { Field, PayloadRequest } from 'payload/types'\n\nimport { fieldAffectsData, fieldHasSubFields, fieldIsArrayType } from 'payload/types'\n\nimport { populate } from './populate.js'\nimport { recurseRichText } from './richTextRelationshipPromise.js'\n\ntype NestedRichTextFieldsArgs = {\n currentDepth?: number\n data: unknown\n depth: number\n fields: Field[]\n overrideAccess: boolean\n promises: Promise<void>[]\n req: PayloadRequest\n showHiddenFields: boolean\n}\n\nexport const recurseNestedFields = ({\n currentDepth = 0,\n data,\n depth,\n fields,\n overrideAccess = false,\n promises,\n req,\n showHiddenFields,\n}: NestedRichTextFieldsArgs): void => {\n fields.forEach((field) => {\n if (field.type === 'relationship' || field.type === 'upload') {\n if (field.type === 'relationship') {\n if (field.hasMany && Array.isArray(data[field.name])) {\n if (Array.isArray(field.relationTo)) {\n data[field.name].forEach(({ relationTo, value }, i) => {\n const collection = req.payload.collections[relationTo]\n if (collection) {\n promises.push(\n populate({\n id: value,\n collection,\n currentDepth,\n data: data[field.name],\n depth,\n field,\n key: i,\n overrideAccess,\n req,\n showHiddenFields,\n }),\n )\n }\n })\n } else {\n data[field.name].forEach((id, i) => {\n const collection = req.payload.collections[field.relationTo as string]\n if (collection) {\n promises.push(\n populate({\n id,\n collection,\n currentDepth,\n data: data[field.name],\n depth,\n field,\n key: i,\n overrideAccess,\n req,\n showHiddenFields,\n }),\n )\n }\n })\n }\n } else if (\n Array.isArray(field.relationTo) &&\n data[field.name]?.value &&\n data[field.name]?.relationTo\n ) {\n if (!('hasMany' in field) || !field.hasMany) {\n const collection = req.payload.collections[data[field.name].relationTo]\n promises.push(\n populate({\n id: data[field.name].value,\n collection,\n currentDepth,\n data: data[field.name],\n depth,\n field,\n key: 'value',\n overrideAccess,\n req,\n showHiddenFields,\n }),\n )\n }\n }\n }\n if (typeof data[field.name] !== 'undefined' && typeof field.relationTo === 'string') {\n const collection = req.payload.collections[field.relationTo]\n promises.push(\n populate({\n id: data[field.name],\n collection,\n currentDepth,\n data,\n depth,\n field,\n key: field.name,\n overrideAccess,\n req,\n showHiddenFields,\n }),\n )\n }\n } else if (fieldHasSubFields(field) && !fieldIsArrayType(field)) {\n if (fieldAffectsData(field) && typeof data[field.name] === 'object') {\n recurseNestedFields({\n currentDepth,\n data: data[field.name],\n depth,\n fields: field.fields,\n overrideAccess,\n promises,\n req,\n showHiddenFields,\n })\n } else {\n recurseNestedFields({\n currentDepth,\n data,\n depth,\n fields: field.fields,\n overrideAccess,\n promises,\n req,\n showHiddenFields,\n })\n }\n } else if (field.type === 'tabs') {\n field.tabs.forEach((tab) => {\n recurseNestedFields({\n currentDepth,\n data,\n depth,\n fields: tab.fields,\n overrideAccess,\n promises,\n req,\n showHiddenFields,\n })\n })\n } else if (Array.isArray(data[field.name])) {\n if (field.type === 'blocks') {\n data[field.name].forEach((row, i) => {\n const block = field.blocks.find(({ slug }) => slug === row?.blockType)\n if (block) {\n recurseNestedFields({\n currentDepth,\n data: data[field.name][i],\n depth,\n fields: block.fields,\n overrideAccess,\n promises,\n req,\n showHiddenFields,\n })\n }\n })\n }\n\n if (field.type === 'array') {\n data[field.name].forEach((_, i) => {\n recurseNestedFields({\n currentDepth,\n data: data[field.name][i],\n depth,\n fields: field.fields,\n overrideAccess,\n promises,\n req,\n showHiddenFields,\n })\n })\n }\n }\n\n if (field.type === 'richText' && Array.isArray(data[field.name])) {\n data[field.name].forEach((node) => {\n if (Array.isArray(node.children)) {\n recurseRichText({\n children: node.children,\n currentDepth,\n depth,\n field,\n overrideAccess,\n promises,\n req,\n showHiddenFields,\n })\n }\n })\n }\n })\n}\n"],"names":["fieldAffectsData","fieldHasSubFields","fieldIsArrayType","populate","recurseRichText","recurseNestedFields","currentDepth","data","depth","fields","overrideAccess","promises","req","showHiddenFields","forEach","field","type","hasMany","Array","isArray","name","relationTo","value","i","collection","payload","collections","push","id","key","tabs","tab","row","block","blocks","find","slug","blockType","_","node","children"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/data/recurseNestedFields.ts"],"sourcesContent":["import type { Field, PayloadRequestWithData } from 'payload/types'\n\nimport { fieldAffectsData, fieldHasSubFields, fieldIsArrayType } from 'payload/types'\n\nimport { populate } from './populate.js'\nimport { recurseRichText } from './richTextRelationshipPromise.js'\n\ntype NestedRichTextFieldsArgs = {\n currentDepth?: number\n data: unknown\n depth: number\n draft: boolean\n fields: Field[]\n overrideAccess: boolean\n populationPromises: Promise<void>[]\n req: PayloadRequestWithData\n showHiddenFields: boolean\n}\n\nexport const recurseNestedFields = ({\n currentDepth = 0,\n data,\n depth,\n draft,\n fields,\n overrideAccess = false,\n populationPromises,\n req,\n showHiddenFields,\n}: NestedRichTextFieldsArgs): void => {\n fields.forEach((field) => {\n if (field.type === 'relationship' || field.type === 'upload') {\n if (field.type === 'relationship') {\n if (field.hasMany && Array.isArray(data[field.name])) {\n if (Array.isArray(field.relationTo)) {\n data[field.name].forEach(({ relationTo, value }, i) => {\n const collection = req.payload.collections[relationTo]\n if (collection) {\n populationPromises.push(\n populate({\n id: value,\n collection,\n currentDepth,\n data: data[field.name],\n depth,\n draft,\n field,\n key: i,\n overrideAccess,\n req,\n showHiddenFields,\n }),\n )\n }\n })\n } else {\n data[field.name].forEach((id, i) => {\n const collection = req.payload.collections[field.relationTo as string]\n if (collection) {\n populationPromises.push(\n populate({\n id,\n collection,\n currentDepth,\n data: data[field.name],\n depth,\n draft,\n field,\n key: i,\n overrideAccess,\n req,\n showHiddenFields,\n }),\n )\n }\n })\n }\n } else if (\n Array.isArray(field.relationTo) &&\n data[field.name]?.value &&\n data[field.name]?.relationTo\n ) {\n if (!('hasMany' in field) || !field.hasMany) {\n const collection = req.payload.collections[data[field.name].relationTo]\n populationPromises.push(\n populate({\n id: data[field.name].value,\n collection,\n currentDepth,\n data: data[field.name],\n depth,\n draft,\n field,\n key: 'value',\n overrideAccess,\n req,\n showHiddenFields,\n }),\n )\n }\n }\n }\n if (typeof data[field.name] !== 'undefined' && typeof field.relationTo === 'string') {\n const collection = req.payload.collections[field.relationTo]\n populationPromises.push(\n populate({\n id: data[field.name],\n collection,\n currentDepth,\n data,\n depth,\n draft,\n field,\n key: field.name,\n overrideAccess,\n req,\n showHiddenFields,\n }),\n )\n }\n } else if (fieldHasSubFields(field) && !fieldIsArrayType(field)) {\n if (fieldAffectsData(field) && typeof data[field.name] === 'object') {\n recurseNestedFields({\n currentDepth,\n data: data[field.name],\n depth,\n draft,\n fields: field.fields,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n })\n } else {\n recurseNestedFields({\n currentDepth,\n data,\n depth,\n draft,\n fields: field.fields,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n })\n }\n } else if (field.type === 'tabs') {\n field.tabs.forEach((tab) => {\n recurseNestedFields({\n currentDepth,\n data,\n depth,\n draft,\n fields: tab.fields,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n })\n })\n } else if (Array.isArray(data[field.name])) {\n if (field.type === 'blocks') {\n data[field.name].forEach((row, i) => {\n const block = field.blocks.find(({ slug }) => slug === row?.blockType)\n if (block) {\n recurseNestedFields({\n currentDepth,\n data: data[field.name][i],\n depth,\n draft,\n fields: block.fields,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n })\n }\n })\n }\n\n if (field.type === 'array') {\n data[field.name].forEach((_, i) => {\n recurseNestedFields({\n currentDepth,\n data: data[field.name][i],\n depth,\n draft,\n fields: field.fields,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n })\n })\n }\n }\n\n if (field.type === 'richText' && Array.isArray(data[field.name])) {\n data[field.name].forEach((node) => {\n if (Array.isArray(node.children)) {\n recurseRichText({\n children: node.children,\n currentDepth,\n depth,\n draft,\n field,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n })\n }\n })\n }\n })\n}\n"],"names":["fieldAffectsData","fieldHasSubFields","fieldIsArrayType","populate","recurseRichText","recurseNestedFields","currentDepth","data","depth","draft","fields","overrideAccess","populationPromises","req","showHiddenFields","forEach","field","type","hasMany","Array","isArray","name","relationTo","value","i","collection","payload","collections","push","id","key","tabs","tab","row","block","blocks","find","slug","blockType","_","node","children"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { PayloadRequestWithData, RichTextAdapter, RichTextField } from 'payload/types';
|
|
2
2
|
import type { AdapterArguments } from '../types.js';
|
|
3
|
-
export type Args = Parameters<RichTextAdapter<any[], AdapterArguments>['
|
|
3
|
+
export type Args = Parameters<RichTextAdapter<any[], AdapterArguments>['populationPromises']>[0];
|
|
4
4
|
type RecurseRichTextArgs = {
|
|
5
5
|
children: unknown[];
|
|
6
6
|
currentDepth: number;
|
|
7
7
|
depth: number;
|
|
8
|
+
draft: boolean;
|
|
8
9
|
field: RichTextField<any[], AdapterArguments, AdapterArguments>;
|
|
9
10
|
overrideAccess: boolean;
|
|
10
|
-
|
|
11
|
-
req:
|
|
11
|
+
populationPromises: Promise<void>[];
|
|
12
|
+
req: PayloadRequestWithData;
|
|
12
13
|
showHiddenFields: boolean;
|
|
13
14
|
};
|
|
14
|
-
export declare const recurseRichText: ({ children, currentDepth, depth, field, overrideAccess,
|
|
15
|
-
export declare const richTextRelationshipPromise: ({ currentDepth, depth, field, overrideAccess, req, showHiddenFields, siblingDoc, }: Args) =>
|
|
15
|
+
export declare const recurseRichText: ({ children, currentDepth, depth, draft, field, overrideAccess, populationPromises, req, showHiddenFields, }: RecurseRichTextArgs) => void;
|
|
16
|
+
export declare const richTextRelationshipPromise: ({ currentDepth, depth, draft, field, overrideAccess, populationPromises, req, showHiddenFields, siblingDoc, }: Args) => void;
|
|
16
17
|
export {};
|
|
17
18
|
//# sourceMappingURL=richTextRelationshipPromise.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"richTextRelationshipPromise.d.ts","sourceRoot":"","sources":["../../src/data/richTextRelationshipPromise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"richTextRelationshipPromise.d.ts","sourceRoot":"","sources":["../../src/data/richTextRelationshipPromise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE3F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAKnD,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAEhG,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,KAAK,EAAE,aAAa,CAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;IAC/D,cAAc,EAAE,OAAO,CAAA;IACvB,kBAAkB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;IACnC,GAAG,EAAE,sBAAsB,CAAA;IAC3B,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,eAAe,gHAUzB,mBAAmB,KAAG,IAkGxB,CAAA;AAED,eAAO,MAAM,2BAA2B,kHAUrC,IAAI,SAYN,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { populate } from './populate.js';
|
|
2
2
|
import { recurseNestedFields } from './recurseNestedFields.js';
|
|
3
|
-
export const recurseRichText = ({ children, currentDepth = 0, depth, field, overrideAccess = false,
|
|
3
|
+
export const recurseRichText = ({ children, currentDepth = 0, depth, draft, field, overrideAccess = false, populationPromises, req, showHiddenFields })=>{
|
|
4
4
|
if (depth <= 0 || currentDepth > depth) {
|
|
5
5
|
return;
|
|
6
6
|
}
|
|
@@ -9,12 +9,13 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
|
|
|
9
9
|
if ((element.type === 'relationship' || element.type === 'upload') && element?.value?.id) {
|
|
10
10
|
const collection = req.payload.collections[element?.relationTo];
|
|
11
11
|
if (collection) {
|
|
12
|
-
|
|
12
|
+
populationPromises.push(populate({
|
|
13
13
|
id: element.value.id,
|
|
14
14
|
collection,
|
|
15
15
|
currentDepth,
|
|
16
16
|
data: element,
|
|
17
17
|
depth,
|
|
18
|
+
draft,
|
|
18
19
|
field,
|
|
19
20
|
key: 'value',
|
|
20
21
|
overrideAccess,
|
|
@@ -27,9 +28,10 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
|
|
|
27
28
|
currentDepth,
|
|
28
29
|
data: element.fields || {},
|
|
29
30
|
depth,
|
|
31
|
+
draft,
|
|
30
32
|
fields: field.admin.upload.collections[element.relationTo].fields,
|
|
31
33
|
overrideAccess,
|
|
32
|
-
|
|
34
|
+
populationPromises,
|
|
33
35
|
req,
|
|
34
36
|
showHiddenFields
|
|
35
37
|
});
|
|
@@ -39,12 +41,13 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
|
|
|
39
41
|
if (element?.doc?.value && element?.doc?.relationTo) {
|
|
40
42
|
const collection = req.payload.collections[element?.doc?.relationTo];
|
|
41
43
|
if (collection) {
|
|
42
|
-
|
|
44
|
+
populationPromises.push(populate({
|
|
43
45
|
id: element.doc.value,
|
|
44
46
|
collection,
|
|
45
47
|
currentDepth,
|
|
46
48
|
data: element.doc,
|
|
47
49
|
depth,
|
|
50
|
+
draft,
|
|
48
51
|
field,
|
|
49
52
|
key: 'value',
|
|
50
53
|
overrideAccess,
|
|
@@ -58,9 +61,10 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
|
|
|
58
61
|
currentDepth,
|
|
59
62
|
data: element.fields || {},
|
|
60
63
|
depth,
|
|
64
|
+
draft,
|
|
61
65
|
fields: field.admin?.link?.fields,
|
|
62
66
|
overrideAccess,
|
|
63
|
-
|
|
67
|
+
populationPromises,
|
|
64
68
|
req,
|
|
65
69
|
showHiddenFields
|
|
66
70
|
});
|
|
@@ -71,9 +75,10 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
|
|
|
71
75
|
children: element.children,
|
|
72
76
|
currentDepth,
|
|
73
77
|
depth,
|
|
78
|
+
draft,
|
|
74
79
|
field,
|
|
75
80
|
overrideAccess,
|
|
76
|
-
|
|
81
|
+
populationPromises,
|
|
77
82
|
req,
|
|
78
83
|
showHiddenFields
|
|
79
84
|
});
|
|
@@ -81,19 +86,18 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
|
|
|
81
86
|
});
|
|
82
87
|
}
|
|
83
88
|
};
|
|
84
|
-
export const richTextRelationshipPromise =
|
|
85
|
-
const promises = [];
|
|
89
|
+
export const richTextRelationshipPromise = ({ currentDepth, depth, draft, field, overrideAccess, populationPromises, req, showHiddenFields, siblingDoc })=>{
|
|
86
90
|
recurseRichText({
|
|
87
91
|
children: siblingDoc[field.name],
|
|
88
92
|
currentDepth,
|
|
89
93
|
depth,
|
|
94
|
+
draft,
|
|
90
95
|
field,
|
|
91
96
|
overrideAccess,
|
|
92
|
-
|
|
97
|
+
populationPromises,
|
|
93
98
|
req,
|
|
94
99
|
showHiddenFields
|
|
95
100
|
});
|
|
96
|
-
await Promise.all(promises);
|
|
97
101
|
};
|
|
98
102
|
|
|
99
103
|
//# sourceMappingURL=richTextRelationshipPromise.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/data/richTextRelationshipPromise.ts"],"sourcesContent":["import type {
|
|
1
|
+
{"version":3,"sources":["../../src/data/richTextRelationshipPromise.ts"],"sourcesContent":["import type { PayloadRequestWithData, RichTextAdapter, RichTextField } from 'payload/types'\n\nimport type { AdapterArguments } from '../types.js'\n\nimport { populate } from './populate.js'\nimport { recurseNestedFields } from './recurseNestedFields.js'\n\nexport type Args = Parameters<RichTextAdapter<any[], AdapterArguments>['populationPromises']>[0]\n\ntype RecurseRichTextArgs = {\n children: unknown[]\n currentDepth: number\n depth: number\n draft: boolean\n field: RichTextField<any[], AdapterArguments, AdapterArguments>\n overrideAccess: boolean\n populationPromises: Promise<void>[]\n req: PayloadRequestWithData\n showHiddenFields: boolean\n}\n\nexport const recurseRichText = ({\n children,\n currentDepth = 0,\n depth,\n draft,\n field,\n overrideAccess = false,\n populationPromises,\n req,\n showHiddenFields,\n}: RecurseRichTextArgs): void => {\n if (depth <= 0 || currentDepth > depth) {\n return\n }\n\n if (Array.isArray(children)) {\n ;(children as any[]).forEach((element) => {\n if ((element.type === 'relationship' || element.type === 'upload') && element?.value?.id) {\n const collection = req.payload.collections[element?.relationTo]\n\n if (collection) {\n populationPromises.push(\n populate({\n id: element.value.id,\n collection,\n currentDepth,\n data: element,\n depth,\n draft,\n field,\n key: 'value',\n overrideAccess,\n req,\n showHiddenFields,\n }),\n )\n }\n if (\n element.type === 'upload' &&\n Array.isArray(field.admin?.upload?.collections?.[element?.relationTo]?.fields)\n ) {\n recurseNestedFields({\n currentDepth,\n data: element.fields || {},\n depth,\n draft,\n fields: field.admin.upload.collections[element.relationTo].fields,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n })\n }\n }\n\n if (element.type === 'link') {\n if (element?.doc?.value && element?.doc?.relationTo) {\n const collection = req.payload.collections[element?.doc?.relationTo]\n\n if (collection) {\n populationPromises.push(\n populate({\n id: element.doc.value,\n collection,\n currentDepth,\n data: element.doc,\n depth,\n draft,\n field,\n key: 'value',\n overrideAccess,\n req,\n showHiddenFields,\n }),\n )\n }\n }\n\n if (Array.isArray(field.admin?.link?.fields)) {\n recurseNestedFields({\n currentDepth,\n data: element.fields || {},\n depth,\n draft,\n fields: field.admin?.link?.fields,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n })\n }\n }\n\n if (element?.children) {\n recurseRichText({\n children: element.children,\n currentDepth,\n depth,\n draft,\n field,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n })\n }\n })\n }\n}\n\nexport const richTextRelationshipPromise = ({\n currentDepth,\n depth,\n draft,\n field,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n siblingDoc,\n}: Args) => {\n recurseRichText({\n children: siblingDoc[field.name] as unknown[],\n currentDepth,\n depth,\n draft,\n field,\n overrideAccess,\n populationPromises,\n req,\n showHiddenFields,\n })\n}\n"],"names":["populate","recurseNestedFields","recurseRichText","children","currentDepth","depth","draft","field","overrideAccess","populationPromises","req","showHiddenFields","Array","isArray","forEach","element","type","value","id","collection","payload","collections","relationTo","push","data","key","admin","upload","fields","doc","link","richTextRelationshipPromise","siblingDoc","name"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,QAAQ,QAAQ,gBAAe;AACxC,SAASC,mBAAmB,QAAQ,2BAA0B;AAgB9D,OAAO,MAAMC,kBAAkB,CAAC,EAC9BC,QAAQ,EACRC,eAAe,CAAC,EAChBC,KAAK,EACLC,KAAK,EACLC,KAAK,EACLC,iBAAiB,KAAK,EACtBC,kBAAkB,EAClBC,GAAG,EACHC,gBAAgB,EACI;IACpB,IAAIN,SAAS,KAAKD,eAAeC,OAAO;QACtC;IACF;IAEA,IAAIO,MAAMC,OAAO,CAACV,WAAW;QACzBA,SAAmBW,OAAO,CAAC,CAACC;YAC5B,IAAI,AAACA,CAAAA,QAAQC,IAAI,KAAK,kBAAkBD,QAAQC,IAAI,KAAK,QAAO,KAAMD,SAASE,OAAOC,IAAI;gBACxF,MAAMC,aAAaT,IAAIU,OAAO,CAACC,WAAW,CAACN,SAASO,WAAW;gBAE/D,IAAIH,YAAY;oBACdV,mBAAmBc,IAAI,CACrBvB,SAAS;wBACPkB,IAAIH,QAAQE,KAAK,CAACC,EAAE;wBACpBC;wBACAf;wBACAoB,MAAMT;wBACNV;wBACAC;wBACAC;wBACAkB,KAAK;wBACLjB;wBACAE;wBACAC;oBACF;gBAEJ;gBACA,IACEI,QAAQC,IAAI,KAAK,YACjBJ,MAAMC,OAAO,CAACN,MAAMmB,KAAK,EAAEC,QAAQN,aAAa,CAACN,SAASO,WAAW,EAAEM,SACvE;oBACA3B,oBAAoB;wBAClBG;wBACAoB,MAAMT,QAAQa,MAAM,IAAI,CAAC;wBACzBvB;wBACAC;wBACAsB,QAAQrB,MAAMmB,KAAK,CAACC,MAAM,CAACN,WAAW,CAACN,QAAQO,UAAU,CAAC,CAACM,MAAM;wBACjEpB;wBACAC;wBACAC;wBACAC;oBACF;gBACF;YACF;YAEA,IAAII,QAAQC,IAAI,KAAK,QAAQ;gBAC3B,IAAID,SAASc,KAAKZ,SAASF,SAASc,KAAKP,YAAY;oBACnD,MAAMH,aAAaT,IAAIU,OAAO,CAACC,WAAW,CAACN,SAASc,KAAKP,WAAW;oBAEpE,IAAIH,YAAY;wBACdV,mBAAmBc,IAAI,CACrBvB,SAAS;4BACPkB,IAAIH,QAAQc,GAAG,CAACZ,KAAK;4BACrBE;4BACAf;4BACAoB,MAAMT,QAAQc,GAAG;4BACjBxB;4BACAC;4BACAC;4BACAkB,KAAK;4BACLjB;4BACAE;4BACAC;wBACF;oBAEJ;gBACF;gBAEA,IAAIC,MAAMC,OAAO,CAACN,MAAMmB,KAAK,EAAEI,MAAMF,SAAS;oBAC5C3B,oBAAoB;wBAClBG;wBACAoB,MAAMT,QAAQa,MAAM,IAAI,CAAC;wBACzBvB;wBACAC;wBACAsB,QAAQrB,MAAMmB,KAAK,EAAEI,MAAMF;wBAC3BpB;wBACAC;wBACAC;wBACAC;oBACF;gBACF;YACF;YAEA,IAAII,SAASZ,UAAU;gBACrBD,gBAAgB;oBACdC,UAAUY,QAAQZ,QAAQ;oBAC1BC;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC;gBACF;YACF;QACF;IACF;AACF,EAAC;AAED,OAAO,MAAMoB,8BAA8B,CAAC,EAC1C3B,YAAY,EACZC,KAAK,EACLC,KAAK,EACLC,KAAK,EACLC,cAAc,EACdC,kBAAkB,EAClBC,GAAG,EACHC,gBAAgB,EAChBqB,UAAU,EACL;IACL9B,gBAAgB;QACdC,UAAU6B,UAAU,CAACzB,MAAM0B,IAAI,CAAC;QAChC7B;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;IACF;AACF,EAAC"}
|
package/dist/data/validation.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { defaultRichTextValue } from './defaultValue.js';
|
|
2
|
-
export const richTextValidate = (value, { required })=>{
|
|
2
|
+
export const richTextValidate = (value, { req, required })=>{
|
|
3
|
+
const { t } = req;
|
|
3
4
|
if (required) {
|
|
4
5
|
const stringifiedDefaultValue = JSON.stringify(defaultRichTextValue);
|
|
5
6
|
if (value && JSON.stringify(value) !== stringifiedDefaultValue) return true;
|
|
6
|
-
|
|
7
|
-
return 'This field is required.';
|
|
7
|
+
return t('validation:required');
|
|
8
8
|
}
|
|
9
9
|
return true;
|
|
10
10
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/data/validation.ts"],"sourcesContent":["import type { RichTextField, Validate } from 'payload/types'\n\nimport type { AdapterArguments } from '../types.js'\n\nimport { defaultRichTextValue } from './defaultValue.js'\n\nexport const richTextValidate: Validate<\n unknown[],\n unknown,\n RichTextField<any[], AdapterArguments>,\n RichTextField<any[], AdapterArguments>\n> = (value, { required }) => {\n if (required) {\n const stringifiedDefaultValue = JSON.stringify(defaultRichTextValue)\n if (value && JSON.stringify(value) !== stringifiedDefaultValue) return true\n
|
|
1
|
+
{"version":3,"sources":["../../src/data/validation.ts"],"sourcesContent":["import type { RichTextField, Validate } from 'payload/types'\n\nimport type { AdapterArguments } from '../types.js'\n\nimport { defaultRichTextValue } from './defaultValue.js'\n\nexport const richTextValidate: Validate<\n unknown[],\n unknown,\n RichTextField<any[], AdapterArguments>,\n RichTextField<any[], AdapterArguments>\n> = (value, { req, required }) => {\n const { t } = req\n if (required) {\n const stringifiedDefaultValue = JSON.stringify(defaultRichTextValue)\n if (value && JSON.stringify(value) !== stringifiedDefaultValue) return true\n return t('validation:required')\n }\n\n return true\n}\n"],"names":["defaultRichTextValue","richTextValidate","value","req","required","t","stringifiedDefaultValue","JSON","stringify"],"rangeMappings":";;;;;;;;;","mappings":"AAIA,SAASA,oBAAoB,QAAQ,oBAAmB;AAExD,OAAO,MAAMC,mBAKT,CAACC,OAAO,EAAEC,GAAG,EAAEC,QAAQ,EAAE;IAC3B,MAAM,EAAEC,CAAC,EAAE,GAAGF;IACd,IAAIC,UAAU;QACZ,MAAME,0BAA0BC,KAAKC,SAAS,CAACR;QAC/C,IAAIE,SAASK,KAAKC,SAAS,CAACN,WAAWI,yBAAyB,OAAO;QACvE,OAAOD,EAAE;IACX;IAEA,OAAO;AACT,EAAC"}
|
package/dist/field/RichText.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { FormFieldBase } from '@payloadcms/ui/fields/shared';
|
|
2
|
-
import type { FieldBase } from 'payload/types';
|
|
3
2
|
import type { BaseEditor } from 'slate';
|
|
4
3
|
import type { HistoryEditor } from 'slate-history';
|
|
5
4
|
import type { ReactEditor } from 'slate-react';
|
|
@@ -16,7 +15,6 @@ declare module 'slate' {
|
|
|
16
15
|
}
|
|
17
16
|
export declare const RichText: React.FC<FormFieldBase & {
|
|
18
17
|
elements: EnabledFeatures['elements'];
|
|
19
|
-
label?: FieldBase['label'];
|
|
20
18
|
leaves: EnabledFeatures['leaves'];
|
|
21
19
|
name: string;
|
|
22
20
|
placeholder?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RichText.d.ts","sourceRoot":"","sources":["../../src/field/RichText.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"RichText.d.ts","sourceRoot":"","sources":["../../src/field/RichText.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAiB,MAAM,OAAO,CAAA;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAY9C,OAAO,KAAkD,MAAM,OAAO,CAAA;AAKtE,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAMjD,OAAO,cAAc,CAAA;AAWrB,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAU,WAAW;QACnB,MAAM,EAAE,UAAU,GAAG,WAAW,GAAG,aAAa,CAAA;QAChD,OAAO,EAAE,WAAW,CAAA;QACpB,IAAI,EAAE,QAAQ,CAAA;KACf;CACF;AAiaD,eAAO,MAAM,QAAQ;cA7ZP,eAAe,CAAC,UAAU,CAAC;YAC7B,eAAe,CAAC,QAAQ,CAAC;UAC3B,MAAM;kBACE,MAAM;aACX,cAAc,EAAE;0BACH,IAAI,MAAM,EAAE,MAAM,SAAS,CAAC;YAC1C,MAAM;EAuZkC,CAAA"}
|
package/dist/field/RichText.js
CHANGED
|
@@ -37,12 +37,16 @@ const RichTextField = (props)=>{
|
|
|
37
37
|
if (typeof validate === 'function') {
|
|
38
38
|
return validate(value, {
|
|
39
39
|
...validationOptions,
|
|
40
|
+
req: {
|
|
41
|
+
t: i18n.t
|
|
42
|
+
},
|
|
40
43
|
required
|
|
41
44
|
});
|
|
42
45
|
}
|
|
43
46
|
}, [
|
|
44
47
|
validate,
|
|
45
|
-
required
|
|
48
|
+
required,
|
|
49
|
+
i18n
|
|
46
50
|
]);
|
|
47
51
|
const { path: pathFromContext } = useFieldProps();
|
|
48
52
|
const { initialValue, path, schemaPath, setValue, showError, value } = useField({
|