@financial-times/cp-content-pipeline-ui 7.1.4 → 7.2.1

package/src/components/{ImageSet → content-tree/ImageSet}/index.tsx

@@ -2,12 +2,12 @@ import React, { PropsWithChildren, useContext } from 'react'
 import {
   FallbackImageOverrideWrapper,
   ImageSetOverrideWrapper,
-} from '../ImageOverrideWrappers'
+} from '../../ImageOverrideWrappers'
 
 import type { ContentTree } from '@financial-times/content-tree'
 
-import { PresentationFlagsContext } from '../../context'
-import { ContentProps } from '../types'
+import { PresentationFlagsContext } from '../../../context'
+import { ContentProps } from '../../types'
 import { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema'
 import { SetRequired } from 'type-fest'
 import type * as ComponentWorkarounds from '../Workarounds'
@@ -215,7 +215,8 @@ export const FallbackImage: React.FC<FallbackImageProps> = (props) => {
   )
 }
 
-export interface ImageSetProps extends ContentProps<ComponentWorkarounds.ImageSet> {
+export interface ImageSetProps
+  extends ContentProps<ComponentWorkarounds.ImageSet> {
   isMainImage?: boolean
 }
 

package/src/components/{Layout → content-tree/Layout}/index.tsx

@@ -1,6 +1,6 @@
 import { ContentTree } from '@financial-times/content-tree'
 import React from 'react'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 
 interface LayoutProps extends ContentProps<Omit<ContentTree.transit.Layout, 'children'>> {}
 

package/src/components/{Paragraph → content-tree/Paragraph}/index.tsx

@@ -1,6 +1,6 @@
 import { ContentTree } from '@financial-times/content-tree'
 import React, { createContext, useContext } from 'react'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 
 export const ParagraphContext = createContext<{ className: string } | null>(
   null

package/src/components/{Pullquote → content-tree/Pullquote}/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema'
 import classnames from 'classnames'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 
 interface PullquoteProps
   extends ContentProps<ContentTreeWorkarounds.Pullquote> {}

package/src/components/{Recommended → content-tree/Recommended}/index.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 //HACK: worked around missing Teaser type by declaring a module x-teaser.d.ts
 import { presets, Teaser } from '@financial-times/x-teaser/dist/Teaser.cjs'
 import classnames from 'classnames'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 import type * as ComponentWorkarounds from '../Workarounds'
 
 // Renders a Recommended teaser component

package/src/components/{Scrollytelling → content-tree/Scrollytelling}/ScrollyImage.tsx

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react'
 import { BreakpointGetter, FallbackImage, Sources } from '../ImageSet'
 import { ScrollyIDContext } from '.'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 import type * as ComponentWorkarounds from '../Workarounds'
 
 const scrollyGetBreakpoints: BreakpointGetter = (image) => {

package/src/components/{Scrollytelling → content-tree/Scrollytelling}/index.tsx

@@ -3,7 +3,7 @@ import type { ContentTree } from '@financial-times/content-tree'
 import classnames from 'classnames'
 import type scrollytelling from '@financial-times/n-scrollytelling-image/server'
 import { ParagraphContext } from '../Paragraph'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 
 export const ScrollyIDContext = createContext<string | null>(null)
 

package/src/components/{Table → content-tree/Table}/TableBody.tsx

@@ -1,6 +1,6 @@
 import { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema'
 import React from 'react'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 
 interface TableBodyProps
   extends ContentProps<ContentTreeWorkarounds.TableBody> {}

package/src/components/{Table → content-tree/Table}/TableCell.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from 'react'
 import type { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema'
 import { ColumnSettingsContext } from '.'
 import classNames from 'classnames'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 
 interface TableCellProps
   extends ContentProps<ContentTreeWorkarounds.TableCell> {}

package/src/components/{Table → content-tree/Table}/index.tsx

@@ -1,7 +1,7 @@
 import type { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema'
 import React, { createContext } from 'react'
 import classNames from 'classnames'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 
 export const ColumnSettingsContext = createContext<
   ContentTreeWorkarounds.TableColumnSettings[]

package/src/components/{Tweet → content-tree/Tweet}/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 import * as ComponentWorkarounds from '../Workarounds'
 
 interface TweetProps extends ContentProps<ComponentWorkarounds.Tweet> {}

package/src/components/{Video → content-tree/Video}/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 import { ContentTreeWorkarounds } from '@financial-times/cp-content-pipeline-schema'
 
 interface VideoProps extends ContentProps<ContentTreeWorkarounds.Video> {}

package/src/components/{YoutubeVideo → content-tree/YoutubeVideo}/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { ContentTree } from '@financial-times/content-tree'
-import { ContentProps } from '../types'
+import { ContentProps } from '../../types'
 
 interface YoutubeVideoProps extends ContentProps<ContentTree.YoutubeVideo> {}
 

package/src/context.ts

@@ -1,6 +1,9 @@
 import { createContext, PropsWithChildren } from 'react'
 
-import type { FallbackImageProps, ImageSetProps } from './components/ImageSet'
+import type {
+  FallbackImageProps,
+  ImageSetProps,
+} from './components/content-tree/ImageSet'
 import type { PictureProps } from './components/Topper/Picture'
 
 export type PresentationOverrideTypes = {

package/src/index.ts

@@ -1,28 +1,34 @@
-export { default as ArticleBody } from './components/ArticleBody'
 export { default as ArticleInfo } from './components/ArticleInfo'
-export { default as BigNumber } from './components/BigNumber'
-export { default as Body } from './components/Body'
 export { default as Byline } from './components/Byline'
-export { default as Flourish } from './components/Flourish'
-export { default as Heading } from './components/Heading'
-export { default as ImageSet } from './components/ImageSet'
-export { default as CustomCodeComponent } from './components/CustomCodeComponent'
-export { default as Clip } from './components/Clip/template/component'
-export { Layout, LayoutContainer, LayoutSlot } from './components/Layout'
-export { default as LiveBlogBody } from './components/LiveBlogBody'
 export { LiveBlogWrapper } from './components/LiveBlogWrapper'
 export { default as MainImage } from './components/MainImage'
-export { default as Paragraph } from './components/Paragraph'
-export { default as PodcastBody } from './components/PodcastBody'
-export { default as Pullquote } from './components/Pullquote/index'
-export { default as Recommended } from './components/Recommended'
-export { default as RichText } from './components/RichText'
-export { ScrollyBlock } from './components/Scrollytelling'
-export { default as Table } from './components/Table'
 export { default as Topper } from './components/Topper'
-export { default as Tweet } from './components/Tweet'
-export { default as Video } from './components/Video'
-export { default as YoutubeVideo } from './components/YoutubeVideo'
+
+export { default as Body } from './components/Body'
+export { default as ArticleBody } from './components/body-components/ArticleBody'
+export { default as LiveBlogBody } from './components/body-components/LiveBlogBody'
+export { default as PodcastBody } from './components/body-components/PodcastBody'
+
+export { default as RichText } from './components/RichText'
+export { default as BigNumber } from './components/content-tree/BigNumber'
+export { default as CustomCodeComponent } from './components/content-tree/CustomCodeComponent'
+export { default as Flourish } from './components/content-tree/Flourish'
+export { default as Heading } from './components/content-tree/Heading'
+export { default as ImageSet } from './components/content-tree/ImageSet'
+export { default as Clip } from './components/content-tree/Clip/template/component'
+export {
+  Layout,
+  LayoutContainer,
+  LayoutSlot,
+} from './components/content-tree/Layout'
+export { default as Paragraph } from './components/content-tree/Paragraph'
+export { default as Pullquote } from './components/content-tree/Pullquote/index'
+export { default as Recommended } from './components/content-tree/Recommended'
+export { ScrollyBlock } from './components/content-tree/Scrollytelling'
+export { default as Table } from './components/content-tree/Table'
+export { default as Tweet } from './components/content-tree/Tweet'
+export { default as Video } from './components/content-tree/Video'
+export { default as YoutubeVideo } from './components/content-tree/YoutubeVideo'
 export {
   List,
   ListItem,
@@ -36,6 +42,7 @@ export {
   Cite,
   CccFallbackText,
 } from './components/RichText/BasicComponents'
+
 export {
   PresentationFlagsContext,
   PresentationOverridesContext,

package/src/stories/Clip.stories.scss

@@ -1,6 +1,6 @@
 $system-code: "n-clip-demo";
 @import "./article-page.scss";
-@import "../components/Clip/client/main.scss";
+@import "../components/content-tree/Clip/client/main.scss";
 @import "@financial-times/o-expander/main";
 @include oExpander();
 

package/src/stories/Clip.stories.tsx

@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react'
 import type { Meta, StoryObj } from '@storybook/react'
 
-import ClipServer from '../components/Clip'
-import ClipClient from '../components/Clip/client'
+import ClipServer from '../components/content-tree/Clip'
+import ClipClient from '../components/content-tree/Clip/client'
 import oTracking from '@financial-times/o-tracking/main'
 import './Clip.stories.scss'
-import { ClipProps } from '../components/Clip/template/component'
+import { ClipProps } from '../components/content-tree/Clip/template/component'
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
 export default {

package/src/stories/Expander.stories.tsx

@@ -4,7 +4,7 @@ import { ExpanderClient } from '../components/Expander/client'
 import React, { useEffect } from 'react'
 import oTracking from '@financial-times/o-tracking/main'
 import './Expander.stories.scss'
-import ClipClient from '../components/Clip/client'
+import ClipClient from '../components/content-tree/Clip/client'
 import RichText from '../components/RichText'
 import { ContentTree } from '@financial-times/content-tree'