Skip to content
Merged
Changes from all commits
Commits
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
21 changes: 16 additions & 5 deletions components/Timezone Selector/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useState } from 'react'
import Select from 'react-timezone-select'
import React, { useState, useMemo } from 'react'
import { useTimezoneSelect, allTimezones } from 'react-timezone-select'
import Select from 'react-select'
import style from './timezone-selector.module.css'

interface TimezoneSelectorProps {
Expand All @@ -14,6 +15,16 @@ const TimezoneSelector: React.FC<TimezoneSelectorProps> = ({ value }) => {
const [error, setError] = useState('')
const [success, setSuccess] = useState('')

const { options, parseTimezone } = useTimezoneSelect({ timezones: allTimezones, displayValue: 'UTC' })

const sortedOptions = useMemo(() => {
return [...options].sort((a, b) => {
if (a.offset !== b.offset) return (a.offset ?? 0) - (b.offset ?? 0)
// secondary sort by timezone name
return a.value.localeCompare(b.value)
})
}, [options])

const handleChange = (selectedOption: any): void => {
const updateTimezone = async (): Promise<void> => {
const oldTimezone = selectedTimezone
Expand Down Expand Up @@ -62,12 +73,12 @@ const TimezoneSelector: React.FC<TimezoneSelectorProps> = ({ value }) => {
return (
<>
<Select
value={selectedTimezone}
value={parseTimezone(selectedTimezone)}
onChange={handleChange}
disabled={false}
isDisabled={false}
className={style.select_timezone}
displayValue="UTC"
styles={customStyles}
options={sortedOptions}
/>
{error !== '' && <span className={style.error_message}>{error}</span>}
{success !== '' && <span className={style.success_message}>{success}</span>}
Expand Down