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

check if the content and the wrapper exists before computing the sizes #123

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+6 −6
Open

check if the content and the wrapper exists before computing the sizes #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b5c7d1e
check if the content and the wrapper exists before computing the size…
Jun 18, 2018
89e41a6
check if the content and the wrapper exists before computing the size…
Jun 20, 2018
5e821b4
Update .gitignore
alexnaiman Jun 20, 2018
ea6a6e5
fix for setState
Jun 22, 2018
2c21475
Merge remote-tracking branch 'origin/checking-if-the-content-exists-b…
Jun 22, 2018
a35da8c
fixing mistakes because I forgot changing branches *facepalm*
Jun 22, 2018
52dafb9
Merge branch 'master' into checking-if-the-content-exists-before-comp…
alexnaiman Sep 6, 2019
0764a81
- requested fixes for pr
alexnaiman Sep 6, 2019
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
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@
"url": "https://github.com/souhe/reactScrollbar/issues"
},
"homepage": "https://github.com/souhe/reactScrollbar"
}
}
8 changes: 4 additions & 4 deletions src/js/ScrollArea.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,10 +371,10 @@ export default class ScrollArea extends React.Component {
}

computeSizes() {
let realHeight = this.content.offsetHeight;
let containerHeight = this.wrapper.offsetHeight;
let realWidth = this.content.offsetWidth;
let containerWidth = this.wrapper.offsetWidth;
let realHeight = this.content ? this.content.offsetHeight : 0;
let containerHeight = this.wrapper ? this.wrapper.offsetHeight : 0;
let realWidth = this.content ? this.content.offsetWidth : 0;
let containerWidth = this.content ? this.wrapper.offsetWidth : 0;

return {
realHeight: realHeight,
Expand Down