Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: conditionally remove fixed prop if we're in embed #14586

Merged
merged 3 commits into from
Apr 15, 2024
Merged

fix: conditionally remove fixed prop if we're in embed #14586

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e111ccb
fix: conditionally remove fixed prop if we're in embed
sean-brydon Apr 15, 2024
7260d11
fix: conditionally remove fixed prop if we're in embed
sean-brydon Apr 15, 2024
cc6b61c
merge
sean-brydon Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions packages/features/bookings/Booker/Booker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,18 +247,6 @@ const BookerComponent = ({
<>
{event.data && !isPlatform ? <BookingPageTagManager eventType={event.data} /> : <></>}

{bookerState !== "booking" && event.data?.isInstantEvent && (
<div
className="animate-fade-in-up fixed bottom-2 z-40 my-2 opacity-0"
style={{ animationDelay: "1s" }}>
<InstantBooking
event={event.data}
onConnectNow={() => {
onConnectNowInstantMeeting();
}}
/>
</div>
)}
<div
className={classNames(
// In a popup embed, if someone clicks outside the main(having main class or main tag), it closes the embed
Expand Down Expand Up @@ -439,6 +427,22 @@ const BookerComponent = ({
setDayCount(null);
}}
/>

{bookerState !== "booking" && event.data?.isInstantEvent && (
<div
className={classNames(
"animate-fade-in-up z-40 my-2 opacity-0",
layout === BookerLayouts.MONTH_VIEW && isEmbed ? "" : "fixed bottom-2"
)}
style={{ animationDelay: "1s" }}>
<InstantBooking
event={event.data}
onConnectNow={() => {
onConnectNowInstantMeeting();
}}
/>
</div>
)}
{!hideBranding && !isPlatform && (
<m.span
key="logo"
Expand Down
Loading