Skip to content

Commit 31ac874

Browse files
committed
fix: fix content loading
1 parent 7f703c8 commit 31ac874

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

packages/smooth/src/page/Page.js

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,17 @@ function enrichPageRef(
8181

8282
if (isContent) {
8383
pageRef.current.slug = getContentSlug({ match, history, location, pageRef })
84-
}
8584

86-
if (
87-
isContent &&
88-
!pageRef.current.ContentComponent &&
89-
!pageRef.current.PageComponent
90-
) {
91-
const ContentComponent = props => {
92-
const Component = pageRef.current.module.default
93-
const element = <Component {...props} />
94-
return applyHook('wrapContentElement', { element, props }, 'element')
85+
if (!pageRef.current.ContentComponent && !pageRef.current.PageComponent) {
86+
const ContentComponent = props => {
87+
const Component = pageRef.current.module.default
88+
const element = <Component {...props} />
89+
return applyHook('wrapContentElement', { element, props }, 'element')
90+
}
91+
const PageComponent = () => <Content Component={ContentComponent} />
92+
pageRef.current.ContentComponent = ContentComponent
93+
pageRef.current.PageComponent = PageComponent
9594
}
96-
const PageComponent = () => <Content Component={ContentComponent} />
97-
pageRef.current.ContentComponent = ContentComponent
98-
pageRef.current.PageComponent = PageComponent
9995
} else {
10096
pageRef.current.PageComponent = pageModule.default
10197
}

0 commit comments

Comments
 (0)