-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
[1.x] [Labs] Add useManualCalc prop to TimezonePicker as speed optimization #2564
Merged
Merged
Changes from 3 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,38 +15,51 @@ export interface ITimezoneMetadata { | |
} | ||
|
||
export function getTimezoneMetadata(timezone: string, date: Date): ITimezoneMetadata { | ||
const timestamp = date.getTime(); | ||
const zone = moment.tz.zone(timezone); | ||
const zonedDate = moment.tz(timestamp, timezone); | ||
const offset = zonedDate.utcOffset(); | ||
const offsetAsString = zonedDate.format("Z"); | ||
const abbreviation = getAbbreviation(timezone, timestamp); | ||
|
||
const timestamp = date.getTime(); | ||
const { abbrs, offsets, population, untils } = zone; | ||
const index = findOffsetIndex(timestamp, untils); | ||
const abbreviation = getNonOffsetAbbreviation(abbrs[index]); | ||
const offset = offsets[index] * -1; | ||
const offsetAsString = getOffsetAsString(offset); | ||
return { | ||
abbreviation, | ||
offset, | ||
offsetAsString, | ||
population: zone.population, | ||
population, | ||
timezone, | ||
}; | ||
} | ||
|
||
/** | ||
* Get the abbreviation for a timezone. | ||
* We need this utility because moment-timezone's `abbr` will not always give the abbreviated time zone name, | ||
* since it falls back to the time offsets for each region. | ||
* https://momentjs.com/timezone/docs/#/using-timezones/formatting/ | ||
* Ignore abbreviations that are simply offsets, i.e. "+14" instead of "PST" | ||
* @param abbreviation | ||
*/ | ||
function getAbbreviation(timezone: string, timestamp: number): string | undefined { | ||
const zone = moment.tz.zone(timezone); | ||
if (zone) { | ||
const abbreviation = zone.abbr(timestamp); | ||
function getNonOffsetAbbreviation(abbreviation: string) { | ||
return isNonOffsetAbbreviation(abbreviation) ? abbreviation : undefined; | ||
} | ||
|
||
// Only include abbreviations that are not just a repeat of the offset | ||
if (abbreviation.length > 0 && abbreviation[0] !== "-" && abbreviation[0] !== "+") { | ||
return abbreviation; | ||
function isNonOffsetAbbreviation(abbreviation: string) { | ||
return abbreviation != null && abbreviation.length > 0 && abbreviation[0] !== "-" && abbreviation[0] !== "+"; | ||
} | ||
|
||
function findOffsetIndex(timestamp: number, untils: number[]) { | ||
for (let i = 0; i < untils.length; i++) { | ||
if (i === untils.length - 1 || timestamp < untils[i]) { | ||
return i; | ||
} | ||
} | ||
return 0; | ||
} | ||
|
||
function getOffsetAsString(offset: number) { | ||
const offsetVal = Math.abs(offset); | ||
const minutes = offsetVal % 60; | ||
const hours = (offsetVal - minutes) / 60; | ||
const sign = offset >= 0 ? "+" : "-"; | ||
return sign + lpad(hours) + ":" + lpad(minutes); | ||
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. slight preference for |
||
} | ||
|
||
return undefined; | ||
function lpad(num: number) { | ||
return num < 10 ? "0" + num : num; | ||
} |
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.
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.
slight preference for inlining vars in object def as they're never re-used.