react-datocms 7.2.1 → 7.2.2
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/cjs/StructuredText/index.js +4 -4
- package/dist/cjs/StructuredText/index.js.map +1 -1
- package/dist/esm/StructuredText/index.js +4 -4
- package/dist/esm/StructuredText/index.js.map +1 -1
- package/dist/types/StructuredText/index.d.ts +7 -7
- package/package.json +3 -3
- package/src/StructuredText/__tests__/__snapshots__/index.test.tsx.snap +2 -0
- package/src/StructuredText/__tests__/index.test.tsx +5 -2
- package/src/StructuredText/index.tsx +30 -14
|
@@ -105,12 +105,12 @@ function StructuredText({ data, renderInlineRecord, renderLinkToRecord, renderBl
|
|
|
105
105
|
if (!renderInlineBlock) {
|
|
106
106
|
throw new datocms_structured_text_utils_1.RenderError(`The Structured Text document contains an 'inlineBlock' node, but no 'renderInlineBlock' prop is specified!`, node);
|
|
107
107
|
}
|
|
108
|
-
if (!((0, datocms_structured_text_utils_1.isStructuredText)(data) && data.
|
|
109
|
-
throw new datocms_structured_text_utils_1.RenderError(`The document contains an 'inlineBlock' node, but the passed data prop is not a Structured Text GraphQL response, or data.
|
|
108
|
+
if (!((0, datocms_structured_text_utils_1.isStructuredText)(data) && data.inlineBlocks)) {
|
|
109
|
+
throw new datocms_structured_text_utils_1.RenderError(`The document contains an 'inlineBlock' node, but the passed data prop is not a Structured Text GraphQL response, or data.inlineBlocks is not present!`, node);
|
|
110
110
|
}
|
|
111
|
-
const item = data.
|
|
111
|
+
const item = data.inlineBlocks.find((item) => item.id === node.item);
|
|
112
112
|
if (!item) {
|
|
113
|
-
throw new datocms_structured_text_utils_1.RenderError(`The Structured Text document contains an 'inlineBlock' node, but cannot find a record with ID ${node.item} inside data.
|
|
113
|
+
throw new datocms_structured_text_utils_1.RenderError(`The Structured Text document contains an 'inlineBlock' node, but cannot find a record with ID ${node.item} inside data.inlineBlocks!`, node);
|
|
114
114
|
}
|
|
115
115
|
return appendKeyToValidElement(renderInlineBlock({ record: item }), key);
|
|
116
116
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/StructuredText/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iHAQuD;AAkB9B,+FApBvB,8DAAc,OAoBuB;AAA9B,+FAnBP,8DAAc,OAmBO;AAGI,2FAtBzB,8DAAc,OAsBqB;AApBrC,iFAcuC;AAGE,4FAfvC,2CAAW,OAeuC;AAFpD,+CAA+E;AAgBlE,QAAA,cAAc,GAAG;IAC5B,UAAU,EAAE,eAAK,CAAC,aAAgD;IAClE,cAAc,EAAE,CACd,QAA+B,EAC/B,GAAW,EACI,EAAE,CAAC,8BAAC,eAAK,CAAC,QAAQ,IAAC,GAAG,EAAE,GAAG,IAAG,QAAQ,CAAkB;IACzE,UAAU,EAAE,CAAC,IAAY,EAAE,GAAW,EAAiB,EAAE,CAAC,IAAI;CAC/D,CAAC;AAEF,SAAgB,uBAAuB,CACrC,OAA4B,EAC5B,GAAW;IAEX,IAAI,IAAA,sBAAc,EAAC,OAAO,CAAC,IAAI,OAAO,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;QACpD,OAAO,IAAA,oBAAY,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AARD,0DAQC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/StructuredText/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -77,12 +77,12 @@ export function StructuredText({ data, renderInlineRecord, renderLinkToRecord, r
|
|
|
77
77
|
if (!renderInlineBlock) {
|
|
78
78
|
throw new RenderError(`The Structured Text document contains an 'inlineBlock' node, but no 'renderInlineBlock' prop is specified!`, node);
|
|
79
79
|
}
|
|
80
|
-
if (!(isStructuredText(data) && data.
|
|
81
|
-
throw new RenderError(`The document contains an 'inlineBlock' node, but the passed data prop is not a Structured Text GraphQL response, or data.
|
|
80
|
+
if (!(isStructuredText(data) && data.inlineBlocks)) {
|
|
81
|
+
throw new RenderError(`The document contains an 'inlineBlock' node, but the passed data prop is not a Structured Text GraphQL response, or data.inlineBlocks is not present!`, node);
|
|
82
82
|
}
|
|
83
|
-
const item = data.
|
|
83
|
+
const item = data.inlineBlocks.find((item) => item.id === node.item);
|
|
84
84
|
if (!item) {
|
|
85
|
-
throw new RenderError(`The Structured Text document contains an 'inlineBlock' node, but cannot find a record with ID ${node.item} inside data.
|
|
85
|
+
throw new RenderError(`The Structured Text document contains an 'inlineBlock' node, but cannot find a record with ID ${node.item} inside data.inlineBlocks!`, node);
|
|
86
86
|
}
|
|
87
87
|
return appendKeyToValidElement(renderInlineBlock({ record: item }), key);
|
|
88
88
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/StructuredText/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,sBAAsB,EACtB,MAAM,EACN,cAAc,EACd,cAAc,GACf,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAEL,WAAW,EAOX,OAAO,EACP,aAAa,EACb,YAAY,EACZ,UAAU,EACV,gBAAgB,GACjB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,EAAqB,YAAY,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC;AAEvD,aAAa;AACb,OAAO,EAAE,cAAc,IAAI,UAAU,EAAE,CAAC;AAWxC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,UAAU,EAAE,KAAK,CAAC,aAAgD;IAClE,cAAc,EAAE,CACd,QAA+B,EAC/B,GAAW,EACI,EAAE,CAAC,oBAAC,KAAK,CAAC,QAAQ,IAAC,GAAG,EAAE,GAAG,IAAG,QAAQ,CAAkB;IACzE,UAAU,EAAE,CAAC,IAAY,EAAE,GAAW,EAAiB,EAAE,CAAC,IAAI;CAC/D,CAAC;AAEF,MAAM,UAAU,uBAAuB,CACrC,OAA4B,EAC5B,GAAW;IAEX,IAAI,cAAc,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;QACpD,OAAO,YAAY,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/StructuredText/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -25,21 +25,21 @@ export type RenderRecordLinkContext<R extends StructuredTextGraphQlResponseRecor
|
|
|
25
25
|
export type RenderBlockContext<R extends StructuredTextGraphQlResponseRecord> = {
|
|
26
26
|
record: R;
|
|
27
27
|
};
|
|
28
|
-
export type StructuredTextPropTypes<
|
|
28
|
+
export type StructuredTextPropTypes<BlockRecord extends StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord, LinkRecord extends StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord, InlineBlockRecord extends StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord> = {
|
|
29
29
|
/** The actual field value you get from DatoCMS **/
|
|
30
|
-
data: StructuredTextGraphQlResponse<
|
|
30
|
+
data: StructuredTextGraphQlResponse<BlockRecord, LinkRecord, InlineBlockRecord> | StructuredTextDocument | Node | null | undefined;
|
|
31
31
|
/** A set of additional rules to convert nodes to JSX **/
|
|
32
32
|
customNodeRules?: RenderRule<H, T, F>[];
|
|
33
33
|
/** A set of additional rules to convert marks to JSX **/
|
|
34
34
|
customMarkRules?: RenderMarkRule<H, T, F>[];
|
|
35
35
|
/** Fuction that converts an 'inlineItem' node into React **/
|
|
36
|
-
renderInlineRecord?: (context: RenderInlineRecordContext<
|
|
36
|
+
renderInlineRecord?: (context: RenderInlineRecordContext<LinkRecord>) => ReactElement | null;
|
|
37
37
|
/** Fuction that converts an 'itemLink' node into React **/
|
|
38
|
-
renderLinkToRecord?: (context: RenderRecordLinkContext<
|
|
38
|
+
renderLinkToRecord?: (context: RenderRecordLinkContext<LinkRecord>) => ReactElement | null;
|
|
39
39
|
/** Fuction that converts a 'block' node into React **/
|
|
40
|
-
renderBlock?: (context: RenderBlockContext<
|
|
40
|
+
renderBlock?: (context: RenderBlockContext<BlockRecord>) => ReactElement | null;
|
|
41
41
|
/** Fuction that converts an 'inlineBlock' node into React **/
|
|
42
|
-
renderInlineBlock?: (context: RenderBlockContext<
|
|
42
|
+
renderInlineBlock?: (context: RenderBlockContext<InlineBlockRecord>) => ReactElement | null;
|
|
43
43
|
/** Function that converts 'link' and 'itemLink' `meta` into HTML props */
|
|
44
44
|
metaTransformer?: TransformMetaFn;
|
|
45
45
|
/** Fuction that converts a simple string text into React **/
|
|
@@ -51,4 +51,4 @@ export type StructuredTextPropTypes<R1 extends StructuredTextGraphQlResponseReco
|
|
|
51
51
|
/** @deprecated use customNodeRules **/
|
|
52
52
|
customRules?: RenderRule<H, T, F>[];
|
|
53
53
|
};
|
|
54
|
-
export declare function StructuredText<
|
|
54
|
+
export declare function StructuredText<BlockRecord extends StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord, LinkRecord extends StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord, InlineBlockRecord extends StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord>({ data, renderInlineRecord, renderLinkToRecord, renderBlock, renderInlineBlock, renderText, renderNode, renderFragment, customMarkRules, customRules, customNodeRules, metaTransformer, }: StructuredTextPropTypes<BlockRecord, LinkRecord, InlineBlockRecord>): ReactElement | null;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-datocms",
|
|
3
|
-
"version": "7.2.
|
|
3
|
+
"version": "7.2.2",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">=8.0.0"
|
|
6
6
|
},
|
|
@@ -135,8 +135,8 @@
|
|
|
135
135
|
"dependencies": {
|
|
136
136
|
"@mux/mux-player-react": "*",
|
|
137
137
|
"datocms-listen": "^0.1.9",
|
|
138
|
-
"datocms-structured-text-generic-html-renderer": "^
|
|
139
|
-
"datocms-structured-text-utils": "^
|
|
138
|
+
"datocms-structured-text-generic-html-renderer": "^5.0.0",
|
|
139
|
+
"datocms-structured-text-utils": "^5.0.0",
|
|
140
140
|
"react-intersection-observer": "^9.4.3",
|
|
141
141
|
"react-string-replace": "^1.1.0",
|
|
142
142
|
"use-deep-compare-effect": "^1.6.1"
|
|
@@ -150,8 +150,9 @@ describe('StructuredText', () => {
|
|
|
150
150
|
};
|
|
151
151
|
|
|
152
152
|
const structuredText: StructuredTextGraphQlResponse<
|
|
153
|
-
QuoteRecord
|
|
154
|
-
DocPageRecord
|
|
153
|
+
QuoteRecord,
|
|
154
|
+
DocPageRecord,
|
|
155
|
+
MentionRecord
|
|
155
156
|
> = {
|
|
156
157
|
value: {
|
|
157
158
|
schema: 'dast',
|
|
@@ -201,6 +202,8 @@ describe('StructuredText', () => {
|
|
|
201
202
|
quote: 'Foo bar.',
|
|
202
203
|
author: 'Mark Smith',
|
|
203
204
|
},
|
|
205
|
+
],
|
|
206
|
+
inlineBlocks: [
|
|
204
207
|
{
|
|
205
208
|
id: '789',
|
|
206
209
|
__typename: 'MentionRecord',
|
|
@@ -81,12 +81,16 @@ export type RenderBlockContext<R extends StructuredTextGraphQlResponseRecord> =
|
|
|
81
81
|
};
|
|
82
82
|
|
|
83
83
|
export type StructuredTextPropTypes<
|
|
84
|
-
|
|
85
|
-
|
|
84
|
+
BlockRecord extends
|
|
85
|
+
StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord,
|
|
86
|
+
LinkRecord extends
|
|
87
|
+
StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord,
|
|
88
|
+
InlineBlockRecord extends
|
|
89
|
+
StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord,
|
|
86
90
|
> = {
|
|
87
91
|
/** The actual field value you get from DatoCMS **/
|
|
88
92
|
data:
|
|
89
|
-
| StructuredTextGraphQlResponse<
|
|
93
|
+
| StructuredTextGraphQlResponse<BlockRecord, LinkRecord, InlineBlockRecord>
|
|
90
94
|
| StructuredTextDocument
|
|
91
95
|
| Node
|
|
92
96
|
| null
|
|
@@ -97,16 +101,20 @@ export type StructuredTextPropTypes<
|
|
|
97
101
|
customMarkRules?: RenderMarkRule<H, T, F>[];
|
|
98
102
|
/** Fuction that converts an 'inlineItem' node into React **/
|
|
99
103
|
renderInlineRecord?: (
|
|
100
|
-
context: RenderInlineRecordContext<
|
|
104
|
+
context: RenderInlineRecordContext<LinkRecord>,
|
|
101
105
|
) => ReactElement | null;
|
|
102
106
|
/** Fuction that converts an 'itemLink' node into React **/
|
|
103
107
|
renderLinkToRecord?: (
|
|
104
|
-
context: RenderRecordLinkContext<
|
|
108
|
+
context: RenderRecordLinkContext<LinkRecord>,
|
|
105
109
|
) => ReactElement | null;
|
|
106
110
|
/** Fuction that converts a 'block' node into React **/
|
|
107
|
-
renderBlock?: (
|
|
111
|
+
renderBlock?: (
|
|
112
|
+
context: RenderBlockContext<BlockRecord>,
|
|
113
|
+
) => ReactElement | null;
|
|
108
114
|
/** Fuction that converts an 'inlineBlock' node into React **/
|
|
109
|
-
renderInlineBlock?: (
|
|
115
|
+
renderInlineBlock?: (
|
|
116
|
+
context: RenderBlockContext<InlineBlockRecord>,
|
|
117
|
+
) => ReactElement | null;
|
|
110
118
|
/** Function that converts 'link' and 'itemLink' `meta` into HTML props */
|
|
111
119
|
metaTransformer?: TransformMetaFn;
|
|
112
120
|
/** Fuction that converts a simple string text into React **/
|
|
@@ -120,8 +128,12 @@ export type StructuredTextPropTypes<
|
|
|
120
128
|
};
|
|
121
129
|
|
|
122
130
|
export function StructuredText<
|
|
123
|
-
|
|
124
|
-
|
|
131
|
+
BlockRecord extends
|
|
132
|
+
StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord,
|
|
133
|
+
LinkRecord extends
|
|
134
|
+
StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord,
|
|
135
|
+
InlineBlockRecord extends
|
|
136
|
+
StructuredTextGraphQlResponseRecord = StructuredTextGraphQlResponseRecord,
|
|
125
137
|
>({
|
|
126
138
|
data,
|
|
127
139
|
renderInlineRecord,
|
|
@@ -135,7 +147,11 @@ export function StructuredText<
|
|
|
135
147
|
customRules,
|
|
136
148
|
customNodeRules,
|
|
137
149
|
metaTransformer,
|
|
138
|
-
}: StructuredTextPropTypes<
|
|
150
|
+
}: StructuredTextPropTypes<
|
|
151
|
+
BlockRecord,
|
|
152
|
+
LinkRecord,
|
|
153
|
+
InlineBlockRecord
|
|
154
|
+
>): ReactElement | null {
|
|
139
155
|
const result = render(data, {
|
|
140
156
|
adapter: {
|
|
141
157
|
renderText: renderText || defaultAdapter.renderText,
|
|
@@ -246,18 +262,18 @@ export function StructuredText<
|
|
|
246
262
|
);
|
|
247
263
|
}
|
|
248
264
|
|
|
249
|
-
if (!(isStructuredText(data) && data.
|
|
265
|
+
if (!(isStructuredText(data) && data.inlineBlocks)) {
|
|
250
266
|
throw new RenderError(
|
|
251
|
-
`The document contains an 'inlineBlock' node, but the passed data prop is not a Structured Text GraphQL response, or data.
|
|
267
|
+
`The document contains an 'inlineBlock' node, but the passed data prop is not a Structured Text GraphQL response, or data.inlineBlocks is not present!`,
|
|
252
268
|
node,
|
|
253
269
|
);
|
|
254
270
|
}
|
|
255
271
|
|
|
256
|
-
const item = data.
|
|
272
|
+
const item = data.inlineBlocks.find((item) => item.id === node.item);
|
|
257
273
|
|
|
258
274
|
if (!item) {
|
|
259
275
|
throw new RenderError(
|
|
260
|
-
`The Structured Text document contains an 'inlineBlock' node, but cannot find a record with ID ${node.item} inside data.
|
|
276
|
+
`The Structured Text document contains an 'inlineBlock' node, but cannot find a record with ID ${node.item} inside data.inlineBlocks!`,
|
|
261
277
|
node,
|
|
262
278
|
);
|
|
263
279
|
}
|