Merge branch 'bose/2505' into staging

equinor · Oct 18, 2024 · ba44f54 · ba44f54
2 parents 9bfd073 + 980eb83
commit ba44f54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/web/core/TextField/TextArea.tsx b/web/core/TextField/TextArea.tsx
@@ -13,7 +13,9 @@ export type TextareaProps = {
 } & SharedTextFieldProps &
   TextareaHTMLAttributes<HTMLTextAreaElement>
 
-/** Temporary. Until feature request to export textarea in EDS or description feature added to EDS Textfield */
+/** Temporary. Until feature request,
+ * https://github.com/equinor/design-system/issues/3622,
+ * is resolved */
 export const Textarea = forwardRef<HTMLTextAreaElement, TextareaProps>(function Textarea(
   { variant, disabled = false, type = 'text', rowsMax = 10, className = '', ...other },
   ref,
@@ -45,7 +47,7 @@ export const Textarea = forwardRef<HTMLTextAreaElement, TextareaProps>(function
   const leftAdornmentStyles = {
     style: { alignItems: 'flex-start' },
   }
-  const rigthAdornmentStyles = {
+  const rightAdornmentStyles = {
     style: {
       alignItems: 'flex-start',
       pointerEvents: 'none' as CSSProperties['pointerEvents'],
@@ -55,7 +57,7 @@ export const Textarea = forwardRef<HTMLTextAreaElement, TextareaProps>(function
   return (
     <Input
       as="textarea"
-      rightAdornmentsProps={rigthAdornmentStyles}
+      rightAdornmentsProps={rightAdornmentStyles}
       leftAdornmentsProps={leftAdornmentStyles}
       {...inputProps}
     />

diff --git a/web/core/TextField/TextField.tsx b/web/core/TextField/TextField.tsx
@@ -50,7 +50,9 @@ const Field = forwardRef<HTMLTextAreaElement | HTMLInputElement, FieldProps>(fun
   )
 })
 
-/** Temporary. Until feature request to export textarea in EDS or description feature added to EDS Textfield */
+/** Temporary. Until feature request
+ *  https://github.com/equinor/design-system/issues/3622
+ *  is resolved */
 export const TextField = forwardRef<HTMLDivElement, TextFieldProps>(function TextField(
   {
     id,