refactor(ui): use false instead of null in dOrder

DevCloudFE · Nov 23, 2022 · 16a7c83 · 16a7c83
1 parent d25d315
commit 16a7c83
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/ui/src/components/_date-input/utils.ts b/packages/ui/src/components/_date-input/utils.ts
@@ -34,14 +34,14 @@ export function deepCompareDate(a: Date | null | [Date, Date], b: Date | null |
   return false;
 }
 
-export function orderDate(date: [Date, Date], order: 'ascend' | 'descend' | null, unit?: OpUnitType): boolean {
+export function orderDate(date: [Date, Date], order: 'ascend' | 'descend' | false, unit?: OpUnitType): boolean {
   if ((order === 'ascend' && dayjs(date[0]).isAfter(date[1], unit)) || (order === 'descend' && dayjs(date[0]).isBefore(date[1], unit))) {
     return true;
   }
   return false;
 }
 
-export function orderTime(time: [Date, Date], order: 'ascend' | 'descend' | null): boolean {
+export function orderTime(time: [Date, Date], order: 'ascend' | 'descend' | false): boolean {
   const t1 = dayjs(time[0]).set('year', 2000).set('month', 0).set('date', 1);
   const t2 = dayjs(time[1]).set('year', 2000).set('month', 0).set('date', 1);
 

diff --git a/packages/ui/src/components/date-picker/DatePicker.tsx b/packages/ui/src/components/date-picker/DatePicker.tsx
@@ -30,7 +30,7 @@ export interface DDatePickerProps extends Omit<React.HTMLAttributes<HTMLDivEleme
   dFormat?: string;
   dVisible?: boolean;
   dPlacement?: 'top' | 'top-left' | 'top-right' | 'bottom' | 'bottom-left' | 'bottom-right';
-  dOrder?: 'ascend' | 'descend' | null;
+  dOrder?: 'ascend' | 'descend' | false;
   dPlaceholder?: string | [string?, string?];
   dRange?: boolean;
   dSize?: DSize;

diff --git a/packages/ui/src/components/time-picker/TimePicker.tsx b/packages/ui/src/components/time-picker/TimePicker.tsx
@@ -29,7 +29,7 @@ export interface DTimePickerProps extends Omit<React.HTMLAttributes<HTMLDivEleme
   dFormat?: string;
   dVisible?: boolean;
   dPlacement?: 'top' | 'top-left' | 'top-right' | 'bottom' | 'bottom-left' | 'bottom-right';
-  dOrder?: 'ascend' | 'descend' | null;
+  dOrder?: 'ascend' | 'descend' | false;
   dPlaceholder?: string | [string?, string?];
   dRange?: boolean;
   dSize?: DSize;