Skip to content

fix(time-picker): Unable to select any hours before noon, #132 #136

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

Merged
merged 1 commit into from
Feb 7, 2022
Merged

fix(time-picker): Unable to select any hours before noon, #132 #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 12 additions & 18 deletions src/Time/AnalogClock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,17 @@ import {
getAngle,
getHours,
getHourType,
getHourTypeFromOffset,
getMinutes,
hourTypes,
PossibleClockTypes,
} from './timeUtils'
import * as React from 'react'

import { useLatest } from '../utils'
import AnalogClockHours from './AnalogClockHours'

import AnimatedClockSwitcher from './AnimatedClockSwitcher'
import AnalogClockMinutes from './AnalogClockMinutes'
import { DisplayModeContext } from './TimePicker'

function AnalogClock({
hours,
minutes,
Expand All @@ -45,9 +44,7 @@ function AnalogClock({
const { mode } = React.useContext(DisplayModeContext)
// used to make pointer shorter if hours are selected and above 12
const shortPointer = (hours === 0 || hours > 12) && is24Hour

const clockRef = React.useRef<View | null>(null)

// Hooks are nice, sometimes... :-)..
// We need the latest values, since the onPointerMove uses a closure to the function
const hoursRef = useLatest(hours)
Expand All @@ -56,31 +53,35 @@ function AnalogClock({
const focusedRef = useLatest(focused)
const is24HourRef = useLatest(is24Hour)
const modeRef = useLatest(mode)

const onPointerMove = React.useCallback(
(e: GestureResponderEvent, final: boolean) => {
let x = e.nativeEvent.locationX
let y = e.nativeEvent.locationY

let angle = getAngle(x, y, circleSize)

if (focusedRef.current === clockTypes.hours) {
let hours24 = is24HourRef.current
let previousHourType = getHourType(hoursRef.current)
let pickedHours = getHours(angle, previousHourType)

let hours12AndPm = !hours24 && modeRef.current === 'PM'
let hours12AndPm = !hours24 && modeRef.current === 'AM'

let hourTypeFromOffset = getHourTypeFromOffset(x, y, circleSize)
let hours24AndPM = hours24 && hourTypeFromOffset === hourTypes.pm

// Avoiding the "24h"
// Should be 12h for 12 hours and PM mode
if ((hours12AndPm || hours24) && pickedHours + 12 < 24) {

if (hours12AndPm || hours24AndPM) {
pickedHours += 12
}
if (modeRef.current === 'AM' && pickedHours === 12) {
pickedHours = 0
}

if (pickedHours === 24) {
if (
(!hours24 && modeRef.current === 'AM' && pickedHours === 12) ||
pickedHours === 24
) {
pickedHours = 0
}

Expand All @@ -103,13 +104,11 @@ function AnalogClock({
},
[focusedRef, is24HourRef, hoursRef, onChangeRef, minutesRef, modeRef]
)

const panResponder = React.useRef(
PanResponder.create({
onPanResponderGrant: (e) => onPointerMove(e, false),
onPanResponderMove: (e) => onPointerMove(e, false),
onPanResponderRelease: (e) => onPointerMove(e, true),

onStartShouldSetPanResponder: returnTrue,
onStartShouldSetPanResponderCapture: () => false,
onMoveShouldSetPanResponder: returnTrue,
Expand All @@ -118,7 +117,6 @@ function AnalogClock({
onShouldBlockNativeResponder: returnTrue,
})
).current

const dynamicSize = focused === clockTypes.hours && shortPointer ? 33 : 0
const pointerNumber = focused === clockTypes.hours ? hours : minutes
const degreesPerNumber = focused === clockTypes.hours ? 30 : 6
Expand Down Expand Up @@ -178,7 +176,6 @@ function AnalogClock({
</View>
)
}

const styles = StyleSheet.create({
clock: {
height: circleSize,
Expand All @@ -204,15 +201,12 @@ const styles = StyleSheet.create({
},
line: {
position: 'absolute',

marginBottom: -1,
height: 2,
borderRadius: 4,
},
})

function returnTrue() {
return true
}

export default React.memo(AnalogClock)