AI: address review on PR #475
このコミットが含まれているのは:
@@ -1,7 +1,9 @@
|
||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||
import { cn } from '@/lib/utils'
|
||||
import { useEffect, useRef, useState } from 'react'
|
||||
|
||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||
import { useVerticalPreview } from '@/lib/useLocale'
|
||||
import { cn } from '@/lib/utils'
|
||||
|
||||
import type { FC } from 'react'
|
||||
|
||||
type Props = {
|
||||
@@ -11,7 +13,7 @@ type Props = {
|
||||
title?: string }
|
||||
|
||||
const DESKTOP_MARQUEE_MEDIA =
|
||||
'(min-width: 768px) and (hover: hover) and (pointer: fine) and (prefers-reduced-motion: no-preference)'
|
||||
'(hover: hover) and (pointer: fine) and (prefers-reduced-motion: no-preference)'
|
||||
const MARQUEE_START_DELAY_MS = 1600
|
||||
const MARQUEE_END_HOLD_MS = 2400
|
||||
const MARQUEE_SCROLL_PX_PER_SECOND = 43
|
||||
@@ -21,6 +23,7 @@ const MIN_MARQUEE_OVERFLOW_PX = 1
|
||||
const ResponsiveMarqueeText: FC<Props> = (
|
||||
{ text, className, truncateOnMobile = false, title },
|
||||
) => {
|
||||
const verticalPreview = useVerticalPreview ()
|
||||
const behaviourSettings = useClientBehaviourSettings ()
|
||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
||||
const outerRef = useRef<HTMLSpanElement | null> (null)
|
||||
@@ -69,7 +72,8 @@ const ResponsiveMarqueeText: FC<Props> = (
|
||||
if (typeof window === 'undefined' || typeof window.matchMedia !== 'function')
|
||||
return
|
||||
|
||||
const media = window.matchMedia (DESKTOP_MARQUEE_MEDIA)
|
||||
const sizeMedia = verticalPreview ? '(min-height: 768px)' : '(min-width: 768px)'
|
||||
const media = window.matchMedia (`${ sizeMedia } and ${ DESKTOP_MARQUEE_MEDIA }`)
|
||||
const update = () => {
|
||||
setDesktopMarqueeEnabled (media.matches)
|
||||
}
|
||||
@@ -80,7 +84,7 @@ const ResponsiveMarqueeText: FC<Props> = (
|
||||
return () => {
|
||||
media.removeEventListener ('change', update)
|
||||
}
|
||||
}, [])
|
||||
}, [verticalPreview])
|
||||
|
||||
useEffect (() => {
|
||||
const clearScheduled = () => {
|
||||
|
||||
@@ -299,21 +299,14 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
|
||||
let active = true
|
||||
|
||||
const update = () => {
|
||||
if (!(window.matchMedia ('(min-width: 768px)').matches))
|
||||
const desktopMedia = verticalPreview ? '(min-height: 768px)' : '(min-width: 768px)'
|
||||
if (!(window.matchMedia (desktopMedia).matches))
|
||||
{
|
||||
setDesktop (false)
|
||||
setDensity ('auto')
|
||||
return
|
||||
}
|
||||
|
||||
if (verticalPreview)
|
||||
{
|
||||
setDesktop (true)
|
||||
setDensity ('auto')
|
||||
measure (moreVsbl ? -1 : activeIdx)
|
||||
return
|
||||
}
|
||||
|
||||
// Measure the same desktop elements while the mobile layout is active.
|
||||
layout.setAttribute ('data-measuring', '')
|
||||
const previousDensity = layout.getAttribute ('data-density') ?? 'auto'
|
||||
@@ -324,16 +317,25 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
|
||||
{
|
||||
layout.setAttribute ('data-density', candidate)
|
||||
const style = getComputedStyle (bar)
|
||||
const primaryWidth = Math.max (
|
||||
primary.getBoundingClientRect ().width, primary.scrollWidth)
|
||||
const accountWidth =
|
||||
const primarySize =
|
||||
verticalPreview
|
||||
? Math.max (primary.getBoundingClientRect ().height, primary.scrollHeight)
|
||||
: Math.max (primary.getBoundingClientRect ().width, primary.scrollWidth)
|
||||
const accountSize =
|
||||
account == null
|
||||
? 0
|
||||
: Math.max (account.getBoundingClientRect ().width, account.scrollWidth)
|
||||
const required = primaryWidth + accountWidth
|
||||
+ parseFloat (style.paddingLeft) + parseFloat (style.paddingRight)
|
||||
+ (account == null ? 0 : parseFloat (style.columnGap))
|
||||
if (Math.ceil (required) <= bar.clientWidth)
|
||||
: (verticalPreview
|
||||
? Math.max (account.getBoundingClientRect ().height, account.scrollHeight)
|
||||
: Math.max (account.getBoundingClientRect ().width, account.scrollWidth))
|
||||
const padding =
|
||||
verticalPreview
|
||||
? parseFloat (style.paddingTop) + parseFloat (style.paddingBottom)
|
||||
: parseFloat (style.paddingLeft) + parseFloat (style.paddingRight)
|
||||
const gap = verticalPreview ? style.rowGap : style.columnGap
|
||||
const required = primarySize + accountSize + padding
|
||||
+ (account == null ? 0 : parseFloat (gap))
|
||||
const available = verticalPreview ? bar.clientHeight : bar.clientWidth
|
||||
if (Math.ceil (required) <= available)
|
||||
return candidate
|
||||
}
|
||||
return null
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする