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

feat: add custom checkbox icons #7608

Merged
merged 2 commits into from
Sep 17, 2024
Merged

feat: add custom checkbox icons #7608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c40bdcc
feat: add custom checkbox icons
Sep 17, 2024
e633abd
fix: add minor changes
Sep 17, 2024
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
34 changes: 25 additions & 9 deletions packages/vkui/src/components/Checkbox/CheckboxInput/CheckboxInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ import { RootComponent } from '../../RootComponent/RootComponent';
import { VisuallyHidden } from '../../VisuallyHidden/VisuallyHidden';
import styles from './CheckboxInput.module.css';

type VendorIconType = typeof Icon20CheckBoxOn;

export type CheckboxInputIconType =
| React.ComponentType<React.SVGProps<SVGSVGElement>>
| VendorIconType;

function setIndeterminate(el: HTMLInputElement, indeterminate: boolean) {
el.indeterminate = indeterminate;
}
Expand All @@ -26,6 +32,11 @@ export interface CheckboxInputProps
HasRef<HTMLInputElement> {
indeterminate?: boolean;
defaultIndeterminate?: boolean;
IconOnCompact?: CheckboxInputIconType;
IconOnRegular?: CheckboxInputIconType;
IconOffCompact?: CheckboxInputIconType;
IconOffRegular?: CheckboxInputIconType;
IconIndeterminate?: CheckboxInputIconType;
}

const warn = warnOnce('Checkbox');
Expand All @@ -38,6 +49,11 @@ export function CheckboxInput({
indeterminate,
defaultIndeterminate,
onChange,
IconOnCompact = Icon20CheckBoxOn,
IconOnRegular = Icon24CheckBoxOn,
IconOffCompact = Icon20CheckBoxOff,
IconOffRegular = Icon24CheckBoxOff,
IconIndeterminate = Icon20CheckBoxIndetermanate,
...restProps
}: CheckboxInputProps) {
const inputRef = useExternRef(getRef);
Expand Down Expand Up @@ -100,19 +116,19 @@ export function CheckboxInput({
getRootRef={inputRef}
/>
{platform === 'vkcom' ? (
<Icon20CheckBoxOn className={styles['CheckboxInput__icon--on']} />
<IconOnCompact className={styles['CheckboxInput__icon--on']} />
) : (
<React.Fragment>
{adaptiveSizeY.compact && (
<Icon20CheckBoxOn
<IconOnCompact
className={classNames(
styles['CheckboxInput__icon--on'],
adaptiveSizeY.compact.className,
)}
/>
)}
{adaptiveSizeY.regular && (
<Icon24CheckBoxOn
<IconOnRegular
className={classNames(
styles['CheckboxInput__icon--on'],
adaptiveSizeY.regular.className,
Expand All @@ -122,19 +138,19 @@ export function CheckboxInput({
</React.Fragment>
)}
{platform === 'vkcom' ? (
<Icon20CheckBoxOff className={styles['CheckboxInput__icon--off']} />
<IconOffCompact className={styles['CheckboxInput__icon--off']} />
) : (
<React.Fragment>
{adaptiveSizeY.compact && (
<Icon20CheckBoxOff
<IconOffCompact
className={classNames(
styles['CheckboxInput__icon--off'],
adaptiveSizeY.compact.className,
)}
/>
)}
{adaptiveSizeY.regular && (
<Icon24CheckBoxOff
<IconOffRegular
className={classNames(
styles['CheckboxInput__icon--off'],
adaptiveSizeY.regular.className,
Expand All @@ -144,15 +160,15 @@ export function CheckboxInput({
</React.Fragment>
)}
{platform === 'vkcom' ? (
<Icon20CheckBoxIndetermanate
<IconIndeterminate
width={20}
height={20}
className={styles['CheckboxInput__icon--indeterminate']}
/>
) : (
<React.Fragment>
{adaptiveSizeY.compact && (
<Icon20CheckBoxIndetermanate
<IconIndeterminate
className={classNames(
styles['CheckboxInput__icon--indeterminate'],
adaptiveSizeY.compact.className,
Expand All @@ -162,7 +178,7 @@ export function CheckboxInput({
/>
)}
{adaptiveSizeY.regular && (
<Icon20CheckBoxIndetermanate
<IconIndeterminate
className={classNames(
styles['CheckboxInput__icon--indeterminate'],
adaptiveSizeY.regular.className,
Expand Down
1 change: 1 addition & 0 deletions packages/vkui/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ export { RadioGroup } from './components/RadioGroup/RadioGroup';
export type { RadioGroupProps } from './components/RadioGroup/RadioGroup';
export { Checkbox } from './components/Checkbox/Checkbox';
export type { CheckboxProps } from './components/Checkbox/Checkbox';
export type { CheckboxInputIconType } from './components/Checkbox/CheckboxInput/CheckboxInput';
export { Select } from './components/Select/Select';
export { SelectMimicry } from './components/SelectMimicry/SelectMimicry';
export type { SelectMimicryProps } from './components/SelectMimicry/SelectMimicry';
Expand Down
Loading