swico 0.8.6 → 0.9.0-beta1
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/package.json
CHANGED
|
@@ -87,12 +87,13 @@ var getPathNameList = function (routes) {
|
|
|
87
87
|
};
|
|
88
88
|
exports.pathNameList = getPathNameList(routes_1.default);
|
|
89
89
|
var getLocation = function (originalHistory) {
|
|
90
|
-
var _a = originalHistory.location, pathname = _a.pathname, hash = _a.hash, search = _a.search;
|
|
90
|
+
var _a = originalHistory.location, pathname = _a.pathname, hash = _a.hash, search = _a.search, _b = _a.state, state = _b === void 0 ? {} : _b;
|
|
91
91
|
var routerBaseLength = formatRouterBase.length;
|
|
92
92
|
var path = pathname.slice(routerBaseLength);
|
|
93
93
|
var matchPathNameItem = exports.pathNameList.find(function (item) { return item.path === path || (0, exports.compareURLPatterns)(path, item.path); });
|
|
94
94
|
var params = interpolatePathParams(matchPathNameItem === null || matchPathNameItem === void 0 ? void 0 : matchPathNameItem.path, path);
|
|
95
95
|
return {
|
|
96
|
+
state: state,
|
|
96
97
|
hash: hash,
|
|
97
98
|
search: search,
|
|
98
99
|
pathname: pathname,
|
|
@@ -104,9 +105,10 @@ var getLocation = function (originalHistory) {
|
|
|
104
105
|
};
|
|
105
106
|
var getFormatHistoryOption = function (to, formatRouterBase, pathList, type) {
|
|
106
107
|
var _a;
|
|
107
|
-
var params = to.params, path = to.path, hash = to.hash, name = to.name, query = to.query;
|
|
108
|
+
var params = to.params, path = to.path, hash = to.hash, name = to.name, query = to.query, state = to.state;
|
|
108
109
|
var obj = {
|
|
109
110
|
hash: hash,
|
|
111
|
+
state: state,
|
|
110
112
|
search: query ? qs_1.default.stringify(query) : undefined
|
|
111
113
|
};
|
|
112
114
|
if (path) {
|
|
@@ -11,7 +11,7 @@ var useLocation = function () {
|
|
|
11
11
|
var _a, _b;
|
|
12
12
|
var location = (0, react_router_dom_1.useLocation)();
|
|
13
13
|
var params = (0, react_router_dom_1.useParams)();
|
|
14
|
-
var search = location.search, hash = location.hash, pathname = location.pathname;
|
|
14
|
+
var search = location.search, hash = location.hash, pathname = location.pathname, _c = location.state, state = _c === void 0 ? {} : _c;
|
|
15
15
|
var name = (_a = history_1.pathNameList.find(function (item) {
|
|
16
16
|
return (Object.keys(params).length > 0 && (0, history_1.compareURLPatterns)(pathname, item.path)) ||
|
|
17
17
|
item.path === pathname;
|
|
@@ -19,6 +19,7 @@ var useLocation = function () {
|
|
|
19
19
|
var query = search ? qs_1.default.parse(search.startsWith('?') ? search.slice(1) : search) : {};
|
|
20
20
|
return {
|
|
21
21
|
name: name,
|
|
22
|
+
state: state,
|
|
22
23
|
path: pathname,
|
|
23
24
|
pathname: (_b = window === null || window === void 0 ? void 0 : window.location) === null || _b === void 0 ? void 0 : _b.pathname,
|
|
24
25
|
search: '',
|
|
@@ -19,8 +19,8 @@ var getRouter = function () {
|
|
|
19
19
|
router.push(options);
|
|
20
20
|
}
|
|
21
21
|
else {
|
|
22
|
-
var query = options.query, name_1 = options.name, hash = options.hash, params = options.params, path = options.path;
|
|
23
|
-
router.push({ name: name_1, path: path, query: query, hash: hash, params: params });
|
|
22
|
+
var query = options.query, name_1 = options.name, hash = options.hash, params = options.params, path = options.path, state = options.state;
|
|
23
|
+
router.push({ name: name_1, path: path, query: query, hash: hash, params: params, state: state });
|
|
24
24
|
}
|
|
25
25
|
},
|
|
26
26
|
replace: function (options) {
|
|
@@ -28,17 +28,18 @@ var getRouter = function () {
|
|
|
28
28
|
router.replace(options);
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
|
-
var query = options.query, name_2 = options.name, hash = options.hash, params = options.params, path = options.path;
|
|
32
|
-
router.replace({ name: name_2, path: path, query: query, hash: hash, params: params });
|
|
31
|
+
var query = options.query, name_2 = options.name, hash = options.hash, params = options.params, path = options.path, state = options.state;
|
|
32
|
+
router.replace({ name: name_2, path: path, query: query, hash: hash, params: params, state: state });
|
|
33
33
|
}
|
|
34
34
|
},
|
|
35
35
|
go: router.go,
|
|
36
36
|
back: router.back,
|
|
37
37
|
forward: router.forward,
|
|
38
38
|
get location() {
|
|
39
|
+
var _a;
|
|
39
40
|
var lastIndexBase = config_1.routerBase[config_1.routerBase.length - 1];
|
|
40
41
|
var formatRouterBase = lastIndexBase === '/' ? config_1.routerBase.slice(0, config_1.routerBase.length - 1) : config_1.routerBase;
|
|
41
|
-
var
|
|
42
|
+
var _b = router.currentRoute.value, path = _b.path, params = _b.params, query = _b.query, name = _b.name, hash = _b.hash, fullPath = _b.fullPath;
|
|
42
43
|
return {
|
|
43
44
|
path: path,
|
|
44
45
|
pathname: formatRouterBase + path,
|
|
@@ -46,6 +47,7 @@ var getRouter = function () {
|
|
|
46
47
|
query: query,
|
|
47
48
|
name: name,
|
|
48
49
|
hash: hash,
|
|
50
|
+
state: (_a = window.history.state) !== null && _a !== void 0 ? _a : {},
|
|
49
51
|
search: query ? qs_1.default.stringify(query) : ''
|
|
50
52
|
};
|
|
51
53
|
}
|
|
@@ -19,6 +19,7 @@ var useLocation = function () {
|
|
|
19
19
|
name: '',
|
|
20
20
|
path: '',
|
|
21
21
|
search: '',
|
|
22
|
+
state: {},
|
|
22
23
|
hash: '',
|
|
23
24
|
pathname: '',
|
|
24
25
|
params: {},
|
|
@@ -34,6 +35,7 @@ var useLocation = function () {
|
|
|
34
35
|
location.query = query;
|
|
35
36
|
location.hash = hash;
|
|
36
37
|
location.params = params;
|
|
38
|
+
location.state = window.history.state || {};
|
|
37
39
|
});
|
|
38
40
|
return location;
|
|
39
41
|
};
|
|
@@ -6,6 +6,7 @@ export type SwicoLocationType = {
|
|
|
6
6
|
path: string;
|
|
7
7
|
pathname: string;
|
|
8
8
|
search: string;
|
|
9
|
+
state?: Record<string, any>;
|
|
9
10
|
};
|
|
10
11
|
export type SwicoHistoryOptionType = {
|
|
11
12
|
query?: Record<string, any>;
|
|
@@ -13,6 +14,7 @@ export type SwicoHistoryOptionType = {
|
|
|
13
14
|
hash?: string;
|
|
14
15
|
path?: string;
|
|
15
16
|
name?: string;
|
|
17
|
+
state?: Record<string, any>;
|
|
16
18
|
};
|
|
17
19
|
export type SwicoHistoryType = {
|
|
18
20
|
push: (to: string | SwicoHistoryOptionType) => void;
|