Skip to content
Merged
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion packages/color-compact/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export interface CompactProps<T> extends Omit<React.HTMLAttributes<HTMLDivElemen
onChange?: (color: ColorResult, evn?: T) => void;
rectRender?: (props: SwatchRectRenderProps) => JSX.Element | undefined;
rectProps?: SwatchProps['rectProps'];
addonBefore?: React.ReactNode;
addonAfter?: React.ReactNode;
}

const COLORS = [
Expand Down Expand Up @@ -84,6 +86,8 @@ const Compact = React.forwardRef<HTMLDivElement, CompactProps<React.MouseEvent<H
colors = COLORS,
rectProps,
rectRender,
addonBefore,
addonAfter,
...other
} = props;
const hsva = (typeof color === 'string' && validHex(color) ? hexToHsva(color) : color) as HsvaColor;
Expand Down Expand Up @@ -128,8 +132,13 @@ const Compact = React.forwardRef<HTMLDivElement, CompactProps<React.MouseEvent<H
},
}}
onChange={(hsvColor) => handleChangeCallback(hsvColor)}
addonBefore={addonBefore}
addonAfter={addonAfter}
/>
<div style={{ display: 'flex', margin: '0 4px 3px 0' }}>
<div
className={[`${prefixCls}-input-wrapper`, className || ''].filter(Boolean).join(' ')}
style={{ display: 'flex', margin: '0 4px 3px 0' }}
>
<EditableInput
onChange={(evn, val) => handleHex(val, evn)}
labelStyle={{ paddingRight: 5, marginTop: -1 }}
Expand Down