-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
Disables timezone options if it is set to automatic #15176
Changes from all commits
0d34efd
073f8f7
9e22ee5
3f587b6
953ca2e
97c20b3
e27a3ae
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,28 +33,74 @@ class TimezoneSelectPage extends Component { | |
|
||
this.saveSelectedTimezone = this.saveSelectedTimezone.bind(this); | ||
this.filterShownTimezones = this.filterShownTimezones.bind(this); | ||
this.getTimezoneOption = this.getTimezoneOption.bind(this); | ||
|
||
this.currentSelectedTimezone = lodashGet(props.currentUserPersonalDetails, 'timezone.selected', CONST.DEFAULT_TIME_ZONE.selected); | ||
this.timezone = this.getUserTimezone(props.currentUserPersonalDetails); | ||
this.allTimezones = _.chain(moment.tz.names()) | ||
.filter(timezone => !timezone.startsWith('Etc/GMT')) | ||
.map(timezone => ({ | ||
text: timezone, | ||
keyForList: timezone, | ||
|
||
// Include the green checkmark icon to indicate the currently selected value | ||
customIcon: timezone === this.currentSelectedTimezone ? greenCheckmark : undefined, | ||
|
||
// This property will make the currently selected value have bold text | ||
boldStyle: timezone === this.currentSelectedTimezone, | ||
})) | ||
.map(this.getTimezoneOption) | ||
.value(); | ||
|
||
this.state = { | ||
timezoneInputText: this.currentSelectedTimezone, | ||
timezoneInputText: this.timezone.selected, | ||
timezoneOptions: this.allTimezones, | ||
}; | ||
} | ||
|
||
componentDidUpdate() { | ||
// componentDidUpdate is added in order to update the timezone options when automatic is toggled on/off as | ||
// navigating back doesn't unmount the page, thus it won't update the timezone options & stay disabled without this. | ||
const newTimezone = this.getUserTimezone(this.props.currentUserPersonalDetails); | ||
if (_.isEqual(this.timezone, newTimezone)) { | ||
return; | ||
} | ||
this.timezone = newTimezone; | ||
this.allTimezones = _.map(this.allTimezones, (timezone) => { | ||
const text = timezone.text.split('-')[0]; | ||
return this.getTimezoneOption(text); | ||
}); | ||
|
||
this.setState({ | ||
timezoneInputText: this.timezone.selected, | ||
timezoneOptions: this.allTimezones, | ||
}); | ||
} | ||
|
||
/** | ||
* We add the current time to the key to fix a bug where the list options don't update unless the key is updated. | ||
* @param {String} text | ||
* @return {string} key for list item | ||
*/ | ||
getKey(text) { | ||
return `${text}-${(new Date()).getTime()}`; | ||
} | ||
|
||
/** | ||
* Get timezone option object for the list. | ||
* @param {String} text | ||
* @return {Object} Timezone list option | ||
*/ | ||
getTimezoneOption(text) { | ||
return { | ||
text, | ||
keyForList: this.getKey(text), | ||
|
||
// Include the green checkmark icon to indicate the currently selected value | ||
customIcon: text === this.timezone.selected ? greenCheckmark : undefined, | ||
|
||
// This property will make the currently selected value have bold text | ||
boldStyle: text === this.timezone.selected, | ||
}; | ||
} | ||
|
||
/** | ||
* @param {Object} currentUserPersonalDetails | ||
* @return {Object} user's timezone data | ||
*/ | ||
getUserTimezone(currentUserPersonalDetails) { | ||
return lodashGet(currentUserPersonalDetails, 'timezone', CONST.DEFAULT_TIME_ZONE); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @priyeshshah11 Why do we need this There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
We should put that instead of // Update timezoneInputText & all timezoneOptions when the timezone object changes There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks @priyeshshah11 that will help to explain what's going on 👍 |
||
|
||
/** | ||
* @param {Object} timezone | ||
* @param {String} timezone.text | ||
|
@@ -90,7 +136,7 @@ class TimezoneSelectPage extends Component { | |
onChangeText={this.filterShownTimezones} | ||
onSelectRow={this.saveSelectedTimezone} | ||
optionHoveredStyle={styles.hoveredComponentBG} | ||
sections={[{data: this.state.timezoneOptions, indexOffset: 0}]} | ||
sections={[{data: this.state.timezoneOptions, indexOffset: 0, isDisabled: this.timezone.automatic}]} | ||
shouldHaveOptionSeparator | ||
safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle} | ||
initiallyFocusedOptionKey={this.currentSelectedTimezone} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a description of why we are doing this?