Skip to content

Commit 631007f

Browse files
Merge pull request #14127 from guardian/parity-for-dcar-immersives
2 parents 3d5868a + 3e6afe8 commit 631007f

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

dotcom-rendering/src/layouts/DecideLayout.tsx

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,26 @@ const DecideLayoutApps = ({ article, format, renderingTarget }: AppProps) => {
3939
const notSupported = <pre>Not supported</pre>;
4040
switch (format.display) {
4141
case ArticleDisplay.Immersive: {
42-
return (
43-
<ImmersiveLayout
44-
article={article}
45-
format={format}
46-
renderingTarget={renderingTarget}
47-
/>
48-
);
42+
switch (format.design) {
43+
case ArticleDesign.Interactive: {
44+
return (
45+
<FullPageInteractiveLayout
46+
article={article}
47+
format={format}
48+
renderingTarget={renderingTarget}
49+
/>
50+
);
51+
}
52+
default: {
53+
return (
54+
<ImmersiveLayout
55+
article={article}
56+
format={format}
57+
renderingTarget={renderingTarget}
58+
/>
59+
);
60+
}
61+
}
4962
}
5063
case ArticleDisplay.NumberedList:
5164
case ArticleDisplay.Showcase: {
@@ -153,10 +166,6 @@ const DecideLayoutWeb = ({
153166
case ArticleDisplay.Immersive: {
154167
switch (format.design) {
155168
case ArticleDesign.Interactive: {
156-
// Render all 'immersive interactives' until switchover date as 'FullPageInteractive'
157-
// TBD: After 'immersive interactive' changes to CAPI are merged, add logic here to either use
158-
// 'InteractiveImmersiveLayout' if published after switchover date, or 'FullPageInteractiveLayout'
159-
// if published before.
160169
return (
161170
<FullPageInteractiveLayout
162171
article={article}

0 commit comments

Comments
 (0)