Merge branch 'beta'

illacloud · Oct 27, 2023 · afe7aa6 · afe7aa6
2 parents 78c2879 + 7fb0fb6
commit afe7aa6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/packages/time-picker/src/interface.ts b/packages/time-picker/src/interface.ts
@@ -31,6 +31,7 @@ export interface PublicTimePickerProps extends BoxProps {
   utcOffset?: number
   timezone?: string
   disabled?: boolean
+  readonly?: boolean
 }
 
 type BaseTimePickerProps = {

diff --git a/packages/time-picker/src/range-picker.tsx b/packages/time-picker/src/range-picker.tsx
@@ -47,6 +47,7 @@ export const RangePicker = forwardRef<HTMLDivElement, RangePickerProps>(
       format = "HH:mm:ss",
       scrollSticky = true,
       order = true,
+      readonly = false,
     } = props
 
     const suffixIcon = (icons && icons.inputSuffix) || <TimeIcon />
@@ -213,7 +214,7 @@ export const RangePicker = forwardRef<HTMLDivElement, RangePickerProps>(
         <Trigger
           trigger="click"
           position={position}
-          disabled={disabled}
+          disabled={disabled || readonly}
           popupVisible={mergedPopupVisible}
           onVisibleChange={onVisibleChange}
           colorScheme="white"
@@ -244,7 +245,7 @@ export const RangePicker = forwardRef<HTMLDivElement, RangePickerProps>(
               onPressEnter={onPressEnter}
               onClear={onClear}
               suffixIcon={suffixIcon}
-              editable={editable}
+              editable={editable || !readonly}
               allowClear={allowClear}
               ref={refInput}
               placeholder={placeholder}

diff --git a/packages/time-picker/src/single-picker.tsx b/packages/time-picker/src/single-picker.tsx
@@ -46,6 +46,7 @@ export const TimePicker = forwardRef<HTMLDivElement, TimePickerProps>(
       timezone,
       format = "HH:mm:ss",
       scrollSticky = true,
+      readonly = false,
     } = props
 
     const suffixIcon = (icons && icons.inputSuffix) || <TimeIcon />
@@ -187,7 +188,7 @@ export const TimePicker = forwardRef<HTMLDivElement, TimePickerProps>(
         <Trigger
           trigger="click"
           position={position}
-          disabled={disabled}
+          disabled={disabled || readonly}
           popupVisible={mergedPopupVisible}
           onVisibleChange={onVisibleChange}
           colorScheme="white"
@@ -216,7 +217,7 @@ export const TimePicker = forwardRef<HTMLDivElement, TimePickerProps>(
               onPressEnter={onPressEnter}
               onClear={onClear}
               suffixIcon={suffixIcon}
-              editable={editable}
+              editable={editable || !readonly}
               allowClear={allowClear}
               ref={refInput}
               placeholder={placeholder as string}