Skip to content

Commit 011b407

Browse files
committed
Fix updateInputWidth not called properly, improve Preact compatibility
1 parent 4755f15 commit 011b407

File tree

4 files changed

+11
-20
lines changed

4 files changed

+11
-20
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"get-user-locale": "^1.2.0",
3232
"make-event-props": "^1.1.0",
3333
"merge-class-names": "^1.1.1",
34-
"merge-refs": "^1.0.0",
3534
"prop-types": "^15.6.0",
3635
"react-clock": "^3.1.0",
3736
"react-fit": "^1.4.0",

src/TimeInput/Input.jsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import React from 'react';
1+
import React, { useLayoutEffect } from 'react';
22
import PropTypes from 'prop-types';
33
import mergeClassNames from 'merge-class-names';
4-
import mergeRefs from 'merge-refs';
54
import updateInputWidth, { getFontShorthand } from 'update-input-width';
65

76
import { isRef } from '../shared/propTypes';
@@ -105,6 +104,15 @@ export default function Input({
105104
step,
106105
value,
107106
}) {
107+
useLayoutEffect(() => {
108+
if (!inputRef.current) {
109+
return;
110+
}
111+
112+
updateInputWidth(inputRef.current);
113+
updateInputWidthOnFontLoad(inputRef.current);
114+
}, [inputRef, value]);
115+
108116
const hasLeadingZero =
109117
showLeadingZeros && value && value < 10 && (value === '0' || !value.toString().startsWith('0'));
110118
const maxLength = max ? max.toString().length : null;
@@ -143,7 +151,7 @@ export default function Input({
143151
}
144152
}}
145153
placeholder={placeholder}
146-
ref={mergeRefs(updateInputWidth, updateInputWidthOnFontLoad, inputRef)}
154+
ref={inputRef}
147155
required={required}
148156
step={step}
149157
type="number"

test/yarn.lock

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4527,13 +4527,6 @@ __metadata:
45274527
languageName: node
45284528
linkType: hard
45294529

4530-
"merge-refs@npm:^1.0.0":
4531-
version: 1.0.0
4532-
resolution: "merge-refs@npm:1.0.0"
4533-
checksum: 3b4ea1a178c52349a0e725281aa34b130fb6819d22f8e616ae30da6f4da223d9c3a53f6e1a427c5ba56bf6b162c98de95a53f76e01a343e10162823fee33f64a
4534-
languageName: node
4535-
linkType: hard
4536-
45374530
"merge-stream@npm:^2.0.0":
45384531
version: 2.0.0
45394532
resolution: "merge-stream@npm:2.0.0"
@@ -5475,7 +5468,6 @@ __metadata:
54755468
get-user-locale: ^1.2.0
54765469
make-event-props: ^1.1.0
54775470
merge-class-names: ^1.1.1
5478-
merge-refs: ^1.0.0
54795471
prop-types: ^15.6.0
54805472
react-clock: ^3.1.0
54815473
react-fit: ^1.4.0

yarn.lock

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5168,13 +5168,6 @@ __metadata:
51685168
languageName: node
51695169
linkType: hard
51705170

5171-
"merge-refs@npm:^1.0.0":
5172-
version: 1.0.0
5173-
resolution: "merge-refs@npm:1.0.0"
5174-
checksum: 3b4ea1a178c52349a0e725281aa34b130fb6819d22f8e616ae30da6f4da223d9c3a53f6e1a427c5ba56bf6b162c98de95a53f76e01a343e10162823fee33f64a
5175-
languageName: node
5176-
linkType: hard
5177-
51785171
"merge-stream@npm:^2.0.0":
51795172
version: 2.0.0
51805173
resolution: "merge-stream@npm:2.0.0"
@@ -5995,7 +5988,6 @@ __metadata:
59955988
less: ^4.0.0
59965989
make-event-props: ^1.1.0
59975990
merge-class-names: ^1.1.1
5998-
merge-refs: ^1.0.0
59995991
prettier: ^2.5.0
60005992
pretty-quick: ^3.1.0
60015993
prop-types: ^15.6.0

0 commit comments

Comments
 (0)