Skip to content

[犀牛鸟]feat(ColorPicker): add color dropper support #6811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liuyax0818 wants to merge 3 commits into
base: develop
Choose a base branch
from
+28 −2
Open

[犀牛鸟]feat(ColorPicker): add color dropper support #6811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
985664c
feat(ColorPicker): add color dropper support
liuyax0818 Jul 14, 2026
cebeb45
Merge branch 'develop' into develop
uyarn Jul 29, 2026
0498686
chore: update common to common pr
uyarn Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/common
Open in desktop
Submodule common updated 18 files
+1 −0 .github/workflows/typos-config.toml
+35 −0 js/color-picker/dropper.ts
+1 −0 js/color-picker/index.ts
+26 −5 js/global-config/mobile/locale/ar_KW.ts
+20 −0 js/global-config/mobile/locale/en_US.ts
+24 −4 js/global-config/mobile/locale/it_IT.ts
+20 −0 js/global-config/mobile/locale/ja_JP.ts
+20 −0 js/global-config/mobile/locale/ko_KR.ts
+21 −0 js/global-config/mobile/locale/ru_RU.ts
+20 −0 js/global-config/mobile/locale/zh_CN.ts
+21 −1 js/global-config/mobile/locale/zh_TW.ts
+3 −7 style/mobile/components/navbar/_index.less
+1 −0 style/mobile/theme/_dark.less
+1 −0 style/mobile/theme/_light.less
+5 −0 style/web/components/color-picker/_index.less
+8 −1 style/web/components/menu/_index.less
+1 −0 style/web/theme/_dark.less
+1 −0 style/web/theme/_light.less
28 changes: 27 additions & 1 deletion packages/components/color-picker/components/panel/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import {
GradientColorPoint,
initColorFormat,
TD_COLOR_USED_COLORS_MAX_SIZE,
useDropper,
} from '@tdesign/common-js/color-picker/index';
import { useCommonClassName, useConfig, useDefaultValue, useVModel } from '@tdesign/shared-hooks';
import { useCommonClassName, useConfig, useDefaultValue, useGlobalIcon, useVModel } from '@tdesign/shared-hooks';
import { FocusIcon as TdFocusIcon } from 'tdesign-icons-vue-next';
import props from '../../color-picker-panel-props';
import { useBaseClassName } from '../../hooks';
import type { ColorPickerChangeTrigger, TdColorPickerProps } from '../../type';
Expand Down Expand Up @@ -86,6 +88,20 @@ export default defineComponent({
setInnerRecentColors(colors);
};

const { FocusIcon } = useGlobalIcon({ FocusIcon: TdFocusIcon });

const { support, open } = useDropper();

/** 屏幕取色 */
const handleDroppper = async () => {
if (props.disabled) {
return;
}
open().then(({ sRGBHex }) => {
color.value.update(sRGBHex);
});
};

/**
* onChange
* @param trigger
Expand Down Expand Up @@ -317,6 +333,16 @@ export default defineComponent({
/>
</div>
) : null}

{support && (
<span
role="button"
class={[`${baseClassName.value}__icon`, `${baseClassName.value}__dropper`]}
onClick={handleDroppper}
>
<FocusIcon />
</span>
)}
</div>

<FormatPanel {...props} color={color.value} format={formatModel.value} onInputChange={handleInputChange} />
Expand Down
Loading