fix(past-time-picker): visible change & disabled style (#1541)

Co-authored-by: ZhaoChen <ittisennsinn@gmail.com>
growingio · Nov 29, 2021 · 7cdd93a · 7cdd93a · vercel · Nov 29, 2021
1 parent 851403c
commit 7cdd93a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/date-picker/Picker.tsx b/src/date-picker/Picker.tsx
@@ -67,18 +67,20 @@ export const DatePicker: React.FC<DatePickerProps> = (props: DatePickerProps) =>
         suffix={suffix}
         className={className}
         style={style}
+        onClick={() => setVisible(!visible)}
       />
     );
   }
 
   return (
     <Popover
       content={content}
-      trigger={['click', 'focus']}
+      trigger="click"
       visible={visible}
       placement="bottomLeft"
       overlayClassName={overlayCls}
       onVisibleChange={handleVisibleChange}
+      disabled={disabled}
       {...restProps}
     >
       {renderTrigger()}

diff --git a/src/date-range-picker/Picker.tsx b/src/date-range-picker/Picker.tsx
@@ -83,14 +83,16 @@ export const DateRangePicker: React.FC<DateRangePickerProps> = (props: DateRange
         suffix={suffix}
         className={className}
         style={style}
+        onClick={() => setVisible(!visible)}
       />
     );
   }
 
   return (
     <Popover
       content={content}
-      trigger={['click', 'focus']}
+      disabled={disabled}
+      trigger="click"
       visible={visible}
       placement="bottomLeft"
       overlayClassName={overlayCls}

diff --git a/src/past-time-picker/PastTimePicker.tsx b/src/past-time-picker/PastTimePicker.tsx
@@ -157,18 +157,20 @@ const PastTimePicker = (props: PastTimePickerProps) => {
         suffix={suffix}
         className={className}
         style={style}
+        onClick={() => setControlledVisible(!controlledVisible)}
       />
     );
   }
 
   return (
     <Popover
       content={content()}
-      trigger={['click', 'focus']}
+      trigger="click"
       visible={controlledVisible}
       placement="bottomLeft"
       overlayClassName={overlayCls}
       onVisibleChange={handleVisibleChange}
+      disabled={disabled}
       {...restProps}
     >
       {renderTrigger()}

diff --git a/src/static-date-picker/style/index.less b/src/static-date-picker/style/index.less
@@ -184,8 +184,8 @@
     }
 
     &-disabled {
+      color: @gray-3;
       cursor: not-allowed;
-      pointer-events: none;
 
       &::before {
         background: @palette-gray-1;