fix: remove extra attrs from GlobalSearch and Text

taskany-inc · Sep 27, 2023 · c08aa64 · c08aa64
1 parent fab2706
commit c08aa64
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/components/GlobalSearch.tsx b/src/components/GlobalSearch.tsx
@@ -35,7 +35,8 @@ const StyledResults = styled.div`
     padding-bottom: ${gapS};
 `;
 
-const StyledSearchIcon = styled(IconSearchOutline)<{ focused?: boolean }>`
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const StyledSearchIcon = styled(({ focused, ...props }) => <IconSearchOutline {...props} />)<{ focused?: boolean }>`
     ${({ focused }) =>
         focused &&
         `

diff --git a/src/components/Input/Input.tsx b/src/components/Input/Input.tsx
@@ -95,6 +95,10 @@ const StyledInput = styled(({ forwardRef, size, view, brick, iconLeft, iconRight
             padding: 5px 8px;
 
             font-size: 13px;
+
+            & ${StyledIconContainer} {
+                top: 5px;
+            }
         `}
 
     ${({ size, iconLeft }) =>

diff --git a/src/components/Text/Text.tsx b/src/components/Text/Text.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import styled, { css, createGlobalStyle } from 'styled-components';
 import { fontDisplay, gapL, gapM, gapS, gapSm, gapXl, gapXs, textColor } from '@taskany/colors';
 
@@ -44,10 +45,15 @@ export interface TextProps extends React.HTMLAttributes<HTMLDivElement> {
     lines?: number;
     wordWrap?: React.CSSProperties['wordWrap'];
     wordBreak?: React.CSSProperties['wordBreak'];
+    as?: string;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const Text = styled.div<TextProps>`
+export const Text = styled(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    ({ color, as: Tag = 'div', size, weight, ellipsis, lines, wordBreak, wordWrap, ...props }: TextProps) => (
+        <Tag {...props} />
+    ),
+)<TextProps>`
     font-size: 16px;
     font-family: ${fontDisplay};
     color: ${textColor};