react-router-dom 4.1.1 → 4.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/BrowserRouter.js +12 -2
- package/HashRouter.js +12 -2
- package/Link.js +11 -3
- package/MemoryRouter.js +7 -8
- package/NavLink.js +13 -7
- package/Prompt.js +7 -8
- package/Redirect.js +7 -8
- package/Route.js +7 -8
- package/Router.js +7 -8
- package/StaticRouter.js +7 -8
- package/Switch.js +7 -8
- package/es/BrowserRouter.js +6 -1
- package/es/HashRouter.js +6 -1
- package/es/Link.js +8 -3
- package/es/MemoryRouter.js +4 -1
- package/es/NavLink.js +10 -6
- package/es/Prompt.js +4 -1
- package/es/Redirect.js +4 -1
- package/es/Route.js +4 -1
- package/es/Router.js +4 -1
- package/es/StaticRouter.js +4 -1
- package/es/Switch.js +4 -1
- package/es/matchPath.js +4 -1
- package/es/withRouter.js +4 -1
- package/matchPath.js +7 -8
- package/package.json +25 -27
- package/umd/react-router-dom.js +4647 -3951
- package/umd/react-router-dom.min.js +1 -2
- package/withRouter.js +7 -8
package/BrowserRouter.js
CHANGED
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
+
var _warning = require('warning');
|
|
6
|
+
|
|
7
|
+
var _warning2 = _interopRequireDefault(_warning);
|
|
8
|
+
|
|
5
9
|
var _react = require('react');
|
|
6
10
|
|
|
7
11
|
var _react2 = _interopRequireDefault(_react);
|
|
@@ -14,7 +18,9 @@ var _createBrowserHistory = require('history/createBrowserHistory');
|
|
|
14
18
|
|
|
15
19
|
var _createBrowserHistory2 = _interopRequireDefault(_createBrowserHistory);
|
|
16
20
|
|
|
17
|
-
var
|
|
21
|
+
var _Router = require('./Router');
|
|
22
|
+
|
|
23
|
+
var _Router2 = _interopRequireDefault(_Router);
|
|
18
24
|
|
|
19
25
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
20
26
|
|
|
@@ -42,8 +48,12 @@ var BrowserRouter = function (_React$Component) {
|
|
|
42
48
|
return _ret = (_temp = (_this = _possibleConstructorReturn(this, _React$Component.call.apply(_React$Component, [this].concat(args))), _this), _this.history = (0, _createBrowserHistory2.default)(_this.props), _temp), _possibleConstructorReturn(_this, _ret);
|
|
43
49
|
}
|
|
44
50
|
|
|
51
|
+
BrowserRouter.prototype.componentWillMount = function componentWillMount() {
|
|
52
|
+
(0, _warning2.default)(!this.props.history, '<BrowserRouter> ignores the history prop. To use a custom history, ' + 'use `import { Router }` instead of `import { BrowserRouter as Router }`.');
|
|
53
|
+
};
|
|
54
|
+
|
|
45
55
|
BrowserRouter.prototype.render = function render() {
|
|
46
|
-
return _react2.default.createElement(
|
|
56
|
+
return _react2.default.createElement(_Router2.default, { history: this.history, children: this.props.children });
|
|
47
57
|
};
|
|
48
58
|
|
|
49
59
|
return BrowserRouter;
|
package/HashRouter.js
CHANGED
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
+
var _warning = require('warning');
|
|
6
|
+
|
|
7
|
+
var _warning2 = _interopRequireDefault(_warning);
|
|
8
|
+
|
|
5
9
|
var _react = require('react');
|
|
6
10
|
|
|
7
11
|
var _react2 = _interopRequireDefault(_react);
|
|
@@ -14,7 +18,9 @@ var _createHashHistory = require('history/createHashHistory');
|
|
|
14
18
|
|
|
15
19
|
var _createHashHistory2 = _interopRequireDefault(_createHashHistory);
|
|
16
20
|
|
|
17
|
-
var
|
|
21
|
+
var _Router = require('./Router');
|
|
22
|
+
|
|
23
|
+
var _Router2 = _interopRequireDefault(_Router);
|
|
18
24
|
|
|
19
25
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
20
26
|
|
|
@@ -42,8 +48,12 @@ var HashRouter = function (_React$Component) {
|
|
|
42
48
|
return _ret = (_temp = (_this = _possibleConstructorReturn(this, _React$Component.call.apply(_React$Component, [this].concat(args))), _this), _this.history = (0, _createHashHistory2.default)(_this.props), _temp), _possibleConstructorReturn(_this, _ret);
|
|
43
49
|
}
|
|
44
50
|
|
|
51
|
+
HashRouter.prototype.componentWillMount = function componentWillMount() {
|
|
52
|
+
(0, _warning2.default)(!this.props.history, '<HashRouter> ignores the history prop. To use a custom history, ' + 'use `import { Router }` instead of `import { HashRouter as Router }`.');
|
|
53
|
+
};
|
|
54
|
+
|
|
45
55
|
HashRouter.prototype.render = function render() {
|
|
46
|
-
return _react2.default.createElement(
|
|
56
|
+
return _react2.default.createElement(_Router2.default, { history: this.history, children: this.props.children });
|
|
47
57
|
};
|
|
48
58
|
|
|
49
59
|
return HashRouter;
|
package/Link.js
CHANGED
|
@@ -12,6 +12,10 @@ var _propTypes = require('prop-types');
|
|
|
12
12
|
|
|
13
13
|
var _propTypes2 = _interopRequireDefault(_propTypes);
|
|
14
14
|
|
|
15
|
+
var _invariant = require('invariant');
|
|
16
|
+
|
|
17
|
+
var _invariant2 = _interopRequireDefault(_invariant);
|
|
18
|
+
|
|
15
19
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
16
20
|
|
|
17
21
|
function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
|
|
@@ -71,11 +75,14 @@ var Link = function (_React$Component) {
|
|
|
71
75
|
var _props = this.props,
|
|
72
76
|
replace = _props.replace,
|
|
73
77
|
to = _props.to,
|
|
74
|
-
|
|
78
|
+
innerRef = _props.innerRef,
|
|
79
|
+
props = _objectWithoutProperties(_props, ['replace', 'to', 'innerRef']); // eslint-disable-line no-unused-vars
|
|
80
|
+
|
|
81
|
+
(0, _invariant2.default)(this.context.router, 'You should not use <Link> outside a <Router>');
|
|
75
82
|
|
|
76
83
|
var href = this.context.router.history.createHref(typeof to === 'string' ? { pathname: to } : to);
|
|
77
84
|
|
|
78
|
-
return _react2.default.createElement('a', _extends({}, props, { onClick: this.handleClick, href: href }));
|
|
85
|
+
return _react2.default.createElement('a', _extends({}, props, { onClick: this.handleClick, href: href, ref: innerRef }));
|
|
79
86
|
};
|
|
80
87
|
|
|
81
88
|
return Link;
|
|
@@ -85,7 +92,8 @@ Link.propTypes = {
|
|
|
85
92
|
onClick: _propTypes2.default.func,
|
|
86
93
|
target: _propTypes2.default.string,
|
|
87
94
|
replace: _propTypes2.default.bool,
|
|
88
|
-
to: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.object]).isRequired
|
|
95
|
+
to: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.object]).isRequired,
|
|
96
|
+
innerRef: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.func])
|
|
89
97
|
};
|
|
90
98
|
Link.defaultProps = {
|
|
91
99
|
replace: false
|
package/MemoryRouter.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
});
|
|
5
|
+
var _MemoryRouter = require('react-router/MemoryRouter');
|
|
6
|
+
|
|
7
|
+
var _MemoryRouter2 = _interopRequireDefault(_MemoryRouter);
|
|
8
|
+
|
|
9
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
+
|
|
11
|
+
exports.default = _MemoryRouter2.default; // Written in this round about way for babel-transform-imports
|
package/NavLink.js
CHANGED
|
@@ -14,7 +14,9 @@ var _propTypes = require('prop-types');
|
|
|
14
14
|
|
|
15
15
|
var _propTypes2 = _interopRequireDefault(_propTypes);
|
|
16
16
|
|
|
17
|
-
var
|
|
17
|
+
var _Route = require('./Route');
|
|
18
|
+
|
|
19
|
+
var _Route2 = _interopRequireDefault(_Route);
|
|
18
20
|
|
|
19
21
|
var _Link = require('./Link');
|
|
20
22
|
|
|
@@ -37,9 +39,10 @@ var NavLink = function NavLink(_ref) {
|
|
|
37
39
|
activeStyle = _ref.activeStyle,
|
|
38
40
|
style = _ref.style,
|
|
39
41
|
getIsActive = _ref.isActive,
|
|
40
|
-
|
|
42
|
+
ariaCurrent = _ref.ariaCurrent,
|
|
43
|
+
rest = _objectWithoutProperties(_ref, ['to', 'exact', 'strict', 'location', 'activeClassName', 'className', 'activeStyle', 'style', 'isActive', 'ariaCurrent']);
|
|
41
44
|
|
|
42
|
-
return _react2.default.createElement(
|
|
45
|
+
return _react2.default.createElement(_Route2.default, {
|
|
43
46
|
path: (typeof to === 'undefined' ? 'undefined' : _typeof(to)) === 'object' ? to.pathname : to,
|
|
44
47
|
exact: exact,
|
|
45
48
|
strict: strict,
|
|
@@ -52,10 +55,11 @@ var NavLink = function NavLink(_ref) {
|
|
|
52
55
|
|
|
53
56
|
return _react2.default.createElement(_Link2.default, _extends({
|
|
54
57
|
to: to,
|
|
55
|
-
className: isActive ? [
|
|
58
|
+
className: isActive ? [className, activeClassName].filter(function (i) {
|
|
56
59
|
return i;
|
|
57
60
|
}).join(' ') : className,
|
|
58
|
-
style: isActive ? _extends({}, style, activeStyle) : style
|
|
61
|
+
style: isActive ? _extends({}, style, activeStyle) : style,
|
|
62
|
+
'aria-current': isActive && ariaCurrent
|
|
59
63
|
}, rest));
|
|
60
64
|
}
|
|
61
65
|
});
|
|
@@ -70,11 +74,13 @@ NavLink.propTypes = {
|
|
|
70
74
|
className: _propTypes2.default.string,
|
|
71
75
|
activeStyle: _propTypes2.default.object,
|
|
72
76
|
style: _propTypes2.default.object,
|
|
73
|
-
isActive: _propTypes2.default.func
|
|
77
|
+
isActive: _propTypes2.default.func,
|
|
78
|
+
ariaCurrent: _propTypes2.default.oneOf(['page', 'step', 'location', 'true'])
|
|
74
79
|
};
|
|
75
80
|
|
|
76
81
|
NavLink.defaultProps = {
|
|
77
|
-
activeClassName: 'active'
|
|
82
|
+
activeClassName: 'active',
|
|
83
|
+
ariaCurrent: 'true'
|
|
78
84
|
};
|
|
79
85
|
|
|
80
86
|
exports.default = NavLink;
|
package/Prompt.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
});
|
|
5
|
+
var _Prompt = require('react-router/Prompt');
|
|
6
|
+
|
|
7
|
+
var _Prompt2 = _interopRequireDefault(_Prompt);
|
|
8
|
+
|
|
9
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
+
|
|
11
|
+
exports.default = _Prompt2.default; // Written in this round about way for babel-transform-imports
|
package/Redirect.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
});
|
|
5
|
+
var _Redirect = require('react-router/Redirect');
|
|
6
|
+
|
|
7
|
+
var _Redirect2 = _interopRequireDefault(_Redirect);
|
|
8
|
+
|
|
9
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
+
|
|
11
|
+
exports.default = _Redirect2.default; // Written in this round about way for babel-transform-imports
|
package/Route.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
});
|
|
5
|
+
var _Route = require('react-router/Route');
|
|
6
|
+
|
|
7
|
+
var _Route2 = _interopRequireDefault(_Route);
|
|
8
|
+
|
|
9
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
+
|
|
11
|
+
exports.default = _Route2.default; // Written in this round about way for babel-transform-imports
|
package/Router.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
});
|
|
5
|
+
var _Router = require('react-router/Router');
|
|
6
|
+
|
|
7
|
+
var _Router2 = _interopRequireDefault(_Router);
|
|
8
|
+
|
|
9
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
+
|
|
11
|
+
exports.default = _Router2.default; // Written in this round about way for babel-transform-imports
|
package/StaticRouter.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
});
|
|
5
|
+
var _StaticRouter = require('react-router/StaticRouter');
|
|
6
|
+
|
|
7
|
+
var _StaticRouter2 = _interopRequireDefault(_StaticRouter);
|
|
8
|
+
|
|
9
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
+
|
|
11
|
+
exports.default = _StaticRouter2.default; // Written in this round about way for babel-transform-imports
|
package/Switch.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
});
|
|
5
|
+
var _Switch = require('react-router/Switch');
|
|
6
|
+
|
|
7
|
+
var _Switch2 = _interopRequireDefault(_Switch);
|
|
8
|
+
|
|
9
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
+
|
|
11
|
+
exports.default = _Switch2.default; // Written in this round about way for babel-transform-imports
|
package/es/BrowserRouter.js
CHANGED
|
@@ -4,10 +4,11 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
|
|
|
4
4
|
|
|
5
5
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
|
|
6
6
|
|
|
7
|
+
import warning from 'warning';
|
|
7
8
|
import React from 'react';
|
|
8
9
|
import PropTypes from 'prop-types';
|
|
9
10
|
import createHistory from 'history/createBrowserHistory';
|
|
10
|
-
import
|
|
11
|
+
import Router from './Router';
|
|
11
12
|
|
|
12
13
|
/**
|
|
13
14
|
* The public API for a <Router> that uses HTML5 history.
|
|
@@ -28,6 +29,10 @@ var BrowserRouter = function (_React$Component) {
|
|
|
28
29
|
return _ret = (_temp = (_this = _possibleConstructorReturn(this, _React$Component.call.apply(_React$Component, [this].concat(args))), _this), _this.history = createHistory(_this.props), _temp), _possibleConstructorReturn(_this, _ret);
|
|
29
30
|
}
|
|
30
31
|
|
|
32
|
+
BrowserRouter.prototype.componentWillMount = function componentWillMount() {
|
|
33
|
+
warning(!this.props.history, '<BrowserRouter> ignores the history prop. To use a custom history, ' + 'use `import { Router }` instead of `import { BrowserRouter as Router }`.');
|
|
34
|
+
};
|
|
35
|
+
|
|
31
36
|
BrowserRouter.prototype.render = function render() {
|
|
32
37
|
return React.createElement(Router, { history: this.history, children: this.props.children });
|
|
33
38
|
};
|
package/es/HashRouter.js
CHANGED
|
@@ -4,10 +4,11 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
|
|
|
4
4
|
|
|
5
5
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
|
|
6
6
|
|
|
7
|
+
import warning from 'warning';
|
|
7
8
|
import React from 'react';
|
|
8
9
|
import PropTypes from 'prop-types';
|
|
9
10
|
import createHistory from 'history/createHashHistory';
|
|
10
|
-
import
|
|
11
|
+
import Router from './Router';
|
|
11
12
|
|
|
12
13
|
/**
|
|
13
14
|
* The public API for a <Router> that uses window.location.hash.
|
|
@@ -28,6 +29,10 @@ var HashRouter = function (_React$Component) {
|
|
|
28
29
|
return _ret = (_temp = (_this = _possibleConstructorReturn(this, _React$Component.call.apply(_React$Component, [this].concat(args))), _this), _this.history = createHistory(_this.props), _temp), _possibleConstructorReturn(_this, _ret);
|
|
29
30
|
}
|
|
30
31
|
|
|
32
|
+
HashRouter.prototype.componentWillMount = function componentWillMount() {
|
|
33
|
+
warning(!this.props.history, '<HashRouter> ignores the history prop. To use a custom history, ' + 'use `import { Router }` instead of `import { HashRouter as Router }`.');
|
|
34
|
+
};
|
|
35
|
+
|
|
31
36
|
HashRouter.prototype.render = function render() {
|
|
32
37
|
return React.createElement(Router, { history: this.history, children: this.props.children });
|
|
33
38
|
};
|
package/es/Link.js
CHANGED
|
@@ -10,6 +10,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
|
|
|
10
10
|
|
|
11
11
|
import React from 'react';
|
|
12
12
|
import PropTypes from 'prop-types';
|
|
13
|
+
import invariant from 'invariant';
|
|
13
14
|
|
|
14
15
|
var isModifiedEvent = function isModifiedEvent(event) {
|
|
15
16
|
return !!(event.metaKey || event.altKey || event.ctrlKey || event.shiftKey);
|
|
@@ -60,11 +61,14 @@ var Link = function (_React$Component) {
|
|
|
60
61
|
var _props = this.props,
|
|
61
62
|
replace = _props.replace,
|
|
62
63
|
to = _props.to,
|
|
63
|
-
|
|
64
|
+
innerRef = _props.innerRef,
|
|
65
|
+
props = _objectWithoutProperties(_props, ['replace', 'to', 'innerRef']); // eslint-disable-line no-unused-vars
|
|
66
|
+
|
|
67
|
+
invariant(this.context.router, 'You should not use <Link> outside a <Router>');
|
|
64
68
|
|
|
65
69
|
var href = this.context.router.history.createHref(typeof to === 'string' ? { pathname: to } : to);
|
|
66
70
|
|
|
67
|
-
return React.createElement('a', _extends({}, props, { onClick: this.handleClick, href: href }));
|
|
71
|
+
return React.createElement('a', _extends({}, props, { onClick: this.handleClick, href: href, ref: innerRef }));
|
|
68
72
|
};
|
|
69
73
|
|
|
70
74
|
return Link;
|
|
@@ -74,7 +78,8 @@ Link.propTypes = {
|
|
|
74
78
|
onClick: PropTypes.func,
|
|
75
79
|
target: PropTypes.string,
|
|
76
80
|
replace: PropTypes.bool,
|
|
77
|
-
to: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired
|
|
81
|
+
to: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,
|
|
82
|
+
innerRef: PropTypes.oneOfType([PropTypes.string, PropTypes.func])
|
|
78
83
|
};
|
|
79
84
|
Link.defaultProps = {
|
|
80
85
|
replace: false
|
package/es/MemoryRouter.js
CHANGED
package/es/NavLink.js
CHANGED
|
@@ -6,7 +6,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
|
|
|
6
6
|
|
|
7
7
|
import React from 'react';
|
|
8
8
|
import PropTypes from 'prop-types';
|
|
9
|
-
import
|
|
9
|
+
import Route from './Route';
|
|
10
10
|
import Link from './Link';
|
|
11
11
|
|
|
12
12
|
/**
|
|
@@ -22,7 +22,8 @@ var NavLink = function NavLink(_ref) {
|
|
|
22
22
|
activeStyle = _ref.activeStyle,
|
|
23
23
|
style = _ref.style,
|
|
24
24
|
getIsActive = _ref.isActive,
|
|
25
|
-
|
|
25
|
+
ariaCurrent = _ref.ariaCurrent,
|
|
26
|
+
rest = _objectWithoutProperties(_ref, ['to', 'exact', 'strict', 'location', 'activeClassName', 'className', 'activeStyle', 'style', 'isActive', 'ariaCurrent']);
|
|
26
27
|
|
|
27
28
|
return React.createElement(Route, {
|
|
28
29
|
path: (typeof to === 'undefined' ? 'undefined' : _typeof(to)) === 'object' ? to.pathname : to,
|
|
@@ -37,10 +38,11 @@ var NavLink = function NavLink(_ref) {
|
|
|
37
38
|
|
|
38
39
|
return React.createElement(Link, _extends({
|
|
39
40
|
to: to,
|
|
40
|
-
className: isActive ? [
|
|
41
|
+
className: isActive ? [className, activeClassName].filter(function (i) {
|
|
41
42
|
return i;
|
|
42
43
|
}).join(' ') : className,
|
|
43
|
-
style: isActive ? _extends({}, style, activeStyle) : style
|
|
44
|
+
style: isActive ? _extends({}, style, activeStyle) : style,
|
|
45
|
+
'aria-current': isActive && ariaCurrent
|
|
44
46
|
}, rest));
|
|
45
47
|
}
|
|
46
48
|
});
|
|
@@ -55,11 +57,13 @@ NavLink.propTypes = {
|
|
|
55
57
|
className: PropTypes.string,
|
|
56
58
|
activeStyle: PropTypes.object,
|
|
57
59
|
style: PropTypes.object,
|
|
58
|
-
isActive: PropTypes.func
|
|
60
|
+
isActive: PropTypes.func,
|
|
61
|
+
ariaCurrent: PropTypes.oneOf(['page', 'step', 'location', 'true'])
|
|
59
62
|
};
|
|
60
63
|
|
|
61
64
|
NavLink.defaultProps = {
|
|
62
|
-
activeClassName: 'active'
|
|
65
|
+
activeClassName: 'active',
|
|
66
|
+
ariaCurrent: 'true'
|
|
63
67
|
};
|
|
64
68
|
|
|
65
69
|
export default NavLink;
|
package/es/Prompt.js
CHANGED
package/es/Redirect.js
CHANGED
package/es/Route.js
CHANGED
package/es/Router.js
CHANGED
package/es/StaticRouter.js
CHANGED
package/es/Switch.js
CHANGED
package/es/matchPath.js
CHANGED
package/es/withRouter.js
CHANGED
package/matchPath.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
});
|
|
5
|
+
var _matchPath = require('react-router/matchPath');
|
|
6
|
+
|
|
7
|
+
var _matchPath2 = _interopRequireDefault(_matchPath);
|
|
8
|
+
|
|
9
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
|
+
|
|
11
|
+
exports.default = _matchPath2.default; // Written in this round about way for babel-transform-imports
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-router-dom",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.2",
|
|
4
4
|
"description": "DOM bindings for React Router",
|
|
5
5
|
"repository": "ReactTraining/react-router",
|
|
6
6
|
"license": "MIT",
|
|
@@ -20,10 +20,10 @@
|
|
|
20
20
|
"Router.js",
|
|
21
21
|
"StaticRouter.js",
|
|
22
22
|
"Switch.js",
|
|
23
|
+
"es",
|
|
23
24
|
"index.js",
|
|
24
25
|
"matchPath.js",
|
|
25
26
|
"withRouter.js",
|
|
26
|
-
"es",
|
|
27
27
|
"umd"
|
|
28
28
|
],
|
|
29
29
|
"main": "index.js",
|
|
@@ -31,49 +31,47 @@
|
|
|
31
31
|
"scripts": {
|
|
32
32
|
"build": "node ./tools/build.js",
|
|
33
33
|
"watch": "babel ./modules -d . --ignore __tests__ --watch",
|
|
34
|
-
"
|
|
34
|
+
"prepublishOnly": "node ./tools/build.js",
|
|
35
35
|
"clean": "git clean -fdX .",
|
|
36
36
|
"lint": "eslint modules",
|
|
37
|
-
"test": "
|
|
37
|
+
"test": "jest"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
|
-
"react": "
|
|
40
|
+
"react": ">=15"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"history": "^4.
|
|
43
|
+
"history": "^4.7.2",
|
|
44
|
+
"invariant": "^2.2.2",
|
|
44
45
|
"loose-envify": "^1.3.1",
|
|
45
46
|
"prop-types": "^15.5.4",
|
|
46
|
-
"react-router": "^4.
|
|
47
|
+
"react-router": "^4.2.0",
|
|
48
|
+
"warning": "^3.0.0"
|
|
47
49
|
},
|
|
48
50
|
"devDependencies": {
|
|
49
|
-
"babel-cli": "^6.
|
|
50
|
-
"babel-eslint": "^
|
|
51
|
-
"babel-loader": "^6.2.10",
|
|
51
|
+
"babel-cli": "^6.26.0",
|
|
52
|
+
"babel-eslint": "^7.2.3",
|
|
52
53
|
"babel-plugin-dev-expression": "^0.2.1",
|
|
53
|
-
"babel-plugin-
|
|
54
|
+
"babel-plugin-external-helpers": "^6.22.0",
|
|
55
|
+
"babel-plugin-transform-imports": "^1.2.0",
|
|
56
|
+
"babel-plugin-transform-react-remove-prop-types": "^0.4.8",
|
|
54
57
|
"babel-preset-es2015": "^6.14.0",
|
|
55
58
|
"babel-preset-react": "^6.5.0",
|
|
56
59
|
"babel-preset-stage-1": "^6.5.0",
|
|
57
|
-
"eslint": "^
|
|
58
|
-
"eslint-plugin-import": "^
|
|
59
|
-
"eslint-plugin-react": "^
|
|
60
|
-
"expect": "^1.20.1",
|
|
60
|
+
"eslint": "^4.5.0",
|
|
61
|
+
"eslint-plugin-import": "^2.2.0",
|
|
62
|
+
"eslint-plugin-react": "^7.3.0",
|
|
61
63
|
"gzip-size": "^3.0.0",
|
|
62
|
-
"
|
|
63
|
-
"
|
|
64
|
-
"karma-browserstack-launcher": "^1.0.1",
|
|
65
|
-
"karma-chrome-launcher": "^1.0.1",
|
|
66
|
-
"karma-mocha": "^1.0.1",
|
|
67
|
-
"karma-mocha-reporter": "^2.0.4",
|
|
68
|
-
"karma-sourcemap-loader": "^0.3.7",
|
|
69
|
-
"karma-webpack": "^1.7.0",
|
|
70
|
-
"mocha": "^2.5.3",
|
|
71
|
-
"pretty-bytes": "^3.0.1",
|
|
64
|
+
"jest": "^20.0.4",
|
|
65
|
+
"pretty-bytes": "^4.0.2",
|
|
72
66
|
"react": "^15.4.2",
|
|
73
67
|
"react-addons-test-utils": "^15.4.2",
|
|
74
68
|
"react-dom": "^15.3.0",
|
|
75
|
-
"
|
|
76
|
-
"
|
|
69
|
+
"rollup": "^0.48.2",
|
|
70
|
+
"rollup-plugin-babel": "^3.0.2",
|
|
71
|
+
"rollup-plugin-commonjs": "^8.2.0",
|
|
72
|
+
"rollup-plugin-node-resolve": "^3.0.0",
|
|
73
|
+
"rollup-plugin-replace": "^1.1.1",
|
|
74
|
+
"rollup-plugin-uglify": "^2.0.1"
|
|
77
75
|
},
|
|
78
76
|
"browserify": {
|
|
79
77
|
"transform": [
|