Update conditions when adjustDayPickerHeight is called #1241
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nnishimura
force-pushed
the
fix/adjustDayPickerHeight2
branch
from
66dc966
to
0e17f26
Compare
majapw
requested changes
Jul 3, 2018
src/components/DayPicker.jsx
Outdated
| this.isHorizontal() | ||
| && (orientation !== prevProps.orientation || daySize !== prevProps.daySize) | ||
| ) { | ||
| this.adjustDayPickerHeight(); |
There was a problem hiding this comment.
I think that in #1192, we changed this function so that it now takes a value. If we change this line to:
const visibleCalendarWeeks = this.calendarMonthWeeks.slice(0, numberOfMonths);
const calendarMonthWeeksHeight = Math.max(0, ...visibleCalendarWeeks) * (daySize - 1);
const newMonthHeight = monthTitleHeight + calendarMonthWeeksHeight + 1;
this.adjustDayPickerHeight(newMonthHeight);
that should work (monthTitleHeight is in state).
There was a problem hiding this comment.
@majapw thanks for the catch, have updated.
nnishimura
force-pushed
the
fix/adjustDayPickerHeight2
branch
4 times, most recently
from
3d3e06c
to
a60cabc
Compare
majapw
reviewed
Jul 12, 2018
src/components/DayPicker.jsx
Outdated
| this.isHorizontal() | ||
| && (orientation !== prevProps.orientation || daySize !== prevProps.daySize) | ||
| ) { | ||
| const visibleCalendarWeeks = this.calendarMonthWeeks.slice(0, numberOfMonths); |
There was a problem hiding this comment.
ah shit, this should be this.calendarMonthWeeks.slice(1, numberOfMonths + 1); (we have to slice off the first and last months because they are hidden). I will update this.
* Added checks for daySize and orientation in DayPicker.componentDidUpdate() so that DayPicker height is recalculated if either of these change between renders * Added new tests for DayPicker.componentDidUpdate
majapw
force-pushed
the
fix/adjustDayPickerHeight2
branch
from
a60cabc
to
ab8c80b
Compare
majapw
approved these changes
Jul 12, 2018
|
All right! This looks great! I'll merge in when tests pass. :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #443
Replaces #446, #640