Merge pull request #110 from J3j3m/Fixes/#105

fix(timepicker): selecting 12pm returns 24 hrs
web-ridge · Oct 20, 2021 · c779747 · c779747
2 parents 8ce85da + 96ab103
commit c779747
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 48 deletions.
diff --git a/src/Time/AmPmSwitcher.tsx b/src/Time/AmPmSwitcher.tsx
@@ -3,15 +3,17 @@ import { View, StyleSheet } from 'react-native'
 import { Text, TouchableRipple, useTheme } from 'react-native-paper'
 import { useMemo } from 'react'
 import Color from 'color'
-import { getHourType, hourTypes, useSwitchColors } from './timeUtils'
+import { useSwitchColors } from './timeUtils'
+import { DisplayModeContext } from './TimePicker'
 
 export default function AmPmSwitcher({
-  hours,
   onChange,
+  hours,
 }: {
   hours: number
   onChange: (hours: number) => any
 }) {
+  const { setMode, mode } = React.useContext(DisplayModeContext)
   const theme = useTheme()
   const backgroundColor = useMemo<string>(() => {
     if (theme.dark) {
@@ -20,10 +22,7 @@ export default function AmPmSwitcher({
     return Color(theme.colors.surface).darken(0.1).hex()
   }, [theme])
 
-  const hourType = getHourType(hours)
-  const isAM = hourType === hourTypes.am
-  const isPM = hourType === hourTypes.pm
-
+  const isAM = mode === 'AM'
   return (
     <View
       style={[
@@ -36,16 +35,26 @@ export default function AmPmSwitcher({
     >
       <SwitchButton
         label="AM"
-        onPress={isAM ? undefined : () => onChange(hours - 12)}
+        onPress={() => {
+          setMode('AM')
+          if (hours - 12 >= 0) {
+            onChange(hours - 12)
+          }
+        }}
         selected={isAM}
         disabled={isAM}
       />
       <View style={[styles.switchSeparator, { backgroundColor }]} />
       <SwitchButton
         label="PM"
-        onPress={isPM ? undefined : () => onChange(hours + 12)}
-        selected={isPM}
-        disabled={isPM}
+        onPress={() => {
+          setMode('PM')
+          if (hours + 12 <= 24) {
+            onChange(hours + 12)
+          }
+        }}
+        selected={!isAM}
+        disabled={!isAM}
       />
     </View>
   )

diff --git a/src/Time/AnalogClock.tsx b/src/Time/AnalogClock.tsx
@@ -12,9 +12,7 @@ import {
   getAngle,
   getHours,
   getHourType,
-  getHourTypeFromOffset,
   getMinutes,
-  hourTypes,
   PossibleClockTypes,
 } from './timeUtils'
 import * as React from 'react'
@@ -24,6 +22,7 @@ import AnalogClockHours from './AnalogClockHours'
 
 import AnimatedClockSwitcher from './AnimatedClockSwitcher'
 import AnalogClockMinutes from './AnalogClockMinutes'
+import { DisplayModeContext } from './TimePicker'
 
 function AnalogClock({
   hours,
@@ -47,7 +46,7 @@ function AnalogClock({
   }) => any
 }) {
   const theme = useTheme()
-
+  const { mode } = React.useContext(DisplayModeContext)
   // used to make pointer shorter if hours are selected and above 12
   const shortPointer = (hours === 0 || hours > 12) && is24Hour
 
@@ -60,6 +59,7 @@ function AnalogClock({
   const minutesRef = useLatest(minutes)
   const focusedRef = useLatest(focused)
   const is24HourRef = useLatest(is24Hour)
+  const modeRef = useLatest(mode)
 
   const onPointerMove = React.useCallback(
     (e: GestureResponderEvent, final: boolean) => {
@@ -73,12 +73,10 @@ function AnalogClock({
         let previousHourType = getHourType(hoursRef.current)
         let pickedHours = getHours(angle, previousHourType)
 
-        let hourTypeFromOffset = getHourTypeFromOffset(x, y, circleSize)
-        let hours24AndPM = hours24 && hourTypeFromOffset === hourTypes.pm
-        let hours12AndPm = !hours24 && previousHourType === hourTypes.pm
-
-        // TODO: check which mode is switched on am/pm
-        if (hours12AndPm || hours24AndPM) {
+        let hours12AndPm = !hours24 && modeRef.current === 'PM'
+        // Avoiding the "24h"
+        // Should be 12h for 12 hours and PM mode
+        if ((hours12AndPm || hours24) && pickedHours + 12 < 24) {
           pickedHours += 12
         }
 
@@ -103,7 +101,7 @@ function AnalogClock({
         }
       }
     },
-    [focusedRef, is24HourRef, hoursRef, onChangeRef, minutesRef]
+    [focusedRef, is24HourRef, hoursRef, onChangeRef, minutesRef, modeRef]
   )
 
   const panResponder = React.useRef(

diff --git a/src/Time/AnalogClockHours.tsx b/src/Time/AnalogClockHours.tsx
@@ -3,6 +3,7 @@ import { View, StyleSheet } from 'react-native'
 import { Text } from 'react-native-paper'
 import { circleSize } from './timeUtils'
 import { useTextColorOnPrimary } from '../utils'
+import { DisplayModeContext } from './TimePicker'
 
 function AnalogClockHours({
   is24Hour,
@@ -11,9 +12,11 @@ function AnalogClockHours({
   is24Hour: boolean
   hours: number
 }) {
-  const outerRange = getHourNumbers(false, circleSize, 12)
-  const innerRange = getHourNumbers(true, circleSize, 12)
+  const { mode } = React.useContext(DisplayModeContext)
+  const outerRange = getHourNumbers(false, circleSize, 12, 12)
+  const innerRange = getHourNumbers(true, circleSize, 12, 12)
   const color = useTextColorOnPrimary()
+
   return (
     <>
       {outerRange.map((a, i) => (
@@ -29,8 +32,9 @@ function AnalogClockHours({
           ]}
         >
           <View style={styles.outerHourInner}>
+            {/* Display 00 instead of 12 for AM hours */}
             <Text style={hours === i + 1 ? { color } : null} selectable={false}>
-              {i + 1}
+              {mode === 'AM' && i + 1 === 12 ? '00' : i + 1}
             </Text>
           </View>
         </View>
@@ -97,14 +101,19 @@ const styles = StyleSheet.create({
   innerHourText: { fontSize: 13 },
 })
 
-function getHourNumbers(is24Hour: boolean, size: number, count: number) {
+function getHourNumbers(
+  is24Hour: boolean,
+  size: number,
+  count: number,
+  arrayLength: number
+) {
   let angle = 0
   let step = (2 * Math.PI) / count
   let radius = size / (is24Hour ? 4 : 2.5)
 
   angle = (-90 * Math.PI) / 180 + Math.PI / 6
 
-  return Array(12)
+  return Array(arrayLength)
     .fill(true)
     .map(() => {
       let x = Math.round(size / 2 + radius * Math.cos(angle))

diff --git a/src/Time/TimePicker.tsx b/src/Time/TimePicker.tsx
@@ -13,6 +13,11 @@ import AnalogClock from './AnalogClock'
 import { circleSize } from './timeUtils'
 import TimeInputs from './TimeInputs'
 
+export const DisplayModeContext = React.createContext<{
+  mode: 'AM' | 'PM' | undefined
+  setMode: React.Dispatch<React.SetStateAction<'AM' | 'PM' | undefined>>
+}>({ mode: 'AM', setMode: () => {} })
+
 type onChangeFunc = ({
   hours,
   minutes,
@@ -40,6 +45,9 @@ function TimePicker({
   onFocusInput: (type: PossibleClockTypes) => any
   onChange: onChangeFunc
 }) {
+  const [displayMode, setDisplayMode] = React.useState<'AM' | 'PM' | undefined>(
+    undefined
+  )
   const dimensions = useWindowDimensions()
   const isLandscape = dimensions.width > dimensions.height
 
@@ -54,6 +62,16 @@ function TimePicker({
     return formatted.includes('23')
   }, [locale])
 
+  // Initialize display Mode according the hours value
+  React.useEffect(() => {
+    if (hours >= 12) {
+      setDisplayMode('PM')
+    } else {
+      setDisplayMode('AM')
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
   const onInnerChange = React.useCallback<onChangeFunc>(
     (params) => {
       params.hours = toHourOutputFormat(params.hours, hours, is24Hour)
@@ -63,28 +81,32 @@ function TimePicker({
   )
 
   return (
-    <View style={isLandscape ? styles.rootLandscape : styles.rootPortrait}>
-      <TimeInputs
-        inputType={inputType}
-        hours={hours}
-        minutes={minutes}
-        is24Hour={is24Hour}
-        onChange={onChange}
-        onFocusInput={onFocusInput}
-        focused={focused}
-      />
-      {inputType === inputTypes.picker ? (
-        <View style={styles.clockContainer}>
-          <AnalogClock
-            hours={toHourInputFormat(hours, is24Hour)}
-            minutes={minutes}
-            focused={focused}
-            is24Hour={is24Hour}
-            onChange={onInnerChange}
-          />
-        </View>
-      ) : null}
-    </View>
+    <DisplayModeContext.Provider
+      value={{ mode: displayMode, setMode: setDisplayMode }}
+    >
+      <View style={isLandscape ? styles.rootLandscape : styles.rootPortrait}>
+        <TimeInputs
+          inputType={inputType}
+          hours={hours}
+          minutes={minutes}
+          is24Hour={is24Hour}
+          onChange={onChange}
+          onFocusInput={onFocusInput}
+          focused={focused}
+        />
+        {inputType === inputTypes.picker ? (
+          <View style={styles.clockContainer}>
+            <AnalogClock
+              hours={toHourInputFormat(hours, is24Hour)}
+              minutes={minutes}
+              focused={focused}
+              is24Hour={is24Hour}
+              onChange={onInnerChange}
+            />
+          </View>
+        ) : null}
+      </View>
+    </DisplayModeContext.Provider>
   )
 }
 

diff --git a/src/Time/timeUtils.ts b/src/Time/timeUtils.ts
@@ -199,6 +199,9 @@ export function useInputColors(highlighted: boolean) {
 }
 
 export function toHourInputFormat(hours: number, is24Hour: boolean): number {
+  if (hours === 24) {
+    return 0
+  }
   if (is24Hour) {
     return hours
   }
@@ -216,7 +219,7 @@ export function toHourOutputFormat(
   if (is24Hour) {
     return newHours
   }
-  if (previousHours > 12 && newHours <= 12) {
+  if (previousHours > 12 && newHours < 12) {
     return newHours + 12
   }
   return newHours