@financial-times/cp-content-pipeline-ui 6.15.6 → 7.0.1

package/lib/components/Layout/index.d.ts

@@ -1,19 +1,9 @@
 import { ContentTree } from '@financial-times/content-tree';
 import React from 'react';
-interface ContentTreeLayoutSlot extends ContentTree.Node {
-    type: 'slot';
-    children: [ContentTree.ImageSet?, ...ContentTree.Paragraph[]];
+import { ContentProps } from '../types';
+interface LayoutProps extends ContentProps<ContentTree.transit.Layout> {
 }
-interface BaseLayoutProps {
-    layoutWidth: 'inset-left' | 'full-width' | 'full-grid' | 'in-line';
-    layoutName?: string;
-}
-interface ContentTreeCardLayout extends BaseLayoutProps, ContentTree.Node {
-    type: 'layout';
-    layoutName: 'auto' | 'card' | 'timeline';
-    children: ContentTreeLayoutSlot[];
-}
-export declare const Layout: React.FC<React.PropsWithChildren<ContentTreeCardLayout | BaseLayoutProps>>;
+export declare const Layout: React.FC<React.PropsWithChildren<LayoutProps>>;
 export declare const LayoutContainer: React.FC<React.PropsWithChildren>;
 export declare const LayoutSlot: React.FC<React.PropsWithChildren>;
 export {};

package/lib/components/Layout/index.js

@@ -11,7 +11,7 @@ const react_1 = __importDefault(require("react"));
  * @param layoutName - The name of the layout.
  * @param children - The content to be displayed in the layout.
  */
-const Layout = ({ children, layoutWidth, layoutName = 'auto' }) => {
+const Layout = ({ content: { layoutWidth, layoutName = 'auto' }, children, }) => {
     return (react_1.default.createElement("div", { className: "n-content-layout", "data-layout-name": layoutName, "data-layout-width": layoutWidth },
         react_1.default.createElement(exports.LayoutContainer, null, children)));
 };

package/lib/components/Layout/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Layout/index.tsx"],"names":[],"mappings":";;;;;;AACA,kDAAyB;AAkBzB;;;;;GAKG;AACI,MAAM,MAAM,GAEf,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,GAAG,MAAM,EAAE,EAAE,EAAE;IACrD,OAAO,CACL,uCACE,SAAS,EAAC,kBAAkB,sBACV,UAAU,uBACT,WAAW;QAE9B,8BAAC,uBAAe,QAAE,QAAQ,CAAmB,CACzC,CACP,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,MAAM,UAYlB;AAEM,MAAM,eAAe,GAAsC,CAAC,EACjE,QAAQ,GACT,EAAE,EAAE;IACH,OAAO,uCAAK,SAAS,EAAC,6BAA6B,IAAE,QAAQ,CAAO,CAAA;AACtE,CAAC,CAAA;AAJY,QAAA,eAAe,mBAI3B;AAEM,MAAM,UAAU,GAAsC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5E,OAAO,uCAAK,SAAS,EAAC,wBAAwB,IAAE,QAAQ,CAAO,CAAA;AACjE,CAAC,CAAA;AAFY,QAAA,UAAU,cAEtB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Layout/index.tsx"],"names":[],"mappings":";;;;;;AACA,kDAAyB;AAKzB;;;;;GAKG;AACI,MAAM,MAAM,GAAmD,CAAC,EACrE,OAAO,EAAE,EAAE,WAAW,EAAE,UAAU,GAAG,MAAM,EAAE,EAC7C,QAAQ,GACT,EAAE,EAAE;IACH,OAAO,CACL,uCACE,SAAS,EAAC,kBAAkB,sBACV,UAAU,uBACT,WAAW;QAE9B,8BAAC,uBAAe,QAAE,QAAQ,CAAmB,CACzC,CACP,CAAA;AACH,CAAC,CAAA;AAbY,QAAA,MAAM,UAalB;AAEM,MAAM,eAAe,GAAsC,CAAC,EACjE,QAAQ,GACT,EAAE,EAAE;IACH,OAAO,uCAAK,SAAS,EAAC,6BAA6B,IAAE,QAAQ,CAAO,CAAA;AACtE,CAAC,CAAA;AAJY,QAAA,eAAe,mBAI3B;AAEM,MAAM,UAAU,GAAsC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5E,OAAO,uCAAK,SAAS,EAAC,wBAAwB,IAAE,QAAQ,CAAO,CAAA;AACjE,CAAC,CAAA;AAFY,QAAA,UAAU,cAEtB"}

package/lib/components/MainImage/index.js

@@ -37,11 +37,11 @@ const MainImage = ({ content }) => {
     */
     const mainImage = references?.find((ref) => ref.type === 'main-image');
     if (mainImage) {
-        return react_1.default.createElement(index_1.default, { isMainImage: true, ...mainImage });
+        return react_1.default.createElement(index_1.default, { isMainImage: true, content: mainImage });
     }
     const mainImageRaw = references?.find((ref) => ref.type === 'main-image-raw');
     if (mainImageRaw) {
-        return react_1.default.createElement(index_1.FallbackImage, { isMainImage: true, ...mainImageRaw });
+        return react_1.default.createElement(index_1.FallbackImage, { isMainImage: true, content: mainImageRaw });
     }
     return null;
 };

package/lib/components/MainImage/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/MainImage/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAMzB,2DAA2D;AAM3D,MAAM,SAAS,GAA6B,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAA;IAEtD;;;;MAIE;IAEF,MAAM,SAAS,GAAG,UAAU,EAAE,IAAI,CAChC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,CACQ,CAAA;IAE5C,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,8BAAC,eAAQ,IAAC,WAAW,WAAK,SAAS,GAAI,CAAA;IAChD,CAAC;IAED,MAAM,YAAY,GAAG,UAAU,EAAE,IAAI,CACnC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,CACX,CAAA;IAE7B,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,8BAAC,qBAAa,IAAC,WAAW,WAAK,YAAY,GAAI,CAAA;IACxD,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/MainImage/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAKzB,2DAA2D;AAO3D,MAAM,SAAS,GAA6B,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAA;IAEtD;;;;MAIE;IAEF,MAAM,SAAS,GAAG,UAAU,EAAE,IAAI,CAChC,CAAC,GAAG,EAAmD,EAAE,CACvD,GAAG,CAAC,IAAI,KAAK,YAAY,CAC5B,CAAA;IAED,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,8BAAC,eAAQ,IAAC,WAAW,QAAC,OAAO,EAAE,SAAS,GAAI,CAAA;IACrD,CAAC;IAED,MAAM,YAAY,GAAG,UAAU,EAAE,IAAI,CACnC,CAAC,GAAG,EAA4C,EAAE,CAChD,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAChC,CAAA;IAED,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,8BAAC,qBAAa,IAAC,WAAW,QAAC,OAAO,EAAE,YAAY,GAAI,CAAA;IAC7D,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/lib/components/Paragraph/index.d.ts

@@ -1,7 +1,10 @@
 import { ContentTree } from '@financial-times/content-tree';
 import React from 'react';
+import { ContentProps } from '../types';
 export declare const ParagraphContext: React.Context<{
     className: string;
 } | null>;
-declare const Paragraph: React.FC<React.PropsWithChildren<ContentTree.Paragraph>>;
+interface ParagraphProps extends ContentProps<ContentTree.Paragraph> {
+}
+declare const Paragraph: React.FC<React.PropsWithChildren<ParagraphProps>>;
 export default Paragraph;

package/lib/components/Paragraph/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Paragraph/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAwD;AAE3C,QAAA,gBAAgB,GAAG,IAAA,qBAAa,EAC3C,IAAI,CACL,CAAA;AAED,MAAM,SAAS,GAA6D,CAC1E,KAAK,EACL,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,kBAAU,EAAC,wBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,CAAA;IAE9E,OAAO,qCAAS,SAAS,IAAK,KAAK,CAAC,QAAQ,CAAK,CAAA;AACnD,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Paragraph/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAwD;AAG3C,QAAA,gBAAgB,GAAG,IAAA,qBAAa,EAC3C,IAAI,CACL,CAAA;AAID,MAAM,SAAS,GAAsD,CACnE,KAAK,EACL,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,kBAAU,EAAC,wBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,CAAA;IAE9E,OAAO,qCAAS,SAAS,IAAK,KAAK,CAAC,QAAQ,CAAK,CAAA;AACnD,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/lib/components/Pullquote/index.d.ts

@@ -1,4 +1,7 @@
 import React from 'react';
 import { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema';
-declare const Pullquote: React.FC<React.PropsWithChildren<ContentTreeWorkarounds.ContentTreePullquote>>;
+import { ContentProps } from '../types';
+interface PullquoteProps extends ContentProps<ContentTreeWorkarounds.Pullquote> {
+}
+declare const Pullquote: React.FC<React.PropsWithChildren<PullquoteProps>>;
 export default Pullquote;

package/lib/components/Pullquote/index.js

@@ -5,15 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const classnames_1 = __importDefault(require("classnames"));
-const Pullquote = (props) => {
+const Pullquote = ({ content: { text, source }, children, }) => {
+    const hasChildren = react_1.default.Children.count(children) > 0;
     return (react_1.default.createElement("blockquote", { className: (0, classnames_1.default)('n-content-pullquote', {
-            'n-content-pullquote--with-image': props.children.length > 0,
-            'n-content-pullquote--no-image': !props.children.length,
+            'n-content-pullquote--with-image': hasChildren,
+            'n-content-pullquote--no-image': !hasChildren,
         }), "aria-hidden": "true" },
         react_1.default.createElement("div", { className: "n-content-pullquote__content" },
-            react_1.default.createElement("p", null, props.text),
-            react_1.default.createElement("footer", { className: "n-content-pullquote__footer" }, props.source)),
-        props.children));
+            react_1.default.createElement("p", null, text),
+            react_1.default.createElement("footer", { className: "n-content-pullquote__footer" }, source)),
+        children));
 };
 exports.default = Pullquote;
 //# sourceMappingURL=index.js.map

package/lib/components/Pullquote/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Pullquote/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAEzB,4DAAmC;AAEnC,MAAM,SAAS,GAEX,CAAC,KAAK,EAAE,EAAE;IACZ,OAAO,CACL,8CACE,SAAS,EAAE,IAAA,oBAAU,EAAC,qBAAqB,EAAE;YAC3C,iCAAiC,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YAC5D,+BAA+B,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM;SACxD,CAAC,iBACU,MAAM;QAElB,uCAAK,SAAS,EAAC,8BAA8B;YAC3C,yCAAI,KAAK,CAAC,IAAI,CAAK;YACnB,0CAAQ,SAAS,EAAC,6BAA6B,IAAE,KAAK,CAAC,MAAM,CAAU,CACnE;QAEL,KAAK,CAAC,QAAQ,CACJ,CACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Pullquote/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAEzB,4DAAmC;AAMnC,MAAM,SAAS,GAAsD,CAAC,EACpE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EACzB,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IAEtD,OAAO,CACL,8CACE,SAAS,EAAE,IAAA,oBAAU,EAAC,qBAAqB,EAAE;YAC3C,iCAAiC,EAAE,WAAW;YAC9C,+BAA+B,EAAE,CAAC,WAAW;SAC9C,CAAC,iBACU,MAAM;QAElB,uCAAK,SAAS,EAAC,8BAA8B;YAC3C,yCAAI,IAAI,CAAK;YACb,0CAAQ,SAAS,EAAC,6BAA6B,IAAE,MAAM,CAAU,CAC7D;QAEL,QAAQ,CACE,CACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/lib/components/Recommended/index.d.ts

@@ -1,10 +1,7 @@
 import React from 'react';
-import { ContentTree } from '@financial-times/content-tree';
-import type { RecommendedFragment } from '@financial-times/cp-content-pipeline-client';
-/**
- * Renders a Recommended teaser component
- * `<Teaser>` is imported from x-dash
- * https://github.com/Financial-Times/x-dash/tree/main/components/x-teaser)
- */
-declare const Recommended: React.FC<ContentTree.Recommended & RecommendedFragment>;
+import { ContentProps } from '../types';
+import type * as ComponentWorkarounds from '../Workarounds';
+interface RecommendedProps extends ContentProps<ComponentWorkarounds.Recommended> {
+}
+declare const Recommended: React.FC<RecommendedProps>;
 export default Recommended;

package/lib/components/Recommended/index.js

@@ -7,12 +7,7 @@ const react_1 = __importDefault(require("react"));
 //HACK: worked around missing Teaser type by declaring a module x-teaser.d.ts
 const Teaser_cjs_1 = require("@financial-times/x-teaser/dist/Teaser.cjs");
 const classnames_1 = __importDefault(require("classnames"));
-/**
- * Renders a Recommended teaser component
- * `<Teaser>` is imported from x-dash
- * https://github.com/Financial-Times/x-dash/tree/main/components/x-teaser)
- */
-const Recommended = ({ heading, teaser, isInLiveBlog, }) => {
+const Recommended = ({ content: { heading, teaser, isInLiveBlog }, }) => {
     if (!teaser) {
         return null;
     }

package/lib/components/Recommended/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Recommended/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAEzB,6EAA6E;AAC7E,0EAA2E;AAG3E,4DAAmC;AACnC;;;;GAIG;AAEH,MAAM,WAAW,GAA4D,CAAC,EAC5E,OAAO,EACP,MAAM,EACN,YAAY,GACb,EAAE,EAAE;IACH,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CACL,4DACkB,aAAa,EAC7B,SAAS,EAAE,IAAA,oBAAU,EAAC,qCAAqC,EAAE;YAC3D,8BAA8B,EAAE,CAAC,YAAY;SAC9C,CAAC,oBACa,aAAa;QAE3B,CAAC,YAAY,IAAI,CAChB,qCAAG,SAAS,EAAC,8BAA8B,IAAE,OAAO,CAAK,CAC1D;QACD,8BAAC,mBAAM,IACL,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAC5C,oBAAO,CAAC,UAAU,KAClB,MAAM,GACV,CACI,CACT,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Recommended/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAEzB,6EAA6E;AAC7E,0EAA2E;AAC3E,4DAAmC;AAWnC,MAAM,WAAW,GAA+B,CAAC,EAC/C,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,GAC3C,EAAE,EAAE;IACH,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CACL,4DACkB,aAAa,EAC7B,SAAS,EAAE,IAAA,oBAAU,EAAC,qCAAqC,EAAE;YAC3D,8BAA8B,EAAE,CAAC,YAAY;SAC9C,CAAC,oBACa,aAAa;QAE3B,CAAC,YAAY,IAAI,CAChB,qCAAG,SAAS,EAAC,8BAA8B,IAAE,OAAO,CAAK,CAC1D;QACD,8BAAC,mBAAM,IACL,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAC5C,oBAAO,CAAC,UAAU,KAClB,MAAM,GACV,CACI,CACT,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}

package/lib/components/RichText/BasicComponents.d.ts

@@ -1,16 +1,17 @@
 import React from 'react';
 import type { ContentTree } from '@financial-times/content-tree';
 import type { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema';
-export declare const List: React.FC<React.PropsWithChildren<ContentTree.List>>;
-export declare const ListItem: React.FC<React.PropsWithChildren<ContentTree.ListItem>>;
-export declare const Link: React.FC<React.PropsWithChildren<ContentTree.Link>>;
-export declare const Blockquote: React.FC<React.PropsWithChildren<ContentTree.Blockquote>>;
-export declare const Cite: React.FC<React.PropsWithChildren<ContentTree.Phrasing>>;
+import { ContentProps } from '../types';
+export declare const List: React.FC<React.PropsWithChildren<ContentProps<ContentTree.List>>>;
+export declare const ListItem: React.FC<React.PropsWithChildren<ContentProps<ContentTree.ListItem>>>;
+export declare const Link: React.FC<React.PropsWithChildren<ContentProps<ContentTree.Link>>>;
+export declare const Blockquote: React.FC<React.PropsWithChildren<ContentProps<ContentTree.Blockquote>>>;
+export declare const Cite: React.FC<React.PropsWithChildren<ContentProps<ContentTreeWorkarounds.Cite>>>;
 export declare const LineBreak: React.FC;
 export declare const HorizontalRule: React.FC;
-export declare const Emphasis: React.FC<React.PropsWithChildren<ContentTree.Emphasis>>;
-export declare const Strong: React.FC<React.PropsWithChildren<ContentTree.Strong>>;
-export declare const Strikethrough: React.FC<React.PropsWithChildren<ContentTree.Strikethrough>>;
-export declare const TableRow: React.FC<React.PropsWithChildren<ContentTreeWorkarounds.TableRow>>;
-export declare const TableFooter: React.FC<React.PropsWithChildren<ContentTreeWorkarounds.TableFooter>>;
-export declare const TableCaption: React.FC<React.PropsWithChildren<ContentTreeWorkarounds.TableCaption>>;
+export declare const Emphasis: React.FC<React.PropsWithChildren<ContentProps<ContentTree.Emphasis>>>;
+export declare const Strong: React.FC<React.PropsWithChildren<ContentProps<ContentTree.Strong>>>;
+export declare const Strikethrough: React.FC<React.PropsWithChildren<ContentProps<ContentTree.Strikethrough>>>;
+export declare const TableRow: React.FC<React.PropsWithChildren<ContentProps<ContentTreeWorkarounds.TableRow>>>;
+export declare const TableFooter: React.FC<React.PropsWithChildren<ContentProps<ContentTreeWorkarounds.TableFooter>>>;
+export declare const TableCaption: React.FC<React.PropsWithChildren<ContentProps<ContentTreeWorkarounds.TableCaption>>>;

package/lib/components/RichText/BasicComponents.js

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableCaption = exports.TableFooter = exports.TableRow = exports.Strikethrough = exports.Strong = exports.Emphasis = exports.HorizontalRule = exports.LineBreak = exports.Cite = exports.Blockquote = exports.Link = exports.ListItem = exports.List = void 0;
 const react_1 = __importDefault(require("react"));
-const List = (props) => (props.ordered ? react_1.default.createElement("ol", null, props.children) : react_1.default.createElement("ul", null, props.children));
+const List = (props) => props.content.ordered ? react_1.default.createElement("ol", null, props.children) : react_1.default.createElement("ul", null, props.children);
 exports.List = List;
 const ListItem = (props) => react_1.default.createElement("li", null, props.children);
 exports.ListItem = ListItem;
-const Link = (props) => (react_1.default.createElement("a", { href: props.url, title: props.title }, props.children));
+const Link = (props) => (react_1.default.createElement("a", { href: props.content.url, title: props.content.title }, props.children));
 exports.Link = Link;
 const Blockquote = (props) => {
     return (react_1.default.createElement("blockquote", { className: "n-content-blockquote" }, props.children));

package/lib/components/RichText/BasicComponents.js.map

@@ -1 +1 @@
-{"version":3,"file":"BasicComponents.js","sourceRoot":"","sources":["../../../src/components/RichText/BasicComponents.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAIlB,MAAM,IAAI,GAAwD,CACvE,KAAK,EACL,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAK,KAAK,CAAC,QAAQ,CAAM,CAAC,CAAC,CAAC,0CAAK,KAAK,CAAC,QAAQ,CAAM,CAAC,CAAA;AAF/D,QAAA,IAAI,QAE2D;AAErE,MAAM,QAAQ,GAEjB,CAAC,KAAK,EAAE,EAAE,CAAC,0CAAK,KAAK,CAAC,QAAQ,CAAM,CAAA;AAF3B,QAAA,QAAQ,YAEmB;AAEjC,MAAM,IAAI,GAAwD,CACvE,KAAK,EACL,EAAE,CAAC,CACH,qCAAG,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,IACnC,KAAK,CAAC,QAAQ,CACb,CACL,CAAA;AANY,QAAA,IAAI,QAMhB;AAEM,MAAM,UAAU,GAEnB,CAAC,KAAK,EAAE,EAAE;IACZ,OAAO,CACL,8CAAY,SAAS,EAAC,sBAAsB,IAAE,KAAK,CAAC,QAAQ,CAAc,CAC3E,CAAA;AACH,CAAC,CAAA;AANY,QAAA,UAAU,cAMtB;AAEM,MAAM,IAAI,GAA4D,CAC3E,KAAK,EACL,EAAE;IACF,OAAO,4CAAO,KAAK,CAAC,QAAQ,CAAQ,CAAA;AACtC,CAAC,CAAA;AAJY,QAAA,IAAI,QAIhB;AAEM,MAAM,SAAS,GAAa,GAAG,EAAE,CAAC,yCAAM,CAAA;AAAlC,QAAA,SAAS,aAAyB;AAExC,MAAM,cAAc,GAAa,GAAG,EAAE,CAAC,yCAAM,CAAA;AAAvC,QAAA,cAAc,kBAAyB;AAE7C,MAAM,QAAQ,GAEjB,CAAC,KAAK,EAAE,EAAE,CAAC,0CAAK,KAAK,CAAC,QAAQ,CAAM,CAAA;AAF3B,QAAA,QAAQ,YAEmB;AAEjC,MAAM,MAAM,GAA0D,CAC3E,KAAK,EACL,EAAE,CAAC,8CAAS,KAAK,CAAC,QAAQ,CAAU,CAAA;AAFzB,QAAA,MAAM,UAEmB;AAE/B,MAAM,aAAa,GAEtB,CAAC,KAAK,EAAE,EAAE,CAAC,yCAAI,KAAK,CAAC,QAAQ,CAAK,CAAA;AAFzB,QAAA,aAAa,iBAEY;AAE/B,MAAM,QAAQ,GAEjB,CAAC,KAAK,EAAE,EAAE,CAAC,0CAAK,KAAK,CAAC,QAAQ,CAAM,CAAA;AAF3B,QAAA,QAAQ,YAEmB;AAEjC,MAAM,WAAW,GAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,CACb;IACE;QACE,sCAAI,OAAO,EAAE,IAAI,EAAE,SAAS,EAAC,kBAAkB,IAC5C,KAAK,CAAC,QAAQ,CACZ,CACF,CACC,CACT,CAAA;AAVY,QAAA,WAAW,eAUvB;AAEM,MAAM,YAAY,GAErB,CAAC,KAAK,EAAE,EAAE,CAAC,CACb,2CAAS,SAAS,EAAC,uDAAuD,IACvE,KAAK,CAAC,QAAQ,CACP,CACX,CAAA;AANY,QAAA,YAAY,gBAMxB"}
+{"version":3,"file":"BasicComponents.js","sourceRoot":"","sources":["../../../src/components/RichText/BasicComponents.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAKlB,MAAM,IAAI,GAEb,CAAC,KAAK,EAAE,EAAE,CACZ,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAK,KAAK,CAAC,QAAQ,CAAM,CAAC,CAAC,CAAC,0CAAK,KAAK,CAAC,QAAQ,CAAM,CAAA;AAHlE,QAAA,IAAI,QAG8D;AAExE,MAAM,QAAQ,GAEjB,CAAC,KAAK,EAAE,EAAE,CAAC,0CAAK,KAAK,CAAC,QAAQ,CAAM,CAAA;AAF3B,QAAA,QAAQ,YAEmB;AAEjC,MAAM,IAAI,GAEb,CAAC,KAAK,EAAE,EAAE,CAAC,CACb,qCAAG,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,IACnD,KAAK,CAAC,QAAQ,CACb,CACL,CAAA;AANY,QAAA,IAAI,QAMhB;AAEM,MAAM,UAAU,GAEnB,CAAC,KAAK,EAAE,EAAE;IACZ,OAAO,CACL,8CAAY,SAAS,EAAC,sBAAsB,IAAE,KAAK,CAAC,QAAQ,CAAc,CAC3E,CAAA;AACH,CAAC,CAAA;AANY,QAAA,UAAU,cAMtB;AAEM,MAAM,IAAI,GAEb,CAAC,KAAK,EAAE,EAAE;IACZ,OAAO,4CAAO,KAAK,CAAC,QAAQ,CAAQ,CAAA;AACtC,CAAC,CAAA;AAJY,QAAA,IAAI,QAIhB;AAEM,MAAM,SAAS,GAAa,GAAG,EAAE,CAAC,yCAAM,CAAA;AAAlC,QAAA,SAAS,aAAyB;AAExC,MAAM,cAAc,GAAa,GAAG,EAAE,CAAC,yCAAM,CAAA;AAAvC,QAAA,cAAc,kBAAyB;AAE7C,MAAM,QAAQ,GAEjB,CAAC,KAAK,EAAE,EAAE,CAAC,0CAAK,KAAK,CAAC,QAAQ,CAAM,CAAA;AAF3B,QAAA,QAAQ,YAEmB;AAEjC,MAAM,MAAM,GAEf,CAAC,KAAK,EAAE,EAAE,CAAC,8CAAS,KAAK,CAAC,QAAQ,CAAU,CAAA;AAFnC,QAAA,MAAM,UAE6B;AAEzC,MAAM,aAAa,GAEtB,CAAC,KAAK,EAAE,EAAE,CAAC,yCAAI,KAAK,CAAC,QAAQ,CAAK,CAAA;AAFzB,QAAA,aAAa,iBAEY;AAE/B,MAAM,QAAQ,GAEjB,CAAC,KAAK,EAAE,EAAE,CAAC,0CAAK,KAAK,CAAC,QAAQ,CAAM,CAAA;AAF3B,QAAA,QAAQ,YAEmB;AAEjC,MAAM,WAAW,GAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,CACb;IACE;QACE,sCAAI,OAAO,EAAE,IAAI,EAAE,SAAS,EAAC,kBAAkB,IAC5C,KAAK,CAAC,QAAQ,CACZ,CACF,CACC,CACT,CAAA;AAVY,QAAA,WAAW,eAUvB;AAEM,MAAM,YAAY,GAErB,CAAC,KAAK,EAAE,EAAE,CAAC,CACb,2CAAS,SAAS,EAAC,uDAAuD,IACvE,KAAK,CAAC,QAAQ,CACP,CACX,CAAA;AANY,QAAA,YAAY,gBAMxB"}

package/lib/components/RichText/index.d.ts

@@ -1,8 +1,15 @@
 import React, { JSXElementConstructor } from 'react';
-import type { StructuredContentFragment } from '@financial-times/cp-content-pipeline-client';
+import type { StructuredContentFragment, ReferenceMapping } from '@financial-times/cp-content-pipeline-client';
 import { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema';
-export type RichTextComponentMapRecord = Partial<Record<ContentTreeWorkarounds.AnyNode['type'] | 'fallback', JSXElementConstructor<any>>>;
-export declare const ComponentsContext: React.Context<Partial<Record<"blockquote" | "body" | "cite" | "link" | "strong" | "table" | "video" | "clip" | "text" | "layout" | "table-caption" | "table-cell" | "table-row" | "list-item" | "heading" | "recommended" | "image-set" | "flourish" | "pullquote" | "table-body" | "table-footer" | "break" | "thematic-break" | "paragraph" | "emphasis" | "strikethrough" | "list" | "custom-code-component" | "root" | "clip-set" | "tweet" | "big-number" | "scrolly-block" | "scrolly-section" | "scrolly-copy" | "scrolly-heading" | "scrolly-image" | "layout-slot" | "layout-image" | "youtube-video" | "main-image" | "raw-image" | "main-image-raw" | "author-link" | "fallback", React.JSXElementConstructor<any>>> | undefined>;
+import { mapNodeToReference } from '@financial-times/cp-content-pipeline-schema/lib/resolvers/content-tree/references';
+import { ContentProps } from '../types';
+type mapComponentToReference<T extends ContentTreeWorkarounds.AnyNode['type']> = T extends keyof typeof mapNodeToReference ? (typeof mapNodeToReference)[T] extends keyof ReferenceMapping ? ReferenceMapping[(typeof mapNodeToReference)[T]] : never : Record<string, never>;
+export type RichTextComponentMapRecord = {
+    [T in ContentTreeWorkarounds.AnyNode | {
+        type: 'fallback';
+    } as T['type']]?: JSXElementConstructor<React.PropsWithChildren<T['type'] extends 'fallback' ? unknown : ContentProps<T & mapComponentToReference<Exclude<T['type'], 'fallback'>>>>>;
+};
+export declare const ComponentsContext: React.Context<RichTextComponentMapRecord | undefined>;
 type WithOptionalProperty<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
 export type RichTextProps = {
     structuredContent: WithOptionalProperty<StructuredContentFragment, 'references'>;

package/lib/components/RichText/index.js

@@ -110,10 +110,16 @@ const RichTextChild = ({ node, components, references, parentIndex, }) => {
                 .filter(Boolean)
             : [];
         const reference = typeof node.data?.referenceIndex === 'number'
-            ? references[node.data?.referenceIndex]
+            ? references[node.data?.referenceIndex] ?? {}
             : {};
         return (react_1.default.createElement(context_1.default.Provider, { value: RichText },
-            react_1.default.createElement(Component, { ...node, ...reference, key: parentIndex, parentIndex: parentIndex }, children)));
+            react_1.default.createElement(Component
+            // HACK:20240808:IM TypeScript fails to unify the content types here
+            // and I'm not sure why :(
+            , { 
+                // HACK:20240808:IM TypeScript fails to unify the content types here
+                // and I'm not sure why :(
+                content: { ...node, ...reference }, key: parentIndex, parentIndex: parentIndex }, children)));
     }
     return null;
 };

package/lib/components/RichText/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/RichText/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/RichText/index.tsx"],"names":[],"mappings":"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"}

package/lib/components/Scrollytelling/ScrollyImage.d.ts

@@ -1,4 +1,7 @@
-import { ContentTree } from '@financial-times/content-tree';
-import { ScrollyImageFragment } from '@financial-times/cp-content-pipeline-client';
 import React from 'react';
-export declare const ScrollyImage: React.FC<ContentTree.ScrollyImage & ScrollyImageFragment>;
+import { ContentProps } from '../types';
+import type * as ComponentWorkarounds from '../Workarounds';
+interface ScrollyImageProps extends ContentProps<ComponentWorkarounds.ScrollyImage> {
+}
+export declare const ScrollyImage: React.FC<ScrollyImageProps>;
+export {};

package/lib/components/Scrollytelling/ScrollyImage.js

@@ -47,7 +47,7 @@ const scrollyGetBreakpoints = (image) => {
             };
     }
 };
-const ScrollyImage = ({ picture }) => {
+const ScrollyImage = ({ content: { picture }, }) => {
     const scrollyId = (0, react_1.useContext)(_1.ScrollyIDContext);
     if (!picture?.images) {
         throw new Error(`ScrollyImage has no images. Check that they are present in the query`);
@@ -55,7 +55,7 @@ const ScrollyImage = ({ picture }) => {
     return (react_1.default.createElement("figure", { className: "n-scrollytelling__figure n-content-image--full", "data-scrollytelling-slide": scrollyId },
         react_1.default.createElement("picture", null,
             react_1.default.createElement(ImageSet_1.Sources, { images: picture.images, getBreakpoints: scrollyGetBreakpoints }),
-            react_1.default.createElement(ImageSet_1.FallbackImage, { image: picture.fallbackImage, imageType: picture.imageType, className: "n-scrollytelling__image", inSourceSet: true })),
+            react_1.default.createElement(ImageSet_1.FallbackImage, { content: { image: picture.fallbackImage }, imageType: picture.imageType, className: "n-scrollytelling__image", inSourceSet: true })),
         (picture.caption || picture.credit) && (react_1.default.createElement("figcaption", { className: "n-scrollytelling__caption n-scrollytelling__caption--has-caption" },
             picture.caption ? picture.caption + ' ' : '',
             picture.credit))));

package/lib/components/Scrollytelling/ScrollyImage.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScrollyImage.js","sourceRoot":"","sources":["../../../src/components/Scrollytelling/ScrollyImage.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,+CAAyC;AACzC,0CAAsE;AACtE,wBAAoC;AAEpC,MAAM,qBAAqB,GAAqB,CAAC,KAAK,EAAE,EAAE;IACxD,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO;gBACL,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,WAAW,EAAE;gBAC9C,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,WAAW,EAAE;gBAC9C,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;gBAC/C,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;gBAChD,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;aAClD,CAAA;QACH,KAAK,QAAQ;YACX,OAAO;gBACL,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE;gBAC7C,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE;gBAC7C,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE;gBAC7C,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE;gBAC/C,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE;aACjD,CAAA;IACL,CAAC;AACH,CAAC,CAAA;AAEM,MAAM,YAAY,GAErB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IAClB,MAAM,SAAS,GAAG,IAAA,kBAAU,EAAC,mBAAgB,CAAC,CAAA;IAE9C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAA;IACH,CAAC;IAED,OAAO,CACL,0CACE,SAAS,EAAC,gDAAgD,+BAC/B,SAAS;QAEpC;YACE,8BAAC,kBAAO,IACN,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,qBAAqB,GACrC;YACF,8BAAC,wBAAa,IACZ,KAAK,EAAE,OAAO,CAAC,aAAa,EAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,SAAS,EAAC,yBAAyB,EACnC,WAAW,EAAE,IAAI,GACjB,CACM;QACT,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CACtC,8CAAY,SAAS,EAAC,kEAAkE;YACrF,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE;YAC5C,OAAO,CAAC,MAAM,CACJ,CACd,CACM,CACV,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,YAAY,gBAoCxB"}
+{"version":3,"file":"ScrollyImage.js","sourceRoot":"","sources":["../../../src/components/Scrollytelling/ScrollyImage.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAyC;AACzC,0CAAsE;AACtE,wBAAoC;AAIpC,MAAM,qBAAqB,GAAqB,CAAC,KAAK,EAAE,EAAE;IACxD,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO;gBACL,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,WAAW,EAAE;gBAC9C,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,WAAW,EAAE;gBAC9C,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;gBAC/C,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;gBAChD,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;aAClD,CAAA;QACH,KAAK,QAAQ;YACX,OAAO;gBACL,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE;gBAC7C,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE;gBAC7C,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE;gBAC7C,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE;gBAC/C,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE;aACjD,CAAA;IACL,CAAC;AACH,CAAC,CAAA;AAKM,MAAM,YAAY,GAAgC,CAAC,EACxD,OAAO,EAAE,EAAE,OAAO,EAAE,GACrB,EAAE,EAAE;IACH,MAAM,SAAS,GAAG,IAAA,kBAAU,EAAC,mBAAgB,CAAC,CAAA;IAE9C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAA;IACH,CAAC;IAED,OAAO,CACL,0CACE,SAAS,EAAC,gDAAgD,+BAC/B,SAAS;QAEpC;YACE,8BAAC,kBAAO,IACN,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,qBAAqB,GACrC;YACF,8BAAC,wBAAa,IACZ,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,aAAa,EAAE,EACzC,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,SAAS,EAAC,yBAAyB,EACnC,WAAW,EAAE,IAAI,GACjB,CACM;QACT,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CACtC,8CAAY,SAAS,EAAC,kEAAkE;YACrF,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE;YAC5C,OAAO,CAAC,MAAM,CACJ,CACd,CACM,CACV,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,YAAY,gBAoCxB"}

package/lib/components/Scrollytelling/index.d.ts

@@ -1,9 +1,17 @@
 import React from 'react';
 import type { ContentTree } from '@financial-times/content-tree';
+import { ContentProps } from '../types';
 export declare const ScrollyIDContext: React.Context<string | null>;
-export declare const ScrollyBlock: React.FC<React.PropsWithChildren<Omit<ContentTree.ScrollyBlock, 'children'>> & {
-    parentIndex: number;
-}>;
-export declare const ScrollySection: React.FC<React.PropsWithChildren<ContentTree.ScrollySection>>;
-export declare const ScrollyCopy: React.FC<React.PropsWithChildren<ContentTree.ScrollyCopy>>;
-export declare const ScrollyHeading: React.FC<React.PropsWithChildren<ContentTree.ScrollyHeading>>;
+interface ScrollyBlockProps extends ContentProps<ContentTree.transit.ScrollyBlock> {
+}
+export declare const ScrollyBlock: React.FC<React.PropsWithChildren<ScrollyBlockProps>>;
+interface ScrollySectionProps extends ContentProps<ContentTree.transit.ScrollySection> {
+}
+export declare const ScrollySection: React.FC<React.PropsWithChildren<ScrollySectionProps>>;
+interface ScrollyCopyProps extends ContentProps<ContentTree.ScrollyCopy> {
+}
+export declare const ScrollyCopy: React.FC<React.PropsWithChildren<ScrollyCopyProps>>;
+interface ScrollyHeadingProps extends ContentProps<ContentTree.ScrollyHeading> {
+}
+export declare const ScrollyHeading: React.FC<React.PropsWithChildren<ScrollyHeadingProps>>;
+export {};

package/lib/components/Scrollytelling/index.js

@@ -31,12 +31,12 @@ const react_1 = __importStar(require("react"));
 const classnames_1 = __importDefault(require("classnames"));
 const Paragraph_1 = require("../Paragraph");
 exports.ScrollyIDContext = (0, react_1.createContext)(null);
-const ScrollyBlock = ({ children, theme, parentIndex }) => (react_1.default.createElement("div", { className: "n-content-layout n-content-layout--scrollytelling", "data-layout-name": "auto" },
+const ScrollyBlock = ({ content: { theme }, children, parentIndex }) => (react_1.default.createElement("div", { className: "n-content-layout n-content-layout--scrollytelling", "data-layout-name": "auto" },
     react_1.default.createElement("div", { className: (0, classnames_1.default)('n-scrollytelling', `n-scrollytelling--theme-${theme}`), "data-component": "scrollytelling-image", "data-scrollytelling-theme": theme },
         react_1.default.createElement("div", { className: "n-scrollytelling__viewport" }, react_1.default.Children.map(children, (child, index) => (react_1.default.createElement(exports.ScrollyIDContext.Provider, { value: `${parentIndex}-${index}` }, child)))))));
 exports.ScrollyBlock = ScrollyBlock;
 const ScrollySectionOptionsContext = (0, react_1.createContext)(null);
-const ScrollySection = ({ children, display, noBox, position, transition }) => (react_1.default.createElement(ScrollySectionOptionsContext.Provider, { value: { display, noBox, position, transition } },
+const ScrollySection = ({ content: { display, noBox, position, transition }, children }) => (react_1.default.createElement(ScrollySectionOptionsContext.Provider, { value: { display, noBox, position, transition } },
     react_1.default.createElement(react_1.default.Fragment, null, children)));
 exports.ScrollySection = ScrollySection;
 const ScrollyCopy = ({ children }) => {
@@ -59,7 +59,7 @@ const ScrollyCopy = ({ children }) => {
                 react_1.default.createElement(react_1.default.Fragment, null, children)))));
 };
 exports.ScrollyCopy = ScrollyCopy;
-const ScrollyHeading = ({ children, level }) => {
+const ScrollyHeading = ({ content: { level }, children }) => {
     const classNames = (0, classnames_1.default)('n-scrollytelling__overlay-text', `n-scrollytelling__overlay-text--text-style-${level}`);
     switch (level) {
         case 'chapter':

package/lib/components/Scrollytelling/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Scrollytelling/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Scrollytelling/index.tsx"],"names":[],"mappings":"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"}

package/lib/components/Table/TableBody.d.ts

@@ -1,4 +1,7 @@
 import { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema';
 import React from 'react';
-declare const TableBody: React.FC<React.PropsWithChildren<ContentTreeWorkarounds.TableBody>>;
+import { ContentProps } from '../types';
+interface TableBodyProps extends ContentProps<ContentTreeWorkarounds.TableBody> {
+}
+declare const TableBody: React.FC<React.PropsWithChildren<TableBodyProps>>;
 export default TableBody;

package/lib/components/Table/TableBody.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
-const TableBody = ({ children }) => {
+const TableBody = ({ children, }) => {
     const [headerRow, ...bodyRows] = react_1.default.Children.toArray(children);
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement("thead", null, headerRow),

package/lib/components/Table/TableBody.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableBody.js","sourceRoot":"","sources":["../../../src/components/Table/TableBody.tsx"],"names":[],"mappings":";;;;;AACA,kDAAyB;AAEzB,MAAM,SAAS,GAEX,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACnB,MAAM,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAEjE,OAAO,CACL;QACE,6CAAQ,SAAS,CAAS;QAC1B,6CAAQ,QAAQ,CAAS,CACxB,CACJ,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"TableBody.js","sourceRoot":"","sources":["../../../src/components/Table/TableBody.tsx"],"names":[],"mappings":";;;;;AACA,kDAAyB;AAMzB,MAAM,SAAS,GAAsD,CAAC,EACpE,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAEjE,OAAO,CACL;QACE,6CAAQ,SAAS,CAAS;QAC1B,6CAAQ,QAAQ,CAAS,CACxB,CACJ,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/lib/components/Table/TableCell.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema';
-type TableCellProps = React.PropsWithChildren<ContentTreeWorkarounds.TableCell> & {
-    parentIndex: number;
-};
-export declare const TableCell: React.FC<TableCellProps>;
+import { ContentProps } from '../types';
+interface TableCellProps extends ContentProps<ContentTreeWorkarounds.TableCell> {
+}
+export declare const TableCell: React.FC<React.PropsWithChildren<TableCellProps>>;
 export {};

package/lib/components/Table/TableCell.js

@@ -32,11 +32,11 @@ const _1 = require(".");
 const classnames_1 = __importDefault(require("classnames"));
 const TableCell = (props) => {
     const allColumnSettings = (0, react_1.useContext)(_1.ColumnSettingsContext);
-    const columnSettings = allColumnSettings[props.parentIndex] ?? {
+    const columnSettings = (props.parentIndex ? allColumnSettings[props.parentIndex] : undefined) ?? {
         hideOnMobile: false,
         sortable: false,
     };
-    return props.heading ? (react_1.default.createElement("th", { className: (0, classnames_1.default)({
+    return props.content.heading ? (react_1.default.createElement("th", { className: (0, classnames_1.default)({
             'n-content-body__table-cell--hide-mobile': columnSettings.hideOnMobile,
         }), "data-o-table-data-type": columnSettings.sortType, "data-o-table-heading-disable-sort": !columnSettings.sortable || undefined, scope: "col", role: "columnheader" }, props.children)) : (react_1.default.createElement("td", { className: (0, classnames_1.default)({
             'o-table__cell--numeric': columnSettings.sortType === 'number',

package/lib/components/Table/TableCell.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableCell.js","sourceRoot":"","sources":["../../../src/components/Table/TableCell.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAyC;AAEzC,wBAAyC;AACzC,4DAAmC;AAM5B,MAAM,SAAS,GAA6B,CAAC,KAAK,EAAE,EAAE;IAC3D,MAAM,iBAAiB,GAAG,IAAA,kBAAU,EAAC,wBAAqB,CAAC,CAAA;IAC3D,MAAM,cAAc,GAClB,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI;QACtC,YAAY,EAAE,KAAK;QACnB,QAAQ,EAAE,KAAK;KAChB,CAAA;IAEH,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CACrB,sCACE,SAAS,EAAE,IAAA,oBAAU,EAAC;YACpB,yCAAyC,EAAE,cAAc,CAAC,YAAY;SACvE,CAAC,4BACsB,cAAc,CAAC,QAAQ,uCACZ,CAAC,cAAc,CAAC,QAAQ,IAAI,SAAS,EACxE,KAAK,EAAC,KAAK,EACX,IAAI,EAAC,cAAc,IAElB,KAAK,CAAC,QAAQ,CACZ,CACN,CAAC,CAAC,CAAC,CACF,sCACE,SAAS,EAAE,IAAA,oBAAU,EAAC;YACpB,wBAAwB,EAAE,cAAc,CAAC,QAAQ,KAAK,QAAQ;YAC9D,yCAAyC,EAAE,cAAc,CAAC,YAAY;SACvE,CAAC,IAED,KAAK,CAAC,QAAQ,CACZ,CACN,CAAA;AACH,CAAC,CAAA;AA9BY,QAAA,SAAS,aA8BrB"}
+{"version":3,"file":"TableCell.js","sourceRoot":"","sources":["../../../src/components/Table/TableCell.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAyC;AAEzC,wBAAyC;AACzC,4DAAmC;AAM5B,MAAM,SAAS,GAAsD,CAC1E,KAAK,EACL,EAAE;IACF,MAAM,iBAAiB,GAAG,IAAA,kBAAU,EAAC,wBAAqB,CAAC,CAAA;IAC3D,MAAM,cAAc,GAClB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI;QACxE,YAAY,EAAE,KAAK;QACnB,QAAQ,EAAE,KAAK;KAChB,CAAA;IAEH,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAC7B,sCACE,SAAS,EAAE,IAAA,oBAAU,EAAC;YACpB,yCAAyC,EAAE,cAAc,CAAC,YAAY;SACvE,CAAC,4BACsB,cAAc,CAAC,QAAQ,uCACZ,CAAC,cAAc,CAAC,QAAQ,IAAI,SAAS,EACxE,KAAK,EAAC,KAAK,EACX,IAAI,EAAC,cAAc,IAElB,KAAK,CAAC,QAAQ,CACZ,CACN,CAAC,CAAC,CAAC,CACF,sCACE,SAAS,EAAE,IAAA,oBAAU,EAAC;YACpB,wBAAwB,EAAE,cAAc,CAAC,QAAQ,KAAK,QAAQ;YAC9D,yCAAyC,EAAE,cAAc,CAAC,YAAY;SACvE,CAAC,IAED,KAAK,CAAC,QAAQ,CACZ,CACN,CAAA;AACH,CAAC,CAAA;AAhCY,QAAA,SAAS,aAgCrB"}

package/lib/components/Table/index.d.ts

@@ -1,5 +1,8 @@
 import type { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema';
 import React from 'react';
+import { ContentProps } from '../types';
 export declare const ColumnSettingsContext: React.Context<ContentTreeWorkarounds.TableColumnSettings[]>;
-declare const Table: React.FC<React.PropsWithChildren<ContentTreeWorkarounds.Table>>;
+interface TableProps extends ContentProps<ContentTreeWorkarounds.Table> {
+}
+declare const Table: React.FC<React.PropsWithChildren<TableProps>>;
 export default Table;

package/lib/components/Table/index.js

@@ -30,7 +30,7 @@ exports.ColumnSettingsContext = void 0;
 const react_1 = __importStar(require("react"));
 const classnames_1 = __importDefault(require("classnames"));
 exports.ColumnSettingsContext = (0, react_1.createContext)([]);
-const Table = ({ children, compact, layoutWidth, stripes, responsiveStyle, columnSettings, collapseAfterHowManyRows, }) => {
+const Table = ({ children, content: { compact, layoutWidth, stripes, responsiveStyle, columnSettings, collapseAfterHowManyRows, }, }) => {
     return (react_1.default.createElement(exports.ColumnSettingsContext.Provider, { value: columnSettings },
         react_1.default.createElement("div", { className: (0, classnames_1.default)('o-table-container n-content-layout', {
                 'o-table-container--contracted': Boolean(collapseAfterHowManyRows),

package/lib/components/Table/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Table/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA4C;AAC5C,4DAAmC;AAEtB,QAAA,qBAAqB,GAAG,IAAA,qBAAa,EAEhD,EAAE,CAAC,CAAA;AAEL,MAAM,KAAK,GAEP,CAAC,EACH,QAAQ,EACR,OAAO,EACP,WAAW,EACX,OAAO,EACP,eAAe,EACf,cAAc,EACd,wBAAwB,GACzB,EAAE,EAAE;IACH,OAAO,CACL,8BAAC,6BAAqB,CAAC,QAAQ,IAAC,KAAK,EAAE,cAAc;QACnD,uCACE,SAAS,EAAE,IAAA,oBAAU,EAAC,oCAAoC,EAAE;gBAC1D,+BAA+B,EAAE,OAAO,CAAC,wBAAwB,CAAC;aACnE,CAAC,uBACiB,WAAW,oBACf,OAAO;YAEtB,uCACE,SAAS,EAAE,IAAA,oBAAU,EAAC,yBAAyB,EAAE;oBAC/C,6BAA6B,EAAE,WAAW,KAAK,MAAM;iBACtD,CAAC;gBAEF,uCAAK,SAAS,EAAC,wBAAwB;oBACrC,yCACE,SAAS,EAAE,IAAA,oBAAU,EACnB,SAAS,EACT,uBAAuB,eAAe,EAAE,EACxC;4BACE,kBAAkB,EAAE,OAAO;4BAC3B,sBAAsB,EAAE,OAAO;4BAC/B,2BAA2B,EAAE,CAAC,OAAO;yBACtC,CACF,sBACgB,SAAS,6BACD,eAAe,oCACR,wBAAwB,2BACjC,MAAM,CAAC,CAAC,wBAAwB,CAAC,IAEvD,QAAQ,CACH,CACJ,CACF,CACF,CACyB,CAClC,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,KAAK,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Table/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA4C;AAC5C,4DAAmC;AAGtB,QAAA,qBAAqB,GAAG,IAAA,qBAAa,EAEhD,EAAE,CAAC,CAAA;AAIL,MAAM,KAAK,GAAkD,CAAC,EAC5D,QAAQ,EACR,OAAO,EAAE,EACP,OAAO,EACP,WAAW,EACX,OAAO,EACP,eAAe,EACf,cAAc,EACd,wBAAwB,GACzB,GACF,EAAE,EAAE;IACH,OAAO,CACL,8BAAC,6BAAqB,CAAC,QAAQ,IAAC,KAAK,EAAE,cAAc;QACnD,uCACE,SAAS,EAAE,IAAA,oBAAU,EAAC,oCAAoC,EAAE;gBAC1D,+BAA+B,EAAE,OAAO,CAAC,wBAAwB,CAAC;aACnE,CAAC,uBACiB,WAAW,oBACf,OAAO;YAEtB,uCACE,SAAS,EAAE,IAAA,oBAAU,EAAC,yBAAyB,EAAE;oBAC/C,6BAA6B,EAAE,WAAW,KAAK,MAAM;iBACtD,CAAC;gBAEF,uCAAK,SAAS,EAAC,wBAAwB;oBACrC,yCACE,SAAS,EAAE,IAAA,oBAAU,EACnB,SAAS,EACT,uBAAuB,eAAe,EAAE,EACxC;4BACE,kBAAkB,EAAE,OAAO;4BAC3B,sBAAsB,EAAE,OAAO;4BAC/B,2BAA2B,EAAE,CAAC,OAAO;yBACtC,CACF,sBACgB,SAAS,6BACD,eAAe,oCACR,wBAAwB,2BACjC,MAAM,CAAC,CAAC,wBAAwB,CAAC,IAEvD,QAAQ,CACH,CACJ,CACF,CACF,CACyB,CAClC,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,KAAK,CAAA"}

package/lib/components/Topper/Picture.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { TopperFragment } from '@financial-times/cp-content-pipeline-client';
-type PictureProps = {
+export type PictureProps = {
     topper: TopperFragment;
     alt?: string;
 };

package/lib/components/Topper/Picture.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const ImageSet_1 = require("../ImageSet");
+const ImageOverrideWrappers_1 = require("../ImageOverrideWrappers");
 const topperGetBreakpointsMap = {
     SplitTextTopper(image) {
         switch (image.format) {
@@ -59,14 +60,16 @@ const topperGetBreakpointsMap = {
         }
     },
 };
-const Picture = ({ topper, alt = '' }) => {
+const Picture = (props) => {
+    const { topper, alt = '' } = props;
     if (!('images' in topper) || !topper.fallbackImage) {
         return null;
     }
     return (react_1.default.createElement("figure", { className: "o-topper__visual" },
         react_1.default.createElement("picture", { className: "o-topper__picture", key: "responsive-images" },
-            react_1.default.createElement(ImageSet_1.Sources, { images: topper.images, getBreakpoints: topperGetBreakpointsMap[topper.__typename] }),
-            react_1.default.createElement("img", { alt: alt, className: "o-topper__image", src: topper.fallbackImage.sourceSet[0]?.url, key: "fallback-image" })),
+            react_1.default.createElement(ImageOverrideWrappers_1.PictureOverrideWrapper, { ...props },
+                react_1.default.createElement(ImageSet_1.Sources, { images: topper.images, getBreakpoints: topperGetBreakpointsMap[topper.__typename] }),
+                react_1.default.createElement("img", { alt: alt, className: "o-topper__image", src: topper.fallbackImage.sourceSet[0]?.url, key: "fallback-image" }))),
         topper.fallbackImage.caption ||
             topper.__typename === 'DeepPortraitTopper' ||
             topper.__typename === 'DeepLandscapeTopper' ? (react_1.default.createElement("figcaption", { className: "o-topper__image-caption" },

package/lib/components/Topper/Picture.js.map

@@ -1 +1 @@
-{"version":3,"file":"Picture.js","sourceRoot":"","sources":["../../../src/components/Topper/Picture.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Picture.js","sourceRoot":"","sources":["../../../src/components/Topper/Picture.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAIzB,0CAA2E;AAC3E,oEAAiE;AAGjE,MAAM,uBAAuB,GAEzB;IACF,eAAe,CAAC,KAAK;QACnB,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;YACrB,KAAK,QAAQ;gBACX,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;YAC/D,KAAK,UAAU;gBACb,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAA;YACzC,KAAK,MAAM;gBACT,OAAO;oBACL,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC1C,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;iBAC3B,CAAA;QACL,CAAC;IACH,CAAC;IAED,eAAe,CAAC,KAAK;QACnB,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;YACrB,KAAK,QAAQ;gBACX,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAA;YAC1B,KAAK,UAAU;gBACb,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;YAC1C,KAAK,MAAM;gBACT,OAAO;oBACL,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC1C,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;oBACxC,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;oBACzC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;iBAC3B,CAAA;QACL,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,KAAK;QACtB,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;YACrB,KAAK,UAAU;gBACb,OAAO;oBACL,KAAK,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE;oBACxB,MAAM,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE;oBACzC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACzB,CAAA;QACL,CAAC;IACH,CAAC;IAED,mBAAmB,CAAC,KAAK;QACvB,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;YACrB,KAAK,UAAU;gBACb,OAAO;oBACL,KAAK,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE;oBACxB,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE;iBAC1C,CAAA;YACH,KAAK,WAAW;gBACd,OAAO;oBACL,MAAM,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE;oBACzC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACzB,CAAA;QACL,CAAC;IACH,CAAC;CACF,CAAA;AAOD,MAAM,OAAO,GAA2B,CAAC,KAAK,EAAE,EAAE;IAChD,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,EAAE,GAAG,KAAK,CAAA;IAClC,IAAI,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QACnD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CACL,0CAAQ,SAAS,EAAC,kBAAkB;QAClC,2CAAS,SAAS,EAAC,mBAAmB,EAAC,GAAG,EAAC,mBAAmB;YAC5D,8BAAC,8CAAsB,OAAK,KAAK;gBAC/B,8BAAC,kBAAO,IACN,MAAM,EAAE,MAAM,CAAC,MAAsC,EACrD,cAAc,EAAE,uBAAuB,CAAC,MAAM,CAAC,UAAU,CAAC,GAC1D;gBAEF,uCACE,GAAG,EAAE,GAAG,EACR,SAAS,EAAC,iBAAiB,EAC3B,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAC3C,GAAG,EAAC,gBAAgB,GACpB,CACqB,CACjB;QACT,MAAM,CAAC,aAAa,CAAC,OAAO;YAC7B,MAAM,CAAC,UAAU,KAAK,oBAAoB;YAC1C,MAAM,CAAC,UAAU,KAAK,qBAAqB,CAAC,CAAC,CAAC,CAC5C,8CAAY,SAAS,EAAC,yBAAyB;YAC5C,MAAM,CAAC,aAAa,CAAC,OAAO;;YAAG,MAAM,CAAC,aAAa,CAAC,MAAM,CAChD,CACd,CAAC,CAAC,CAAC,CACF,MAAM,CAAC,aAAa,CAAC,MAAM,IAAI,CAC7B,8CAAY,SAAS,EAAE,wBAAwB,IAC5C,MAAM,CAAC,aAAa,CAAC,MAAM,CACjB,CACd,CACF,CACM,CACV,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,OAAO,CAAA"}

package/lib/components/Topper/index.js

@@ -99,7 +99,13 @@ const Topper = ({ content, slot, followButtonSlot, showPremiumLabel = false, rea
                         react_1.default.createElement(LiveBlogIndicator_1.default, { realtime: content.realtime ?? undefined, lastUpdatedDateTime: getMostRecentPostPublishedDate() }))) : (react_1.default.createElement(Tags_1.default, { __typename: topper.__typename, isPackage: isPackage, displayConcept: topper.displayConcept ?? undefined, brandConcept: ('brandConcept' in topper && topper.brandConcept) || undefined, genreConcept: ('genreConcept' in topper && topper.genreConcept) || undefined, headshot: hasHeadshot || undefined, hasColumnist: hasColumnist, followButtonVariant: topper.followButtonVariant, FollowButtonSlot: followButtonSlot })),
                     react_1.default.createElement(Headline_1.default, { headline: topper.headline, showPremiumLabel: showPremiumLabel && content.accessLevel === 'premium', isLargeHeadline: ('isLargeHeadline' in topper && topper.isLargeHeadline) ??
                             undefined }),
-                    isLiveBlog && isFlourish ? (react_1.default.createElement(Flourish_1.default, { id: topper.leadFlourish.id || '', flourishType: topper.leadFlourish.type || '', description: topper.leadFlourish.description || '', fallbackImage: topper.leadFlourish.fallbackImage || '', iFrame: true, inArticleBody: false })) : (''),
+                    isLiveBlog && isFlourish ? (react_1.default.createElement(Flourish_1.default, { content: {
+                            type: 'flourish',
+                            id: topper.leadFlourish.id ?? '',
+                            flourishType: topper.leadFlourish.type ?? '',
+                            description: topper.leadFlourish.description ?? '',
+                            fallbackImage: topper.leadFlourish.fallbackImage,
+                        }, iFrame: true, inArticleBody: false })) : (''),
                     topper.intro && (react_1.default.createElement(Intro_1.default, { structured: topper.intro.structured, source: topper.intro.source })),
                     hasHeadshot && !isAudio && isOpinion && topper.columnist && (react_1.default.createElement("div", { className: "o-topper__headshot" },
                         react_1.default.createElement(Headshot_1.default, { headshot: topper.headshot, prefLabel: topper.columnist.prefLabel, className: 'o-topper__headshot-image', altText: headshotAltText }))),