granblue.team/hensei-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change headerRef footerRef to be camelcase

Browse source
This commit is contained in:
Justin Edmund 2023-07-09 22:45:55 -07:00
parent 686d0d0642
commit b79f25bb0f
9 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/auth/AccountModal/index.tsx
View file

@ -277,8 +277,8 @@ const AccountModal = React.forwardRef<HTMLDivElement, Props>(
<Dialog open={open} onOpenChange={openChange}>
<DialogContent
className="Account"
headerref={headerRef}
footerref={footerRef}
headerRef={headerRef}
footerRef={footerRef}
onOpenAutoFocus={(event: Event) => {}}
onEscapeKeyDown={onEscapeKeyDown}
>

2
components/auth/LoginModal/index.tsx
View file

@ -218,7 +218,7 @@ const LoginModal = (props: Props) => {
<Dialog open={open} onOpenChange={openChange}>
<DialogContent
className="login"
footerref={footerRef}
footerRef={footerRef}
onEscapeKeyDown={onEscapeKeyDown}
onOpenAutoFocus={onOpenAutoFocus}
>

2
components/auth/SignupModal/index.tsx
View file

@ -298,7 +298,7 @@ const SignupModal = (props: Props) => {
<Dialog open={open} onOpenChange={openChange}>
<DialogContent
className="signup"
footerref={footerRef}
footerRef={footerRef}
onEscapeKeyDown={onEscapeKeyDown}
onOpenAutoFocus={onOpenAutoFocus}
>

2
components/character/CharacterConflictModal/index.tsx
View file

@ -77,7 +77,7 @@ const CharacterConflictModal = (props: Props) => {
<Dialog open={open} onOpenChange={openChange}>
<DialogContent
className="conflict"
footerref={footerRef}
footerRef={footerRef}
onOpenAutoFocus={(event) => event.preventDefault()}
onEscapeKeyDown={close}
>

4
components/character/CharacterModal/index.tsx
View file

@ -354,8 +354,8 @@ const CharacterModal = ({
<DialogTrigger asChild>{children}</DialogTrigger>
<DialogContent
className="character"
headerref={headerRef}
footerref={footerRef}
headerRef={headerRef}
footerRef={footerRef}
onOpenAutoFocus={(event) => event.preventDefault()}
onEscapeKeyDown={() => {}}
>

20
components/common/DialogContent/index.tsx
View file

@ -12,15 +12,15 @@ interface Props
HTMLDivElement
> {
wrapperClassName?: string
headerref?: React.RefObject<HTMLDivElement>
footerref?: React.RefObject<HTMLDivElement>
headerRef?: React.RefObject<HTMLDivElement>
footerRef?: React.RefObject<HTMLDivElement>
scrollable?: boolean
onEscapeKeyDown: (event: KeyboardEvent) => void
onOpenAutoFocus: (event: Event) => void
}
const DialogContent = React.forwardRef<HTMLDivElement, Props>(function Dialog(
{ scrollable, children, ...props },
{ scrollable, wrapperClassName, headerRef, footerRef, children, ...props },
forwardedRef
) {
// Classes
@ -37,12 +37,12 @@ const DialogContent = React.forwardRef<HTMLDivElement, Props>(function Dialog(
const scrollHeight = event.currentTarget.scrollHeight
const clientHeight = event.currentTarget.clientHeight
if (props.headerref && props.headerref.current)
manipulateHeaderShadow(props.headerref.current, scrollTop)
if (headerRef && headerRef.current)
manipulateHeaderShadow(headerRef.current, scrollTop)
if (props.footerref && props.footerref.current)
if (footerRef && footerRef.current)
manipulateFooterShadow(
props.footerref.current,
footerRef.current,
scrollTop,
scrollHeight,
clientHeight
@ -94,7 +94,7 @@ const DialogContent = React.forwardRef<HTMLDivElement, Props>(function Dialog(
const calculateFooterShadow = debounce(() => {
const boxShadowBase = '0 -2px 8px'
const scrollable = document.querySelector(`.${styles.scrollable}`)
const footer = props.footerref
const footer = footerRef
if (footer && footer.current) {
if (scrollable && scrollable.clientHeight >= scrollable.scrollHeight) {
@ -133,9 +133,7 @@ const DialogContent = React.forwardRef<HTMLDivElement, Props>(function Dialog(
{
[styles.dialog]: true,
},
props.wrapperClassName
?.split(' ')
.map((className) => styles[className])
wrapperClassName?.split(' ').map((className) => styles[className])
)}
>
<DialogPrimitive.Content

2
components/search/SearchModal/index.tsx
View file

@ -412,7 +412,7 @@ const SearchModal = (props: Props) => {
<DialogTrigger asChild>{props.children}</DialogTrigger>
<DialogContent
className="search"
headerref={headerRef}
headerRef={headerRef}
scrollable={false}
onEscapeKeyDown={onEscapeKeyDown}
onOpenAutoFocus={onOpenAutoFocus}

2
components/weapon/WeaponConflictModal/index.tsx
View file

@ -71,7 +71,7 @@ const WeaponConflictModal = (props: Props) => {
<Dialog open={open} onOpenChange={openChange}>
<DialogContent
className="conflict"
footerref={footerRef}
footerRef={footerRef}
onOpenAutoFocus={(event) => event.preventDefault()}
onEscapeKeyDown={close}
>

4
components/weapon/WeaponModal/index.tsx
View file

@ -469,8 +469,8 @@ const WeaponModal = ({
<DialogTrigger asChild>{children}</DialogTrigger>
<DialogContent
className="Weapon"
headerref={headerRef}
footerref={footerRef}
headerRef={headerRef}
footerRef={footerRef}
onOpenAutoFocus={(event) => event.preventDefault()}
onEscapeKeyDown={onEscapeKeyDown}
>