From 1fd8c4b3b2bafeddd29df7e86c3df879653bf901 Mon Sep 17 00:00:00 2001
From: JCL206312 <111559907+JCL206312@users.noreply.github.com>
Date: Tue, 24 Jun 2025 16:35:57 +0800
Subject: [PATCH] fix(components): [color-picker] Improve modelValue prop type
 (#20880)

* fix(components): [color-picker] Improve modelValue prop type

* Revert "fix(components): [color-picker] Improve modelValue prop type"

This reverts commit 450fdfa1da107a78c47e3c92c68e11441a1fcde6.

* fix(components): [color-picker] Improve modelValue prop type

* Update packages/components/color-picker/src/color-picker.ts

Co-authored-by: Noblet Ouways <91417411+Dsaquel@users.noreply.github.com>

* fix: typecheck

---------

Co-authored-by: Noblet Ouways <91417411+Dsaquel@users.noreply.github.com>
Co-authored-by: Dsaquel <291874700n@gmail.com>
---
 packages/components/color-picker/src/color-picker.ts | 5 ++++-
 packages/components/color-picker/src/utils/color.ts  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/components/color-picker/src/color-picker.ts b/packages/components/color-picker/src/color-picker.ts
index 12d2c6f9da..73d27d2608 100644
--- a/packages/components/color-picker/src/color-picker.ts
+++ b/packages/components/color-picker/src/color-picker.ts
@@ -11,7 +11,10 @@ export const colorPickerProps = buildProps({
   /**
    * @description binding value
    */
-  modelValue: String,
+  modelValue: {
+    type: definePropType<string | null>(String),
+    default: undefined,
+  },
   /**
    * @description ColorPicker id
    */
diff --git a/packages/components/color-picker/src/utils/color.ts b/packages/components/color-picker/src/utils/color.ts
index 526282edd3..b042675f41 100644
--- a/packages/components/color-picker/src/utils/color.ts
+++ b/packages/components/color-picker/src/utils/color.ts
@@ -6,7 +6,7 @@ import type { ColorFormats } from '@ctrl/tinycolor'
 interface ColorOptions {
   enableAlpha: boolean
   format: string
-  value?: string
+  value?: string | null
 }
 
 export default class Color {