From f30ab8a702bff73b0fb05a67891470a3e915493f Mon Sep 17 00:00:00 2001 From: Mohammed Haris <75088888+MohammedHaris96@users.noreply.github.com> Date: Tue, 19 Mar 2024 19:20:40 +0530 Subject: [PATCH] feat: changed proptype from `string`/`IconSubComponentProps` to `SubIcon` (#2026) --- .../core/src/components/Modal/ModalHeader/ModalHeader.tsx | 6 ++++-- packages/core/src/components/Tabs/Tab/Tab.tsx | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx b/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx index bc5d152dea..3b2ed35f39 100644 --- a/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx +++ b/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx @@ -2,7 +2,7 @@ import React, { FC } from "react"; import cx from "classnames"; import IconButton from "../../IconButton/IconButton"; import CloseSmall from "../../Icon/Icons/components/CloseSmall"; -import Icon, { IconSubComponentProps } from "../../Icon/Icon"; +import Icon from "../../Icon/Icon"; import VibeComponentProps from "../../../types/VibeComponentProps"; import { NOOP } from "../../../utils/function-utils"; import { ElementContent } from "src/types/ElementContent"; @@ -12,6 +12,7 @@ import Text from "../../Text/Text"; import Heading from "../../Heading/Heading"; import Flex from "../../Flex/Flex"; import styles from "./ModalHeader.module.scss"; +import { SubIcon } from "../../../types/SubIcon"; export interface ModalHeaderProps extends VibeComponentProps { /** @@ -29,7 +30,8 @@ export interface ModalHeaderProps extends VibeComponentProps { /** * Icon to be rendered before the title */ - icon?: string | React.FunctionComponent | null; + // icon?: string | React.FunctionComponent | null; + icon?: SubIcon; /** * Class name for the wrapper */ diff --git a/packages/core/src/components/Tabs/Tab/Tab.tsx b/packages/core/src/components/Tabs/Tab/Tab.tsx index 2c57619d48..adbf5a1283 100644 --- a/packages/core/src/components/Tabs/Tab/Tab.tsx +++ b/packages/core/src/components/Tabs/Tab/Tab.tsx @@ -4,11 +4,12 @@ import React, { FC, forwardRef, ReactElement, useRef } from "react"; import { noop as NOOP } from "lodash-es"; import useMergeRef from "../../../hooks/useMergeRef"; import { getStyle } from "../../../helpers/typesciptCssModulesHelper"; -import Icon, { IconSubComponentProps } from "../../Icon/Icon"; +import Icon from "../../Icon/Icon"; import VibeComponentProps from "../../../types/VibeComponentProps"; import { IconType } from "../../Icon/IconConstants"; import { ComponentDefaultTestId, getTestId } from "../../../tests/test-ids-utils"; import styles from "./Tab.module.scss"; +import { SubIcon } from "../../../types/SubIcon"; export interface TabProps extends VibeComponentProps { /** @@ -22,7 +23,7 @@ export interface TabProps extends VibeComponentProps { disabled?: boolean; active?: boolean; focus?: boolean; - icon?: string | React.FunctionComponent | null; + icon?: SubIcon; iconType?: IconType; iconSide?: string; onClick?: (value: number) => void;