Skip to content

Commit c0244b4

Browse files
authored
Merge pull request #347 from nginformatica/chore/hermes-adjusts
fix/adjust textfield character count position;
2 parents 884b7de + fcaaa65 commit c0244b4

File tree

9 files changed

+18
-19
lines changed

9 files changed

+18
-19
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flipper-ui",
3-
"version": "0.31.5",
3+
"version": "0.31.6",
44
"description": "",
55
"main": "dist/index.js",
66
"homepage": "https://flipper-ui.ngi.com.br/",

src/core/data-display/data-table/rows.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,10 @@ export const StatefulRow = <D extends Data>({
205205

206206
return (
207207
<>
208-
{columns.map(column => (
208+
{columns.map((column, i) => (
209209
<TableCell
210210
align={column.align}
211-
key={column.title}
211+
key={`${column.title}-${i}`}
212212
style={column.cellStyle}>
213213
{getCorrectViewMode(column, mode, isEditable(column))}
214214
</TableCell>
@@ -237,11 +237,11 @@ export const NewRow = <D extends Data>({
237237

238238
return (
239239
<TableRow data-testid='table-row'>
240-
{columns.map(column => (
240+
{columns.map((column, i) => (
241241
<TableCell
242242
style={column.cellStyle}
243243
align={column.align}
244-
key={column.title}>
244+
key={`${column.title}-${i}`}>
245245
{isEditable(column)
246246
? renderEditMode(
247247
column,

src/core/inputs/auto-complete/__snapshots__/auto-complete.spec.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ exports[`AutoComplete should match snapshot 1`] = `
66
style="position: relative;"
77
>
88
<div
9-
class="sc-dmyCSP kvMDoa"
9+
class="sc-dmyCSP jvASYa"
1010
>
1111
<div
1212
class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"

src/core/inputs/date-time/__snapshots__/date-time.spec.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ exports[`DateTime should match snapshot 1`] = `
1414
class="MuiInputBase-input MuiOutlinedInput-input makeStyles-outlinedInput-49 MuiInputBase-inputAdornedEnd MuiOutlinedInput-inputAdornedEnd"
1515
role="date-picker"
1616
type="text"
17-
value="03042024"
17+
value="03052024"
1818
/>
1919
<div
2020
class="MuiInputAdornment-root MuiInputAdornment-positionEnd"

src/core/inputs/mask-field/__snapshots__/mask-field.spec.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`MaskField should match snapshot 1`] = `
44
<div>
55
<div
6-
class="sc-dmyCSP kvMDoa"
6+
class="sc-dmyCSP jvASYa"
77
>
88
<div
99
class="MuiFormControl-root MuiTextField-root"

src/core/inputs/text-field/__snapshots__/text-field.spec.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`TextField should match snapshot 1`] = `
44
<div>
55
<div
6-
class="sc-hLQSwg dhfXCV"
6+
class="sc-hLQSwg gdgoxJ"
77
>
88
<div
99
class="MuiFormControl-root MuiTextField-root"

src/core/inputs/text-field/index.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,12 @@ export const TextField = ({
303303
? classes.outlinedMultiline
304304
: ''
305305
},
306+
endAdornment: characters && (
307+
<CharactersCount>
308+
{otherProps.value?.toString().length}/
309+
{otherProps.inputProps?.maxLength}
310+
</CharactersCount>
311+
),
306312
...InputProps
307313
}}
308314
SelectProps={{
@@ -319,12 +325,6 @@ export const TextField = ({
319325
{...otherProps}>
320326
{options ? renderOptions(options, classes) : children}
321327
</MuiTextField>
322-
{characters && (
323-
<CharactersCount>
324-
{otherProps.value?.toString().length}/
325-
{otherProps.inputProps?.maxLength}
326-
</CharactersCount>
327-
)}
328328
{onHelperClick && (
329329
<HelperBox
330330
helperIcon={helperIcon}

src/core/inputs/text-field/styles.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export const Helper = styled.div`
1111
`
1212

1313
export const TextFieldWrapper = styled.div`
14+
width: 100%;
1415
display: flex;
1516
flex-direction: rows;
16-
width: 100%;
1717
align-items: center;
1818
button {
1919
display: none;
@@ -24,14 +24,13 @@ export const TextFieldWrapper = styled.div`
2424
`
2525

2626
export const StaticTextFieldWrapper = styled.div`
27+
width: 100%;
2728
display: flex;
2829
flex-direction: rows;
29-
width: 100%;
3030
align-items: center;
3131
`
3232

3333
export const CharactersCount = styled.span`
34-
margin-left: -35px;
3534
color: ${grays.g3};
3635
font-size: 14px;
3736
font-family:

src/experimental/auto-complete-lab/autocomplete-lab.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react'
2-
import { Autocomplete as AutocompleteLab } from '@material-ui/lab'
32
import type { Meta } from '@storybook/react'
43
import { default as AutoComplete } from '@/core/inputs/auto-complete'
54
import { TextField } from '@/core/inputs/text-field'
5+
import { Autocomplete as AutocompleteLab } from '.'
66

77
export default {
88
title: 'Experimental/AutoCompleteLab',

0 commit comments

Comments
 (0)