@financial-times/cp-content-pipeline-ui 6.15.6-beta.0 → 7.0.0

package/lib/components/Clip/test/snapshot.spec.js

@@ -28,72 +28,107 @@ describe('Clip Snapshot', () => {
         const poster = 'localhost:8080/fakeposter.jpg';
         it('in-line render', () => {
             const tree = react_test_renderer_1.default
-                .create(react_1.default.createElement(index_1.default, { url: url, dataLayout: "in-line" }))
+                .create(react_1.default.createElement(index_1.default, { content: { url, dataLayout: 'in-line' } }))
                 .toJSON();
             expect(formatString(tree)).toMatchSnapshot();
         });
         it('full-grid default render', () => {
             const tree = react_test_renderer_1.default
-                .create(react_1.default.createElement(index_1.default, { url: url, dataLayout: "full-grid" }))
+                .create(react_1.default.createElement(index_1.default, { content: { url, dataLayout: 'full-grid' } }))
                 .toJSON();
             expect(formatString(tree)).toMatchSnapshot();
         });
         it('mid-grid default render', () => {
             const tree = react_test_renderer_1.default
-                .create(react_1.default.createElement(index_1.default, { url: url, dataLayout: "mid-grid" }))
+                .create(react_1.default.createElement(index_1.default, { content: { url, dataLayout: 'mid-grid' } }))
                 .toJSON();
             expect(formatString(tree)).toMatchSnapshot();
         });
         it('in-line render with attributes', () => {
             const tree = react_test_renderer_1.default
-                .create(react_1.default.createElement(index_1.default, { url: url, dataLayout: "in-line", autoplay: true, loop: true, description: "Video description", caption: "caption text", credits: "@credits", poster: poster, posterAlt: "text poster", mute: true }))
+                .create(react_1.default.createElement(index_1.default, { content: {
+                    url,
+                    dataLayout: 'in-line',
+                    autoplay: true,
+                    loop: true,
+                    description: 'Video description',
+                    caption: 'caption text',
+                    credits: '@credits',
+                    poster,
+                    posterAlt: 'text poster',
+                    muted: true,
+                } }))
                 .toJSON();
             expect(formatString(tree)).toMatchSnapshot();
         });
         it('full-grid render with attributes', () => {
             const tree = react_test_renderer_1.default
-                .create(react_1.default.createElement(index_1.default, { url: url, dataLayout: "full-grid", autoplay: true, loop: true, description: "Video description", caption: "caption text", credits: "@credits", poster: poster, posterAlt: "text poster", mute: true }))
+                .create(react_1.default.createElement(index_1.default, { content: {
+                    url,
+                    dataLayout: 'full-grid',
+                    autoplay: true,
+                    loop: true,
+                    description: 'Video description',
+                    caption: 'caption text',
+                    credits: '@credits',
+                    poster,
+                    posterAlt: 'text poster',
+                    muted: true,
+                } }))
                 .toJSON();
             expect(formatString(tree)).toMatchSnapshot();
         });
         it('mid-grid render with attributes', () => {
             const tree = react_test_renderer_1.default
-                .create(react_1.default.createElement(index_1.default, { url: url, dataLayout: "mid-grid", autoplay: true, loop: true, description: "Video description", caption: "caption text", credits: "@credits", poster: poster, posterAlt: "text poster", mute: true }))
+                .create(react_1.default.createElement(index_1.default, { content: {
+                    url,
+                    dataLayout: 'mid-grid',
+                    autoplay: true,
+                    loop: true,
+                    description: 'Video description',
+                    caption: 'caption text',
+                    credits: '@credits',
+                    poster,
+                    posterAlt: 'text poster',
+                    muted: true,
+                } }))
                 .toJSON();
             expect(formatString(tree)).toMatchSnapshot();
         });
         it('renders multiple video sources', () => {
             const videoWithMultipleSources = {
-                dataLayout: 'in-line',
-                id: '84d7e1b0-e8b2-4ffc-a798-306f29dc9d52',
-                url: 'https://spark-clips-staging.s3.eu-west-1.amazonaws.com/optimised-media-files/16968704765960/1080x1920.mp4',
-                description: ' Dolor sit amet, consectetur adipiscing elit. Sed sit amet odio quis ante auctor dapibus. Sed dapibus cursus nisi, tincidunt sagittis sapien vehicula vitae.',
-                clips: [
-                    {
-                        dataSource: [
-                            {
-                                binaryUrl: 'https://whatever/1080x1920.mp4',
-                                mediaType: 'video/mp4',
-                                pixelHeight: 1080,
-                                pixelWidth: 1920,
-                            },
-                            {
-                                binaryUrl: 'https://whatever/320x240.mp4',
-                                mediaType: 'video/mp4',
-                                pixelHeight: 320,
-                                pixelWidth: 240,
-                            },
-                            {
-                                binaryUrl: 'https://whatever/640x480.avi',
-                                mediaType: 'video/avi',
-                                pixelHeight: 640,
-                                pixelWidth: 480,
-                            },
-                        ],
-                        poster: 'https://whatever/1080x1920.jpg',
-                    },
-                ],
-                caption: 'Aenean lobortis volutpat nunc vitae elementum',
+                content: {
+                    dataLayout: 'in-line',
+                    id: '84d7e1b0-e8b2-4ffc-a798-306f29dc9d52',
+                    url: 'https://spark-clips-staging.s3.eu-west-1.amazonaws.com/optimised-media-files/16968704765960/1080x1920.mp4',
+                    description: ' Dolor sit amet, consectetur adipiscing elit. Sed sit amet odio quis ante auctor dapibus. Sed dapibus cursus nisi, tincidunt sagittis sapien vehicula vitae.',
+                    caption: 'Aenean lobortis volutpat nunc vitae elementum',
+                    clips: [
+                        {
+                            dataSource: [
+                                {
+                                    binaryUrl: 'https://whatever/1080x1920.mp4',
+                                    mediaType: 'video/mp4',
+                                    pixelHeight: 1080,
+                                    pixelWidth: 1920,
+                                },
+                                {
+                                    binaryUrl: 'https://whatever/320x240.mp4',
+                                    mediaType: 'video/mp4',
+                                    pixelHeight: 320,
+                                    pixelWidth: 240,
+                                },
+                                {
+                                    binaryUrl: 'https://whatever/640x480.avi',
+                                    mediaType: 'video/avi',
+                                    pixelHeight: 640,
+                                    pixelWidth: 480,
+                                },
+                            ],
+                            poster: 'https://whatever/1080x1920.jpg',
+                        },
+                    ],
+                },
             };
             const tree = react_test_renderer_1.default
                 .create(react_1.default.createElement(index_1.default, { ...videoWithMultipleSources }))
@@ -102,30 +137,34 @@ describe('Clip Snapshot', () => {
         });
         it('in-line rendered output is the same for CAPI and cp-content-pipeline data', () => {
             const inlineVideo = {
-                dataLayout: 'in-line',
-                url: 'https://spark-clips-staging.s3.eu-west-1.amazonaws.com/optimised-media-files/16968704765960/1080x1920.mp4',
-                description: ' Dolor sit amet, consectetur adipiscing elit. Sed sit amet odio quis ante auctor dapibus. Sed dapibus cursus nisi, tincidunt sagittis sapien vehicula vitae.',
-                poster: 'https://www.ft.com/__origami/service/image/v2/images/raw/https%3A%2F%2Fd1e00ek4ebabms.cloudfront.net%2Fproduction%2F84d7e1b0-e8b2-4ffc-a798-306f29dc9d52.png?fit=scale-down&source=next&width=700',
-                caption: 'Aenean lobortis volutpat nunc vitae elementum',
+                content: {
+                    dataLayout: 'in-line',
+                    url: 'https://spark-clips-staging.s3.eu-west-1.amazonaws.com/optimised-media-files/16968704765960/1080x1920.mp4',
+                    description: ' Dolor sit amet, consectetur adipiscing elit. Sed sit amet odio quis ante auctor dapibus. Sed dapibus cursus nisi, tincidunt sagittis sapien vehicula vitae.',
+                    poster: 'https://www.ft.com/__origami/service/image/v2/images/raw/https%3A%2F%2Fd1e00ek4ebabms.cloudfront.net%2Fproduction%2F84d7e1b0-e8b2-4ffc-a798-306f29dc9d52.png?fit=scale-down&source=next&width=700',
+                    caption: 'Aenean lobortis volutpat nunc vitae elementum',
+                },
             };
             const inlineVideoCPPipeline = {
-                dataLayout: 'in-line',
-                id: 'https://spark-clips-staging.s3.eu-west-1.amazonaws.com/optimised-media-files/16968704765960/1080x1920.mp4',
-                url: 'https://spark-clips-staging.s3.eu-west-1.amazonaws.com/optimised-media-files/16968704765960/1080x1920.mp4',
-                description: ' Dolor sit amet, consectetur adipiscing elit. Sed sit amet odio quis ante auctor dapibus. Sed dapibus cursus nisi, tincidunt sagittis sapien vehicula vitae.',
-                clips: [
-                    {
-                        dataSource: [
-                            {
-                                binaryUrl: 'https://spark-clips-staging.s3.eu-west-1.amazonaws.com/optimised-media-files/16968704765960/1080x1920.mp4',
-                                mediaType: 'video/mp4',
-                            },
-                        ],
-                        id: '22a65f5a-ead3-4a25-bf79-c6b080f00547',
-                        poster: 'https://www.ft.com/__origami/service/image/v2/images/raw/https%3A%2F%2Fd1e00ek4ebabms.cloudfront.net%2Fproduction%2F84d7e1b0-e8b2-4ffc-a798-306f29dc9d52.png?fit=scale-down&source=next&width=700',
-                    },
-                ],
-                caption: 'Aenean lobortis volutpat nunc vitae elementum',
+                content: {
+                    dataLayout: 'in-line',
+                    id: 'https://spark-clips-staging.s3.eu-west-1.amazonaws.com/optimised-media-files/16968704765960/1080x1920.mp4',
+                    url: 'https://spark-clips-staging.s3.eu-west-1.amazonaws.com/optimised-media-files/16968704765960/1080x1920.mp4',
+                    description: ' Dolor sit amet, consectetur adipiscing elit. Sed sit amet odio quis ante auctor dapibus. Sed dapibus cursus nisi, tincidunt sagittis sapien vehicula vitae.',
+                    caption: 'Aenean lobortis volutpat nunc vitae elementum',
+                    clips: [
+                        {
+                            dataSource: [
+                                {
+                                    binaryUrl: 'https://spark-clips-staging.s3.eu-west-1.amazonaws.com/optimised-media-files/16968704765960/1080x1920.mp4',
+                                    mediaType: 'video/mp4',
+                                },
+                            ],
+                            id: '22a65f5a-ead3-4a25-bf79-c6b080f00547',
+                            poster: 'https://www.ft.com/__origami/service/image/v2/images/raw/https%3A%2F%2Fd1e00ek4ebabms.cloudfront.net%2Fproduction%2F84d7e1b0-e8b2-4ffc-a798-306f29dc9d52.png?fit=scale-down&source=next&width=700',
+                        },
+                    ],
+                },
             };
             const capiContainer = react_test_renderer_1.default
                 .create(react_1.default.createElement(index_1.default, { ...inlineVideo }))
@@ -138,9 +177,19 @@ describe('Clip Snapshot', () => {
         // Temporary test to check that the new Origami image is supported.
         it('supports new Origami images, fallbacking to the previous implementation', () => {
             const tree = react_test_renderer_1.default
-                .create(react_1.default.createElement(index_1.default, { url: url, dataLayout: "full-grid", autoplay: true, loop: true, description: "Video description", caption: "caption text", credits: "@credits", 
-                // New Origami image
-                poster: "https://www.ft.com/__origami/service/image/v2/images/raw/https%3A%2F%2Fspark-clips-prod.s3.eu-west-1.amazonaws.com%2Fposter-images%2F898c06df-6ffa-4ed6-87a3-48a8edc309ae?source=cp-content-pipeline&fit=scale-down&quality=highest&width=700&dpr=1", posterAlt: "text poster", mute: true }))
+                .create(react_1.default.createElement(index_1.default, { content: {
+                    url,
+                    dataLayout: 'full-grid',
+                    autoplay: true,
+                    loop: true,
+                    description: 'Video description',
+                    caption: 'caption text',
+                    credits: '@credits',
+                    // New Origami image
+                    poster: 'https://www.ft.com/__origami/service/image/v2/images/raw/https%3A%2F%2Fspark-clips-prod.s3.eu-west-1.amazonaws.com%2Fposter-images%2F898c06df-6ffa-4ed6-87a3-48a8edc309ae?source=cp-content-pipeline&fit=scale-down&quality=highest&width=700&dpr=1',
+                    posterAlt: 'text poster',
+                    muted: true,
+                } }))
                 .toJSON();
             expect(formatString(tree)).toMatchSnapshot();
         });

package/lib/components/Clip/test/snapshot.spec.js.map

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

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

@@ -1,17 +1,9 @@
 import React from 'react';
-type FlourishProps = {
-    id: string;
-    type?: string;
-    flourishType?: string;
-    description?: string;
-    layoutWidth?: string;
-    fallbackImage: {
-        url?: string | null | undefined;
-        width?: number | null | undefined;
-        height?: number | null | undefined;
-    };
+import { ContentProps } from '../types';
+import { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema';
+interface FlourishProps extends ContentProps<ContentTreeWorkarounds.Flourish> {
     iFrame?: boolean;
     inArticleBody?: boolean;
-};
+}
 declare const Flourish: React.FC<FlourishProps>;
 export default Flourish;

package/lib/components/Flourish/index.js

@@ -9,7 +9,7 @@ const DisclaimerNotice = ({ id }) => (react_1.default.createElement("div", { id:
     react_1.default.createElement("div", { className: "o-message__container" },
         react_1.default.createElement("div", { className: "o-message__content" },
             react_1.default.createElement("p", { className: "o-message__content-main" }, "You are seeing a snapshot of an interactive graphic. This is most likely due to being offline or JavaScript being disabled in your browser.")))));
-const Flourish = ({ id, flourishType, description, layoutWidth, fallbackImage, iFrame = false, inArticleBody = true, }) => {
+const Flourish = ({ content: { id, flourishType, description, layoutWidth, fallbackImage }, iFrame = false, inArticleBody = true, }) => {
     if (!id)
         return null;
     const anchorHref = `#${id}`;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Flourish/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AACzB,4DAAmC;AAqBnC,MAAM,gBAAgB,GAAG,CAAC,EAAE,EAAE,EAAmB,EAAE,EAAE,CAAC,CACpD,uCACE,EAAE,EAAE,EAAE,EACN,SAAS,EAAC,mEAAmE,sBAC5D,WAAW;IAE5B,uCAAK,SAAS,EAAC,sBAAsB;QACnC,uCAAK,SAAS,EAAC,oBAAoB;YACjC,qCAAG,SAAS,EAAC,yBAAyB,kJAIlC,CACA,CACF,CACF,CACP,CAAA;AACD,MAAM,QAAQ,GAA4B,CAAC,EACzC,EAAE,EACF,YAAY,EACZ,WAAW,EACX,WAAW,EACX,aAAa,EACb,MAAM,GAAG,KAAK,EACd,aAAa,GAAG,IAAI,GACrB,EAAE,EAAE;IACH,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAA;IACpB,MAAM,UAAU,GAAG,IAAI,EAAE,EAAE,CAAA;IAC3B,MAAM,QAAQ,GAAG,WAAW,KAAK,WAAW,IAAI,WAAW,KAAK,MAAM,CAAA;IACtE,MAAM,gBAAgB,GAAG,IAAA,oBAAU,EAAC;QAClC,mBAAmB,EAAE,IAAI;QACzB,6BAA6B,EAAE,IAAI;QACnC,yBAAyB,EAAE,QAAQ;QACnC,gBAAgB,EAAE,MAAM;KACzB,CAAC,CAAA;IAEF,MAAM,iBAAiB,GACrB,MAAM,IAAI,aAAa,EAAE,KAAK,IAAI,aAAa,EAAE,MAAM;QACrD,CAAC,CAAC,GAAG,aAAa,CAAC,KAAK,IAAI,aAAa,CAAC,MAAM,EAAE;QAClD,CAAC,CAAC,MAAM,CAAA;IAEZ,MAAM,gBAAgB,GACpB,CAAC,aAAa,IAAI,aAAa,EAAE,KAAK,IAAI,aAAa,EAAE,MAAM;QAC7D,CAAC,CAAC;YACE,KAAK,EAAE,MAAM;YACb,WAAW,EAAE,GAAG,aAAa,CAAC,KAAK,IAAI,aAAa,CAAC,MAAM,EAAE;SAC9D;QACH,CAAC,CAAC,EAAE,CAAA;IAER,OAAO,CACL,uCACE,SAAS,EAAE,IAAA,oBAAU,EAAC;YACpB,kBAAkB,EAAE,aAAa;YACjC,QAAQ,EAAE,MAAM;YAChB,kBAAkB,EAAE,MAAM;SAC3B,CAAC,uBACiB,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,oBACjC,UAAU,uBACN,EAAE,yBAEnB,aAAa,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,iBAAiB;QAG1D,MAAM,IAAI,CACT,0CACE,GAAG,EAAE,oCAAoC,EAAE,oBAAoB,CAAC,aAAa,EAAE,EAC/E,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,EACxD,SAAS,EAAC,mBAAmB,GACrB,CACX;QACD,0CACE,SAAS,EAAE,gBAAgB,+BACA,QAAQ,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,gCACrC,QAAQ,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI;YAEnE,qCAAG,IAAI,EAAE,UAAU;gBACjB,8DAGmB,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,sBACrC,EAAE,wBACA,YAAY;oBAEhC,8BAAC,gBAAgB,IAAC,EAAE,EAAE,EAAE,GAAI;oBAC5B,uCACE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAI,EAAE,EAC7B,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,gBAAgB,GACvB,CACM,CACR,CACG,CACL,CACP,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,QAAQ,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Flourish/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AACzB,4DAAmC;AAQnC,MAAM,gBAAgB,GAAG,CAAC,EAAE,EAAE,EAAmB,EAAE,EAAE,CAAC,CACpD,uCACE,EAAE,EAAE,EAAE,EACN,SAAS,EAAC,mEAAmE,sBAC5D,WAAW;IAE5B,uCAAK,SAAS,EAAC,sBAAsB;QACnC,uCAAK,SAAS,EAAC,oBAAoB;YACjC,qCAAG,SAAS,EAAC,yBAAyB,kJAIlC,CACA,CACF,CACF,CACP,CAAA;AAOD,MAAM,QAAQ,GAA4B,CAAC,EACzC,OAAO,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,EACtE,MAAM,GAAG,KAAK,EACd,aAAa,GAAG,IAAI,GACrB,EAAE,EAAE;IACH,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAA;IACpB,MAAM,UAAU,GAAG,IAAI,EAAE,EAAE,CAAA;IAC3B,MAAM,QAAQ,GAAG,WAAW,KAAK,WAAW,IAAI,WAAW,KAAK,MAAM,CAAA;IACtE,MAAM,gBAAgB,GAAG,IAAA,oBAAU,EAAC;QAClC,mBAAmB,EAAE,IAAI;QACzB,6BAA6B,EAAE,IAAI;QACnC,yBAAyB,EAAE,QAAQ;QACnC,gBAAgB,EAAE,MAAM;KACzB,CAAC,CAAA;IAEF,MAAM,iBAAiB,GACrB,MAAM,IAAI,aAAa,EAAE,KAAK,IAAI,aAAa,EAAE,MAAM;QACrD,CAAC,CAAC,GAAG,aAAa,CAAC,KAAK,IAAI,aAAa,CAAC,MAAM,EAAE;QAClD,CAAC,CAAC,MAAM,CAAA;IAEZ,MAAM,gBAAgB,GACpB,CAAC,aAAa,IAAI,aAAa,EAAE,KAAK,IAAI,aAAa,EAAE,MAAM;QAC7D,CAAC,CAAC;YACE,KAAK,EAAE,MAAM;YACb,WAAW,EAAE,GAAG,aAAa,CAAC,KAAK,IAAI,aAAa,CAAC,MAAM,EAAE;SAC9D;QACH,CAAC,CAAC,EAAE,CAAA;IAER,OAAO,CACL,uCACE,SAAS,EAAE,IAAA,oBAAU,EAAC;YACpB,kBAAkB,EAAE,aAAa;YACjC,QAAQ,EAAE,MAAM;YAChB,kBAAkB,EAAE,MAAM;SAC3B,CAAC,uBACiB,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,oBACjC,UAAU,uBACN,EAAE,yBAEnB,aAAa,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,iBAAiB;QAG1D,MAAM,IAAI,CACT,0CACE,GAAG,EAAE,oCAAoC,EAAE,oBAAoB,CAAC,aAAa,EAAE,EAC/E,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,EACxD,SAAS,EAAC,mBAAmB,GACrB,CACX;QACD,0CACE,SAAS,EAAE,gBAAgB,+BACA,QAAQ,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,gCACrC,QAAQ,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI;YAEnE,qCAAG,IAAI,EAAE,UAAU;gBACjB,8DAGmB,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,sBACrC,EAAE,wBACA,YAAY;oBAEhC,8BAAC,gBAAgB,IAAC,EAAE,EAAE,EAAE,GAAI;oBAC5B,uCACE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAI,EAAE,EAC7B,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,gBAAgB,GACvB,CACM,CACR,CACG,CACL,CACP,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,QAAQ,CAAA"}

package/lib/components/Flourish/test/snapshot.spec.js

@@ -26,32 +26,74 @@ const anImage = {
 };
 describe('Flourish component', () => {
     it('renders with a full-grid layout and fallback image', async () => {
-        const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { type: "flourish", id: "123", flourishType: "bar", description: "foo", layoutWidth: "full-grid", fallbackImage: anImage }));
+        const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { content: {
+                type: 'flourish',
+                id: '123',
+                flourishType: 'bar',
+                description: 'foo',
+                layoutWidth: 'full-grid',
+                fallbackImage: anImage,
+            } }));
         expect(container).toMatchSnapshot();
     });
     it('renders ignoring layout different from full-grid', async () => {
-        const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { type: "flourish", id: "123", flourishType: "bar", description: "foo", layoutWidth: "whatever", fallbackImage: anImage }));
+        const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { content: {
+                type: 'flourish',
+                id: '123',
+                flourishType: 'bar',
+                description: 'foo',
+                layoutWidth: 'whatever',
+                fallbackImage: anImage,
+            } }));
         expect(container).toMatchSnapshot();
     });
     it('renders with an iframe rather than using the embed script to insert it', async () => {
         const iFrame = true;
-        const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { type: "flourish", id: "123", flourishType: "bar", description: "foo", layoutWidth: "full-grid", fallbackImage: anImage, iFrame: iFrame }));
+        const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { content: {
+                type: 'flourish',
+                id: '123',
+                flourishType: 'bar',
+                description: 'foo',
+                layoutWidth: 'full-grid',
+                fallbackImage: anImage,
+            }, iFrame: iFrame }));
         expect(container).toMatchSnapshot();
     });
     it('renders without n-content-layout class for charts not in article body', async () => {
         const inArticleBody = false;
-        const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { type: "flourish", id: "123", flourishType: "bar", description: "foo", layoutWidth: "full-grid", fallbackImage: anImage, inArticleBody: inArticleBody }));
+        const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { content: {
+                type: 'flourish',
+                id: '123',
+                flourishType: 'bar',
+                description: 'foo',
+                layoutWidth: 'full-grid',
+                fallbackImage: anImage,
+            }, inArticleBody: inArticleBody }));
         expect(container).toMatchSnapshot();
     });
 });
 it('sets the hideTitle param in the iframe url to true when not in article body', async () => {
     const inArticleBody = false;
     const iFrame = true;
-    const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { type: "flourish", id: "123", flourishType: "bar", description: "foo", layoutWidth: "full-grid", fallbackImage: anImage, iFrame: iFrame, inArticleBody: inArticleBody }));
+    const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { content: {
+            type: 'flourish',
+            id: '123',
+            flourishType: 'bar',
+            description: 'foo',
+            layoutWidth: 'full-grid',
+            fallbackImage: anImage,
+        }, iFrame: iFrame, inArticleBody: inArticleBody }));
     expect(container).toMatchSnapshot();
 });
 it('does not set aspect ratios when in article body', async () => {
-    const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { type: "flourish", id: "123", flourishType: "bar", description: "foo", layoutWidth: "full-grid", fallbackImage: anImage }));
+    const { container } = (0, react_2.render)(react_1.default.createElement(__1.default, { content: {
+            type: 'flourish',
+            id: '123',
+            flourishType: 'bar',
+            description: 'foo',
+            layoutWidth: 'full-grid',
+            fallbackImage: anImage,
+        } }));
     expect(container).toMatchSnapshot();
 });
 //# sourceMappingURL=snapshot.spec.js.map

package/lib/components/Flourish/test/snapshot.spec.js.map

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

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

@@ -1,4 +1,5 @@
 import React from 'react';
 import type { ContentTree } from '@financial-times/content-tree';
-declare const Heading: React.FC<React.PropsWithChildren<ContentTree.Heading>>;
+import { ContentProps } from '../types';
+declare const Heading: React.FC<React.PropsWithChildren<ContentProps<ContentTree.Heading>>>;
 export default Heading;

package/lib/components/Heading/index.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const Heading = (props) => {
-    if (!props.children.length)
+    if (!react_1.default.Children.count(props.children))
         return null;
-    switch (props.level) {
+    switch (props.content.level) {
         case 'chapter':
             return react_1.default.createElement("h2", { className: "n-content-heading-2" }, props.children);
         case 'subheading':

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Heading/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAGzB,MAAM,OAAO,GAA2D,CACtE,KAAK,EACL,EAAE;IACF,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM;QAAE,OAAO,IAAI,CAAA;IAEvC,QAAQ,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,KAAK,SAAS;YACZ,OAAO,sCAAI,SAAS,EAAC,qBAAqB,IAAE,KAAK,CAAC,QAAQ,CAAM,CAAA;QAClE,KAAK,YAAY;YACf,OAAO,sCAAI,SAAS,EAAC,qBAAqB,IAAE,KAAK,CAAC,QAAQ,CAAM,CAAA;QAClE,KAAK,OAAO;YACV,OAAO,sCAAI,SAAS,EAAC,qBAAqB,IAAE,KAAK,CAAC,QAAQ,CAAM,CAAA;IACpE,CAAC;AACH,CAAC,CAAA;AAED,kBAAe,OAAO,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Heading/index.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAIzB,MAAM,OAAO,GAET,CAAC,KAAK,EAAE,EAAE;IACZ,IAAI,CAAC,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAA;IAEtD,QAAQ,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAC5B,KAAK,SAAS;YACZ,OAAO,sCAAI,SAAS,EAAC,qBAAqB,IAAE,KAAK,CAAC,QAAQ,CAAM,CAAA;QAClE,KAAK,YAAY;YACf,OAAO,sCAAI,SAAS,EAAC,qBAAqB,IAAE,KAAK,CAAC,QAAQ,CAAM,CAAA;QAClE,KAAK,OAAO;YACV,OAAO,sCAAI,SAAS,EAAC,qBAAqB,IAAE,KAAK,CAAC,QAAQ,CAAM,CAAA;IACpE,CAAC;AACH,CAAC,CAAA;AAED,kBAAe,OAAO,CAAA"}

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

@@ -0,0 +1,4 @@
+import type { PresentationOverrideTypes } from '../../context';
+export declare const FallbackImageOverrideWrapper: PresentationOverrideTypes['FallbackImage'];
+export declare const ImageSetOverrideWrapper: PresentationOverrideTypes['ImageSet'];
+export declare const PictureOverrideWrapper: PresentationOverrideTypes['Picture'];

package/lib/components/ImageOverrideWrappers/index.js

@@ -0,0 +1,44 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PictureOverrideWrapper = exports.ImageSetOverrideWrapper = exports.FallbackImageOverrideWrapper = void 0;
+const react_1 = __importStar(require("react"));
+const context_1 = require("../../context");
+const FallbackImageOverrideWrapper = ({ children, ...props }) => {
+    const { FallbackImage } = (0, react_1.useContext)(context_1.PresentationOverridesContext);
+    return FallbackImage ? (react_1.default.createElement(FallbackImage, { ...props }, children)) : (children);
+};
+exports.FallbackImageOverrideWrapper = FallbackImageOverrideWrapper;
+const ImageSetOverrideWrapper = ({ children, ...props }) => {
+    const { ImageSet } = (0, react_1.useContext)(context_1.PresentationOverridesContext);
+    return ImageSet ? react_1.default.createElement(ImageSet, { ...props }, children) : children;
+};
+exports.ImageSetOverrideWrapper = ImageSetOverrideWrapper;
+const PictureOverrideWrapper = ({ children, ...props }) => {
+    const { Picture } = (0, react_1.useContext)(context_1.PresentationOverridesContext);
+    return Picture ? react_1.default.createElement(Picture, { ...props }, children) : children;
+};
+exports.PictureOverrideWrapper = PictureOverrideWrapper;
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ImageOverrideWrappers/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAyC;AAEzC,2CAA4D;AAIrD,MAAM,4BAA4B,GACvC,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACzB,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,kBAAU,EAAC,sCAA4B,CAAC,CAAA;IAElE,OAAO,aAAa,CAAC,CAAC,CAAC,CACrB,8BAAC,aAAa,OAAK,KAAK,IAAG,QAAQ,CAAiB,CACrD,CAAC,CAAC,CAAC,CACF,QAAQ,CACT,CAAA;AACH,CAAC,CAAA;AATU,QAAA,4BAA4B,gCAStC;AAEI,MAAM,uBAAuB,GAA0C,CAAC,EAC7E,QAAQ,EACR,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,kBAAU,EAAC,sCAA4B,CAAC,CAAA;IAE7D,OAAO,QAAQ,CAAC,CAAC,CAAC,8BAAC,QAAQ,OAAK,KAAK,IAAG,QAAQ,CAAY,CAAC,CAAC,CAAC,QAAQ,CAAA;AACzE,CAAC,CAAA;AAPY,QAAA,uBAAuB,2BAOnC;AAEM,MAAM,sBAAsB,GAAyC,CAAC,EAC3E,QAAQ,EACR,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,kBAAU,EAAC,sCAA4B,CAAC,CAAA;IAE5D,OAAO,OAAO,CAAC,CAAC,CAAC,8BAAC,OAAO,OAAK,KAAK,IAAG,QAAQ,CAAW,CAAC,CAAC,CAAC,QAAQ,CAAA;AACtE,CAAC,CAAA;AAPY,QAAA,sBAAsB,0BAOlC"}

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

@@ -1,5 +1,6 @@
 import React from 'react';
-import type { ImageFragment, ImageSetFragment, PictureFragment } from '@financial-times/cp-content-pipeline-client';
+import { ContentProps } from '../types';
+import type * as ComponentWorkarounds from '../Workarounds';
 type Breakpoint = {
     minWidth?: number;
     maxWidth?: number;
@@ -8,24 +9,27 @@ type Breakpoint = {
 export type AliasedBreakpoints = {
     [alias: string]: Breakpoint;
 };
-declare const defaultGetBreakpoints: (image: ImageFragment) => Breakpoint | Array<Breakpoint> | AliasedBreakpoints | undefined;
+declare const defaultGetBreakpoints: (image: ComponentWorkarounds.Image) => Breakpoint | Array<Breakpoint> | AliasedBreakpoints | undefined;
 export type BreakpointGetter = typeof defaultGetBreakpoints;
 type SourcesProps = {
-    images: readonly ImageFragment[];
+    images: readonly ComponentWorkarounds.Image[];
     getBreakpoints?: BreakpointGetter;
 };
 export declare const Sources: React.FC<SourcesProps>;
-type FallbackImageProps = {
-    image: ImageFragment;
+export type FallbackImageProps = (ContentProps<ComponentWorkarounds.RawImage> | {
+    content: {
+        image: ComponentWorkarounds.Image;
+    };
+}) & {
     imageType?: string;
-    picture?: PictureFragment;
+    picture?: ComponentWorkarounds.ImageSetPicture;
     className?: string;
     inSourceSet?: boolean;
     isMainImage?: boolean;
 };
 export declare const FallbackImage: React.FC<FallbackImageProps>;
-type ImageSetProps = ImageSetFragment & {
+export interface ImageSetProps extends ContentProps<ComponentWorkarounds.ImageSet> {
     isMainImage?: boolean;
-};
+}
 declare const ImageSet: React.FC<ImageSetProps>;
 export default ImageSet;

package/lib/components/ImageSet/index.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FallbackImage = exports.Sources = void 0;
 const react_1 = __importStar(require("react"));
+const ImageOverrideWrappers_1 = require("../ImageOverrideWrappers");
 const context_1 = require("../../context");
 const formatSourceSet = (sourceSet) => sourceSet.map((src) => `${src.url} ${src.dpr}x`).join(',');
 const figureClassNameMap = {
@@ -96,17 +97,20 @@ const Sources = ({ images, getBreakpoints }) => {
 };
 exports.Sources = Sources;
 // TODO should `fallback` be added to content-tree imageset?
-const FallbackImage = ({ image, imageType = 'image', picture, className, inSourceSet = false, isMainImage = false, }) => {
+const FallbackImage = (props) => {
+    const { content: { image }, imageType = 'image', picture, className, inSourceSet = false, isMainImage = false, } = props;
     const Wrapper = inSourceSet
         ? react_1.default.Fragment
         : ({ children }) => (react_1.default.createElement("figure", { className: "n-content-image" }, children));
     return (react_1.default.createElement(Wrapper, null,
-        react_1.default.createElement("img", { src: hasSourceSet(image)
-                ? image.sourceSet[0]?.url
-                : image?.url ?? undefined, srcSet: hasSourceSet(image) ? formatSourceSet(image.sourceSet) : undefined, alt: picture?.alt ?? '', "data-image-type": imageType, width: image.width ?? undefined, height: image.height ?? undefined, className: className, loading: isMainImage ? 'eager' : 'lazy' })));
+        react_1.default.createElement(ImageOverrideWrappers_1.FallbackImageOverrideWrapper, { ...props },
+            react_1.default.createElement("img", { src: hasSourceSet(image)
+                    ? image.sourceSet[0]?.url
+                    : image?.url ?? undefined, srcSet: hasSourceSet(image) ? formatSourceSet(image.sourceSet) : undefined, alt: picture?.alt ?? '', "data-image-type": imageType, width: image.width ?? undefined, height: image.height ?? undefined, className: className, loading: isMainImage ? 'eager' : 'lazy' }))));
 };
 exports.FallbackImage = FallbackImage;
-const ImageSet = (imageSet) => {
+const ImageSet = (props) => {
+    const { content: imageSet, isMainImage } = props;
     if (!imageSet.picture?.images) {
         return null;
     }
@@ -121,9 +125,10 @@ const ImageSet = (imageSet) => {
         react_1.default.createElement("figure", { className: (imageSet.picture.layoutWidth &&
                 figureClassNameMap[imageSet.picture.layoutWidth]) ??
                 'n-content-image', style: figureWidth(imageSet.picture), "data-component": "image-set" },
-            react_1.default.createElement("picture", null,
-                react_1.default.createElement(exports.Sources, { images: imageSet.picture.images }),
-                react_1.default.createElement(exports.FallbackImage, { picture: imageSet.picture, image: imageSet.picture.fallbackImage, imageType: imageSet.picture.imageType || 'image', inSourceSet: true, isMainImage: imageSet.isMainImage })),
+            react_1.default.createElement(ImageOverrideWrappers_1.ImageSetOverrideWrapper, { ...props },
+                react_1.default.createElement("picture", null,
+                    react_1.default.createElement(exports.Sources, { images: imageSet.picture.images }),
+                    react_1.default.createElement(exports.FallbackImage, { picture: imageSet.picture, content: { image: imageSet.picture.fallbackImage }, imageType: imageSet.picture.imageType || 'image', inSourceSet: true, isMainImage: isMainImage }))),
             (imageSet.picture.caption || imageSet.picture.credit) && (react_1.default.createElement("figcaption", { className: "n-content-picture__caption" },
                 react_1.default.createElement("span", null, imageSet.picture.caption),
                 react_1.default.createElement("span", null,

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

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