Merge pull request #230 from web-ridge/hour-formatting-bugfix

Roll out fixes for 12 hour formatting.

Author: RichardLindhout

src/Time/AnalogClock.tsx

@@ -63,7 +63,7 @@ function AnalogClock({
         let previousHourType = getHourType(hoursRef.current)
         let pickedHours = getHours(angle, previousHourType)
 
-        let hours12AndPm = !hours24 && modeRef.current === 'AM'
+        let hours12AndPm = !hours24 && modeRef.current === 'PM'
 
         let hourTypeFromOffset = getHourTypeFromOffset(x, y, circleSize)
         let hours24AndPM = hours24 && hourTypeFromOffset === hourTypes.pm

src/Time/AnalogClockHours.tsx

@@ -38,7 +38,7 @@ function AnalogClockHours({
               variant="bodyLarge"
               selectable={false}
             >
-              {mode === 'AM' && !is24Hour && i + 1 === 12 ? '00' : i + 1}
+              {mode === 'AM' && is24Hour && i + 1 === 12 ? '00' : i + 1}
             </Text>
           </View>
         </View>

src/Time/timeUtils.ts

@@ -242,15 +242,18 @@ export function useInputColors(highlighted: boolean) {
 }
 
 export function toHourInputFormat(hours: number, is24Hour: boolean): number {
-  if (hours === 24) {
-    return 0
-  }
   if (is24Hour) {
+    if (hours === 24) {
+      return 0
+    }
     return hours
   }
   if (hours > 12) {
     return hours - 12
   }
+  if (hours === 0) {
+    return hours + 12
+  }
   return hours
 }
 
@@ -262,7 +265,7 @@ export function toHourOutputFormat(
   if (is24Hour) {
     return newHours
   }
-  if (previousHours > 12 && newHours < 12) {
+  if ((!is24Hour && previousHours === 0) || newHours === 0) {
     return newHours + 12
   }
   return newHours

src/__tests__/Time/__snapshots__/AnalogClock.test.tsx.snap

@@ -794,7 +794,7 @@ exports[`renders AnalogClock 1`] = `
               ]
             }
           >
-            00
+            12
           </Text>
         </View>
       </View>

src/__tests__/Time/__snapshots__/AnalogClockHours.test.tsx.snap

@@ -660,7 +660,7 @@ exports[`renders AnalogClockHours 1`] = `
           ]
         }
       >
-        12
+        00
       </Text>
     </View>
   </View>,

src/__tests__/Time/timeUtils.test.tsx

@@ -78,7 +78,7 @@ describe('timeUtils', () => {
   })
 
   it('should return correct hour output format when not is24Hour', () => {
-    expect(toHourOutputFormat(11, 13, false)).toBe(23)
+    expect(toHourOutputFormat(11, 13, false)).toBe(11)
   })
 
   it('should return correct hour output format when is24Hour', () => {