Skip to content

changed Icon wrapper from div to span #20

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

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

changed Icon wrapper from div to span #20

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
16 changes: 8 additions & 8 deletions src/components/Icon/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export enum IconType {
youtube = 'youtube',
}

export interface IconProps extends HTMLAttributes<HTMLDivElement> {
export interface IconProps extends HTMLAttributes<HTMLSpanElement> {
/** Optional. Extra classNames you can pass. Storybook options: black, white, primary, secondary, tertiary, alert. */
className?: string;
/** Optional. identifies a DOM node for testing purposes. */
Expand All @@ -164,9 +164,9 @@ export interface IconProps extends HTMLAttributes<HTMLDivElement> {
/** Required. pass in the icon type, using the IconType enum. */
icon: IconType;
/** Optional. add an onClick event handler. */
onClick?(e?: React.MouseEvent<HTMLDivElement, MouseEvent>): void;
onClick?(e?: React.MouseEvent<HTMLSpanElement, MouseEvent>): void;
/** Optional. add an onKeyDown event handler. */
onKeyDown?(e?: React.KeyboardEvent<HTMLDivElement>): void;
onKeyDown?(e?: React.KeyboardEvent<HTMLSpanElement>): void;
/** Optional. size of the actual icon. */
size?: number;
/** Optional. size of the icon + paddings. Ignored if value is smaller than size. */
Expand All @@ -178,7 +178,7 @@ export interface IconProps extends HTMLAttributes<HTMLDivElement> {
/**
* Icon component with optional ability to pass in an onClick event handler.
*/
const Icon = forwardRef<HTMLDivElement, IconProps>(
const Icon = forwardRef<HTMLSpanElement, IconProps>(
(
{
className,
Expand All @@ -205,14 +205,14 @@ const Icon = forwardRef<HTMLDivElement, IconProps>(
);

const handleClick = (
e?: React.MouseEvent<HTMLDivElement, MouseEvent>
e?: React.MouseEvent<HTMLSpanElement, MouseEvent>
): void => {
if (disabled || !onClick) return;

onClick(e);
};

const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>): void => {
const handleKeyDown = (e: React.KeyboardEvent<HTMLSpanElement>): void => {
if (!onClick) return;

if (e.key === 'Enter' && !disabled) {
Expand Down Expand Up @@ -389,7 +389,7 @@ const Icon = forwardRef<HTMLDivElement, IconProps>(
}, [icon, size]);

return (
<div
<span
className={clsx('Icon', className, {
'Icon--button': !!onClick,
'Icon--disabled': disabled,
Expand All @@ -404,7 +404,7 @@ const Icon = forwardRef<HTMLDivElement, IconProps>(
tabIndex={tabIndex}
>
{renderIcon()}
</div>
</span>
);
}
);
Expand Down