mobx-route 0.0.30 → 0.0.32
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/core/route/route.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export declare class Route<TPath extends string, TParentRoute extends Route<any,
|
|
|
8
8
|
protected history: IMobxHistory;
|
|
9
9
|
protected location: IMobxLocation;
|
|
10
10
|
protected baseUrl: string;
|
|
11
|
+
parent: TParentRoute;
|
|
11
12
|
query: IQueryParams;
|
|
12
13
|
private _tokenData;
|
|
13
14
|
private _matcher?;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAkB,SAAS,EAAS,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAI9E,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,KAAK,CAChB,KAAK,SAAS,MAAM,EACpB,YAAY,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAkB,SAAS,EAAS,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAI9E,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,KAAK,CAChB,KAAK,SAAS,MAAM,EACpB,YAAY,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI;IAkBzC,IAAI,EAAE,KAAK;IAClB,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,YAAY,CAAC;IAjBpD,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;IAChC,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC;IAClC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,YAAY,CAAC;IAErB,KAAK,EAAE,YAAY,CAAC;IAEpB,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,SAAS,CAAC,CAA6B;IAE/C,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,QAAQ,EAAE,CAAM;gBAGjB,IAAI,EAAE,KAAK,EACR,MAAM,GAAE,kBAAkB,CAAC,YAAY,CAAM;IAwBzD,SAAS,KAAK,IAAI,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,IAAI,CA0BnD;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,IAAI,CAE/B;IAED,IAAI,MAAM,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,IAAI,CAE3C;IAED,IAAI,QAAQ,YAEX;IAED,MAAM,CAAC,WAAW,SAAS,MAAM,EAC/B,IAAI,EAAE,WAAW,EACjB,MAAM,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;IAqBlD,WAAW,CAAC,GAAG,MAAM,EAAE,QAAQ,EAAE;IAIjC,cAAc,CAAC,GAAG,MAAM,EAAE,QAAQ,EAAE;IAIpC,IAAI,iBAAiB,IAAI,OAAO,CAI/B;IAED,SAAS,CAAC,aAAa,CACrB,MAAM,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,SAAS,GACnD,SAAS,GAAG,SAAS;IAWxB,SAAS,CACP,GAAG,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,GACjE,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAC7D,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC;IAiB3D,IAAI,CACF,GAAG,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,GACjE;QACE,MAAM,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,SAAS;QACpD,cAAc,CAAC,EAAE,mBAAmB;KACrC,GACD,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,EAAE,mBAAmB,CAAC,GAC3E,IAAI;IAEP,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAc7D,SAAS,KAAK,SAAS,cAKtB;CACF"}
|
package/core/route/route.js
CHANGED
|
@@ -8,6 +8,7 @@ export class Route {
|
|
|
8
8
|
history;
|
|
9
9
|
location;
|
|
10
10
|
baseUrl;
|
|
11
|
+
parent;
|
|
11
12
|
query;
|
|
12
13
|
_tokenData;
|
|
13
14
|
_matcher;
|
|
@@ -23,12 +24,14 @@ export class Route {
|
|
|
23
24
|
const usedBaseUrl = this.config.baseUrl ?? routeConfig.get().baseUrl;
|
|
24
25
|
this.baseUrl = !usedBaseUrl || usedBaseUrl === '/' ? '' : usedBaseUrl;
|
|
25
26
|
this.isIndex = !!this.config.index;
|
|
27
|
+
this.parent = config.parent ?? null;
|
|
26
28
|
computed.struct(this, 'isOpened');
|
|
27
29
|
computed.struct(this, 'data');
|
|
28
30
|
computed.struct(this, 'params');
|
|
29
31
|
computed.struct(this, 'currentPath');
|
|
30
32
|
computed.struct(this, 'hasOpenedChildren');
|
|
31
33
|
observable(this, 'children');
|
|
34
|
+
observable.ref(this, 'parent');
|
|
32
35
|
action(this, 'addChildren');
|
|
33
36
|
action(this, 'removeChildren');
|
|
34
37
|
makeObservable(this);
|
|
@@ -79,7 +82,7 @@ export class Route {
|
|
|
79
82
|
this.children = this.children.filter((child) => !routes.includes(child));
|
|
80
83
|
}
|
|
81
84
|
get hasOpenedChildren() {
|
|
82
|
-
return this.children.some((child) => child.isOpened);
|
|
85
|
+
return this.children.some((child) => child.isOpened || child.hasOpenedChildren);
|
|
83
86
|
}
|
|
84
87
|
processParams(params) {
|
|
85
88
|
if (params == null)
|
package/core/route/route.test.js
CHANGED
|
@@ -172,4 +172,16 @@ describe('route', () => {
|
|
|
172
172
|
expect(routes.root.isOpened).toBe(true);
|
|
173
173
|
expect(routes.projects.routes.index.isOpened).toBe(false);
|
|
174
174
|
});
|
|
175
|
+
it('parent test', () => {
|
|
176
|
+
history.pushState(null, '', '/a/b/c');
|
|
177
|
+
const routeA = new Route('/a');
|
|
178
|
+
const routeB = routeA.extend('/b');
|
|
179
|
+
const routeC = routeB.extend('/c');
|
|
180
|
+
expect(routeA.hasOpenedChildren).toBe(true);
|
|
181
|
+
expect(routeB.hasOpenedChildren).toBe(true);
|
|
182
|
+
expect(routeC.hasOpenedChildren).toBe(false);
|
|
183
|
+
expect(routeA.isOpened).toBe(false);
|
|
184
|
+
expect(routeB.isOpened).toBe(false);
|
|
185
|
+
expect(routeC.isOpened).toBe(true);
|
|
186
|
+
});
|
|
175
187
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-group.d.ts","sourceRoot":"","sources":["../../../src/core/route-group/route-group.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,qBAAa,UAAU,CAAC,iBAAiB,SAAS,gBAAgB;IAC7C,MAAM,EAAE,iBAAiB;gBAAzB,MAAM,EAAE,iBAAiB;IAO5C,IAAI,QAAQ,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"route-group.d.ts","sourceRoot":"","sources":["../../../src/core/route-group/route-group.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,qBAAa,UAAU,CAAC,iBAAiB,SAAS,gBAAgB;IAC7C,MAAM,EAAE,iBAAiB;gBAAzB,MAAM,EAAE,iBAAiB;IAO5C,IAAI,QAAQ,IAAI,OAAO,CAOtB;IAED,IAAI,UAAU,gEAIb;IAED,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,mBAAmB;CAuBxD"}
|
|
@@ -10,7 +10,8 @@ export class RouteGroup {
|
|
|
10
10
|
}
|
|
11
11
|
get isOpened() {
|
|
12
12
|
const routes = Object.values(this.routes);
|
|
13
|
-
return routes.some((route) => route.isOpened
|
|
13
|
+
return routes.some((route) => route.isOpened ||
|
|
14
|
+
('hasOpenedChildren' in route && route.hasOpenedChildren));
|
|
14
15
|
}
|
|
15
16
|
get indexRoute() {
|
|
16
17
|
return Object.values(this.routes).find((route) => 'isIndex' in route && route.isIndex);
|