@dgui/react-router-shared 1.7.5 → 1.7.6
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/Components/E404/index.js +5 -6
- package/dist/Components/E404/index.js.map +1 -1
- package/dist/Components/Tab/BackControl.js +11 -3
- package/dist/Components/Tab/BackControl.js.map +1 -1
- package/dist/Components/Tab/RouteControl.js +7 -6
- package/dist/Components/Tab/RouteControl.js.map +1 -1
- package/package.json +10 -10
|
@@ -12,25 +12,24 @@ const E404 = ({ defaultTab }) => {
|
|
|
12
12
|
(0, react_1.useEffect)(() => {
|
|
13
13
|
var _a;
|
|
14
14
|
if (hasRendered.current &&
|
|
15
|
+
Object.keys(tabs).length !== 0 &&
|
|
15
16
|
!Object.values(tabs).some((tab) => {
|
|
16
17
|
var _a;
|
|
17
18
|
const path = (0, react_router_1.generatePath)((_a = tab === null || tab === void 0 ? void 0 : tab.tabPath) !== null && _a !== void 0 ? _a : '', {
|
|
18
19
|
tabId: tab === null || tab === void 0 ? void 0 : tab.tabId
|
|
19
20
|
});
|
|
20
|
-
return location.pathname
|
|
21
|
+
return `${location.pathname}/`.includes(`${path}/`);
|
|
21
22
|
})) {
|
|
22
23
|
const tab = tabs[tabOrder[defaultTab]] || tabs[tabOrder[0]];
|
|
23
24
|
const generatedPath = (0, react_router_1.generatePath)((_a = tab === null || tab === void 0 ? void 0 : tab.tabPath) !== null && _a !== void 0 ? _a : '', {
|
|
24
25
|
tabId: tab === null || tab === void 0 ? void 0 : tab.tabId
|
|
25
26
|
});
|
|
26
|
-
navigate(generatedPath, {
|
|
27
|
-
relative: 'route'
|
|
28
|
-
replace: true
|
|
27
|
+
navigate('/' + generatedPath, {
|
|
28
|
+
relative: 'route'
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
31
|
}, [
|
|
32
|
-
tabs
|
|
33
|
-
hasRendered.current
|
|
32
|
+
tabs
|
|
34
33
|
]);
|
|
35
34
|
(0, react_1.useEffect)(() => {
|
|
36
35
|
hasRendered.current = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Components/E404/index.tsx"],"names":[],"mappings":";;AAAA,qDAG4B;AAC5B,iCAIe;AACf,+CAIsB;AAEtB,MAAM,IAAI,GAAiC,CAAC,EAC1C,UAAU,EACX,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IAElC,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAE/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAA,sBAAO,GAAE,CAAC;IAEvB,IAAA,iBAAS,EACP,GAAG,EAAE;;QACH,IACE,WAAW,CAAC,OAAO;YACnB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CACvB,CAAC,GAAG,EAAE,EAAE;;gBACN,MAAM,IAAI,GAAG,IAAA,2BAAY,EACvB,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,mCAAI,EAAE,EAClB;oBACE,KAAK,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK;iBAClB,CACF,CAAC;gBAEF,OAAO,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Components/E404/index.tsx"],"names":[],"mappings":";;AAAA,qDAG4B;AAC5B,iCAIe;AACf,+CAIsB;AAEtB,MAAM,IAAI,GAAiC,CAAC,EAC1C,UAAU,EACX,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IAElC,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAE/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAA,sBAAO,GAAE,CAAC;IAEvB,IAAA,iBAAS,EACP,GAAG,EAAE;;QACH,IACE,WAAW,CAAC,OAAO;YACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;YAC9B,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CACvB,CAAC,GAAG,EAAE,EAAE;;gBACN,MAAM,IAAI,GAAG,IAAA,2BAAY,EACvB,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,mCAAI,EAAE,EAClB;oBACE,KAAK,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK;iBAClB,CACF,CAAC;gBAEF,OAAO,GAAG,QAAQ,CAAC,QAAQ,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;YACtD,CAAC,CACF,EACD,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAE5D,MAAM,aAAa,GAAG,IAAA,2BAAY,EAChC,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,mCAAI,EAAE,EAClB;gBACE,KAAK,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK;aAClB,CACF,CAAC;YAEF,QAAQ,CACN,GAAG,GAAG,aAAa,EACnB;gBACE,QAAQ,EAAE,OAAO;aAClB,CACF,CAAC;QACJ,CAAC;IACH,CAAC,EACD;QACE,IAAI;KACL,CACF,CAAC;IAEF,IAAA,iBAAS,EACP,GAAG,EAAE;QACH,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;IAC7B,CAAC,EACD,EAAE,CACH,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;AAE1B,kBAAe,IAAI,CAAC"}
|
|
@@ -9,9 +9,17 @@ const BackControl = ({ tabId }) => {
|
|
|
9
9
|
const tabOrder = (0, react_shared_1.useTabOrder)();
|
|
10
10
|
const selectTab = (0, react_shared_1.useSelectTab)();
|
|
11
11
|
(0, react_1.useEffect)(() => {
|
|
12
|
-
if (
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
if (tabId === selectedTabID) {
|
|
13
|
+
const index = routeId ? tabOrder.indexOf(routeId) : false;
|
|
14
|
+
const routeTabIndex = index === -1 ? false : index;
|
|
15
|
+
if (routeTabIndex) {
|
|
16
|
+
selectTab(routeTabIndex);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
}, []);
|
|
20
|
+
(0, react_1.useEffect)(() => {
|
|
21
|
+
if (tabId === selectedTabID &&
|
|
22
|
+
routeId &&
|
|
15
23
|
tabId !== routeId) {
|
|
16
24
|
const currentTabIndex = tabOrder.indexOf(tabId);
|
|
17
25
|
const routeTabIndex = tabOrder.indexOf(routeId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BackControl.js","sourceRoot":"","sources":["../../../src/Components/Tab/BackControl.tsx"],"names":[],"mappings":";;AAAA,qDAI4B;AAC5B,iCAIe;AACf,+CAEsB;AAEtB,MAAM,WAAW,GAAwC,CAAC,EACxD,KAAK,EACN,EAAE,EAAE;IACH,MAAM,EACJ,KAAK,EAAE,OAAO,EACf,GAAG,IAAA,wBAAS,GAAE,CAAC;IAEhB,MAAM,aAAa,GAAG,IAAA,+BAAgB,GAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,SAAS,GAAG,IAAA,2BAAY,GAAE,CAAC;IAEjC,IAAA,iBAAS,EACP,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"BackControl.js","sourceRoot":"","sources":["../../../src/Components/Tab/BackControl.tsx"],"names":[],"mappings":";;AAAA,qDAI4B;AAC5B,iCAIe;AACf,+CAEsB;AAEtB,MAAM,WAAW,GAAwC,CAAC,EACxD,KAAK,EACN,EAAE,EAAE;IACH,MAAM,EACJ,KAAK,EAAE,OAAO,EACf,GAAG,IAAA,wBAAS,GAAE,CAAC;IAEhB,MAAM,aAAa,GAAG,IAAA,+BAAgB,GAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,SAAS,GAAG,IAAA,2BAAY,GAAE,CAAC;IAEjC,IAAA,iBAAS,EACP,GAAG,EAAE;QACH,IAEE,KAAK,KAAK,aAAa,EACvB,CAAC;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAE1D,MAAM,aAAa,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;YAEnD,IAAI,aAAa,EAAE,CAAC;gBAClB,SAAS,CAAC,aAAa,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC,EACD,EAAE,CACH,CAAC;IAEF,IAAA,iBAAS,EACP,GAAG,EAAE;QACH,IAEE,KAAK,KAAK,aAAa;YACvB,OAAO;YACP,KAAK,KAAK,OAAO,EACjB,CAAC;YACD,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAEhD,IACE,aAAa,KAAK,CAAC,CAAC,EACpB,CAAC;YAEH,CAAC;iBAAM,IACL,eAAe,KAAK,aAAa,EACjC,CAAC;gBACD,SAAS,CAAC,aAAa,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC,EAED;QACE,OAAO;KACR,CACF,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,kBAAe,IAAA,YAAI,EAAC,WAAW,CAAC,CAAC"}
|
|
@@ -19,16 +19,15 @@ const RouteControl = ({ tabId }) => {
|
|
|
19
19
|
tabs
|
|
20
20
|
]);
|
|
21
21
|
(0, react_1.useEffect)(() => {
|
|
22
|
-
if (
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
tabId === selectedTabId) {
|
|
22
|
+
if (tabId === selectedTabId &&
|
|
23
|
+
hasRendered.current &&
|
|
24
|
+
routeId) {
|
|
26
25
|
const indexChange = tabIndex !== tabOrder.indexOf(routeId);
|
|
27
26
|
if (indexChange) {
|
|
28
27
|
const generatedPath = (0, react_router_1.generatePath)(selectedTabPath, {
|
|
29
28
|
tabId: selectedTabId
|
|
30
29
|
});
|
|
31
|
-
if (
|
|
30
|
+
if (!`${location.pathname}/`.includes(`${generatedPath}/`)) {
|
|
32
31
|
navigate('/' + generatedPath, {
|
|
33
32
|
relative: 'path'
|
|
34
33
|
});
|
|
@@ -39,7 +38,9 @@ const RouteControl = ({ tabId }) => {
|
|
|
39
38
|
tabIndex
|
|
40
39
|
]);
|
|
41
40
|
(0, react_1.useEffect)(() => {
|
|
42
|
-
|
|
41
|
+
setTimeout(() => {
|
|
42
|
+
hasRendered.current = true;
|
|
43
|
+
}, 100);
|
|
43
44
|
}, []);
|
|
44
45
|
return null;
|
|
45
46
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteControl.js","sourceRoot":"","sources":["../../../src/Components/Tab/RouteControl.tsx"],"names":[],"mappings":";;AAAA,qDAI4B;AAC5B,iCAKe;AACf,+CAKsB;AAEtB,MAAM,YAAY,GAAyC,CAAC,EAC1D,KAAK,EACN,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IAElC,MAAM,EACJ,KAAK,EAAE,OAAO,EACf,GAAG,IAAA,wBAAS,GAAE,CAAC;IAEhB,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAE/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAA,sBAAO,GAAE,CAAC;IAEvB,MAAM,EACJ,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,eAAe,EACzB,GAAG,IAAA,eAAO,EACT,GAAG,EAAE;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,CAAC,EACD;QACE,QAAQ;QACR,QAAQ;QACR,IAAI;KACL,CACF,CAAC;IAEF,IAAA,iBAAS,EACP,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"RouteControl.js","sourceRoot":"","sources":["../../../src/Components/Tab/RouteControl.tsx"],"names":[],"mappings":";;AAAA,qDAI4B;AAC5B,iCAKe;AACf,+CAKsB;AAEtB,MAAM,YAAY,GAAyC,CAAC,EAC1D,KAAK,EACN,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IAElC,MAAM,EACJ,KAAK,EAAE,OAAO,EACf,GAAG,IAAA,wBAAS,GAAE,CAAC;IAEhB,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAE/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAA,sBAAO,GAAE,CAAC;IAEvB,MAAM,EACJ,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,eAAe,EACzB,GAAG,IAAA,eAAO,EACT,GAAG,EAAE;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,CAAC,EACD;QACE,QAAQ;QACR,QAAQ;QACR,IAAI;KACL,CACF,CAAC;IAEF,IAAA,iBAAS,EACP,GAAG,EAAE;QACH,IAEE,KAAK,KAAK,aAAa;YACvB,WAAW,CAAC,OAAO;YACnB,OAAO,EACP,CAAC;YACD,MAAM,WAAW,GAAG,QAAQ,KAAK,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAE3D,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,aAAa,GAAG,IAAA,2BAAY,EAChC,eAAe,EACf;oBACE,KAAK,EAAE,aAAa;iBACrB,CACF,CAAC;gBAEF,IACE,CAAC,GAAG,QAAQ,CAAC,QAAQ,GAAG,CAAC,QAAQ,CAAC,GAAG,aAAa,GAAG,CAAC,EACtD,CAAC;oBACD,QAAQ,CACN,GAAG,GAAG,aAAa,EACnB;wBACE,QAAQ,EAAE,MAAM;qBACjB,CACF,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,EACD;QACE,QAAQ;KACT,CACF,CAAC;IAEF,IAAA,iBAAS,EACP,GAAG,EAAE;QAEH,UAAU,CACR,GAAG,EAAE;YACH,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;QAC7B,CAAC,EACD,GAAG,CACJ,CAAC;IACJ,CAAC,EACD,EAAE,CACH,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,kBAAe,YAAY,CAAC"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@dgui/react-router-shared",
|
|
3
3
|
"title": "Digested React GUI Shared Router Components",
|
|
4
4
|
"license": "LGPL-3.0-or-later",
|
|
5
|
-
"version": "1.7.
|
|
5
|
+
"version": "1.7.6",
|
|
6
6
|
"private": false,
|
|
7
7
|
"description": "Shared Router Components for a boilerplate React GUI",
|
|
8
8
|
"author": "wallzero @wallzeroblog (http://wallzero.com)",
|
|
@@ -42,13 +42,13 @@
|
|
|
42
42
|
"clean:dist": "rimraf dist"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"@digest/eslint-config-jest": "^4.14.
|
|
46
|
-
"@digest/eslint-config-react": "^4.14.
|
|
47
|
-
"@digest/eslint-config-typescript": "^4.14.
|
|
48
|
-
"@digest/jest-junit": "^4.14.
|
|
49
|
-
"@digest/jest-react": "^4.14.
|
|
50
|
-
"@digest/jest-typescript": "^4.14.
|
|
51
|
-
"@digest/typescript": "^4.14.
|
|
45
|
+
"@digest/eslint-config-jest": "^4.14.14",
|
|
46
|
+
"@digest/eslint-config-react": "^4.14.14",
|
|
47
|
+
"@digest/eslint-config-typescript": "^4.14.14",
|
|
48
|
+
"@digest/jest-junit": "^4.14.14",
|
|
49
|
+
"@digest/jest-react": "^4.14.14",
|
|
50
|
+
"@digest/jest-typescript": "^4.14.14",
|
|
51
|
+
"@digest/typescript": "^4.14.14",
|
|
52
52
|
"@types/jest": "^30.0.0",
|
|
53
53
|
"@types/react": "^19.2.7",
|
|
54
54
|
"@types/react-test-renderer": "^19.1.0",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"rimraf": "^6.1.2"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@dgui/react-shared": "1.7.
|
|
65
|
+
"@dgui/react-shared": "1.7.6"
|
|
66
66
|
},
|
|
67
67
|
"peerDependencies": {
|
|
68
68
|
"react": "^18.0.0 || ^19.0.0",
|
|
@@ -76,5 +76,5 @@
|
|
|
76
76
|
"react-router",
|
|
77
77
|
"typescript"
|
|
78
78
|
],
|
|
79
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "864501301de458311da44d7b3043c7488ce6096c"
|
|
80
80
|
}
|