@idealyst/datepicker 1.0.0 → 1.0.41

package/src/DateTimePicker/TimePicker.tsx

@@ -1,406 +1,14 @@
-import React, { useState, useEffect, useRef } from 'react';
-import { Button, View, Input } from '@idealyst/components';
+import React from 'react';
 import { TimePickerProps } from './types';
-import { timePickerStyles } from './TimePicker.styles';
+import { TimePickerBase } from './TimePickerBase';
+import { ClockFace, TimeInput } from './primitives';
 
-export const TimePicker: React.FC<TimePickerProps> = ({
-  value = new Date(),
-  onChange,
-  disabled = false,
-  mode = '12h',
-  showSeconds = false,
-  step = 1,
-  style,
-  testID,
-}) => {
-  const [activeSelection, setActiveSelection] = useState<'hour' | 'minute'>('hour');
-  const [hourInputValue, setHourInputValue] = useState(String(value.getHours() > 12 && mode === '12h' ? value.getHours() - 12 : value.getHours()));
-  const [minuteInputValue, setMinuteInputValue] = useState(String(value.getMinutes()).padStart(2, '0'));
-  const [hourInputFocused, setHourInputFocused] = useState(false);
-  const [minuteInputFocused, setMinuteInputFocused] = useState(false);
-  const hourInputRef = useRef<HTMLInputElement | null>(null);
-  const minuteInputRef = useRef<HTMLInputElement | null>(null);
-  const hours = value.getHours();
-  const minutes = value.getMinutes();
-  const seconds = value.getSeconds();
-
-  const displayHours = mode === '12h' ? (hours === 0 ? 12 : hours > 12 ? hours - 12 : hours) : hours;
-  const ampm = mode === '12h' ? (hours >= 12 ? 'PM' : 'AM') : null;
-
-  // Sync input values when time changes from external sources (like clock clicks)
-  // Only update if the input is not currently focused
-  useEffect(() => {
-    if (!hourInputFocused) {
-      setHourInputValue(String(displayHours));
-    }
-    if (!minuteInputFocused) {
-      setMinuteInputValue(String(minutes).padStart(2, '0'));
-    }
-  }, [displayHours, minutes, hourInputFocused, minuteInputFocused]);
-
-  const updateTime = (newHours: number, newMinutes: number, newSeconds?: number) => {
-    const newDate = new Date(value);
-    newDate.setHours(newHours, newMinutes, newSeconds || 0);
-    onChange(newDate);
-  };
-
-  const handleHourChange = (delta: number) => {
-    let newHours = hours + delta;
-    if (mode === '12h') {
-      if (newHours < 0) newHours = 23;
-      if (newHours > 23) newHours = 0;
-    } else {
-      if (newHours < 0) newHours = 23;
-      if (newHours > 23) newHours = 0;
-    }
-    updateTime(newHours, minutes, seconds);
-  };
-
-  const handleMinuteChange = (delta: number) => {
-    let newMinutes = minutes + (delta * step);
-    let newHours = hours;
-    
-    if (newMinutes < 0) {
-      newMinutes = 60 + newMinutes;
-      newHours = hours - 1;
-      if (newHours < 0) newHours = 23;
-    } else if (newMinutes >= 60) {
-      newMinutes = newMinutes - 60;
-      newHours = hours + 1;
-      if (newHours > 23) newHours = 0;
-    }
-    
-    updateTime(newHours, newMinutes, seconds);
-  };
-
-  const handleSecondChange = (delta: number) => {
-    let newSeconds = seconds + delta;
-    let newMinutes = minutes;
-    let newHours = hours;
-    
-    if (newSeconds < 0) {
-      newSeconds = 59;
-      newMinutes = minutes - 1;
-      if (newMinutes < 0) {
-        newMinutes = 59;
-        newHours = hours - 1;
-        if (newHours < 0) newHours = 23;
-      }
-    } else if (newSeconds >= 60) {
-      newSeconds = 0;
-      newMinutes = minutes + 1;
-      if (newMinutes >= 60) {
-        newMinutes = 0;
-        newHours = hours + 1;
-        if (newHours > 23) newHours = 0;
-      }
-    }
-    
-    updateTime(newHours, newMinutes, newSeconds);
-  };
-
-  const toggleAmPm = () => {
-    if (mode === '12h') {
-      const newHours = hours >= 12 ? hours - 12 : hours + 12;
-      updateTime(newHours, minutes, seconds);
-    }
-  };
-
-  const handleHourClick = (hour: number) => {
-    let hour24 = hour;
-    if (mode === '12h') {
-      const isPM = hours >= 12;
-      if (hour === 12) hour24 = isPM ? 12 : 0;
-      else hour24 = isPM ? hour + 12 : hour;
-    }
-    updateTime(hour24, minutes, seconds);
-    setActiveSelection('minute');
-  };
-
-  const handleMinuteClick = (minute: number) => {
-    updateTime(hours, minute, seconds);
-  };
-
-  const renderClockFace = () => {
-    // Clock configuration
-    const CLOCK_SIZE = 180;
-    const CENTER = CLOCK_SIZE / 2;
-    const CLOCK_RADIUS = CENTER - 5;
-    const NUMBER_RADIUS = CENTER - 24;
-    const HOUR_HAND_LENGTH = CENTER - 44;
-    const MINUTE_HAND_LENGTH = CENTER - 36;
-    const CIRCLE_RADIUS = 15;
-
-    if (activeSelection === 'hour') {
-      return (
-        <View style={timePickerStyles.clockContainer}>
-          <svg width={CLOCK_SIZE} height={CLOCK_SIZE} style={timePickerStyles.clockSvg}>
-            {/* Clock face */}
-            <circle cx={CENTER} cy={CENTER} r={CLOCK_RADIUS} fill="#f9fafb" stroke="#e5e7eb" strokeWidth="2"/>
-            
-            {/* Hour numbers - clickable */}
-            {[...Array(12)].map((_, i) => {
-              const hour = i === 0 ? 12 : i;
-              const angle = (i * 30) - 90;
-              const x = CENTER + NUMBER_RADIUS * Math.cos(angle * Math.PI / 180);
-              const y = CENTER + NUMBER_RADIUS * Math.sin(angle * Math.PI / 180);
-              const isSelected = (mode === '12h' ? displayHours : hours) === (hour === 12 ? 0 : hour);
-              
-              return (
-                <g key={i} onClick={() => handleHourClick(hour)}>
-                  <circle
-                    cx={x}
-                    cy={y}
-                    r={CIRCLE_RADIUS}
-                    fill={isSelected ? '#3b82f6' : 'transparent'}
-                    stroke={isSelected ? '#3b82f6' : '#e5e7eb'}
-                    strokeWidth="1"
-                    style={{ cursor: 'pointer' }}
-                  />
-                  <text
-                    x={x}
-                    y={y + 4}
-                    textAnchor="middle"
-                    fontSize="14"
-                    fill={isSelected ? '#ffffff' : '#374151'}
-                    fontWeight="500"
-                    style={{ cursor: 'pointer', userSelect: 'none', pointerEvents: 'none' }}
-                  >
-                    {hour}
-                  </text>
-                </g>
-              );
-            })}
-            
-            {/* Hour hand pointing to selected hour */}
-            {(() => {
-              const selectedHour = mode === '12h' ? displayHours : hours;
-              // Convert 12 to 0 for angle calculation, but keep others as-is
-              const hourFor12Clock = selectedHour === 12 ? 0 : selectedHour;
-              const hourAngle = (hourFor12Clock * 30) - 90;
-              const handX = CENTER + HOUR_HAND_LENGTH * Math.cos(hourAngle * Math.PI / 180);
-              const handY = CENTER + HOUR_HAND_LENGTH * Math.sin(hourAngle * Math.PI / 180);
-              
-              return (
-                <line
-                  x1={CENTER}
-                  y1={CENTER}
-                  x2={handX}
-                  y2={handY}
-                  stroke="#3b82f6"
-                  strokeWidth="3"
-                  strokeLinecap="round"
-                />
-              );
-            })()}
-            
-            {/* Center dot */}
-            <circle cx={CENTER} cy={CENTER} r="4" fill="#3b82f6"/>
-          </svg>
-        </View>
-      );
-    } else {
-      return (
-        <View style={timePickerStyles.clockContainer}>
-          <svg width={CLOCK_SIZE} height={CLOCK_SIZE} style={timePickerStyles.clockSvg}>
-            {/* Clock face */}
-            <circle cx={CENTER} cy={CENTER} r={CLOCK_RADIUS} fill="#f9fafb" stroke="#e5e7eb" strokeWidth="2"/>
-            
-            {/* Minute markers - every 5 minutes */}
-            {[...Array(12)].map((_, i) => {
-              const minute = i * 5;
-              const angle = (i * 30) - 90;
-              const x = CENTER + NUMBER_RADIUS * Math.cos(angle * Math.PI / 180);
-              const y = CENTER + NUMBER_RADIUS * Math.sin(angle * Math.PI / 180);
-              const isSelected = Math.floor(minutes / 5) * 5 === minute;
-              
-              return (
-                <g key={i} onClick={() => handleMinuteClick(minute)}>
-                  <circle
-                    cx={x}
-                    cy={y}
-                    r={CIRCLE_RADIUS}
-                    fill={isSelected ? '#3b82f6' : 'transparent'}
-                    stroke={isSelected ? '#3b82f6' : '#e5e7eb'}
-                    strokeWidth="1"
-                    style={{ cursor: 'pointer' }}
-                  />
-                  <text
-                    x={x}
-                    y={y + 4}
-                    textAnchor="middle"
-                    fontSize="12"
-                    fill={isSelected ? '#ffffff' : '#374151'}
-                    fontWeight="500"
-                    style={{ cursor: 'pointer', userSelect: 'none', pointerEvents: 'none' }}
-                  >
-                    {minute.toString().padStart(2, '0')}
-                  </text>
-                </g>
-              );
-            })}
-            
-            {/* Minute hand pointing to selected minute */}
-            {(() => {
-              const minuteAngle = (minutes * 6) - 90;
-              const handX = CENTER + MINUTE_HAND_LENGTH * Math.cos(minuteAngle * Math.PI / 180);
-              const handY = CENTER + MINUTE_HAND_LENGTH * Math.sin(minuteAngle * Math.PI / 180);
-              
-              return (
-                <line
-                  x1={CENTER}
-                  y1={CENTER}
-                  x2={handX}
-                  y2={handY}
-                  stroke="#3b82f6"
-                  strokeWidth="2"
-                  strokeLinecap="round"
-                />
-              );
-            })()}
-            
-            {/* Center dot */}
-            <circle cx={CENTER} cy={CENTER} r="4" fill="#3b82f6"/>
-          </svg>
-        </View>
-      );
-    }
-  };
-
-  
+export const TimePicker: React.FC<TimePickerProps> = (props) => {
   return (
-    <View style={[timePickerStyles.container, style]} data-testid={testID}>
-      {/* Tab Bar */}
-      <View style={timePickerStyles.tabBar}>
-        <Button
-          onPress={() => setActiveSelection('hour')}
-          style={[
-            timePickerStyles.tabButton,
-            activeSelection === 'hour' ? timePickerStyles.activeTab : timePickerStyles.inactiveTab
-          ]}
-          disabled={disabled}
-        >
-          Hour
-        </Button>
-        <Button
-          onPress={() => setActiveSelection('minute')}
-          style={[
-            timePickerStyles.tabButton,
-            activeSelection === 'minute' ? timePickerStyles.activeTab : timePickerStyles.inactiveTab
-          ]}
-          disabled={disabled}
-        >
-          Minute
-        </Button>
-      </View>
-
-      {/* Interactive Clock Face */}
-      {renderClockFace()}
-
-      {/* Time Input Row */}
-      <View style={timePickerStyles.timeInputRow}>
-        <Input
-          ref={hourInputRef}
-          variant="bare"
-          value={hourInputValue}
-          onChangeText={(value) => {
-            setHourInputValue(value);
-            
-            // Smart focus switching: if user types 2 or higher, focus on minutes
-            const num = parseInt(value);
-            if (!isNaN(num) && num >= 2 && mode === '12h') {
-              // Wait a moment then focus minutes
-              setTimeout(() => {
-                setActiveSelection('minute');
-                setHourInputFocused(false);
-                setMinuteInputFocused(true);
-                minuteInputRef.current?.focus();
-              }, 100);
-            }
-            
-            // Try to update time if value is valid
-            const hour = parseInt(value);
-            if (!isNaN(hour)) {
-              const maxHour = mode === '12h' ? 12 : 23;
-              const minHour = mode === '12h' ? 1 : 0;
-              
-              if (hour >= minHour && hour <= maxHour) {
-                let hour24 = hour;
-                if (mode === '12h') {
-                  const isPM = hours >= 12;
-                  if (hour === 12) hour24 = isPM ? 12 : 0;
-                  else hour24 = isPM ? hour + 12 : hour;
-                }
-                updateTime(hour24, minutes, seconds);
-              }
-            }
-          }}
-          onFocus={() => {
-            setActiveSelection('hour');
-            setHourInputFocused(true);
-            setHourInputValue(String(displayHours));
-          }}
-          onBlur={() => {
-            setHourInputFocused(false);
-            // Handle 0 -> 12 conversion for 12h mode
-            const hour = parseInt(hourInputValue);
-            if (hour === 0 && mode === '12h') {
-              const isPM = hours >= 12;
-              const hour24 = isPM ? 12 : 0;
-              updateTime(hour24, minutes, seconds);
-            }
-            setHourInputValue(String(displayHours));
-          }}
-          style={[
-            timePickerStyles.timeInput,
-            activeSelection === 'hour' ? timePickerStyles.activeInput : {}
-          ]}
-          disabled={disabled}
-        />
-        <View style={timePickerStyles.timeSeparator}>:</View>
-        <Input
-          ref={minuteInputRef}
-          variant="bare"
-          value={minuteInputValue}
-          onChangeText={(value) => {
-            setMinuteInputValue(value);
-            
-            // Try to update time if value is valid
-            const minute = parseInt(value);
-            if (!isNaN(minute)) {
-              if (minute >= 0 && minute <= 59) {
-                updateTime(hours, minute, seconds);
-              }
-            }
-          }}
-          onFocus={() => {
-            setActiveSelection('minute');
-            setMinuteInputFocused(true);
-            setMinuteInputValue(String(minutes));
-          }}
-          onBlur={() => {
-            setMinuteInputFocused(false);
-            setMinuteInputValue(String(minutes).padStart(2, '0'));
-          }}
-          style={[
-            timePickerStyles.timeInput,
-            activeSelection === 'minute' ? timePickerStyles.activeInput : {}
-          ]}
-          disabled={disabled}
-        />
-        
-        {mode === '12h' && ampm && (
-          <Button
-            variant="outlined"
-            size="small"
-            onPress={toggleAmPm}
-            disabled={disabled}
-            style={timePickerStyles.ampmButton}
-          >
-            {ampm}
-          </Button>
-        )}
-      </View>
-    </View>
+    <TimePickerBase
+      {...props}
+      renderClock={(clockProps) => <ClockFace {...clockProps} />}
+      renderTimeInput={(inputProps) => <TimeInput {...inputProps} />}
+    />
   );
 };

package/src/DateTimePicker/TimePickerBase.tsx

@@ -0,0 +1,232 @@
+import React, { useState, useEffect, useRef, useCallback } from 'react';
+import { View, Text, Button } from '@idealyst/components';
+import { TimePickerProps } from './types';
+import { timePickerStyles } from './TimePicker.styles';
+
+interface TimePickerBaseProps extends TimePickerProps {
+  renderClock: (props: {
+    activeSelection: 'hour' | 'minute';
+    hours: number;
+    minutes: number;
+    displayHours: number;
+    mode: '12h' | '24h';
+    disabled: boolean;
+    onHourClick: (hour: number) => void;
+    onMinuteClick: (minute: number) => void;
+  }) => React.ReactNode;
+  renderTimeInput: (props: {
+    type: 'hour' | 'minute';
+    value: string;
+    onChangeText: (value: string) => void;
+    onFocus: () => void;
+    onBlur: () => void;
+    isActive: boolean;
+    disabled: boolean;
+    inputRef: React.RefObject<any>;
+  }) => React.ReactNode;
+}
+
+export const TimePickerBase: React.FC<TimePickerBaseProps> = ({
+  value = new Date(),
+  onChange,
+  disabled = false,
+  mode = '12h',
+  step = 1,
+  style,
+  testID,
+  renderClock,
+  renderTimeInput,
+}) => {
+  const [activeSelection, setActiveSelection] = useState<'hour' | 'minute'>('hour');
+  const [hourInputValue, setHourInputValue] = useState(String(value.getHours() > 12 && mode === '12h' ? value.getHours() - 12 : value.getHours()));
+  const [minuteInputValue, setMinuteInputValue] = useState(String(value.getMinutes()).padStart(2, '0'));
+  const [hourInputFocused, setHourInputFocused] = useState(false);
+  const [minuteInputFocused, setMinuteInputFocused] = useState(false);
+  const hourInputRef = useRef<any>(null);
+  const minuteInputRef = useRef<any>(null);
+  
+  const hours = value.getHours();
+  const minutes = value.getMinutes();
+
+  const displayHours = mode === '12h' ? (hours === 0 ? 12 : hours > 12 ? hours - 12 : hours) : hours;
+  const ampm = mode === '12h' ? (hours >= 12 ? 'PM' : 'AM') : null;
+
+  // Sync input values when time changes from external sources (like clock clicks)
+  // Only update if the input is not currently focused
+  useEffect(() => {
+    if (!hourInputFocused) {
+      setHourInputValue(String(displayHours));
+    }
+    if (!minuteInputFocused) {
+      setMinuteInputValue(String(minutes).padStart(2, '0'));
+    }
+  }, [displayHours, minutes, hourInputFocused, minuteInputFocused]);
+
+  const updateTime = useCallback((newHours: number, newMinutes: number) => {
+    const newDate = new Date(value);
+    newDate.setHours(newHours, newMinutes, 0);
+    onChange(newDate);
+  }, [value, onChange]);
+
+  const handleHourClick = useCallback((hour: number) => {
+    // Dismiss keyboard when interacting with clock
+    hourInputRef.current?.blur?.();
+    minuteInputRef.current?.blur?.();
+    
+    let hour24 = hour;
+    if (mode === '12h') {
+      const isPM = hours >= 12;
+      if (hour === 12) hour24 = isPM ? 12 : 0;
+      else hour24 = isPM ? hour + 12 : hour;
+    }
+    updateTime(hour24, minutes);
+    setActiveSelection('minute');
+  }, [mode, hours, minutes, updateTime]);
+
+  const handleMinuteClick = useCallback((minute: number) => {
+    // Dismiss keyboard when interacting with clock
+    hourInputRef.current?.blur?.();
+    minuteInputRef.current?.blur?.();
+    
+    updateTime(hours, minute);
+  }, [hours, updateTime]);
+
+  const toggleAmPm = useCallback(() => {
+    if (mode === '12h') {
+      const newHours = hours >= 12 ? hours - 12 : hours + 12;
+      updateTime(newHours, minutes);
+    }
+  }, [mode, hours, minutes, updateTime]);
+
+  const handleHourInputChange = useCallback((inputValue: string) => {
+    setHourInputValue(inputValue);
+    
+    // Smart focus switching: if user types 2 or higher, focus on minutes
+    if (mode === '12h' && parseInt(inputValue) >= 2 && inputValue.length >= 1) {
+      minuteInputRef.current?.focus?.();
+      setActiveSelection('minute');
+    } else if (mode === '24h' && parseInt(inputValue) >= 3 && inputValue.length >= 1) {
+      minuteInputRef.current?.focus?.();
+      setActiveSelection('minute');
+    }
+    
+    // Try to update time if value is valid
+    const hour = parseInt(inputValue);
+    if (!isNaN(hour) && hour >= 0) {
+      let hour24 = hour;
+      if (mode === '12h' && hour <= 12) {
+        const isPM = hours >= 12;
+        if (hour === 12) hour24 = isPM ? 12 : 0;
+        else hour24 = isPM ? hour + 12 : hour;
+      }
+      if (hour24 <= 23) {
+        updateTime(hour24, minutes);
+      }
+    }
+  }, [mode, hours, minutes, updateTime]);
+
+  const handleHourInputFocus = useCallback(() => {
+    setHourInputFocused(true);
+    setActiveSelection('hour');
+  }, []);
+
+  const handleHourInputBlur = useCallback(() => {
+    setHourInputFocused(false);
+    // Handle 0 -> 12 conversion for 12h mode
+    const hour = parseInt(hourInputValue);
+    if (!isNaN(hour)) {
+      let hour24 = hour;
+      if (mode === '12h') {
+        const isPM = hours >= 12;
+        if (hour === 0) hour24 = isPM ? 12 : 0;
+        else if (hour <= 12) hour24 = isPM ? (hour === 12 ? 12 : hour + 12) : (hour === 12 ? 0 : hour);
+      }
+      if (hour24 <= 23) {
+        updateTime(hour24, minutes);
+      }
+    }
+    setHourInputValue(String(displayHours));
+  }, [hourInputValue, mode, hours, minutes, displayHours, updateTime]);
+
+  const handleMinuteInputChange = useCallback((inputValue: string) => {
+    setMinuteInputValue(inputValue);
+    
+    // Try to update time if value is valid
+    const minute = parseInt(inputValue);
+    if (!isNaN(minute) && minute >= 0 && minute <= 59) {
+      updateTime(hours, minute);
+    }
+    
+    // Auto-focus hour input if user deletes and field becomes empty
+    if (inputValue === '') {
+      hourInputRef.current?.focus?.();
+      setActiveSelection('hour');
+    }
+  }, [hours, updateTime]);
+
+  const handleMinuteInputFocus = useCallback(() => {
+    setMinuteInputFocused(true);
+    setActiveSelection('minute');
+  }, []);
+
+  const handleMinuteInputBlur = useCallback(() => {
+    setMinuteInputFocused(false);
+    setMinuteInputValue(String(minutes).padStart(2, '0'));
+  }, [minutes]);
+
+  return (
+    <View style={[timePickerStyles.container, style]} testID={testID} data-testid={testID}>
+      {/* Clock face */}
+      {renderClock({
+        activeSelection,
+        hours,
+        minutes,
+        displayHours,
+        mode,
+        disabled,
+        onHourClick: handleHourClick,
+        onMinuteClick: handleMinuteClick,
+      })}
+
+      {/* Digital time display */}
+      <View style={timePickerStyles.timeInputRow}>
+        {renderTimeInput({
+          type: 'hour',
+          value: hourInputValue,
+          onChangeText: handleHourInputChange,
+          onFocus: handleHourInputFocus,
+          onBlur: handleHourInputBlur,
+          isActive: activeSelection === 'hour',
+          disabled,
+          inputRef: hourInputRef,
+        })}
+        
+        <Text style={timePickerStyles.timeSeparator}>:</Text>
+        
+        {renderTimeInput({
+          type: 'minute',
+          value: minuteInputValue,
+          onChangeText: handleMinuteInputChange,
+          onFocus: handleMinuteInputFocus,
+          onBlur: handleMinuteInputBlur,
+          isActive: activeSelection === 'minute',
+          disabled,
+          inputRef: minuteInputRef,
+        })}
+
+
+        {mode === '12h' && ampm && (
+          <Button
+            variant="outlined"
+            size="small"
+            onPress={toggleAmPm}
+            disabled={disabled}
+            style={timePickerStyles.ampmButton}
+          >
+            {ampm}
+          </Button>
+        )}
+      </View>
+    </View>
+  );
+};