Skip to content

Commit

Permalink
Merge pull request #10783 from wellcomecollection/featured-text-slice…
Browse files Browse the repository at this point in the history
…-machine

Featured text slice machine
  • Loading branch information
davidpmccormick authored Apr 10, 2024
2 parents 9266957 + 5e06522 commit 0d48bef
Show file tree
Hide file tree
Showing 3 changed files with 365 additions and 381 deletions.
3 changes: 2 additions & 1 deletion common/views/slices/ContentList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ const ContentListSlice: FunctionComponent<ContentListProps> = ({
slice,
context,
}) => {
const options = { ...defaultContext, context };
const options = { ...defaultContext, ...context };

const transformedSlice = transformContentListSlice(slice);
if (!options.isLanding) {
return (
Expand Down
2 changes: 1 addition & 1 deletion common/views/slices/EditorialImage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const EditorialImageSlice: FunctionComponent<EditorialImageSliceProps> = ({
}) => {
const transformedSlice = transformEditorialImageSlice(slice);

const options = { ...defaultContext, context };
const options = { ...defaultContext, ...context };
// TODO: use one layout for all image weights if/when it's established
// that width isn't an adequate means to illustrate a difference
return (
Expand Down
Loading

0 comments on commit 0d48bef

Please sign in to comment.