funda-ui 4.7.202 → 4.7.222

package/lib/esm/Table/utils/hooks/useTableKeyPress.tsx

@@ -22,7 +22,8 @@ const App = () => {
         refNode,
         focusableCellId,
         setFocusableCellId,
-        onCellKeyPressed
+        onCellKeyPressed,
+        onCellPressEnter,
     }, [rootRef]);
     
 
@@ -50,6 +51,7 @@ export interface UseTableKeyPressProps {
     focusableCellId: string;
     setFocusableCellId: (s: string) => void;
     onCellKeyPressed: (classname: string, elem: HTMLTableCellElement, event: KeyboardEvent) => void;
+    onCellPressEnter: (classname: string, elem: HTMLTableCellElement, event: KeyboardEvent) => void;
     onKeyDown?: (e: any) => void;
 }
 
@@ -64,13 +66,24 @@ const useTableKeyPress = ({
     focusableCellId,
     setFocusableCellId,
     onCellKeyPressed,
+    onCellPressEnter,
     onKeyDown
 }: UseTableKeyPressProps, deps: any[]) => {
    
     const handleKeyPressed = useCallback( async (event: KeyboardEvent<HTMLTableCellElement>) => {
+        const key = event.code;
+
+        if ((key === 'Enter' || key === 'NumpadEnter') && !enabled) {
+            const currentCell = event.target as HTMLTableCellElement;
+            const row = Number(currentCell.getAttribute('data-table-row'));
+            const col = Number(currentCell.getAttribute('data-table-col'));
+            const nextCellSignal: string = cellMark(row, col);
+            onCellPressEnter?.(nextCellSignal, refNode.current.get(nextCellSignal), event);
+            return;
+        }
+
         if (!Array.isArray(data) || rootDataInfo === null || spyElement === null || typeof enabled === 'undefined' || enabled === false) return;
 
-        const key = event.code;
         const oldCellSignal = focusableCellId?.replace('cell-', '').split('-');
         let _row = Number(oldCellSignal[0]);
         let _col = Number(oldCellSignal[1]);
@@ -80,15 +93,19 @@ const useTableKeyPress = ({
   
             switch (key) {
                 case 'ArrowLeft':
+                case 'Numpad4':
                     _col = _col - 1 < 0 ? 0 : _col - 1;
                 break;
                 case 'ArrowRight':
+                case 'Numpad6':
                     _col = _col + 1 > data.length - 1 ? data.length -1 : _col + 1;
                 break;
                 case 'ArrowUp':
+                case 'Numpad8':
                     _row =  _row - 1 < 0 ? 0 : _row - 1;
                 break;
                 case 'ArrowDown':
+                case 'Numpad2':
                     _row = _row + 1 > rootDataInfo.totalRow - 1 ? rootDataInfo.totalRow - 1 : _row + 1;
                 break;
             }
@@ -109,23 +126,28 @@ const useTableKeyPress = ({
 
         };
       
-        if (key === 'ArrowLeft') {
+        if (key === 'ArrowLeft' || key === 'Numpad4') {
             move('ArrowLeft');
         }
 
-        if (key === 'ArrowRight') {
+        if (key === 'ArrowRight' || key === 'Numpad6') {
             move('ArrowRight');
         }
 
       
-        if (key === 'ArrowUp') {
+        if (key === 'ArrowUp' || key === 'Numpad8') {
             move('ArrowUp');
         }
 
-        if (key === 'ArrowDown') {
+        if (key === 'ArrowDown' || key === 'Numpad2') {
             move('ArrowDown');
         }
 
+        if (key === 'Enter' || key === 'NumpadEnter') {
+            const nextCellSignal: string = cellMark(_row, _col);
+            onCellPressEnter?.(nextCellSignal, refNode.current.get(nextCellSignal), event);
+        }        
+
     }, [focusableCellId]);
 
     useEffect(() => {

package/lib/esm/Utils/libs/time.ts

@@ -9,6 +9,8 @@
 
 console.log(getTimeslots("10:00", "14:00", 60, true)); //['10:00 - 11:00', '11:00 - 12:00', '12:00 - 13:00', '13:00 - 14:00']
 console.log(getTimeslots("10:00", "14:00", 60));   // ['10:00', '11:00', '12:00', '13:00']
+console.log(getTimeslots("08:00:00", "08:02:00", 0.4));   // ['08:00:00', '08:00:24', '08:00:48', '08:01:12', '08:01:36', '08:02:00']
+
 */
 
 function getTimeslots(
@@ -17,49 +19,49 @@ function getTimeslots(
     timeInterval: number,
     formatRange: boolean = false
 ): string[] {
+    // Parse time string to seconds
     const parseTime = (s: string): number => {
-        const c = s.split(':');
-        return parseInt(c[0]) * 60 + parseInt(c[1]);
-    }
-
-    const convertHours = (mins: number): string => {
-        const hour = Math.floor(mins / 60);
-        mins = Math.trunc(mins % 60);
-        const converted = pad(hour, 2) + ':' + pad(mins, 2);
-        return converted;
+        const c = s.split(":").map(Number);
+        // Support HH:mm or HH:mm:ss
+        return c[0] * 3600 + c[1] * 60 + (c[2] || 0);
     }
 
+    // Pad with zeros
     const pad = (str: string | number, max: number): string => {
         str = str.toString();
         return str.length < max ? pad("0" + str, max) : str;
     }
 
-    // calculate time slot
+    // Convert seconds to HH:mm:ss
+    const convertTime = (secs: number): string => {
+        const hour = Math.floor(secs / 3600);
+        const min = Math.floor((secs % 3600) / 60);
+        const sec = secs % 60;
+        return pad(hour, 2) + ":" + pad(min, 2) + ":" + pad(sec, 2);
+    }
+
+    // Calculate time slots
     const calculateTimeSlot = (_startTime: number, _endTime: number, _timeInterval: number): string[] => {
         const timeSlots: string[] = [];
-        // Round start and end times to next 30 min interval
-        _startTime = Math.ceil(_startTime / 30) * 30;
-        _endTime = Math.ceil(_endTime / 30) * 30;
-
-        // Start and end of interval in the loop
         let currentTime = _startTime;
-        while (currentTime < _endTime) {
+        while (currentTime <= _endTime) {
             if (formatRange) {
-                const t = convertHours(currentTime) + ' - ' + convertHours(currentTime + _timeInterval);
+                const t = convertTime(currentTime) + ' - ' + convertTime(Math.min(currentTime + _timeInterval, _endTime));
                 timeSlots.push(t);
             } else {
-                timeSlots.push(convertHours(currentTime));
+                timeSlots.push(convertTime(currentTime));
             }
             currentTime += _timeInterval;
         }
         return timeSlots;
     }
 
-    const inputEndTime = parseTime(endTime);
     const inputStartTime = parseTime(startTime);
-    const timeSegment = calculateTimeSlot(inputStartTime, inputEndTime, timeInterval);
-
-    return timeSegment;
+    const inputEndTime = parseTime(endTime);
+    // If timeInterval is not an integer, treat as minutes with decimals, convert to seconds
+    const isDecimal = !Number.isInteger(timeInterval);
+    const intervalInSeconds = isDecimal ? Math.round(timeInterval * 60) : timeInterval * 60;
+    return calculateTimeSlot(inputStartTime, inputEndTime, intervalInSeconds);
 }
 
 

package/package.json

@@ -2,7 +2,7 @@
   "author": "UIUX Lab",
   "email": "uiuxlab@gmail.com",
   "name": "funda-ui",
-  "version": "4.7.202",
+  "version": "4.7.222",
   "description": "React components using pure Bootstrap 5+ which does not contain any external style and script libraries.",
   "repository": {
     "type": "git",