scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in fix/SW-350-ui-comments (pull request #817)

Browse Source 
fix/SW-350-ui-comments

Approved-by: Niclas Edenvin
This commit is contained in:
Pontus Dreij
2024-11-04 14:51:36 +00:00
parent 19163c59c2 cac1a6891e
commit ccca27d2e6
12 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/BookingWidget/MobileToggleButton/index.tsx
View File

@@ -80,7 +80,7 @@ export default function MobileToggleButton({
{!locationAndDateIsSet && (
<>
<div>
<Caption color="red">
<Caption type="bold" color="red">
{intl.formatMessage({ id: "Where to" })}
</Caption>
<Body color="uiTextPlaceholder">
@@ -91,7 +91,7 @@ export default function MobileToggleButton({
</div>
<Divider color="baseSurfaceSubtleNormal" variant="vertical" />
<div>
<Caption color="red">
<Caption type="bold" color="red">
{intl.formatMessage(
{ id: "booking.nights" },
{ totalNights: nights }

10
components/Forms/BookingWidget/FormContent/Search/SearchList/index.tsx
View File

@@ -29,17 +29,23 @@ export default function SearchList({
}: SearchListProps) {
const intl = useIntl()
const [hasMounted, setHasMounted] = useState(false)
const [isFormSubmitted, setIsFormSubmitted] = useState(false)
const {
clearErrors,
formState: { errors },
formState: { errors, isSubmitted },
} = useFormContext()
const searchError = errors["search"]
useEffect(() => {
setIsFormSubmitted(isSubmitted)
}, [isSubmitted])
useEffect(() => {
let timeoutID: ReturnType<typeof setTimeout> | null = null
if (searchError && searchError.message === "Required") {
timeoutID = setTimeout(() => {
clearErrors("search")
setIsFormSubmitted(false)
// magic number originates from animation
// 5000ms delay + 120ms exectuion
}, 5120)
@@ -60,7 +66,7 @@ export default function SearchList({
return null
}
if (searchError) {
if (searchError && isFormSubmitted) {
if (typeof searchError.message === "string") {
if (!isOpen) {
if (searchError.message === "Required") {

24
components/Forms/BookingWidget/FormContent/Search/index.tsx
View File

@@ -48,13 +48,10 @@ export default function Search({ locations }: SearchProps) {
dispatch({ type: ActionType.CLEAR_HISTORY_LOCATIONS })
}
function handleOnChange(
evt: FormEvent<HTMLInputElement> | ChangeEvent<HTMLInputElement>
) {
const value = evt.currentTarget.value
if (value) {
function dispatchInputValue(inputValue: string) {
if (inputValue) {
dispatch({
payload: { search: value },
payload: { search: inputValue },
type: ActionType.SEARCH_LOCATIONS,
})
} else {
@@ -62,6 +59,14 @@ export default function Search({ locations }: SearchProps) {
}
}
function handleOnChange(
evt: FormEvent<HTMLInputElement> | ChangeEvent<HTMLInputElement>
) {
const newValue = evt.currentTarget.value
setValue(name, newValue)
dispatchInputValue(value)
}
function handleOnFocus(evt: FocusEvent<HTMLInputElement>) {
const searchValue = evt.currentTarget.value
if (searchValue) {
@@ -114,6 +119,7 @@ export default function Search({ locations }: SearchProps) {
inputValue={value}
itemToString={(value) => (value ? value.name : "")}
onSelect={handleOnSelect}
onInputValueChange={(inputValue) => dispatchInputValue(inputValue)}
>
{({
closeMenu,
@@ -128,7 +134,11 @@ export default function Search({ locations }: SearchProps) {
}) => (
<div className={styles.container}>
<label {...getLabelProps({ htmlFor: name })} className={styles.label}>
<Caption color={isOpen ? "uiTextActive" : "red"} asChild>
<Caption
type="bold"
color={isOpen ? "uiTextActive" : "red"}
asChild
>
<span>
{state.searchData?.type === "hotels"
? state.searchData?.relationships?.city?.name

6
components/Forms/BookingWidget/index.tsx
View File

@@ -65,11 +65,7 @@ export default function Form({ locations, type }: BookingWidgetFormProps) {
id={formId}
>
<input {...register("location")} type="hidden" />
<FormContent
locations={locations}
formId={formId}
formState={formState}
/>
<FormContent locations={locations} formId={formId} />
</form>
</section>
)

2
components/GuestsRoomsPicker/GuestsRoomsPicker.tsx
View File

@@ -27,7 +27,7 @@ export default function GuestsRoomsPicker({
id: "Disabled booking options header",
})
const disabledBookingOptionsText = intl.formatMessage({
id: "Disabled booking options text",
id: "Disabled adding room",
})
const addRoomLabel = intl.formatMessage({ id: "Add Room" })

3
i18n/dictionaries/da.json
View File

@@ -11,9 +11,9 @@
"Accessibility": "Tilgængelighed",
"Accessible Room": "Tilgængelighedsrum",
"Activities": "Aktiviteter",
"Add Room": "Tilføj værelse",
"Add code": "Tilføj kode",
"Add new card": "Tilføj nyt kort",
"Add room": "Tilføj værelse",
"Address": "Adresse",
"Adults": "voksne",
"Airport": "Lufthavn",
@@ -90,6 +90,7 @@
"Destination": "Destination",
"Destinations & hotels": "Destinationer & hoteller",
"Details": "Detaljer",
"Disabled adding room": "Tilføjelse af rum er endnu ikke tilgængelig på den nye hjemmeside.",
"Disabled booking options header": "Vi beklager",
"Disabled booking options text": "Koder, checks og bonusnætter er endnu ikke tilgængelige på den nye hjemmeside.",
"Discard changes": "Kassér ændringer",

3
i18n/dictionaries/de.json
View File

@@ -11,9 +11,9 @@
"Accessibility": "Zugänglichkeit",
"Accessible Room": "Barrierefreies Zimmer",
"Activities": "Aktivitäten",
"Add Room": "Zimmer hinzufügen",
"Add code": "Code hinzufügen",
"Add new card": "Neue Karte hinzufügen",
"Add room": "Zimmer hinzufügen",
"Address": "Adresse",
"Adults": "Erwachsene",
"Airport": "Flughafen",
@@ -90,6 +90,7 @@
"Destination": "Bestimmungsort",
"Destinations & hotels": "Reiseziele & Hotels",
"Details": "Details",
"Disabled adding room": "Zum Hinzufügen eines Zimmers ist derzeit nicht möglich.",
"Disabled booking options header": "Es tut uns leid",
"Disabled booking options text": "Codes, Schecks und Bonusnächte sind auf der neuen Website noch nicht verfügbar.",
"Discard changes": "Änderungen verwerfen",

2
i18n/dictionaries/en.json
View File

@@ -14,7 +14,6 @@
"Add Room": "Add room",
"Add code": "Add code",
"Add new card": "Add new card",
"Add room": "Add room",
"Add to calendar": "Add to calendar",
"Address": "Address",
"Adults": "Adults",
@@ -96,6 +95,7 @@
"Destination": "Destination",
"Destinations & hotels": "Destinations & hotels",
"Details": "Details",
"Disabled adding room": "Adding room is not available on the new website yet.",
"Disabled booking options header": "We're sorry",
"Disabled booking options text": "Codes, cheques and reward nights aren't available on the new website yet.",
"Discard changes": "Discard changes",

3
i18n/dictionaries/fi.json
View File

@@ -11,9 +11,9 @@
"Accessibility": "Saavutettavuus",
"Accessible Room": "Esteetön huone",
"Activities": "Aktiviteetit",
"Add Room": "Lisää huone",
"Add code": "Lisää koodi",
"Add new card": "Lisää uusi kortti",
"Add room": "Lisää huone",
"Address": "Osoite",
"Adults": "Aikuista",
"Airport": "Lentokenttä",
@@ -90,6 +90,7 @@
"Destination": "Kohde",
"Destinations & hotels": "Kohteet ja hotellit",
"Details": "Tiedot",
"Disabled adding room": "Lisäämään huone on vielä saatavilla uudella verkkosivustolla.",
"Disabled booking options header": "Olemme pahoillamme",
"Disabled booking options text": "Koodit, sekit ja palkintoillat eivät ole vielä saatavilla uudella verkkosivustolla.",
"Discard changes": "Hylkää muutokset",

3
i18n/dictionaries/no.json
View File

@@ -11,9 +11,9 @@
"Accessibility": "Tilgjengelighet",
"Accessible Room": "Tilgjengelighetsrom",
"Activities": "Aktiviteter",
"Add Room": "Legg til rom",
"Add code": "Legg til kode",
"Add new card": "Legg til nytt kort",
"Add room": "Legg til rom",
"Address": "Adresse",
"Adults": "Voksne",
"Airport": "Flyplass",
@@ -89,6 +89,7 @@
"Destination": "Destinasjon",
"Destinations & hotels": "Destinasjoner og hoteller",
"Details": "Detaljer",
"Disabled adding room": "Legg til rom er enda ikke tilgjengelig på den nye nettsiden.",
"Disabled booking options header": "Vi beklager",
"Disabled booking options text": "Koder, checks og belønningsnætter er enda ikke tilgjengelige på den nye nettsiden.",
"Discard changes": "Forkaste endringer",

3
i18n/dictionaries/sv.json
View File

@@ -11,9 +11,9 @@
"Accessibility": "Tillgänglighet",
"Accessible Room": "Tillgänglighetsrum",
"Activities": "Aktiviteter",
"Add Room": "Lägg till rum",
"Add code": "Lägg till kod",
"Add new card": "Lägg till nytt kort",
"Add room": "Lägg till rum",
"Address": "Adress",
"Adults": "Vuxna",
"Airport": "Flygplats",
@@ -89,6 +89,7 @@
"Destination": "Destination",
"Destinations & hotels": "Destinationer & hotell",
"Details": "Detaljer",
"Disabled adding room": "Lägg till rum är inte tillgängligt än på den nya webbplatsen.",
"Disabled booking options header": "Vi beklagar",
"Disabled booking options text": "Koder, bonuscheckar och belöningsnätter är inte tillgängliga på den nya webbplatsen än.",
"Discard changes": "Ignorera ändringar",

1
types/components/form/bookingwidget.ts
View File

@@ -14,7 +14,6 @@ export interface BookingWidgetFormProps {
export interface BookingWidgetFormContentProps {
locations: Locations
formId: string
formState: FormState<BookingWidgetSchema>
}
export enum ActionType {