Skip to content
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

Jump to bottom

feat: ColorPicker implement showText API #42865

Merged
merged 13 commits into from Jun 19, 2023
Merged

feat: ColorPicker implement showText API #42865

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a0943c0
feat: color-picker support showValue api
RedJue Jun 6, 2023
eb2e60b
Update components/color-picker/index.en-US.md
RedJue Jun 6, 2023
a73f11d
docs: add version column
RedJue Jun 7, 2023
32483ae
test: fix test coverage
RedJue Jun 7, 2023
fcfbd76
feat: replace showValue with textRender
RedJue Jun 19, 2023
95d5c0c
Update components/color-picker/components/ColorTrigger.tsx
RedJue Jun 19, 2023
6ef06aa
fix: style issue
RedJue Jun 19, 2023
91a4a3c
feat: add showText prop and optimization code
RedJue Jun 19, 2023
55656de
chore: merge feature
RedJue Jun 19, 2023
53fd1db
fix: lint issue
RedJue Jun 19, 2023
75bc046
test: fix coverage
RedJue Jun 19, 2023
adbdc16
refactor: combine showText and textRender
RedJue Jun 19, 2023
0372c2f
fix: lint issue
RedJue Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions components/color-picker/ColorPicker.tsx
View file
Open in desktop
Expand Up @@ -41,6 +41,8 @@ export type ColorPickerProps = Omit<
allowClear?: boolean;
presets?: PresetsItem[];
arrow?: boolean | { pointAtCenter: boolean };
showText?: boolean;
textRender?: (color: Color) => React.ReactNode;
li-jia-nan marked this conversation as resolved.
Show resolved Hide resolved
styles?: { popup?: CSSProperties };
rootClassName?: string;
onOpenChange?: (open: boolean) => void;
Expand All @@ -66,6 +68,8 @@ const ColorPicker: CompoundedComponent = (props) => {
disabled,
placement = 'bottomLeft',
arrow = true,
textRender,
showText,
style,
className,
rootClassName,
Expand All @@ -91,6 +95,11 @@ const ColorPicker: CompoundedComponent = (props) => {
postState: (openData) => !disabled && openData,
onChange: onOpenChange,
});
const [formatValue, setFormatValue] = useMergedState(format, {
value: format,
onChange: onFormatChange,
});

const [colorCleared, setColorCleared] = useState(false);

const prefixCls = getPrefixCls('color-picker', customizePrefixCls);
Expand Down Expand Up @@ -151,8 +160,8 @@ const ColorPicker: CompoundedComponent = (props) => {
colorCleared,
disabled,
presets,
format,
onFormatChange,
format: formatValue,
onFormatChange: setFormatValue,
};

return wrapSSR(
Expand Down Expand Up @@ -183,6 +192,9 @@ const ColorPicker: CompoundedComponent = (props) => {
prefixCls={prefixCls}
disabled={disabled}
colorCleared={colorCleared}
textRender={textRender}
showText={showText}
format={formatValue}
/>
)}
</Popover>,
Expand Down