Skip to content

Commit 0ae57a3

Browse files
Sync minor fixes with the upstream (GH-107)
2 parents f051ab7 + 268696d commit 0ae57a3

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

development/src/AntDemo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const AntDemo = () => {
3535
<ConfigProvider
3636
locale={locale("frFR")}
3737
theme={{algorithm: algorithm === "defaultAlgorithm" ? theme.defaultAlgorithm : theme.darkAlgorithm}}>
38-
<Card style={{height: "100%", borderRadius: 0, border: "none"}} bodyStyle={{padding: 0}}>
38+
<Card style={{height: "100%", borderRadius: 0, border: "none"}} styles={{body: {padding: 0}}}>
3939
<div style={{margin: 20, maxWidth: 400}}>
4040
{value && (
4141
<pre style={{

development/src/ant-phone/index.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ const PhoneInput = forwardRef(({
131131

132132
const setFieldValue = useCallback((value: PhoneNumber) => {
133133
if (formInstance) formInstance.setFieldValue(namePath, value);
134-
}, [formInstance, namePath])
134+
setValue(getFormattedNumber(getRawValue(value), pattern));
135+
}, [formInstance, namePath, pattern, setValue])
135136

136137
const onKeyDown = useCallback((event: KeyboardEvent<HTMLInputElement>) => {
137138
onKeyDownMaskHandler(event);
@@ -174,12 +175,14 @@ const PhoneInput = forwardRef(({
174175
const metadata = getMetadata(rawValue);
175176
// Skip if value has not been updated by `setFieldValue`.
176177
if (!metadata?.[3] || rawValue === getRawValue(value)) return;
177-
const formattedNumber = getFormattedNumber(rawValue, metadata?.[3] as string);
178+
let pattern = metadata?.[3] || "";
179+
if (disableParentheses) pattern = pattern.replace(/[()]/g, "");
180+
const formattedNumber = getFormattedNumber(rawValue, pattern);
178181
const phoneMetadata = parsePhoneNumber(formattedNumber);
179182
setFieldValue({...phoneMetadata, valid: (strict: boolean) => checkValidity(phoneMetadata, strict)});
180183
setCountryCode(metadata?.[0] as string);
181184
setValue(formattedNumber);
182-
}, [phoneValue, value, setFieldValue, setValue])
185+
}, [phoneValue, value, disableParentheses, setFieldValue, setValue])
183186

184187
useEffect(() => {
185188
if (initiatedRef.current) return;
@@ -281,7 +284,7 @@ const PhoneInput = forwardRef(({
281284
return (
282285
<div className={`${prefixCls}-phone-input-wrapper`}
283286
ref={node => setMinWidth(node?.offsetWidth || 0)}>
284-
<Space.Compact>
287+
<Space.Compact size={antInputProps?.size || "middle"}>
285288
{dropdownRender(countriesSelect)}
286289
<Input
287290
ref={ref}

0 commit comments

Comments
 (0)