mirrors/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2024-12-23 09:30:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Updated ScrollTop component so that it gets the window object injected as a dependency

Browse source
This commit is contained in:
Alejandro Celaya 2018-12-21 10:38:35 +01:00
parent 16cf30f26f
commit 047d99be6d
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
jest.config.js
View file

@ -4,6 +4,7 @@ module.exports = {
'src/**/*.js', 'src/**/*.js',
'!src/registerServiceWorker.js', '!src/registerServiceWorker.js',
'!src/index.js', '!src/index.js',
'!src/reducers/index.js',
'!src/**/provideServices.js', '!src/**/provideServices.js',
'!src/container/*.js', '!src/container/*.js',
], ],

14
src/common/ScrollToTop.js
View file

@ -1,20 +1,14 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
export default class ScrollToTop extends React.Component { const ScrollToTop = (window) => class ScrollToTop extends React.Component {
static propTypes = { static propTypes = {
location: PropTypes.object, location: PropTypes.object,
window: PropTypes.shape({
scrollTo: PropTypes.func,
}),
children: PropTypes.node, children: PropTypes.node,
}; };
static defaultProps = {
window: global.window,
};
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
const { location, window } = this.props; const { location } = this.props;
if (location !== prevProps.location) { if (location !== prevProps.location) {
window.scrollTo(0, 0); window.scrollTo(0, 0);
@ -24,4 +18,6 @@ export default class ScrollToTop extends React.Component {
render() { render() {
return this.props.children; return this.props.children;
} }
} };
export default ScrollToTop;

4
src/common/services/provideServices.js
View file

@ -5,7 +5,9 @@ import MenuLayout from '../MenuLayout';
import AsideMenu from '../AsideMenu'; import AsideMenu from '../AsideMenu';
const provideServices = (bottle, connect, withRouter) => { const provideServices = (bottle, connect, withRouter) => {
bottle.constant('ScrollToTop', ScrollToTop); bottle.constant('window', global.window);
bottle.serviceFactory('ScrollToTop', ScrollToTop, 'window');
bottle.decorator('ScrollToTop', withRouter); bottle.decorator('ScrollToTop', withRouter);
bottle.serviceFactory('MainHeader', MainHeader, 'ServersDropdown'); bottle.serviceFactory('MainHeader', MainHeader, 'ServersDropdown');

1
src/servers/services/provideServices.js
View file

@ -29,7 +29,6 @@ const provideServices = (bottle, connect, withRouter) => {
// Services // Services
bottle.constant('csvjson', csvjson); bottle.constant('csvjson', csvjson);
bottle.constant('window', global.window);
bottle.service('ServersImporter', ServersImporter, 'csvjson'); bottle.service('ServersImporter', ServersImporter, 'csvjson');
bottle.service('ServersService', ServersService, 'Storage'); bottle.service('ServersService', ServersService, 'Storage');
bottle.service('ServersExporter', ServersExporter, 'ServersService', 'window', 'csvjson'); bottle.service('ServersExporter', ServersExporter, 'ServersService', 'window', 'csvjson');