Skip to content
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

Jump to bottom

[sitecore-jss-nextjs] Placeholder applies the modifyComponentProps prop. #1668

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[sitecore-jss-nextjs] Placeholder applies the modifyComponentProps prop. #1668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4cfc9a
Nextjs Placeholder uses the modifyComponentProps prop.
Adamduehansen Nov 17, 2023
dac32ae
Updates CHANGELOG.
Adamduehansen Nov 18, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Our versioning strategy is as follows:
* `[sitecore-jss-proxy]` Setting "followRedirects" to "true" breaks HEAD requests ([#1630](https://github.com/Sitecore/jss/pull/1630))
* `[templates/nextjs-sxa]` Fix shown horizontal scrollbar in EE mode. ([#1625](https://github.com/Sitecore/jss/pull/1625)), ([#1626](https://github.com/Sitecore/jss/pull/1626))
* `[sitecore-jss-nextjs]` Fix issue when redirects works each every other times. ([#1629](https://github.com/Sitecore/jss/pull/1629))
* `[sitecore-jss-nextjs]` Next.js placeholder applies the modifyComponentProps prop. ([#1668](https://github.com/Sitecore/jss/pull/1668))
* `[templates/nextjs]` Fix custom headers. Now in cors-header plugin extends custom headers from next.config.js file. ([#1637](https://github.com/Sitecore/jss/pull/1637))
* `[sitecore-jss-react]` Fix PlaceholderCommon with using two and more dynamic placeholders. ([#1641](https://github.com/Sitecore/jss/pull/1641))
* `[templates/nextjs-multisite]` Fix site info fetch errors (now skipped) on XM Cloud rendering/editing host builds. ([#1649](https://github.com/Sitecore/jss/pull/1649)), ([#1653](https://github.com/Sitecore/jss/pull/1653))
Expand Down
22 changes: 15 additions & 7 deletions packages/sitecore-jss-nextjs/src/components/Placeholder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,29 @@ import {
PlaceholderComponentProps,
} from '@sitecore-jss/sitecore-jss-react';
import { ComponentPropsReactContext } from './ComponentPropsContext';
import { ComponentProps } from '@sitecore-jss/sitecore-jss-react/types/components/PlaceholderCommon';

export const Placeholder = (props: PlaceholderComponentProps) => {
const componentPropsContext = useContext(ComponentPropsReactContext);

function getContextProps(initialProps: ComponentProps) {
if (!initialProps.rendering.uid) return initialProps;

const data = componentPropsContext[initialProps.rendering.uid] as {
[key: string]: unknown;
};

return data;
}

return (
<ReactPlaceholder
{...props}
modifyComponentProps={(initialProps) => {
if (!initialProps.rendering.uid) return initialProps;

const data = componentPropsContext[initialProps.rendering.uid] as {
[key: string]: unknown;
};

return { ...initialProps, ...data };
const finalProps = props.modifyComponentProps
? props.modifyComponentProps(initialProps)
: initialProps;
return { ...finalProps, ...getContextProps(initialProps) };
}}
/>
);
Expand Down