Skip to content

[APT-1675] Don't scroll page on modal cancel #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 19, 2022
Merged

[APT-1675] Don't scroll page on modal cancel #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/components/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@ export const SubscriptionNoticeModal: React.FC<ModalProps> = ({
handleCancelRequest,
handleAcceptRequest,
}) => {
const onRequestClose = () => {
const onRequestClose = (e) => {
// If the user checked to never see this notice but subsequently cancels we will disregard their selection. We will
// only stop showing this notice if they check the box and then proceed to GitHub
if(window.localStorage.getItem(DONT_SHOW_PRIVATE_GITHUB_WARNING_KEY)) {
if (window.localStorage.getItem(DONT_SHOW_PRIVATE_GITHUB_WARNING_KEY)) {
window.localStorage.removeItem(DONT_SHOW_PRIVATE_GITHUB_WARNING_KEY)
}

handleCancelRequest()

// prevent the browser from handling a Cancel button click and scrolling to top
e.preventDefault()
}

const gitHubRepoName = externalLink.match(
Expand Down Expand Up @@ -86,7 +89,7 @@ export const SubscriptionNoticeModal: React.FC<ModalProps> = ({

const setDontWarnMe = (event) => {
event.stopPropagation()
if(!window.localStorage.getItem(DONT_SHOW_PRIVATE_GITHUB_WARNING_KEY)) {
if (!window.localStorage.getItem(DONT_SHOW_PRIVATE_GITHUB_WARNING_KEY)) {
window.localStorage.setItem(DONT_SHOW_PRIVATE_GITHUB_WARNING_KEY, "true")
} else {
window.localStorage.removeItem(DONT_SHOW_PRIVATE_GITHUB_WARNING_KEY)
Expand Down Expand Up @@ -117,7 +120,7 @@ export const SubscriptionNoticeModal: React.FC<ModalProps> = ({
<label>Don't warn me again</label>
</div>
<div className={styles.buttonsContainer}>
<a onClick={() => onRequestClose()} href="#">
<a onClick={(e) => onRequestClose(e)} href="#">
Cancel
</a>
<a id={idOfNoticeLink} href={externalLink} target="_blank">
Expand Down