mirror of
https://github.com/suitenumerique/meet.git
synced 2026-09-01 05:07:56 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cec81ba101 | |||
| a1ecf994c7 | |||
| 04fc9fa1ab |
@@ -8,6 +8,12 @@ and this project adheres to
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- 📱(frontend) collapse mobile control bar items on narrow viewports
|
||||||
|
- 📱(frontend) stack idle modal buttons in a column on mobile
|
||||||
|
- 📱(frontend) improve feedback screen responsiveness on mobile
|
||||||
|
|
||||||
## [1.28.0] - 2026-08-24
|
## [1.28.0] - 2026-08-24
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ const controlBarRegion = cva({
|
|||||||
mobile: {
|
mobile: {
|
||||||
true: {
|
true: {
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
width: '330px',
|
width: '100%',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { useCallback } from 'react'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { RiEmotionLine } from '@remixicon/react'
|
import { RiEmotionLine } from '@remixicon/react'
|
||||||
import { ToggleButton } from '@/primitives'
|
import { ToggleButton } from '@/primitives'
|
||||||
@@ -7,6 +6,8 @@ import { useRegisterKeyboardShortcut } from '@/features/shortcuts/useRegisterKey
|
|||||||
import { REACTIONS_TOOLBAR_ID } from '../constants'
|
import { REACTIONS_TOOLBAR_ID } from '../constants'
|
||||||
import { useReactionsToolbar } from '../hooks/useReactionsToolbar'
|
import { useReactionsToolbar } from '../hooks/useReactionsToolbar'
|
||||||
import { layoutStore } from '@/stores/layout'
|
import { layoutStore } from '@/stores/layout'
|
||||||
|
import { type ButtonRecipeProps } from '@/primitives/buttonRecipe'
|
||||||
|
import { ToggleButtonProps } from '@/primitives/ToggleButton'
|
||||||
|
|
||||||
const focusReactionsToolbar = () => {
|
const focusReactionsToolbar = () => {
|
||||||
document
|
document
|
||||||
@@ -17,35 +18,44 @@ const focusReactionsToolbar = () => {
|
|||||||
|
|
||||||
export const REACTIONS_TOGGLE_ID = 'reactions-toggle'
|
export const REACTIONS_TOGGLE_ID = 'reactions-toggle'
|
||||||
|
|
||||||
export const ReactionsToggle = () => {
|
/* eslint-disable react-refresh/only-export-components */
|
||||||
|
export const reactionShortcutHandler = () => {
|
||||||
|
if (layoutStore.showReactionsToolbar) {
|
||||||
|
focusReactionsToolbar()
|
||||||
|
} else {
|
||||||
|
layoutStore.showReactionsToolbar = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Props = Pick<NonNullable<ButtonRecipeProps>, 'variant'> & ToggleButtonProps
|
||||||
|
|
||||||
|
export const ReactionsToggle = ({
|
||||||
|
variant = 'primaryDark',
|
||||||
|
onPress,
|
||||||
|
...props
|
||||||
|
}: Props) => {
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'controls.reactions' })
|
const { t } = useTranslation('rooms', { keyPrefix: 'controls.reactions' })
|
||||||
|
|
||||||
const { isOpen, toggle } = useReactionsToolbar()
|
const { isOpen, toggle } = useReactionsToolbar()
|
||||||
|
|
||||||
const handleShortcut = useCallback(() => {
|
|
||||||
if (layoutStore.showReactionsToolbar) {
|
|
||||||
focusReactionsToolbar()
|
|
||||||
} else {
|
|
||||||
layoutStore.showReactionsToolbar = true
|
|
||||||
}
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
useRegisterKeyboardShortcut({
|
useRegisterKeyboardShortcut({
|
||||||
id: 'reaction',
|
id: 'reaction',
|
||||||
handler: handleShortcut,
|
handler: reactionShortcutHandler,
|
||||||
})
|
})
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
|
{...props}
|
||||||
id={REACTIONS_TOGGLE_ID}
|
id={REACTIONS_TOGGLE_ID}
|
||||||
data-attr="reactions-toggle"
|
data-attr="reactions-toggle"
|
||||||
square
|
square
|
||||||
variant="primaryDark"
|
variant={variant}
|
||||||
aria-label={t('button')}
|
aria-label={t('button')}
|
||||||
aria-expanded={isOpen}
|
aria-expanded={isOpen}
|
||||||
tooltip={t('button')}
|
tooltip={t('button')}
|
||||||
isSelected={isOpen}
|
isSelected={isOpen}
|
||||||
onChange={toggle}
|
onChange={toggle}
|
||||||
|
onPress={onPress}
|
||||||
>
|
>
|
||||||
<RiEmotionLine />
|
<RiEmotionLine />
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
|
|||||||
@@ -15,7 +15,8 @@ const Card = styled('div', {
|
|||||||
marginTop: '1.5rem',
|
marginTop: '1.5rem',
|
||||||
borderRadius: '0.25rem',
|
borderRadius: '0.25rem',
|
||||||
boxShadow: '',
|
boxShadow: '',
|
||||||
minWidth: '380px',
|
width: '100%',
|
||||||
|
maxWidth: '380px',
|
||||||
minHeight: '196px',
|
minHeight: '196px',
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
@@ -37,8 +38,11 @@ const ratingButtonRecipe = cva({
|
|||||||
color: 'initial',
|
color: 'initial',
|
||||||
border: 'none',
|
border: 'none',
|
||||||
borderRadius: 0,
|
borderRadius: 0,
|
||||||
padding: '0.5rem 0.85rem',
|
padding: { base: '0.5rem 0.25rem', xsm: '0.5rem 0.85rem' },
|
||||||
flexGrow: '1',
|
flexGrow: '1',
|
||||||
|
flexBasis: 0,
|
||||||
|
minWidth: 0,
|
||||||
|
textAlign: 'center',
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
},
|
},
|
||||||
variants: {
|
variants: {
|
||||||
@@ -99,7 +103,9 @@ const OpenFeedback = ({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Card>
|
<Card>
|
||||||
<H lvl={3}>{t('question')}</H>
|
<H lvl={3} centered>
|
||||||
|
{t('question')}
|
||||||
|
</H>
|
||||||
<TextArea
|
<TextArea
|
||||||
id="feedbackInput"
|
id="feedbackInput"
|
||||||
name="feedback"
|
name="feedback"
|
||||||
@@ -168,7 +174,9 @@ const RateQuality = ({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Card>
|
<Card>
|
||||||
<H lvl={3}>{t('question')}</H>
|
<H lvl={3} centered>
|
||||||
|
{t('question')}
|
||||||
|
</H>
|
||||||
<Bar>
|
<Bar>
|
||||||
{[...Array(maxRating)].map((_, index) => (
|
{[...Array(maxRating)].map((_, index) => (
|
||||||
<RACButton
|
<RACButton
|
||||||
@@ -228,7 +236,9 @@ const ConfirmationMessage = ({ onNext }: { onNext: () => void }) => {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<VStack gap={0}>
|
<VStack gap={0}>
|
||||||
<H lvl={3}>{t('heading')}</H>
|
<H lvl={3} centered>
|
||||||
|
{t('heading')}
|
||||||
|
</H>
|
||||||
<Text as="p" variant="paragraph" centered>
|
<Text as="p" variant="paragraph" centered>
|
||||||
{t('body')}
|
{t('body')}
|
||||||
</Text>
|
</Text>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
|
|||||||
import { css } from '@/styled-system/css'
|
import { css } from '@/styled-system/css'
|
||||||
import { useSnapshot } from 'valtio'
|
import { useSnapshot } from 'valtio'
|
||||||
import { connectionObserverStore } from '@/stores/connectionObserver'
|
import { connectionObserverStore } from '@/stores/connectionObserver'
|
||||||
import { HStack } from '@/styled-system/jsx'
|
import { Stack } from '@/styled-system/jsx'
|
||||||
import { useEffect, useRef, useState } from 'react'
|
import { useEffect, useRef, useState } from 'react'
|
||||||
import { navigateTo } from '@/navigation/navigateTo'
|
import { navigateTo } from '@/navigation/navigateTo'
|
||||||
import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce'
|
import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce'
|
||||||
@@ -134,7 +134,11 @@ export const IsIdleDisconnectModal = () => {
|
|||||||
</H>
|
</H>
|
||||||
<Description />
|
<Description />
|
||||||
<Settings />
|
<Settings />
|
||||||
<HStack marginTop="2rem">
|
<Stack
|
||||||
|
direction={{ base: 'column', xsm: 'row' }}
|
||||||
|
align={{ base: 'stretch', xsm: 'center' }}
|
||||||
|
marginTop="2rem"
|
||||||
|
>
|
||||||
<Button
|
<Button
|
||||||
onPress={() => {
|
onPress={() => {
|
||||||
connectionObserverStore.isIdleDisconnectModalOpen = false
|
connectionObserverStore.isIdleDisconnectModalOpen = false
|
||||||
@@ -148,7 +152,7 @@ export const IsIdleDisconnectModal = () => {
|
|||||||
<Button onPress={close} size="sm" variant="primary">
|
<Button onPress={close} size="sm" variant="primary">
|
||||||
{t('stayButton')}
|
{t('stayButton')}
|
||||||
</Button>
|
</Button>
|
||||||
</HStack>
|
</Stack>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -10,10 +10,18 @@ import {
|
|||||||
showLowerHandToast,
|
showLowerHandToast,
|
||||||
} from '@/features/notifications/utils'
|
} from '@/features/notifications/utils'
|
||||||
import { useRegisterKeyboardShortcut } from '@/features/shortcuts/useRegisterKeyboardShortcut'
|
import { useRegisterKeyboardShortcut } from '@/features/shortcuts/useRegisterKeyboardShortcut'
|
||||||
|
import { type ButtonRecipeProps } from '@/primitives/buttonRecipe'
|
||||||
|
import { ToggleButtonProps } from '@/primitives/ToggleButton'
|
||||||
|
|
||||||
const SPEAKING_DETECTION_DELAY = 3000
|
const SPEAKING_DETECTION_DELAY = 3000
|
||||||
|
|
||||||
export const HandToggle = () => {
|
type Props = Pick<NonNullable<ButtonRecipeProps>, 'variant'> & ToggleButtonProps
|
||||||
|
|
||||||
|
export const HandToggle = ({
|
||||||
|
variant = 'primaryDark',
|
||||||
|
onPress,
|
||||||
|
...props
|
||||||
|
}: Props) => {
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'controls.hand' })
|
const { t } = useTranslation('rooms', { keyPrefix: 'controls.hand' })
|
||||||
|
|
||||||
const room = useRoomContext()
|
const room = useRoomContext()
|
||||||
@@ -74,12 +82,16 @@ export const HandToggle = () => {
|
|||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
|
{...props}
|
||||||
square
|
square
|
||||||
variant="primaryDark"
|
variant={variant}
|
||||||
aria-label={t(tooltipLabel)}
|
aria-label={t(tooltipLabel)}
|
||||||
tooltip={t(tooltipLabel)}
|
tooltip={t(tooltipLabel)}
|
||||||
isSelected={isHandRaised}
|
isSelected={isHandRaised}
|
||||||
onPress={handleToggle}
|
onPress={(e) => {
|
||||||
|
handleToggle()
|
||||||
|
onPress?.(e)
|
||||||
|
}}
|
||||||
data-attr={`controls-hand-${tooltipLabel}`}
|
data-attr={`controls-hand-${tooltipLabel}`}
|
||||||
>
|
>
|
||||||
<RiHand />
|
<RiHand />
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { supportsScreenSharing } from '@livekit/components-core'
|
import { supportsScreenSharing } from '@livekit/components-core'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import type { ControlBarAuxProps } from './ControlBar'
|
import type { ControlBarAuxProps } from './ControlBar'
|
||||||
import React from 'react'
|
import React, { useLayoutEffect, useRef, useState } from 'react'
|
||||||
import { css } from '@/styled-system/css'
|
import { css } from '@/styled-system/css'
|
||||||
import { LeaveButton } from '../../components/controls/LeaveButton'
|
import { LeaveButton } from '../../components/controls/LeaveButton'
|
||||||
import { Track } from 'livekit-client'
|
import { Track } from 'livekit-client'
|
||||||
@@ -26,7 +26,26 @@ import { AudioDevicesControl } from '../../components/controls/Device/AudioDevic
|
|||||||
import { VideoDeviceControl } from '../../components/controls/Device/VideoDeviceControl'
|
import { VideoDeviceControl } from '../../components/controls/Device/VideoDeviceControl'
|
||||||
import { openSettingsDialog } from '@/stores/settings'
|
import { openSettingsDialog } from '@/stores/settings'
|
||||||
import { ControlBarRegion } from '@/features/layout/components/ControlBarRegion'
|
import { ControlBarRegion } from '@/features/layout/components/ControlBarRegion'
|
||||||
import { ReactionsToggle } from '@/features/reactions/components/ReactionsToggle'
|
import {
|
||||||
|
ReactionsToggle,
|
||||||
|
reactionShortcutHandler,
|
||||||
|
} from '@/features/reactions/components/ReactionsToggle'
|
||||||
|
import { useSize } from '../../hooks/useResizeObserver'
|
||||||
|
import { useRegisterKeyboardShortcut } from '@/features/shortcuts/useRegisterKeyboardShortcut'
|
||||||
|
import { useRaisedHand } from '@/features/rooms/livekit/hooks/useRaisedHand'
|
||||||
|
import { useRoomContext } from '@livekit/components-react'
|
||||||
|
|
||||||
|
// Hand collapses first, then reactions; hidden toggles move into the menu.
|
||||||
|
const COLLAPSIBLE_COUNT = 2
|
||||||
|
|
||||||
|
// Layout-neutral measuring wrapper: inherits the region's gap and refuses to
|
||||||
|
// flex-shrink so measured widths are natural content widths.
|
||||||
|
const measuredRow = css({
|
||||||
|
display: 'inline-flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: 'inherit',
|
||||||
|
flexShrink: 0,
|
||||||
|
})
|
||||||
|
|
||||||
export function MobileControlBar({
|
export function MobileControlBar({
|
||||||
onDeviceError,
|
onDeviceError,
|
||||||
@@ -36,50 +55,107 @@ export function MobileControlBar({
|
|||||||
const browserSupportsScreenSharing = supportsScreenSharing()
|
const browserSupportsScreenSharing = supportsScreenSharing()
|
||||||
const { toggleEffects } = useSidePanel()
|
const { toggleEffects } = useSidePanel()
|
||||||
|
|
||||||
|
const containerRef = useRef<HTMLDivElement>(null)
|
||||||
|
const { width } = useSize(containerRef)
|
||||||
|
const barRef = useRef<HTMLDivElement>(null)
|
||||||
|
const { width: barWidth } = useSize(barRef)
|
||||||
|
const collapsibleRef = useRef<HTMLDivElement>(null)
|
||||||
|
const { width: collapsibleWidth } = useSize(collapsibleRef)
|
||||||
|
|
||||||
|
const [hiddenCount, setHiddenCount] = useState(0)
|
||||||
|
const calibration = useRef<{ essential: number; slot: number }>()
|
||||||
|
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
if (hiddenCount === 0 && collapsibleWidth > 0 && barRef.current) {
|
||||||
|
const gap = parseFloat(getComputedStyle(barRef.current).columnGap) || 0
|
||||||
|
calibration.current = {
|
||||||
|
essential: barWidth - collapsibleWidth - gap,
|
||||||
|
slot: (collapsibleWidth + gap) / COLLAPSIBLE_COUNT,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!calibration.current || width <= 0) return
|
||||||
|
const { essential, slot } = calibration.current
|
||||||
|
const fits = Math.floor((width - essential) / slot)
|
||||||
|
const next = Math.min(
|
||||||
|
COLLAPSIBLE_COUNT,
|
||||||
|
Math.max(0, COLLAPSIBLE_COUNT - fits)
|
||||||
|
)
|
||||||
|
if (next !== hiddenCount) setHiddenCount(next)
|
||||||
|
}, [barWidth, collapsibleWidth, hiddenCount, width, setHiddenCount])
|
||||||
|
|
||||||
|
const hideHand = hiddenCount >= 1
|
||||||
|
const hideReactions = hiddenCount >= 2
|
||||||
|
|
||||||
|
const room = useRoomContext()
|
||||||
|
const { toggleRaisedHand } = useRaisedHand({
|
||||||
|
participant: room.localParticipant,
|
||||||
|
})
|
||||||
|
useRegisterKeyboardShortcut({
|
||||||
|
id: 'raise-hand',
|
||||||
|
handler: toggleRaisedHand,
|
||||||
|
})
|
||||||
|
useRegisterKeyboardShortcut({
|
||||||
|
id: 'reaction',
|
||||||
|
handler: reactionShortcutHandler,
|
||||||
|
})
|
||||||
|
|
||||||
const { data } = useConfig()
|
const { data } = useConfig()
|
||||||
|
|
||||||
|
const closeMenu = () => setIsMenuOpened(false)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
className={css({
|
className={css({
|
||||||
width: '100vw',
|
width: '100vw',
|
||||||
display: 'flex',
|
|
||||||
padding: '1.125rem',
|
padding: '1.125rem',
|
||||||
justifyContent: 'center',
|
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
<ControlBarRegion mobile>
|
<div
|
||||||
<LeaveButton />
|
ref={containerRef}
|
||||||
<AudioDevicesControl
|
className={css({
|
||||||
onDeviceError={(error) =>
|
width: '100%',
|
||||||
onDeviceError?.({ source: Track.Source.Microphone, error })
|
display: 'flex',
|
||||||
}
|
justifyContent: 'center',
|
||||||
hideMenu={true}
|
})}
|
||||||
/>
|
>
|
||||||
<VideoDeviceControl
|
<ControlBarRegion mobile>
|
||||||
onDeviceError={(error) =>
|
<div ref={barRef} className={measuredRow}>
|
||||||
onDeviceError?.({ source: Track.Source.Camera, error })
|
<LeaveButton />
|
||||||
}
|
<AudioDevicesControl
|
||||||
hideMenu={true}
|
onDeviceError={(error) =>
|
||||||
/>
|
onDeviceError?.({ source: Track.Source.Microphone, error })
|
||||||
<ReactionsToggle />
|
}
|
||||||
<HandToggle />
|
hideMenu={true}
|
||||||
<Button
|
/>
|
||||||
id="room-options-trigger"
|
<VideoDeviceControl
|
||||||
square
|
onDeviceError={(error) =>
|
||||||
variant="primaryDark"
|
onDeviceError?.({ source: Track.Source.Camera, error })
|
||||||
aria-label={t('options.buttonLabel')}
|
}
|
||||||
tooltip={t('options.buttonLabel')}
|
hideMenu={true}
|
||||||
onPress={() => setIsMenuOpened(true)}
|
/>
|
||||||
>
|
{/* Unmounted when empty so it doesn't leave a stray gap. */}
|
||||||
<RiMore2Line />
|
{!hideReactions && (
|
||||||
</Button>
|
<div ref={collapsibleRef} className={measuredRow}>
|
||||||
</ControlBarRegion>
|
<ReactionsToggle />
|
||||||
|
{!hideHand && <HandToggle />}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<Button
|
||||||
|
id="room-options-trigger"
|
||||||
|
square
|
||||||
|
variant="primaryDark"
|
||||||
|
aria-label={t('options.buttonLabel')}
|
||||||
|
tooltip={t('options.buttonLabel')}
|
||||||
|
onPress={() => setIsMenuOpened(true)}
|
||||||
|
>
|
||||||
|
<RiMore2Line />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</ControlBarRegion>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ResponsiveMenu
|
<ResponsiveMenu isOpened={isMenuOpened} onClosed={closeMenu}>
|
||||||
isOpened={isMenuOpened}
|
|
||||||
onClosed={() => setIsMenuOpened(false)}
|
|
||||||
>
|
|
||||||
<div
|
<div
|
||||||
className={css({
|
className={css({
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
@@ -98,6 +174,20 @@ export function MobileControlBar({
|
|||||||
},
|
},
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
|
{hideReactions && (
|
||||||
|
<ReactionsToggle
|
||||||
|
variant="primaryTextDark"
|
||||||
|
description={true}
|
||||||
|
onPress={closeMenu}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{hideHand && (
|
||||||
|
<HandToggle
|
||||||
|
variant="primaryTextDark"
|
||||||
|
description={true}
|
||||||
|
onPress={closeMenu}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{browserSupportsScreenSharing && (
|
{browserSupportsScreenSharing && (
|
||||||
<ScreenShareToggle
|
<ScreenShareToggle
|
||||||
onDeviceError={(error) =>
|
onDeviceError={(error) =>
|
||||||
@@ -105,25 +195,16 @@ export function MobileControlBar({
|
|||||||
}
|
}
|
||||||
variant="primaryTextDark"
|
variant="primaryTextDark"
|
||||||
description={true}
|
description={true}
|
||||||
onPress={() => setIsMenuOpened(false)}
|
onPress={closeMenu}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<ChatToggle
|
<ChatToggle description={true} onPress={closeMenu} />
|
||||||
description={true}
|
<ParticipantsToggle description={true} onPress={closeMenu} />
|
||||||
onPress={() => setIsMenuOpened(false)}
|
<ToolsToggle description={true} onPress={closeMenu} />
|
||||||
/>
|
|
||||||
<ParticipantsToggle
|
|
||||||
description={true}
|
|
||||||
onPress={() => setIsMenuOpened(false)}
|
|
||||||
/>
|
|
||||||
<ToolsToggle
|
|
||||||
description={true}
|
|
||||||
onPress={() => setIsMenuOpened(false)}
|
|
||||||
/>
|
|
||||||
<Button
|
<Button
|
||||||
onPress={() => {
|
onPress={() => {
|
||||||
toggleEffects()
|
toggleEffects()
|
||||||
setIsMenuOpened(false)
|
closeMenu()
|
||||||
}}
|
}}
|
||||||
variant="primaryTextDark"
|
variant="primaryTextDark"
|
||||||
aria-label={t('options.items.effects')}
|
aria-label={t('options.items.effects')}
|
||||||
@@ -140,7 +221,7 @@ export function MobileControlBar({
|
|||||||
aria-label={t('options.items.feedback')}
|
aria-label={t('options.items.feedback')}
|
||||||
description={true}
|
description={true}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
onPress={() => setIsMenuOpened(false)}
|
onPress={closeMenu}
|
||||||
>
|
>
|
||||||
<RiMegaphoneLine size={20} />
|
<RiMegaphoneLine size={20} />
|
||||||
</LinkButton>
|
</LinkButton>
|
||||||
@@ -148,7 +229,7 @@ export function MobileControlBar({
|
|||||||
<Button
|
<Button
|
||||||
onPress={() => {
|
onPress={() => {
|
||||||
openSettingsDialog()
|
openSettingsDialog()
|
||||||
setIsMenuOpened(false)
|
closeMenu()
|
||||||
}}
|
}}
|
||||||
variant="primaryTextDark"
|
variant="primaryTextDark"
|
||||||
aria-label={t('options.items.settings')}
|
aria-label={t('options.items.settings')}
|
||||||
@@ -157,7 +238,7 @@ export function MobileControlBar({
|
|||||||
>
|
>
|
||||||
<RiSettings3Line size={20} />
|
<RiSettings3Line size={20} />
|
||||||
</Button>
|
</Button>
|
||||||
<CameraSwitchButton onPress={() => setIsMenuOpened(false)} />
|
<CameraSwitchButton onPress={closeMenu} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ResponsiveMenu>
|
</ResponsiveMenu>
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { Button } from '@/primitives'
|
import { Button } from '@/primitives'
|
||||||
import { Screen } from '@/layout/Screen'
|
import { Screen } from '@/layout/Screen'
|
||||||
import { Center, HStack, styled, VStack } from '@/styled-system/jsx'
|
import { Center, Stack, styled, VStack } from '@/styled-system/jsx'
|
||||||
|
import { css } from '@/styled-system/css'
|
||||||
import { Rating } from '@/features/rooms/components/Rating.tsx'
|
import { Rating } from '@/features/rooms/components/Rating.tsx'
|
||||||
import { useLocation } from 'wouter'
|
import { useLocation } from 'wouter'
|
||||||
import { useMemo } from 'react'
|
import { useMemo } from 'react'
|
||||||
@@ -14,14 +15,18 @@ const Heading = styled('h1', {
|
|||||||
fontStyle: 'normal',
|
fontStyle: 'normal',
|
||||||
fontStretch: 'normal',
|
fontStretch: 'normal',
|
||||||
fontOpticalSizing: 'auto',
|
fontOpticalSizing: 'auto',
|
||||||
fontSize: '2.3rem',
|
fontSize: { base: '1.75rem', xsm: '2.3rem' },
|
||||||
lineHeight: '2.5rem',
|
lineHeight: { base: '2.125rem', xsm: '2.5rem' },
|
||||||
letterSpacing: '0',
|
letterSpacing: '0',
|
||||||
paddingBottom: '2rem',
|
paddingBottom: { base: '1.5rem', xsm: '2rem' },
|
||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const buttonClass = css({
|
||||||
|
width: { base: '100%', xsm: 'auto' },
|
||||||
|
})
|
||||||
|
|
||||||
enum DisconnectReasonKey {
|
enum DisconnectReasonKey {
|
||||||
DuplicateIdentity = 'duplicateIdentity',
|
DuplicateIdentity = 'duplicateIdentity',
|
||||||
ParticipantRemoved = 'participantRemoved',
|
ParticipantRemoved = 'participantRemoved',
|
||||||
@@ -54,19 +59,31 @@ const FeedbackRoute = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Screen layout="centered" footer={false}>
|
<Screen layout="centered" footer={false}>
|
||||||
<Center>
|
<Center width="100%">
|
||||||
<VStack>
|
<VStack width="100%" paddingX="1rem">
|
||||||
<Heading>{t(`feedback.heading.${reasonKey || 'normal'}`)}</Heading>
|
<Heading>{t(`feedback.heading.${reasonKey || 'normal'}`)}</Heading>
|
||||||
<HStack>
|
<Stack
|
||||||
|
direction={{ base: 'column', xsm: 'row' }}
|
||||||
|
width={{ base: '100%', xsm: 'auto' }}
|
||||||
|
maxWidth="380px"
|
||||||
|
>
|
||||||
{showBackButton && (
|
{showBackButton && (
|
||||||
<Button variant="secondary" onPress={() => window.history.back()}>
|
<Button
|
||||||
|
variant="secondary"
|
||||||
|
className={buttonClass}
|
||||||
|
onPress={() => window.history.back()}
|
||||||
|
>
|
||||||
{t('feedback.back')}
|
{t('feedback.back')}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
<Button variant="primary" onPress={() => setLocation('/')}>
|
<Button
|
||||||
|
variant="primary"
|
||||||
|
className={buttonClass}
|
||||||
|
onPress={() => setLocation('/')}
|
||||||
|
>
|
||||||
{t('feedback.home')}
|
{t('feedback.home')}
|
||||||
</Button>
|
</Button>
|
||||||
</HStack>
|
</Stack>
|
||||||
<Rating metadata={metadata} />
|
<Rating metadata={metadata} />
|
||||||
</VStack>
|
</VStack>
|
||||||
</Center>
|
</Center>
|
||||||
|
|||||||
Reference in New Issue
Block a user