Browse Source

fix: ColorPicker RTL style issues (#42716)

* fix: fix rlt style issues

* fix: add missing rtl className on popup
pull/42730/head
红果汁 2 years ago
committed by GitHub
parent
commit
ef21b23cb3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      components/color-picker/ColorPicker.tsx
  2. 19
      components/color-picker/style/index.ts

9
components/color-picker/ColorPicker.tsx

@ -93,10 +93,11 @@ const ColorPicker: CompoundedComponent = (props) => {
const prefixCls = getPrefixCls('color-picker', customizePrefixCls);
const [wrapSSR, hashId] = useStyle(prefixCls);
const mergeRootCls = classNames(rootClassName, {
[`${prefixCls}-rtl`]: direction,
});
const rtlCls = { [`${prefixCls}-rtl`]: direction };
const mergeRootCls = classNames(rootClassName, rtlCls);
const mergeCls = classNames(mergeRootCls, className, hashId);
const mergePopupCls = classNames(prefixCls, rtlCls);
const popupAllowCloseRef = useRef(true);
const handleChange = (data: Color, type?: HsbaColorType, pickColor?: boolean) => {
@ -171,7 +172,7 @@ const ColorPicker: CompoundedComponent = (props) => {
onClear={handleClear}
/>
}
overlayClassName={prefixCls}
overlayClassName={mergePopupCls}
{...popoverProps}
>
{children || (

19
components/color-picker/style/index.ts

@ -26,6 +26,24 @@ export const genActiveStyle = (token: ColorPickerToken) => ({
outline: 0,
});
const genRtlStyle = (token: ColorPickerToken): CSSObject => {
const { componentCls } = token;
return {
'&-rtl': {
[`${componentCls}-presets-color`]: {
'&::after': {
direction: 'ltr',
},
},
[`${componentCls}-clear`]: {
'&::after': {
direction: 'ltr',
},
},
},
};
};
const genClearStyle = (token: ColorPickerToken, size: number): CSSObject => {
const { componentCls, borderRadiusSM, lineWidth, colorSplit, red6 } = token;
@ -127,6 +145,7 @@ const genColorPickerStyle: GenerateStyle<ColorPickerToken> = (token) => {
...genClearStyle(token, controlHeightSM),
...genColorBlockStyle(token, controlHeightSM),
},
...genRtlStyle(token),
},
},
];

Loading…
Cancel
Save