refactor with simpler solution

Author: rezrah

src/TextInput.tsx

@@ -37,17 +37,14 @@ const TextInput = React.forwardRef<HTMLInputElement, TextInputInternalProps>(
     // this class is necessary to style FilterSearch, plz no touchy!
     const wrapperClasses = classnames(className, 'TextInput-wrapper')
 
-    // temporarily fixes an issue using icon and block in tandem
-    const customStyles = IconComponent && block && {...sxProp, ...{display: 'flex'}}
-
     return (
       <TextInputWrapper
         block={block}
         className={wrapperClasses}
         contrast={contrast}
         disabled={disabled}
         hasIcon={!!IconComponent}
-        sx={customStyles || sxProp}
+        sx={sxProp}
         theme={theme}
         width={widthProp}
         minWidth={minWidthProp}

src/_TextInputWrapper.tsx

@@ -91,6 +91,13 @@ const TextInputWrapper = styled.span<StyledWrapperProps>`
       display: block;
       width: 100%;
     `}
+
+    ${props =>
+    props.block &&
+    props.hasIcon &&
+    css`
+      display: flex;
+    `}
   
     // Ensures inputs don't zoom on mobile but are body-font size on desktop
     @media (min-width: ${get('breakpoints.1')}) {