namirasoft-account-react 1.3.4 → 1.3.5
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/dist/RouterMaker.d.ts +4 -1
- package/dist/RouterMaker.jsx +6 -8
- package/dist/RouterMaker.jsx.map +1 -1
- package/package.json +1 -1
- package/src/RouterMaker.tsx +11 -8
package/dist/RouterMaker.d.ts
CHANGED
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { ParsedNameValue } from "namirasoft-core";
|
|
3
3
|
import { IRouterMaker } from "./IRouterMaker";
|
|
4
|
+
import rrd from 'react-router-dom';
|
|
4
5
|
import { IRouterState } from "./IRouterState";
|
|
5
6
|
export default class RouterMaker {
|
|
6
7
|
private state;
|
|
7
8
|
private setState;
|
|
9
|
+
private location;
|
|
10
|
+
private navigate;
|
|
8
11
|
private component;
|
|
9
|
-
constructor(state: IRouterState | undefined, setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>, component: IRouterMaker);
|
|
12
|
+
constructor(state: IRouterState | undefined, setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>, location: rrd.Location, navigate: rrd.NavigateFunction, component: IRouterMaker);
|
|
10
13
|
private init;
|
|
11
14
|
getQuery(name: string): string;
|
|
12
15
|
getLink(sub: string, customQuery: {
|
package/dist/RouterMaker.jsx
CHANGED
|
@@ -7,12 +7,13 @@ const query_string_1 = __importDefault(require("query-string"));
|
|
|
7
7
|
const namirasoft_core_1 = require("namirasoft-core");
|
|
8
8
|
const Messenger_1 = require("./Messenger");
|
|
9
9
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
10
|
-
const react_router_dom_1 = require("react-router-dom");
|
|
11
10
|
const axios_1 = __importDefault(require("axios"));
|
|
12
11
|
class RouterMaker {
|
|
13
|
-
constructor(state, setState, component) {
|
|
12
|
+
constructor(state, setState, location, navigate, component) {
|
|
14
13
|
this.state = state;
|
|
15
14
|
this.setState = setState;
|
|
15
|
+
this.location = location;
|
|
16
|
+
this.navigate = navigate;
|
|
16
17
|
this.component = component;
|
|
17
18
|
this.init = this.init.bind(this);
|
|
18
19
|
this.getQuery = this.getQuery.bind(this);
|
|
@@ -67,23 +68,20 @@ class RouterMaker {
|
|
|
67
68
|
return { props, inited };
|
|
68
69
|
}
|
|
69
70
|
getQuery(name) {
|
|
70
|
-
|
|
71
|
-
let query = query_string_1.default.parse(location.search);
|
|
71
|
+
let query = query_string_1.default.parse(this.location.search);
|
|
72
72
|
let item = query[name];
|
|
73
73
|
return new namirasoft_core_1.ObjectService(item).getString();
|
|
74
74
|
}
|
|
75
75
|
getLink(sub, customQuery) {
|
|
76
76
|
if (!customQuery)
|
|
77
77
|
customQuery = {};
|
|
78
|
-
|
|
79
|
-
let query = query_string_1.default.parse(location.search);
|
|
78
|
+
let query = query_string_1.default.parse(this.location.search);
|
|
80
79
|
let final = Object.assign(Object.assign({}, query), customQuery);
|
|
81
80
|
return namirasoft_core_1.URLOperation.getLink("", sub, final);
|
|
82
81
|
}
|
|
83
82
|
redirect(sub, customQuery) {
|
|
84
|
-
const navigate = (0, react_router_dom_1.useNavigate)();
|
|
85
83
|
let ans = this.getLink(sub, customQuery);
|
|
86
|
-
navigate(ans);
|
|
84
|
+
this.navigate(ans);
|
|
87
85
|
}
|
|
88
86
|
onComponentDidMount() {
|
|
89
87
|
let { inited, props } = this.init();
|
package/dist/RouterMaker.jsx.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouterMaker.jsx","sourceRoot":"","sources":["../src/RouterMaker.tsx"],"names":[],"mappings":";;;;;AAAA,gEAAuC;AACvC,qDAAwH;AACxH,2CAAwC;AACxC,2DAA2E;
|
|
1
|
+
{"version":3,"file":"RouterMaker.jsx","sourceRoot":"","sources":["../src/RouterMaker.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/RouterMaker.tsx
CHANGED
|
@@ -4,7 +4,7 @@ import { Messenger } from "./Messenger";
|
|
|
4
4
|
import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
|
|
5
5
|
import { IAccountProps } from "./IAccountProps";
|
|
6
6
|
import { IRouterMaker } from "./IRouterMaker";
|
|
7
|
-
import
|
|
7
|
+
import rrd from 'react-router-dom';
|
|
8
8
|
import axios from "axios";
|
|
9
9
|
import { IRouterState } from "./IRouterState";
|
|
10
10
|
|
|
@@ -12,11 +12,17 @@ export default class RouterMaker
|
|
|
12
12
|
{
|
|
13
13
|
private state: IRouterState | undefined;
|
|
14
14
|
private setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>;
|
|
15
|
+
private location: rrd.Location;
|
|
16
|
+
private navigate: rrd.NavigateFunction;
|
|
15
17
|
private component: IRouterMaker;
|
|
16
|
-
constructor(state: IRouterState | undefined, setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>,
|
|
18
|
+
constructor(state: IRouterState | undefined, setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>,
|
|
19
|
+
location: rrd.Location, navigate: rrd.NavigateFunction,
|
|
20
|
+
component: IRouterMaker)
|
|
17
21
|
{
|
|
18
22
|
this.state = state;
|
|
19
23
|
this.setState = setState;
|
|
24
|
+
this.location = location;
|
|
25
|
+
this.navigate = navigate;
|
|
20
26
|
this.component = component;
|
|
21
27
|
this.init = this.init.bind(this);
|
|
22
28
|
this.getQuery = this.getQuery.bind(this);
|
|
@@ -73,8 +79,7 @@ export default class RouterMaker
|
|
|
73
79
|
}
|
|
74
80
|
getQuery(name: string): string
|
|
75
81
|
{
|
|
76
|
-
|
|
77
|
-
let query = queryString.parse(location.search);
|
|
82
|
+
let query = queryString.parse(this.location.search);
|
|
78
83
|
let item = query[name];
|
|
79
84
|
return new ObjectService(item).getString();
|
|
80
85
|
}
|
|
@@ -82,16 +87,14 @@ export default class RouterMaker
|
|
|
82
87
|
{
|
|
83
88
|
if (!customQuery)
|
|
84
89
|
customQuery = {};
|
|
85
|
-
|
|
86
|
-
let query = queryString.parse(location.search);
|
|
90
|
+
let query = queryString.parse(this.location.search);
|
|
87
91
|
let final = { ...query, ...customQuery };
|
|
88
92
|
return URLOperation.getLink("", sub, final);
|
|
89
93
|
}
|
|
90
94
|
redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void
|
|
91
95
|
{
|
|
92
|
-
const navigate = useNavigate();
|
|
93
96
|
let ans = this.getLink(sub, customQuery);
|
|
94
|
-
navigate(ans);
|
|
97
|
+
this.navigate(ans);
|
|
95
98
|
}
|
|
96
99
|
onComponentDidMount(): void
|
|
97
100
|
{
|