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

ScrollablePane: Moves onScroll from root element to container #20123

Merged
merged 5 commits into from Apr 19, 2022
Merged

ScrollablePane: Moves onScroll from root element to container #20123

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b29b2c
Moves onScroll method on ScrollablePane from root to container
bsunderhus Oct 6, 2021
6eef3c3
Change files
bsunderhus Oct 6, 2021
fa7dce5
Merge branch 'master' of https://github.com/microsoft/fluentui into v…
khmakoto Apr 19, 2022
5843245
Using excludedPropNames instead of undefining the onScroll prop.
khmakoto Apr 19, 2022
3dcc0eb
Using excludedPropNames instead of undefining the onScroll prop.
khmakoto Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/@fluentui-react-73d7be27-0748-4f29-b659-db242b6ef7d0.json
View file
Open in desktop
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Moves onScroll method on ScrollablePane from root to container",
"packageName": "@fluentui/react",
"email": "bsunderhus@microsoft.com",
"dependentChangeType": "patch"
}
23 changes: 20 additions & 3 deletions packages/react/src/components/ScrollablePane/ScrollablePane.base.tsx
View file
Open in desktop
Expand Up @@ -187,7 +187,7 @@ export class ScrollablePaneBase
}

public render(): JSX.Element {
const { className, scrollContainerFocus, scrollContainerAriaLabel, theme, styles } = this.props;
const { className, scrollContainerFocus, scrollContainerAriaLabel, theme, styles, onScroll } = this.props;
const { stickyTopHeight, stickyBottomHeight } = this.state;
const classNames = getClassNames(styles!, {
theme: theme!,
Expand All @@ -200,11 +200,28 @@ export class ScrollablePaneBase
role: 'group',
tabIndex: 0,
'aria-label': scrollContainerAriaLabel,
onScroll,
}
: {};
: {
onScroll,
};

return (
<div {...getNativeProps(this.props, divProperties)} ref={this._root} className={classNames.root}>
<div
{...getNativeProps(
{
...this.props,

onScroll: undefined,
},
divProperties,
// on React 17 onScroll is not being invoked on root element,
// as a fix this method will be provided to the container element
['onScroll'],
)}
ref={this._root}
className={classNames.root}
>
<div
ref={this._stickyAboveRef}
className={classNames.stickyAbove}
Expand Down