Skip to content

Remove figure wrapper for interactive atoms #16270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
frederickobrien wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Remove figure wrapper for interactive atoms #16270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions dotcom-rendering/src/lib/renderElement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { DocumentBlockComponent } from '../components/DocumentBlockComponent.isl
import { EmailSignUpWrapper } from '../components/EmailSignUpWrapper.island';
import { EmbedBlockComponent } from '../components/EmbedBlockComponent.island';
import { ExplainerAtom } from '../components/ExplainerAtom';
import { Figure } from '../components/Figure';
import { defaultRoleStyles, Figure } from '../components/Figure';
import { GuideAtomWrapper } from '../components/GuideAtomWrapper.island';
import { GuVideoBlockComponent } from '../components/GuVideoBlockComponent';
import { HighlightBlockComponent } from '../components/HighlightBlockComponent';
Expand Down Expand Up @@ -1082,7 +1082,12 @@ export const RenderArticleElement = ({
idApiUrl,
});

const needsFigure = !bareElements.has(element._type);
const isInteractiveLayoutAtom =
element._type ===
'model.dotcomrendering.pageElements.InteractiveAtomBlockElement';

const needsFigure =
!bareElements.has(element._type) && !isInteractiveLayoutAtom;

const role =
'role' in element
Expand All @@ -1106,6 +1111,17 @@ export const RenderArticleElement = ({
>
{el}
</Figure>
) : isInteractiveLayoutAtom ? (
<section
key={'elementId' in element ? element.elementId : index}
id={'elementId' in element ? element.elementId : undefined}
css={defaultRoleStyles(role ?? 'inline', format, isTimeline)}
data-spacefinder-role={role}
data-spacefinder-type={element._type}
className={interactiveLegacyFigureClasses(element._type, role)}
>
{el}
</section>
) : (
el
);
Expand Down
Loading