@toptal/picasso-number-input 4.0.21-alpha-MP-672-support-end-adornment-properly-in-number-input-992bd4cfc.6 → 4.0.21-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.9
Sign up to get free protection for your applications and to get access to all the features.
- package/dist-package/src/NumberInput/NumberInput.d.ts.map +1 -1
- package/dist-package/src/NumberInput/NumberInput.js +2 -5
- package/dist-package/src/NumberInput/NumberInput.js.map +1 -1
- package/package.json +11 -11
- package/src/NumberInput/NumberInput.tsx +1 -11
- package/src/NumberInput/story/index.jsx +1 -6
- package/src/NumberInput/test.tsx +0 -33
- package/src/NumberInput/story/WithEndAdornment.example.tsx +0 -26
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NumberInput.d.ts","sourceRoot":"","sources":["../../../src/NumberInput/NumberInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAA6B,MAAM,OAAO,CAAA;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAI1E,OAAO,KAAK,EAAE,KAAK,IAAI,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAKjF,MAAM,WAAW,KACf,SAAQ,IAAI,CACR,iBAAiB,CAAC,kBAAkB,CAAC,EACrC,cAAc,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAC/C,EACD,SAAS;IACX,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,4CAA4C;IAC5C,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,4CAA4C;IAC5C,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,yEAAyE;IACzE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACtB,yCAAyC;IACzC,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,uCAAuC;IACvC,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,+DAA+D;IAC/D,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAA;IAC/D,SAAS,CAAC,EAAE,UAAU,CAAA;CACvB;AAED,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"NumberInput.d.ts","sourceRoot":"","sources":["../../../src/NumberInput/NumberInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAA6B,MAAM,OAAO,CAAA;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAI1E,OAAO,KAAK,EAAE,KAAK,IAAI,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAKjF,MAAM,WAAW,KACf,SAAQ,IAAI,CACR,iBAAiB,CAAC,kBAAkB,CAAC,EACrC,cAAc,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAC/C,EACD,SAAS;IACX,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,4CAA4C;IAC5C,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,4CAA4C;IAC5C,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,yEAAyE;IACzE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACtB,yCAAyC;IACzC,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,uCAAuC;IACvC,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,+DAA+D;IAC/D,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAA;IAC/D,SAAS,CAAC,EAAE,UAAU,CAAA;CACvB;AAED,eAAO,MAAM,WAAW,gFAkFvB,CAAA;AAeD,eAAe,WAAW,CAAA"}
|
|
@@ -16,12 +16,9 @@ import { useCombinedRefs } from '@toptal/picasso-utils';
|
|
|
16
16
|
import { twJoin } from '@toptal/picasso-tailwind-merge';
|
|
17
17
|
import { NumberInputEndAdornment } from '../NumberInputEndAdornment';
|
|
18
18
|
export const NumberInput = forwardRef(function NumberInput(props, ref) {
|
|
19
|
-
const { step = 1, min = -Infinity, max = Infinity, hideControls, enableChangeOnMouseWheel, value, onChange, disabled, status, onResetClick, enableReset,
|
|
19
|
+
const { step = 1, min = -Infinity, max = Infinity, hideControls, enableChangeOnMouseWheel, value, onChange, disabled, status, onResetClick, enableReset, width, icon, size, testIds, highlight } = props, rest = __rest(props, ["step", "min", "max", "hideControls", "enableChangeOnMouseWheel", "value", "onChange", "disabled", "status", "onResetClick", "enableReset", "width", "icon", "size", "testIds", "highlight"]);
|
|
20
20
|
const inputRef = useCombinedRefs(ref, useRef(null));
|
|
21
|
-
const
|
|
22
|
-
const endAdornment = hideControls ? (customEndAdornment) : (React.createElement(React.Fragment, null,
|
|
23
|
-
customEndAdornment,
|
|
24
|
-
defaultEndAdornment));
|
|
21
|
+
const endAdornment = hideControls ? null : (React.createElement(NumberInputEndAdornment, { step: step, min: min, max: max, value: value, disabled: disabled, size: size, inputRef: inputRef }));
|
|
25
22
|
const startAdornment = icon ? (React.createElement(InputAdornment, { position: 'start', disablePointerEvents: true }, icon)) : null;
|
|
26
23
|
return (React.createElement(OutlinedInput, { classes: {
|
|
27
24
|
root: 'pr-0 cursor-text',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NumberInput.js","sourceRoot":"","sources":["../../../src/NumberInput/NumberInput.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAA;AAEvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAA;AA6BpE,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CACnC,SAAS,WAAW,CAAC,KAAK,EAAE,GAAG;IAC7B,MAAM,EACJ,IAAI,GAAG,CAAC,EACR,GAAG,GAAG,CAAC,QAAQ,EACf,GAAG,GAAG,QAAQ,EACd,YAAY,EACZ,wBAAwB,EACxB,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,YAAY,EACZ,WAAW,EACX,
|
|
1
|
+
{"version":3,"file":"NumberInput.js","sourceRoot":"","sources":["../../../src/NumberInput/NumberInput.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAA;AAEvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAA;AA6BpE,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CACnC,SAAS,WAAW,CAAC,KAAK,EAAE,GAAG;IAC7B,MAAM,EACJ,IAAI,GAAG,CAAC,EACR,GAAG,GAAG,CAAC,QAAQ,EACf,GAAG,GAAG,QAAQ,EACd,YAAY,EACZ,wBAAwB,EACxB,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,YAAY,EACZ,WAAW,EACX,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,SAAS,KAEP,KAAK,EADJ,IAAI,UACL,KAAK,EAlBH,6LAkBL,CAAQ,CAAA;IAET,MAAM,QAAQ,GAAG,eAAe,CAC9B,GAAG,EACH,MAAM,CAAmB,IAAI,CAAC,CAC/B,CAAA;IAED,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACzC,oBAAC,uBAAuB,IACtB,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAA;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,CAAC,CAAC,CAC5B,oBAAC,cAAc,IAAC,QAAQ,EAAC,OAAO,EAAC,oBAAoB,UAClD,IAAI,CACU,CAClB,CAAC,CAAC,CAAC,IAAI,CAAA;IAER,OAAO,CACL,oBAAC,aAAa,IACZ,OAAO,EAAE;YACP,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE,MAAM;YACX,qDAAqD;YACrD,oFAAoF,EACpF,oFAAoF;YACpF,uCAAuC;YACvC,6BAA6B,CAC9B;SACF,EACD,SAAS,EAAE,SAAS,EACpB,UAAU,kCACL,IAAI,KACP,IAAI;YACJ,2CAA2C;YAC3C,OAAO,EAAE,wBAAwB;gBAC/B,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,KAEzC,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,GAChB,CACH,CAAA;AACH,CAAC,CACF,CAAA;AAED,WAAW,CAAC,YAAY,GAAG;IACzB,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,GAAG,EAAE,CAAC,QAAQ;IACd,GAAG,EAAE,QAAQ;IACb,YAAY,EAAE,KAAK;IACnB,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,SAAS;CAClB,CAAA;AAED,WAAW,CAAC,WAAW,GAAG,aAAa,CAAA;AAEvC,eAAe,WAAW,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@toptal/picasso-number-input",
|
|
3
|
-
"version": "4.0.21-alpha-
|
|
3
|
+
"version": "4.0.21-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.9+abb0fd45e",
|
|
4
4
|
"description": "Toptal UI components library - NumberInput",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -22,13 +22,13 @@
|
|
|
22
22
|
},
|
|
23
23
|
"homepage": "https://github.com/toptal/picasso/tree/master/packages/picasso#readme",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@toptal/picasso-container": "3.1.2-alpha-
|
|
26
|
-
"@toptal/picasso-form": "6.1.8-alpha-
|
|
27
|
-
"@toptal/picasso-icons": "1.11.1-alpha-
|
|
28
|
-
"@toptal/picasso-input-adornment": "3.0.9-alpha-
|
|
29
|
-
"@toptal/picasso-outlined-input": "4.0.17-alpha-
|
|
30
|
-
"@toptal/picasso-shared": "15.0.1-alpha-
|
|
31
|
-
"@toptal/picasso-utils": "3.0.1-alpha-
|
|
25
|
+
"@toptal/picasso-container": "3.1.2-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.33+abb0fd45e",
|
|
26
|
+
"@toptal/picasso-form": "6.1.8-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.9+abb0fd45e",
|
|
27
|
+
"@toptal/picasso-icons": "1.11.1-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.9+abb0fd45e",
|
|
28
|
+
"@toptal/picasso-input-adornment": "3.0.9-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.9+abb0fd45e",
|
|
29
|
+
"@toptal/picasso-outlined-input": "4.0.17-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.9+abb0fd45e",
|
|
30
|
+
"@toptal/picasso-shared": "15.0.1-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.286+abb0fd45e",
|
|
31
|
+
"@toptal/picasso-utils": "3.0.1-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.33+abb0fd45e"
|
|
32
32
|
},
|
|
33
33
|
"sideEffects": [
|
|
34
34
|
"**/styles.ts",
|
|
@@ -43,13 +43,13 @@
|
|
|
43
43
|
".": "./dist-package/src/index.js"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@toptal/picasso-tailwind-merge": "2.0.3-alpha-
|
|
47
|
-
"@toptal/picasso-test-utils": "1.1.2-alpha-
|
|
46
|
+
"@toptal/picasso-tailwind-merge": "2.0.3-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.33+abb0fd45e",
|
|
47
|
+
"@toptal/picasso-test-utils": "1.1.2-alpha-PF-201-fix-duplicate-sidebar-rendering-abb0fd45e.286+abb0fd45e"
|
|
48
48
|
},
|
|
49
49
|
"files": [
|
|
50
50
|
"dist-package/**",
|
|
51
51
|
"!dist-package/tsconfig.tsbuildinfo",
|
|
52
52
|
"src"
|
|
53
53
|
],
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "abb0fd45ee07e63b2d55c84bbf7882080c9e569f"
|
|
55
55
|
}
|
|
@@ -50,7 +50,6 @@ export const NumberInput = forwardRef<HTMLInputElement, Props>(
|
|
|
50
50
|
status,
|
|
51
51
|
onResetClick,
|
|
52
52
|
enableReset,
|
|
53
|
-
endAdornment: customEndAdornment = null,
|
|
54
53
|
width,
|
|
55
54
|
icon,
|
|
56
55
|
size,
|
|
@@ -64,7 +63,7 @@ export const NumberInput = forwardRef<HTMLInputElement, Props>(
|
|
|
64
63
|
useRef<HTMLInputElement>(null)
|
|
65
64
|
)
|
|
66
65
|
|
|
67
|
-
const
|
|
66
|
+
const endAdornment = hideControls ? null : (
|
|
68
67
|
<NumberInputEndAdornment
|
|
69
68
|
step={step}
|
|
70
69
|
min={min}
|
|
@@ -76,15 +75,6 @@ export const NumberInput = forwardRef<HTMLInputElement, Props>(
|
|
|
76
75
|
/>
|
|
77
76
|
)
|
|
78
77
|
|
|
79
|
-
const endAdornment = hideControls ? (
|
|
80
|
-
customEndAdornment
|
|
81
|
-
) : (
|
|
82
|
-
<>
|
|
83
|
-
{customEndAdornment}
|
|
84
|
-
{defaultEndAdornment}
|
|
85
|
-
</>
|
|
86
|
-
)
|
|
87
|
-
|
|
88
78
|
const startAdornment = icon ? (
|
|
89
79
|
<InputAdornment position='start' disablePointerEvents>
|
|
90
80
|
{icon}
|
|
@@ -4,7 +4,7 @@ import PicassoBook from '~/.storybook/components/PicassoBook'
|
|
|
4
4
|
const page = PicassoBook.section('Forms').createPage(
|
|
5
5
|
'NumberInput',
|
|
6
6
|
`Input component for numbers
|
|
7
|
-
|
|
7
|
+
|
|
8
8
|
${PicassoBook.createSourceLink(__filename)}
|
|
9
9
|
`
|
|
10
10
|
)
|
|
@@ -35,11 +35,6 @@ page
|
|
|
35
35
|
'With Icon',
|
|
36
36
|
'base/NumberInput'
|
|
37
37
|
)
|
|
38
|
-
.addExample(
|
|
39
|
-
'NumberInput/story/WithEndAdornment.example.tsx',
|
|
40
|
-
'With End Adornment',
|
|
41
|
-
'base/NumberInput'
|
|
42
|
-
)
|
|
43
38
|
.addExample(
|
|
44
39
|
'NumberInput/story/Sizes.example.tsx',
|
|
45
40
|
'Sizes',
|
package/src/NumberInput/test.tsx
CHANGED
|
@@ -22,8 +22,6 @@ const NumberInputRenderer = (
|
|
|
22
22
|
value={value}
|
|
23
23
|
onChange={handleChange}
|
|
24
24
|
status={props.status}
|
|
25
|
-
endAdornment={props.endAdornment}
|
|
26
|
-
hideControls={props.hideControls}
|
|
27
25
|
testIds={props.testIds}
|
|
28
26
|
/>
|
|
29
27
|
)
|
|
@@ -152,35 +150,4 @@ describe('NumberInput', () => {
|
|
|
152
150
|
expect(validIcon).not.toBeVisible()
|
|
153
151
|
})
|
|
154
152
|
})
|
|
155
|
-
|
|
156
|
-
describe('end adornment', () => {
|
|
157
|
-
describe('when endAdornment is passed', () => {
|
|
158
|
-
it('renders endAdornment with control buttons', () => {
|
|
159
|
-
const testProps: NumberInputProps = {
|
|
160
|
-
value: '10',
|
|
161
|
-
endAdornment: <div data-testid='custom-end-adornment' />,
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
const { getByTestId, getAllByRole } = renderNumberInput(testProps)
|
|
165
|
-
|
|
166
|
-
expect(getByTestId('custom-end-adornment')).toBeVisible()
|
|
167
|
-
expect(getAllByRole('button')).toHaveLength(2)
|
|
168
|
-
})
|
|
169
|
-
})
|
|
170
|
-
|
|
171
|
-
describe('when endAdornment is passed and controls are hidden', () => {
|
|
172
|
-
it('renders endAdornment without control buttons', () => {
|
|
173
|
-
const testProps: NumberInputProps = {
|
|
174
|
-
value: '10',
|
|
175
|
-
endAdornment: <div data-testid='custom-end-adornment' />,
|
|
176
|
-
hideControls: true,
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
const { getByTestId, queryAllByRole } = renderNumberInput(testProps)
|
|
180
|
-
|
|
181
|
-
expect(getByTestId('custom-end-adornment')).toBeVisible()
|
|
182
|
-
expect(queryAllByRole('button')).toHaveLength(0)
|
|
183
|
-
})
|
|
184
|
-
})
|
|
185
|
-
})
|
|
186
153
|
})
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
import type { ChangeEventHandler } from 'react'
|
|
2
|
-
import React, { useState } from 'react'
|
|
3
|
-
import { NumberInput, Container, Typography } from '@toptal/picasso'
|
|
4
|
-
|
|
5
|
-
const WithEndAdornmentExample = () => {
|
|
6
|
-
const [value, setValue] = useState('1')
|
|
7
|
-
|
|
8
|
-
const handleChange: ChangeEventHandler<HTMLInputElement> = event => {
|
|
9
|
-
setValue(event.target.value)
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
return (
|
|
13
|
-
<Container>
|
|
14
|
-
<NumberInput
|
|
15
|
-
value={value}
|
|
16
|
-
onChange={handleChange}
|
|
17
|
-
step='5'
|
|
18
|
-
max='100'
|
|
19
|
-
min='-100'
|
|
20
|
-
endAdornment={<Typography color='dark-grey'>$/hr</Typography>}
|
|
21
|
-
/>
|
|
22
|
-
</Container>
|
|
23
|
-
)
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
export default WithEndAdornmentExample
|