Skip to content

Commit 8fdb754

Browse files
authored
Merge pull request #386 from mashmatrix/fix-comp-settings-propagate-to-portal-cmp
fix to propagate comp settings to comps in portal
2 parents 3a28b1d + dd448fb commit 8fdb754

File tree

1 file changed

+34
-29
lines changed

1 file changed

+34
-29
lines changed

src/scripts/AutoAlign.tsx

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -397,35 +397,40 @@ export function autoAlign(options: AutoAlignOptions) {
397397
) : (
398398
<div ref={(node) => (this.node = node)}>
399399
<ComponentSettingsContext.Consumer>
400-
{({
401-
portalClassName = 'slds-scope',
402-
portalStyle = {
403-
position: 'absolute',
404-
top: 0,
405-
left: 0,
406-
right: 0,
407-
},
408-
}) => (
409-
<RelativePortal
410-
fullWidth
411-
left={offsetLeft}
412-
right={-offsetLeft}
413-
top={offsetTop}
414-
onScroll={ignoreFirstCall(this.requestRecalcAlignment)}
415-
component='div'
416-
className={classnames(
417-
portalClassName,
418-
additionalPortalClassName
419-
)}
420-
style={{ ...portalStyle, ...additionalPortalStyle }}
421-
>
422-
{this.state.triggerNodeRect ? (
423-
content
424-
) : (
425-
<div className='slds-hidden'>{content}</div>
426-
)}
427-
</RelativePortal>
428-
)}
400+
{(compSettings) => {
401+
const {
402+
portalClassName = 'slds-scope',
403+
portalStyle = {
404+
position: 'absolute',
405+
top: 0,
406+
left: 0,
407+
right: 0,
408+
},
409+
} = compSettings;
410+
return (
411+
<RelativePortal
412+
fullWidth
413+
left={offsetLeft}
414+
right={-offsetLeft}
415+
top={offsetTop}
416+
onScroll={ignoreFirstCall(this.requestRecalcAlignment)}
417+
component='div'
418+
className={classnames(
419+
portalClassName,
420+
additionalPortalClassName
421+
)}
422+
style={{ ...portalStyle, ...additionalPortalStyle }}
423+
>
424+
<ComponentSettingsContext.Provider value={compSettings}>
425+
{this.state.triggerNodeRect ? (
426+
content
427+
) : (
428+
<div className='slds-hidden'>{content}</div>
429+
)}
430+
</ComponentSettingsContext.Provider>
431+
</RelativePortal>
432+
);
433+
}}
429434
</ComponentSettingsContext.Consumer>
430435
</div>
431436
);

0 commit comments

Comments
 (0)