Shun Miyazawa hace 3 años
padre
commit
399fdd1403

+ 15 - 2
packages/app/src/components/Admin/AuditLog/DateRangePicker.tsx

@@ -1,4 +1,4 @@
-import React, { FC, useRef, forwardRef } from 'react';
+import React, { FC, useRef, forwardRef, useCallback } from 'react';
 
 import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
@@ -34,13 +34,26 @@ export const DateRangePicker: FC<DateRangePickerProps> = (props: DateRangePicker
 
   const buttonRef = useRef(null);
 
+  const changeDateHandler = useCallback((dateList: Date[] | null[]) => {
+    if (props.onChangeDate != null) {
+      const [start, end] = dateList;
+      const isSameTime = (start != null && end != null) && (start.getTime() === end.getTime());
+      if (isSameTime) {
+        props.onChangeDate([null, null]);
+      }
+      else {
+        props.onChangeDate(dateList);
+      }
+    }
+  }, []);
+
   return (
     <div className="btn-group mr-2 mb-3">
       <DatePicker
         selectsRange
         startDate={startDate}
         endDate={endDate}
-        onChange={props.onChangeDate}
+        onChange={changeDateHandler}
         customInput={<CustomInput buttonRef={buttonRef} />}
       />
     </div>

+ 5 - 13
packages/app/src/components/Admin/AuditLogManagement.tsx

@@ -57,19 +57,11 @@ export const AuditLogManagement: FC = () => {
     setActivePage(selectedPageNum);
   }, []);
 
-  const selectDateChangeHandler = useCallback((dateList: Date[] | null[]) => {
+  const selectDateChangedHandler = useCallback((dateList: Date[] | null[]) => {
+    console.log(dateList);
     setActivePage(1);
-    const [start, end] = dateList;
-
-    const isSameTime = (start != null && end != null) && (start.getTime() === end.getTime());
-    if (isSameTime) {
-      setStartDate(null);
-      setEndDate(null);
-    }
-    else {
-      setStartDate(start);
-      setEndDate(end);
-    }
+    setStartDate(dateList[0]);
+    setEndDate(dateList[1]);
   }, []);
 
   const selectActionCheckboxChangedHandler = useCallback((action: SupportedActionType) => {
@@ -94,7 +86,7 @@ export const AuditLogManagement: FC = () => {
       <DateRangePicker
         startDate={startDate}
         endDate={endDate}
-        onChangeDate={selectDateChangeHandler}
+        onChangeDate={selectDateChangedHandler}
       />
 
       <SelectActionDropdown