* datetime-picker: refactor and use readonly property.

easysoft · Nov 24, 2023 · 627ec4c · 627ec4c
1 parent 3e84e53
commit 627ec4c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/lib/datetime-picker/src/component/date-picker.tsx b/lib/datetime-picker/src/component/date-picker.tsx
@@ -37,8 +37,8 @@ export class DatePicker extends Pick<PickState, DatePickerOptions> {
     };
 
     setDate = (value: string) => {
-        const {onInvalid, defaultValue = '', required, disabled, format} = this.props;
-        if (disabled) {
+        const {onInvalid, defaultValue = '', required, disabled, readonly, format} = this.props;
+        if (disabled || readonly) {
             return;
         }
         const date = createDate(value);

diff --git a/lib/datetime-picker/src/component/datetime-picker.tsx b/lib/datetime-picker/src/component/datetime-picker.tsx
@@ -63,8 +63,8 @@ export class DatetimePicker extends Pick<PickState, DatetimePickerOptions> {
     };
 
     setTime(value: string | {hour?: number, minute?: number}) {
-        const {onInvalid, required, defaultValue, timeFormat, joiner, disabled, dateFormat} = this.props;
-        if (disabled) {
+        const {onInvalid, required, defaultValue, timeFormat, joiner, disabled, readonly, dateFormat} = this.props;
+        if (disabled || readonly) {
             return;
         }
         let valueString = '';
@@ -92,8 +92,8 @@ export class DatetimePicker extends Pick<PickState, DatetimePickerOptions> {
     }
 
     setDate = (value: string) => {
-        const {onInvalid, defaultValue = '', required, dateFormat, disabled, joiner} = this.props;
-        if (disabled) {
+        const {onInvalid, defaultValue = '', required, dateFormat, disabled, readonly, joiner} = this.props;
+        if (disabled || readonly) {
             return;
         }
         const date = createDate(value);

diff --git a/lib/datetime-picker/src/component/time-picker.tsx b/lib/datetime-picker/src/component/time-picker.tsx
@@ -55,7 +55,7 @@ export class TimePicker extends Pick<PickState, TimePickerOptions> {
     };
 
     setTime(value: string | {hour?: number, minute?: number}) {
-        if (this.props.disabled) {
+        if (this.props.disabled || this.props.readonly) {
             return;
         }
         let valueString = '';

diff --git a/lib/datetime-picker/src/types/date-picker-options.ts b/lib/datetime-picker/src/types/date-picker-options.ts
@@ -1,6 +1,7 @@
 import type {IconType} from '@zui/core';
 import type {PickOptions} from '@zui/pick';
-import type {NavItemOptions, NavOptions} from '@zui/nav';
+import type {NavOptions} from '@zui/nav';
+import type {Item} from '@zui/common-list';
 import type {ToolbarItemOptions, ToolbarOptions} from '@zui/toolbar';
 import type {DateLike} from '@zui/helpers/src/date-helper';
 
@@ -18,7 +19,7 @@ export interface DatePickerOptions extends PickOptions {
     weekStart?: number;
     minDate?: DateLike;
     maxDate?: DateLike;
-    menu?: NavItemOptions[] | NavOptions;
+    menu?: Item[] | NavOptions;
     actions?: ToolbarItemOptions[] | ToolbarOptions;
     onInvalid?: (value: string) => void;
 }
diff --git a/lib/datetime-picker/src/types/time-picker-options.ts b/lib/datetime-picker/src/types/time-picker-options.ts
@@ -4,7 +4,6 @@ import type {PickOptions} from '@zui/pick';
 export interface TimePickerOptions extends PickOptions {
     minuteStep?: number;
     placeholder?: string;
-    readonly?: boolean;
     format?: string;
     icon?: IconType | boolean;
     required?: boolean;