Skip to content

refactor: not use SvgIconRoot in SvgIconRootV2 #1262

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

Draft
SevereCloud wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

refactor: not use SvgIconRoot in SvgIconRootV2 #1262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 38 additions & 20 deletions packages/icons-sprite/src/SvgIconRootV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { SvgIconProps, SvgIconRoot } from './SvgIconRoot';
import { type SvgIconProps } from './SvgIconRoot';

interface SvgIconRootV2Props extends SvgIconProps {
vkuiIconId: string;
Expand All @@ -11,33 +11,51 @@
export function SvgIconRootV2({
vkuiIconId,
vkuiAttrs,
children,
vkuiProps,
width: widthProp,
height: heightProp,
viewBox: viewBoxProp,
...restProps
children: vkuiChildren,
...iconProps
}: SvgIconRootV2Props) {
const {
width: widthByUser,
height: heightByUser,
viewBox: viewBoxByUser,
...restVkuiProps
} = vkuiProps;
width = 0,
height = 0,
display = 'block',
'aria-hidden': ariaHidden = true,
className,
getRootRef,
style,
title,
children,
...restProps
} = {
...iconProps,
...vkuiProps,
};

const size = Math.max(width, height);

return (
<SvgIconRoot
baseClassName={`vkuiIcon--${vkuiIconId}`}
width={widthByUser || widthProp}
height={heightByUser || heightProp}
viewBox={viewBoxByUser || viewBoxProp}
<svg
className={
(className ? className + ' ' : '') +
`vkuiIcon vkuiIcon--${size} vkuiIcon--w-${width} vkuiIcon--h-${height} vkuiIcon--${vkuiIconId}`
}
aria-hidden={ariaHidden}
display={display}
width={width}
height={height}
ref={getRootRef}
style={{
width,
height,
color: restProps.fill,
...style,
}}
{...restProps}
{...restVkuiProps}
style={vkuiProps.fill ? { color: vkuiProps.fill, ...vkuiProps.style } : vkuiProps.style}
{...vkuiAttrs}
>
{vkuiProps.children}
{title && <title>{title}</title>}
{children}
</SvgIconRoot>
{vkuiChildren}
</svg>
);
}