File tree Expand file tree Collapse file tree
app/javascript/mastodon/features/ui/components Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -110,6 +110,11 @@ class ColumnsArea extends ImmutablePureComponent {
110110 // React-router does this for us, but too late, feeling laggy.
111111 document . querySelector ( currentLinkSelector ) . classList . remove ( 'active' ) ;
112112 document . querySelector ( nextLinkSelector ) . classList . add ( 'active' ) ;
113+
114+ if ( ! this . state . shouldAnimate && typeof this . pendingIndex === 'number' ) {
115+ this . context . router . history . push ( getLink ( this . pendingIndex ) ) ;
116+ this . pendingIndex = null ;
117+ }
113118 }
114119
115120 handleAnimationEnd = ( ) => {
@@ -160,7 +165,6 @@ class ColumnsArea extends ImmutablePureComponent {
160165 const { shouldAnimate } = this . state ;
161166
162167 const columnIndex = getIndex ( this . context . router . history . location . pathname ) ;
163- this . pendingIndex = null ;
164168
165169 if ( singleColumn ) {
166170 const floatingActionButton = shouldHideFAB ( this . context . router . history . location . pathname ) ? null : < Link key = 'floating-action-button' to = '/statuses/new' className = 'floating-action-button' aria-label = { intl . formatMessage ( messages . publish ) } > < Icon id = 'pencil' /> </ Link > ;
You can’t perform that action at this time.
0 commit comments