fix(ui): clearable when date not null

DevCloudFE · Nov 18, 2022 · 3d4333a · 3d4333a
1 parent 014f83e
commit 3d4333a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/ui/src/components/_date-input/DateInput.tsx b/packages/ui/src/components/_date-input/DateInput.tsx
@@ -199,7 +199,7 @@ function DateInput(props: DDateInputProps, ref: React.ForwardedRef<DDateInputRef
     forceUpdate();
   };
 
-  const clearable = dClearable && !visible && !dDisabled;
+  const clearable = dClearable && !isNull(_value) && !visible && !dDisabled;
 
   const maxZIndex = useMaxIndex(visible);
 

diff --git a/packages/ui/src/styles/components/date-picker.scss b/packages/ui/src/styles/components/date-picker.scss
@@ -77,7 +77,7 @@
     height: 26px;
     cursor: pointer;
 
-    &:not(.is-active, .is-hover, .is-another, .is-between, .is-between-hover):hover {
+    &:not(.is-current-selected, .is-another-selected, .is-hover, .is-between, .is-between-hover):hover {
       background-color: var(--#{$rd-prefix}background-color-hover);
     }