Skip to content

Commit

Permalink
Merge branch 'arc-themes-release-version-2.5.2' into THEMES-2013
Browse files Browse the repository at this point in the history
  • Loading branch information
blakeganderson authored Nov 1, 2024
2 parents 1899641 + 0cf279b commit 1254d2a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"useTabs": true,
"printWidth": 100,
experimentalTernaries: false,
}
"experimentalTernaries": false
}
7 changes: 5 additions & 2 deletions blocks/small-promo-block/features/small-promo/default.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const SmallPromo = ({ customFields }) => {
} = customFields;
const { registerSuccessEvent } = useComponentContext();
const { arcSite, isAdmin } = useFusionContext();
const { searchableField } = useEditableContent();
const { editableContent, searchableField } = useEditableContent();
const shouldLazyLoad = lazyLoad && !isAdmin;

const content =
Expand Down Expand Up @@ -171,9 +171,12 @@ const SmallPromo = ({ customFields }) => {
</Conditional>
) : null;

const editableItem =
content?.headlines ? editableContent(content, "headlines.basic") : {};

const promoHeading =
showHeadline && headline ? (
<Heading>
<Heading {...editableItem} suppressContentEditableWarning>
<Conditional
component={Link}
condition={linkURL}
Expand Down

0 comments on commit 1254d2a

Please sign in to comment.