fix default 12 hour display

dorkyboi · Feb 3, 2023 · 94b19f9 · 94b19f9
1 parent 5de7e07
commit 94b19f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "react-native-calendar-timetable",
     "description": "Timetable (schedule) component for React Native applications",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "private": false,
     "main": "./lib/Timetable.js",
     "types": "./lib/Timetable.d.ts",

diff --git a/src/components/Hours.tsx b/src/components/Hours.tsx
@@ -21,9 +21,17 @@ function Hours({
 }: HoursProps) {
     const timeFontSize = timeStyle?.fontSize || 14;
 
-    const renderTime = (hour: number) => is12Hour
-        ? (hour > 12 ? (hour - 12 + ' pm') : hour + ' am')
-        : (hour > 9 ? '' : '0') + (hour === 24 ? '00' : hour) + ':00';
+    const renderTime = (hour: number) => {
+        if (is12Hour) {
+            switch (hour) {
+                case 0: case 24: return '12 am';
+                case 12: return '12 pm';
+                default:
+                    return (hour > 12 ? (hour - 12 + ' pm') : hour + ' am');
+            }
+        }
+        return (hour > 9 ? '' : '0') + (hour === 24 ? '00' : hour) + ':00';
+    };
 
     return (
         <View>