Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
8980aa80
Commit
8980aa80
authored
7 years ago
by
Nolan Lawson
Committed by
Eugen Rochko
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix reduced motion breaking public galleries (#5423)
parent
34118169
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/javascript/mastodon/features/ui/util/optional_motion.js
+40
-18
40 additions, 18 deletions
app/javascript/mastodon/features/ui/util/optional_motion.js
app/views/layouts/application.html.haml
+1
-0
1 addition, 0 deletions
app/views/layouts/application.html.haml
with
41 additions
and
18 deletions
app/javascript/mastodon/features/ui/util/optional_motion.js
+
40
−
18
View file @
8980aa80
// Like react-motion's Motion, but checks to see if the user prefers
// reduced motion and uses a cross-fade in those cases.
import
React
from
'
react
'
;
import
Motion
from
'
react-motion/lib/Motion
'
;
import
{
connect
}
from
'
react-redux
'
;
import
PropTypes
from
'
prop-types
'
;
const
stylesToKeep
=
[
'
opacity
'
,
'
backgroundOpacity
'
];
let
reduceMotion
;
const
extractValue
=
(
value
)
=>
{
// This is either an object with a "val" property or it's a number
return
(
typeof
value
===
'
object
'
&&
value
&&
'
val
'
in
value
)
?
value
.
val
:
value
;
};
const
mapStateToProps
=
(
state
,
ownProps
)
=>
{
const
reduceMotion
=
state
.
getIn
([
'
meta
'
,
'
reduce_motion
'
]);
if
(
reduceMotion
)
{
const
{
style
,
defaultStyle
}
=
ownProps
;
class
OptionalMotion
extends
React
.
Component
{
Object
.
keys
(
style
).
forEach
(
key
=>
{
if
(
stylesToKeep
.
includes
(
key
))
{
return
;
}
// If it's setting an x or height or scale or some other value, we need
// to preserve the end-state value without actually animating it
style
[
key
]
=
defaultStyle
[
key
]
=
extractValue
(
style
[
key
]);
});
static
propTypes
=
{
defaultStyle
:
PropTypes
.
object
,
style
:
PropTypes
.
object
,
children
:
PropTypes
.
func
,
}
return
{
style
,
defaultStyle
};
render
()
{
const
{
style
,
defaultStyle
,
children
}
=
this
.
props
;
if
(
typeof
reduceMotion
!==
'
boolean
'
)
{
// This never changes without a page reload, so we can just grab it
// once from the body classes as opposed to using Redux's connect(),
// which would unnecessarily update every state change
reduceMotion
=
document
.
body
.
classList
.
contains
(
'
reduce-motion
'
);
}
if
(
reduceMotion
)
{
Object
.
keys
(
style
).
forEach
(
key
=>
{
if
(
stylesToKeep
.
includes
(
key
))
{
return
;
}
// If it's setting an x or height or scale or some other value, we need
// to preserve the end-state value without actually animating it
style
[
key
]
=
defaultStyle
[
key
]
=
extractValue
(
style
[
key
]);
});
}
return
(
<
Motion
style
=
{
style
}
defaultStyle
=
{
defaultStyle
}
>
{
children
}
<
/Motion
>
);
}
return
{};
};
export
default
connect
(
mapStateToProps
)(
Motion
);
}
export
default
OptionalMotion
;
This diff is collapsed.
Click to expand it.
app/views/layouts/application.html.haml
+
1
−
0
View file @
8980aa80
...
...
@@ -27,6 +27,7 @@
=
yield
:header_tags
-
body_classes
||=
@body_classes
||
''
-
body_classes
+=
' reduce-motion'
if
current_account
&
.
user
&
.
setting_reduce_motion
-
body_classes
+=
' system-font'
if
current_account
&
.
user
&
.
setting_system_font_ui
%body
{
class:
add_rtl_body_class
(
body_classes
)
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment