Skip to content

Scheduling infrastructure for absolutely everyone.

fix: prevent location input from losing focus after each key stroke (#22167)

abhix485c9a790f2c1
diff --git a/packages/features/eventtypes/components/Locations.tsx b/packages/features/eventtypes/components/Locations.tsx
index 21550e3d113..5231b766e12 100644
--- a/packages/features/eventtypes/components/Locations.tsx
+++ b/packages/features/eventtypes/components/Locations.tsx
@@ -107,6 +107,66 @@ const getLocationInfo = ({
return { locationAvailable, locationDetails };
};
+const LocationInput = (props: {
+ eventLocationType: EventLocationType;
+ defaultValue?: string;
+ index: number;
+ customClassNames?: LocationInputCustomClassNames;
+ disableLocationProp?: boolean;
+}) => {
+ const { t } = useLocale();
+ const { eventLocationType, index, customClassNames, disableLocationProp, ...remainingProps } = props;
+ if (eventLocationType?.organizerInputType === "text") {
+ const { defaultValue, ...rest } = remainingProps;
+
+ return (
+ <Controller
+ name={`locations.${index}.${eventLocationType.defaultValueVariable}`}
+ defaultValue={defaultValue}
+ render={({ field: { onChange, value } }) => {
+ return (
+ <Input
+ name={`locations[${index}].${eventLocationType.defaultValueVariable}`}
+ placeholder={t(eventLocationType.organizerInputPlaceholder || "")}
+ type="text"
+ required
+ onChange={onChange}
+ value={value}
+ {...(disableLocationProp ? { disabled: true } : {})}
+ className={classNames("my-0", customClassNames?.addressInput)}
+ {...rest}
+ />
+ );
+ }}
+ />
+ );
+ } else if (eventLocationType?.organizerInputType === "phone") {
+ const { defaultValue, ...rest } = remainingProps;
+
+ return (
+ <Controller
+ name={`locations.${index}.${eventLocationType.defaultValueVariable}`}
+ defaultValue={defaultValue}
+ render={({ field: { onChange, value } }) => {
+ return (
+ <PhoneInput
+ required
+ disabled={disableLocationProp}
+ placeholder={t(eventLocationType.organizerInputPlaceholder || "")}
+ name={`locations[${index}].${eventLocationType.defaultValueVariable}`}
+ className={customClassNames?.phoneInput}
+ value={value}
+ onChange={onChange}
+ {...rest}
+ />
+ );
+ }}
+ />
+ );
+ }
+ return null;
+};
+
const Locations: React.FC<LocationsProps> = ({
isChildrenManagedEventType,
disableLocationProp,
@@ -168,64 +228,6 @@ const Locations: React.FC<LocationsProps> = ({
locationOptions: props.locationOptions,
});
- const LocationInput = (props: {
- eventLocationType: EventLocationType;
- defaultValue?: string;
- index: number;
- customClassNames?: LocationInputCustomClassNames;
- }) => {
- const { eventLocationType, index, customClassNames, ...remainingProps } = props;
- if (eventLocationType?.organizerInputType === "text") {
- const { defaultValue, ...rest } = remainingProps;
-
- return (
- <Controller
- name={`locations.${index}.${eventLocationType.defaultValueVariable}`}
- defaultValue={defaultValue}
- render={({ field: { onChange, value } }) => {
- return (
- <Input
- name={`locations[${index}].${eventLocationType.defaultValueVariable}`}
- placeholder={t(eventLocationType.organizerInputPlaceholder || "")}
- type="text"
- required
- onChange={onChange}
- value={value}
- {...(disableLocationProp ? { disabled: true } : {})}
- className={classNames("my-0", customClassNames?.addressInput)}
- {...rest}
- />
- );
- }}
- />
- );
- } else if (eventLocationType?.organizerInputType === "phone") {
- const { defaultValue, ...rest } = remainingProps;
-
- return (
- <Controller
- name={`locations.${index}.${eventLocationType.defaultValueVariable}`}
- defaultValue={defaultValue}
- render={({ field: { onChange, value } }) => {
- return (
- <PhoneInput
- required
- disabled={disableLocationProp}
- placeholder={t(eventLocationType.organizerInputPlaceholder || "")}
- name={`locations[${index}].${eventLocationType.defaultValueVariable}`}
- className={customClassNames?.phoneInput}
- value={value}
- onChange={onChange}
- {...rest}
- />
- );
- }}
- />
- );
- }
- return null;
- };
-
const [showEmptyLocationSelect, setShowEmptyLocationSelect] = useState(false);
const defaultInitialLocation = defaultValue || null;
const [selectedNewOption, setSelectedNewOption] = useState<SingleValueLocationOption | null>(
@@ -459,6 +461,7 @@ const Locations: React.FC<LocationsProps> = ({
eventLocationType={eventLocationType}
index={index}
customClassNames={customClassNames?.organizerContactInput?.locationInput}
+ disableLocationProp={disableLocationProp}
/>
</div>
<ErrorMessage