Change headerRef footerRef to be camelcase

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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