prevent ShortcutsModal bouncing offset

This commit is contained in:
Sanster 2022-04-07 21:38:10 +08:00
parent 1812928887
commit c3315a2d2b
3 changed files with 16 additions and 6 deletions

View File

@ -1,7 +1,7 @@
import React, { ReactNode } from 'react' import React, { ReactNode } from 'react'
import { useSetRecoilState } from 'recoil' import { useSetRecoilState } from 'recoil'
import { shortcutsState } from '../../store/Atoms' import { shortcutsState } from '../../store/Atoms'
import Modal from '../shared/Modal' import Modal, { ModalProps } from '../shared/Modal'
interface Shortcut { interface Shortcut {
children: ReactNode children: ReactNode
@ -19,7 +19,12 @@ function ShortCut(props: Shortcut) {
) )
} }
export default function ShortcutsModal() { interface ShortcutsModalProps {
show: boolean
}
export default function ShortcutsModal(props: ShortcutsModalProps) {
const { show } = props
const setShortcutState = useSetRecoilState(shortcutsState) const setShortcutState = useSetRecoilState(shortcutsState)
const shortcutStateHandler = () => { const shortcutStateHandler = () => {
@ -31,6 +36,7 @@ export default function ShortcutsModal() {
onClose={shortcutStateHandler} onClose={shortcutStateHandler}
title="Hotkeys" title="Hotkeys"
className="modal-shortcuts" className="modal-shortcuts"
show={show}
> >
<div className="shortcut-options"> <div className="shortcut-options">
<ShortCut content="Enable multi-stroke mask drawing"> <ShortCut content="Enable multi-stroke mask drawing">

View File

@ -13,7 +13,7 @@ const Workspace = ({ file }: WorkspaceProps) => {
return ( return (
<> <>
<Editor file={file} /> <Editor file={file} />
{shortcutVisbility ? <ShortcutsModal /> : null} <ShortcutsModal show={shortcutVisbility} />
</> </>
) )
} }

View File

@ -3,7 +3,8 @@ import React, { ReactNode, useRef } from 'react'
import { useClickAway, useKey } from 'react-use' import { useClickAway, useKey } from 'react-use'
import Button from './Button' import Button from './Button'
interface ModalProps { export interface ModalProps {
show: boolean
children?: ReactNode children?: ReactNode
onClose?: () => void onClose?: () => void
title: string title: string
@ -11,7 +12,7 @@ interface ModalProps {
} }
export default function Modal(props: ModalProps) { export default function Modal(props: ModalProps) {
const { children, onClose, className, title } = props const { show, children, onClose, className, title } = props
const ref = useRef(null) const ref = useRef(null)
useClickAway(ref, () => { useClickAway(ref, () => {
@ -23,7 +24,10 @@ export default function Modal(props: ModalProps) {
}) })
return ( return (
<div className="modal-mask"> <div
className="modal-mask"
style={{ visibility: show === true ? 'visible' : 'hidden' }}
>
<div ref={ref} className={`modal ${className}`}> <div ref={ref} className={`modal ${className}`}>
<div className="modal-header"> <div className="modal-header">
<h3>{title}</h3> <h3>{title}</h3>