@dgui/react-router-shared 1.3.0-beta.1 → 1.4.0-beta.1
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 +2 -1
- package/dist/Components/E404/index.js.map +1 -1
- package/dist/Components/Tab/BackControl.js +5 -4
- package/dist/Components/Tab/BackControl.js.map +1 -1
- package/dist/Components/Tab/RouteControl.js +3 -2
- package/dist/Components/Tab/RouteControl.js.map +1 -1
- package/package.json +11 -11
|
@@ -7,7 +7,8 @@ const E404 = ({ defaultTab }) => {
|
|
|
7
7
|
const hasRendered = (0, react_1.useRef)(false);
|
|
8
8
|
const navigate = (0, react_router_1.useNavigate)();
|
|
9
9
|
const location = (0, react_router_1.useLocation)();
|
|
10
|
-
const
|
|
10
|
+
const tabOrder = (0, react_shared_1.useTabOrder)();
|
|
11
|
+
const tabs = (0, react_shared_1.useTabs)();
|
|
11
12
|
(0, react_1.useEffect)(() => {
|
|
12
13
|
if (hasRendered.current &&
|
|
13
14
|
!Object.values(tabs).some((tab) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Components/E404/index.tsx"],"names":[],"mappings":";;AAAA,
|
|
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,EAC3C,UAAU,EACV,EAAE,EAAE;IACJ,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,EACR,GAAG,EAAE;QACJ,IACC,WAAW,CAAC,OAAO;YACnB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CACxB,CAAC,GAAG,EAAE,EAAE;gBACP,MAAM,IAAI,GAAG,IAAA,2BAAY,EACxB,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,KAAI,EAAE,EAClB;oBACC,KAAK,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK;iBACjB,CACD,CAAC;gBAEF,OAAO,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzC,CAAC,CACD,EACA,CAAC;YACF,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,EACjC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,KAAI,EAAE,EAClB;gBACC,KAAK,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK;aACjB,CACD,CAAC;YAEF,QAAQ,CACP,aAAa,EACb;gBACC,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,IAAI;aACb,CACD,CAAC;QACH,CAAC;IACF,CAAC,EAED;QACC,IAAI;QACJ,WAAW,CAAC,OAAO;KACnB,CACD,CAAC;IAEF,IAAA,iBAAS,EACR,GAAG,EAAE;QACJ,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;IAC5B,CAAC,EACD,EAAE,CACF,CAAC;IAEF,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AAEF,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;AAE1B,kBAAe,IAAI,CAAC"}
|
|
@@ -5,12 +5,13 @@ const react_1 = require("react");
|
|
|
5
5
|
const react_router_1 = require("react-router");
|
|
6
6
|
const BackControl = ({ tabId }) => {
|
|
7
7
|
const { tabId: routeId } = (0, react_router_1.useParams)();
|
|
8
|
-
const
|
|
9
|
-
const
|
|
8
|
+
const selectedTabID = (0, react_shared_1.useSelectedTabID)();
|
|
9
|
+
const tabOrder = (0, react_shared_1.useTabOrder)();
|
|
10
|
+
const selectTab = (0, react_shared_1.useSelectTab)();
|
|
10
11
|
(0, react_1.useEffect)(() => {
|
|
11
12
|
if (routeId &&
|
|
12
|
-
|
|
13
|
-
tabId ===
|
|
13
|
+
selectedTabID &&
|
|
14
|
+
tabId === selectedTabID &&
|
|
14
15
|
tabId !== routeId) {
|
|
15
16
|
const currentTabIndex = tabOrder.indexOf(tabId);
|
|
16
17
|
const routeTabIndex = tabOrder.indexOf(routeId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BackControl.js","sourceRoot":"","sources":["../../../src/Components/Tab/BackControl.tsx"],"names":[],"mappings":";;AAAA,
|
|
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,EACzD,KAAK,EACL,EAAE,EAAE;IACJ,MAAM,EACL,KAAK,EAAE,OAAO,EACd,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,EACR,GAAG,EAAE;QAEJ,IACC,OAAO;YACP,aAAa;YACb,KAAK,KAAK,aAAa;YACvB,KAAK,KAAK,OAAO,EAChB,CAAC;YACF,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAEhD,IACC,aAAa,KAAK,CAAC,CAAC,EACnB,CAAC;YAEH,CAAC;iBAAM,IACN,eAAe,KAAK,aAAa,EAChC,CAAC;gBACF,SAAS,CAAC,aAAa,CAAC,CAAC;YAC1B,CAAC;QACF,CAAC;IACF,CAAC,EAGD;QACC,OAAO;KACP,CACD,CAAC;IAEF,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AAEF,kBAAe,IAAA,YAAI,EAAC,WAAW,CAAC,CAAC"}
|
|
@@ -8,8 +8,9 @@ const RouteControl = ({ tabId }) => {
|
|
|
8
8
|
const { tabId: routeId } = (0, react_router_1.useParams)();
|
|
9
9
|
const navigate = (0, react_router_1.useNavigate)();
|
|
10
10
|
const location = (0, react_router_1.useLocation)();
|
|
11
|
-
const
|
|
12
|
-
const
|
|
11
|
+
const tabIndex = (0, react_shared_1.useTabIndex)();
|
|
12
|
+
const tabOrder = (0, react_shared_1.useTabOrder)();
|
|
13
|
+
const tabs = (0, react_shared_1.useTabs)();
|
|
13
14
|
const { tabId: selectedTabId, tabPath: selectedTabPath } = (0, react_1.useMemo)(() => {
|
|
14
15
|
return tabs[tabOrder[tabIndex]] || {};
|
|
15
16
|
}, [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteControl.js","sourceRoot":"","sources":["../../../src/Components/Tab/RouteControl.tsx"],"names":[],"mappings":";;AAAA,
|
|
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,EAC3D,KAAK,EACL,EAAE,EAAE;IACJ,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IAElC,MAAM,EACL,KAAK,EAAE,OAAO,EACd,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,EACL,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,eAAe,EACxB,GAAG,IAAA,eAAO,EACV,GAAG,EAAE;QACJ,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;IACvC,CAAC,EACD;QACC,QAAQ;QACR,QAAQ;QACR,IAAI;KACJ,CACD,CAAC;IAEF,IAAA,iBAAS,EACR,GAAG,EAAE;QAEJ,IACC,WAAW,CAAC,OAAO;YACnB,OAAO;YACP,aAAa;YACb,KAAK,KAAK,aAAa,EACtB,CAAC;YACF,MAAM,WAAW,GAAG,QAAQ,KAAK,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAE3D,IAAI,WAAW,EAAE,CAAC;gBACjB,MAAM,aAAa,GAAG,IAAA,2BAAY,EACjC,eAAe,EACf;oBACC,KAAK,EAAE,aAAa;iBACpB,CACD,CAAC;gBAEF,IACC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EACzC,CAAC;oBACF,QAAQ,CACP,GAAG,GAAG,aAAa,EACnB;wBACC,QAAQ,EAAE,MAAM;qBAChB,CACD,CAAC;gBACH,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC,EAED;QACC,QAAQ;KACR,CACD,CAAC;IAEF,IAAA,iBAAS,EACR,GAAG,EAAE;QACJ,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;IAC5B,CAAC,EACD,EAAE,CACF,CAAC;IAEF,OAAO,IAAI,CAAC;AACb,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.
|
|
5
|
+
"version": "1.4.0-beta.1",
|
|
6
6
|
"private": false,
|
|
7
7
|
"description": "Shared Router Components for a boilerplate React GUI",
|
|
8
8
|
"author": "wallzero @wallzeroblog (http://wallzero.com)",
|
|
@@ -42,15 +42,15 @@
|
|
|
42
42
|
"clean:dist": "rimraf dist"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"@digest/eslint-config-jest": "^4.3
|
|
46
|
-
"@digest/eslint-config-react": "^4.3
|
|
47
|
-
"@digest/eslint-config-typescript": "^4.3
|
|
48
|
-
"@digest/jest-junit": "^4.3
|
|
49
|
-
"@digest/jest-react": "^4.3
|
|
50
|
-
"@digest/jest-typescript": "^4.3
|
|
51
|
-
"@digest/typescript": "^4.3
|
|
45
|
+
"@digest/eslint-config-jest": "^4.4.3",
|
|
46
|
+
"@digest/eslint-config-react": "^4.4.3",
|
|
47
|
+
"@digest/eslint-config-typescript": "^4.4.3",
|
|
48
|
+
"@digest/jest-junit": "^4.4.3",
|
|
49
|
+
"@digest/jest-react": "^4.4.3",
|
|
50
|
+
"@digest/jest-typescript": "^4.4.3",
|
|
51
|
+
"@digest/typescript": "^4.4.3",
|
|
52
52
|
"@types/jest": "^29.5.12",
|
|
53
|
-
"@types/react": "^18.3.
|
|
53
|
+
"@types/react": "^18.3.3",
|
|
54
54
|
"@types/react-test-renderer": "^18.3.0",
|
|
55
55
|
"cross-env": "^7.0.3",
|
|
56
56
|
"jest-environment-jsdom": "^29.7.0",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"rimraf": "^5.0.7"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@dgui/react-shared": "^1.
|
|
65
|
+
"@dgui/react-shared": "^1.4.0-beta.1"
|
|
66
66
|
},
|
|
67
67
|
"peerDependencies": {
|
|
68
68
|
"react": "^16.0.0 || ^17.0.0 || ^18.0.0",
|
|
@@ -76,5 +76,5 @@
|
|
|
76
76
|
"react-router",
|
|
77
77
|
"typescript"
|
|
78
78
|
],
|
|
79
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "60bfb1f54146932cf13326666290ea9b8db03c44"
|
|
80
80
|
}
|