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.

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

fix(widget): do not display Christmas background #5250

Merged
merged 2 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions apps/cowswap-frontend/src/common/constants/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ export const MAX_ORDER_DEADLINE = ms`1y` // https://github.com/cowprotocol/infra

// Use a 150K gas as a fallback if there's issue calculating the gas estimation (fixes some issues with some nodes failing to calculate gas costs for SC wallets)
export const GAS_LIMIT_DEFAULT = BigNumber.from('150000')

export const APP_HEADER_ELEMENT_ID = 'cowswap-app-header'
3 changes: 2 additions & 1 deletion apps/cowswap-frontend/src/cow-react/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { Updaters } from 'modules/application/containers/App/Updaters'
import { WithLDProvider } from 'modules/application/containers/WithLDProvider'
import { useInjectedWidgetParams } from 'modules/injectedWidget'

import { APP_HEADER_ELEMENT_ID } from '../common/constants/common'
import { WalletUnsupportedNetworkBanner } from '../common/containers/WalletUnsupportedNetworkBanner'
import { BlockNumberProvider } from '../common/hooks/useBlockNumber'

Expand Down Expand Up @@ -85,7 +86,7 @@ function Web3ProviderInstance({ children }: { children: ReactNode }) {
function Toasts() {
const { disableToastMessages = false } = useInjectedWidgetParams()

return <SnackbarsWidget hidden={disableToastMessages} />
return <SnackbarsWidget hidden={disableToastMessages} anchorElementId={APP_HEADER_ELEMENT_ID} />
}

const container = document.getElementById('root')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { useInjectedWidgetParams } from 'modules/injectedWidget'
import { parameterizeTradeRoute, useTradeRouteContext } from 'modules/trade'
import { useInitializeUtm } from 'modules/utm'

import { APP_HEADER_ELEMENT_ID } from 'common/constants/common'
import { CoWAmmBanner } from 'common/containers/CoWAmmBanner'
import { InvalidLocalTimeWarning } from 'common/containers/InvalidLocalTimeWarning'
import { useCategorizeRecentActivity } from 'common/hooks/useCategorizeRecentActivity'
Expand Down Expand Up @@ -133,6 +134,7 @@ export function App() {
{!isInjectedWidgetMode && (
// TODO: Move hard-coded colors to theme
<MenuBar
id={APP_HEADER_ELEMENT_ID}
navItems={navItems}
productVariant={PRODUCT_VARIANT}
customTheme={customTheme}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export const BodyWrapper = styled.div<{ customTheme?: CowSwapTheme }>`

${({ customTheme, theme }) =>
isChristmasTheme(customTheme) &&
!theme.isInjectedWidgetMode &&
`
background-image: url(${theme.darkMode ? IMAGE_BACKGROUND_DARK_CHRISTMAS_MEDIUM : IMAGE_BACKGROUND_LIGHT_CHRISTMAS_MEDIUM});
`}
Expand All @@ -101,6 +102,7 @@ export const BodyWrapper = styled.div<{ customTheme?: CowSwapTheme }>`

${({ customTheme, theme }) =>
isChristmasTheme(customTheme) &&
!theme.isInjectedWidgetMode &&
`
background-image: url(${theme.darkMode ? IMAGE_BACKGROUND_DARK_CHRISTMAS_SMALL : IMAGE_BACKGROUND_LIGHT_CHRISTMAS_SMALL});
`}
Expand Down
21 changes: 16 additions & 5 deletions libs/snackbars/src/containers/SnackbarsWidget/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import ms from 'ms.macro'
import { AlertCircle, CheckCircle } from 'react-feather'
import styled from 'styled-components/macro'

import { useAnchorPosition } from '../../hooks/useAnchorPosition'
import { SnackbarPopup } from '../../pure/SnackbarPopup'
import { IconType, removeSnackbarAtom, snackbarsAtom } from '../../state/snackbarsAtom'

Expand All @@ -31,9 +32,9 @@ const List = styled.div`
gap: 10px;
`

const Host = styled.div<{ hidden$: boolean }>`
const Host = styled.div<{ hidden$: boolean; top$: number }>`
position: fixed;
top: 80px;
top: ${({ top$ }) => top$ + 'px'};
right: ${({ hidden$ }) => (hidden$ ? '-9999px' : '20px')};
z-index: 6;
min-width: 300px;
Expand Down Expand Up @@ -67,6 +68,8 @@ const icons: Record<IconType, ReactElement | undefined> = {
custom: undefined,
}

const WIDGET_DEFAULT_TOP_POSITION = 80

interface SnackbarsWidgetProps {
/**
* This prop might seem a bit hacky and this is true
Expand All @@ -76,13 +79,21 @@ interface SnackbarsWidgetProps {
* Having this, we use this flag to artificially hide the widget
*/
hidden?: boolean
/**
* Id of a DOM element to which the snackbars should be anchored (displayed under)
* In CoW Swap the element is the header menu
*/
anchorElementId?: string
}

export function SnackbarsWidget({ hidden }: SnackbarsWidgetProps) {
export function SnackbarsWidget({ hidden, anchorElementId }: SnackbarsWidgetProps) {
const snackbarsState = useAtomValue(snackbarsAtom)
const resetSnackbarsState = useResetAtom(snackbarsAtom)
const removeSnackbar = useSetAtom(removeSnackbarAtom)

const { top, height } = useAnchorPosition(anchorElementId)
const widgetTop = top + height || WIDGET_DEFAULT_TOP_POSITION

const snackbars = useMemo(() => {
return Object.values(snackbarsState)
}, [snackbarsState])
Expand All @@ -91,7 +102,7 @@ export function SnackbarsWidget({ hidden }: SnackbarsWidgetProps) {
(id: string) => {
removeSnackbar(id)
},
[removeSnackbar]
[removeSnackbar],
)

const isUpToSmall = useMediaQuery(Media.upToSmall(false))
Expand All @@ -102,7 +113,7 @@ export function SnackbarsWidget({ hidden }: SnackbarsWidgetProps) {
}, [isOverlayDisplayed])

return (
<Host hidden$={!!hidden}>
<Host hidden$={!!hidden} top$={widgetTop}>
<List>
{snackbars.map((snackbar) => {
const icon = snackbar.icon
Expand Down
36 changes: 36 additions & 0 deletions libs/snackbars/src/hooks/useAnchorPosition.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { useLayoutEffect, useState } from 'react'

export function useAnchorPosition(elementId: string | undefined) {
const [top, setOffsetTop] = useState(0)
const [height, setOffsetHeight] = useState(0)

useLayoutEffect(() => {
if (!elementId) return

const updatePosition = () => {
const element = document.getElementById(elementId)

if (element) {
const { top, height } = element.getBoundingClientRect()
setOffsetTop(top)
setOffsetHeight(height)
} else {
setTimeout(updatePosition, 100)
}
}

updatePosition()

const resizeObserver = new ResizeObserver(updatePosition)
resizeObserver.observe(document.body)

window.addEventListener('scroll', updatePosition)

return () => {
window.removeEventListener('scroll', updatePosition)
resizeObserver.disconnect()
}
}, [elementId])

return { top, height }
}
3 changes: 3 additions & 0 deletions libs/ui/src/pure/MenuBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@ function _onDropdownItemClickFactory(item: MenuItem, postClick?: () => void) {
}

interface MenuBarProps {
id?: string
navItems: MenuItem[]
productVariant: ProductVariant
LinkComponent: LinkComponentType
Expand Down Expand Up @@ -695,6 +696,7 @@ interface MenuBarProps {

export const MenuBar = (props: MenuBarProps) => {
const {
id,
navItems,
productVariant,
persistentAdditionalContent,
Expand Down Expand Up @@ -775,6 +777,7 @@ export const MenuBar = (props: MenuBarProps) => {

return (
<MenuBarWrapper
id={id}
ref={menuRef}
bgColorLight={bgColorLight}
bgColorDark={bgColorDark}
Expand Down
Loading