treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix scroll handling with modals

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Claire 2021-07-13 11:07:16 +02:00
parent 6e3d5cbca2
commit 99f28c17de
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/flavours/glitch/components/scrollable_list.js
View File

@ -265,8 +265,7 @@ class ScrollableList extends PureComponent {
} }
defaultShouldUpdateScroll = (prevRouterProps, { location }) => { defaultShouldUpdateScroll = (prevRouterProps, { location }) => {
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false; return !(prevRouterProps?.location?.state?.mastodonModalKey || location.state?.mastodonModalKey);
return !(location.state && location.state.mastodonModalOpen);
} }
handleLoadPending = e => { handleLoadPending = e => {

2
app/javascript/flavours/glitch/components/status_action_bar.js
View File

@ -147,7 +147,7 @@ class StatusActionBar extends ImmutablePureComponent {
handleOpen = () => { handleOpen = () => {
let state = {...this.context.router.history.location.state}; let state = {...this.context.router.history.location.state};
if (state.mastodonModalOpen) { if (state.mastodonModalKey) {
this.context.router.history.replace(`/statuses/${this.props.status.get('id')}`, { mastodonBackSteps: (state.mastodonBackSteps || 0) + 1 }); this.context.router.history.replace(`/statuses/${this.props.status.get('id')}`, { mastodonBackSteps: (state.mastodonBackSteps || 0) + 1 });
} else { } else {
state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1; state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;

2
app/javascript/flavours/glitch/containers/mastodon.js
View File

@ -41,7 +41,7 @@ export default class Mastodon extends React.PureComponent {
} }
shouldUpdateScroll (_, { location }) { shouldUpdateScroll (_, { location }) {
return !(location.state && location.state.mastodonModalOpen); return !(location.state?.mastodonModalKey);
} }
render () { render () {

3
app/javascript/flavours/glitch/features/account_gallery/index.js
View File

@ -105,8 +105,7 @@ class AccountGallery extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false; return !(prevRouterProps?.location?.state?.mastodonModalKey || location.state?.mastodonModalKey);
return !(location.state && location.state.mastodonModalOpen);
} }
setColumnRef = c => { setColumnRef = c => {

3
app/javascript/flavours/glitch/features/status/index.js
View File

@ -508,8 +508,7 @@ class Status extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false; return !(prevRouterProps?.location?.state?.mastodonModalKey || location.state?.mastodonModalKey);
return !(location.state && location.state.mastodonModalOpen);
} }
render () { render () {