@dgui/react-router-shared 1.2.0-beta.1 → 1.3.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.
Files changed (18) hide show
  1. package/dist/Components/E404/index.js +4 -3
  2. package/dist/Components/E404/index.js.map +1 -0
  3. package/dist/Components/Tab/BackControl.d.ts +3 -3
  4. package/dist/Components/Tab/BackControl.js +13 -12
  5. package/dist/Components/Tab/BackControl.js.map +1 -0
  6. package/dist/Components/Tab/RouteControl.js +1 -0
  7. package/dist/Components/Tab/RouteControl.js.map +1 -0
  8. package/dist/Components/Tab/TabRoute.js +1 -0
  9. package/dist/Components/Tab/TabRoute.js.map +1 -0
  10. package/dist/Components/Tab/index.js +1 -0
  11. package/dist/Components/Tab/index.js.map +1 -0
  12. package/dist/DigestRoute.js +1 -0
  13. package/dist/DigestRoute.js.map +1 -0
  14. package/dist/Types.js +1 -0
  15. package/dist/Types.js.map +1 -0
  16. package/dist/index.js +1 -0
  17. package/dist/index.js.map +1 -0
  18. package/package.json +16 -16
package/dist/Components/E404/index.js CHANGED
@@ -11,13 +11,13 @@ const E404 = ({ defaultTab }) => {
11
11
  (0, react_1.useEffect)(() => {
12
12
  if (hasRendered.current &&
13
13
  !Object.values(tabs).some((tab) => {
14
- const path = (0, react_router_1.generatePath)(tab === null || tab === void 0 ? void 0 : tab.tabPath, {
14
+ const path = (0, react_router_1.generatePath)((tab === null || tab === void 0 ? void 0 : tab.tabPath) || '', {
15
15
  tabId: tab === null || tab === void 0 ? void 0 : tab.tabId
16
16
  });
17
17
  return location.pathname.includes(path);
18
18
  })) {
19
- const tab = tabs[tabOrder[defaultTab]];
20
- const generatedPath = (0, react_router_1.generatePath)(tab === null || tab === void 0 ? void 0 : tab.tabPath, {
19
+ const tab = tabs[tabOrder[defaultTab]] || tabs[tabOrder[0]];
20
+ const generatedPath = (0, react_router_1.generatePath)((tab === null || tab === void 0 ? void 0 : tab.tabPath) || '', {
21
21
  tabId: tab === null || tab === void 0 ? void 0 : tab.tabId
22
22
  });
23
23
  navigate(generatedPath, {
@@ -36,3 +36,4 @@ const E404 = ({ defaultTab }) => {
36
36
  };
37
37
  E404.displayName = 'E404';
38
38
  exports.default = E404;
39
+ //# sourceMappingURL=index.js.map
package/dist/Components/E404/index.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Components/E404/index.tsx"],"names":[],"mappings":";;AAAA,qDAE4B;AAC5B,iCAKe;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,EACL,QAAQ,EACR,IAAI,EACJ,GAAG,IAAA,kBAAU,EAAC,yBAAU,CAAC,CAAC;IAE3B,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"}
package/dist/Components/Tab/BackControl.d.ts CHANGED
@@ -1,6 +1,6 @@
1
- import { type FunctionComponent } from 'react';
2
- declare const BackControl: FunctionComponent<BackControlProps>;
3
- export default BackControl;
1
+ /// <reference types="react" />
2
+ declare const _default: import("react").NamedExoticComponent<BackControlProps>;
3
+ export default _default;
4
4
  export type BackControlProps = {
5
5
  readonly tabId: string;
6
6
  };
package/dist/Components/Tab/BackControl.js CHANGED
@@ -5,24 +5,25 @@ 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 { tabOrder, tabs } = (0, react_1.useContext)(react_shared_1.TabContext);
9
- const { selectTab, tabIndex } = (0, react_1.useContext)(react_shared_1.TabIndexContext);
10
- const { tabId: selectedTabId } = (0, react_1.useMemo)(() => {
11
- return tabs[tabOrder[tabIndex]] || {};
12
- }, [
13
- tabIndex,
14
- tabOrder,
15
- tabs
16
- ]);
8
+ const { selectedTabId, tabOrder } = (0, react_1.useContext)(react_shared_1.TabContext);
9
+ const { selectTab } = (0, react_1.useContext)(react_shared_1.TabIndexContext);
17
10
  (0, react_1.useEffect)(() => {
18
11
  if (routeId &&
19
12
  selectedTabId &&
20
- tabId === selectedTabId) {
21
- selectTab(tabOrder.indexOf(routeId));
13
+ tabId === selectedTabId &&
14
+ tabId !== routeId) {
15
+ const currentTabIndex = tabOrder.indexOf(tabId);
16
+ const routeTabIndex = tabOrder.indexOf(routeId);
17
+ if (routeTabIndex === -1) {
18
+ }
19
+ else if (currentTabIndex !== routeTabIndex) {
20
+ selectTab(routeTabIndex);
21
+ }
22
22
  }
23
23
  }, [
24
24
  routeId
25
25
  ]);
26
26
  return null;
27
27
  };
28
- exports.default = BackControl;
28
+ exports.default = (0, react_1.memo)(BackControl);
29
+ //# sourceMappingURL=BackControl.js.map
package/dist/Components/Tab/BackControl.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"BackControl.js","sourceRoot":"","sources":["../../../src/Components/Tab/BackControl.tsx"],"names":[],"mappings":";;AAAA,qDAG4B;AAC5B,iCAKe;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,EACL,aAAa,EACb,QAAQ,EACR,GAAG,IAAA,kBAAU,EAAC,yBAAU,CAAC,CAAC;IAE3B,MAAM,EACL,SAAS,EACT,GAAG,IAAA,kBAAU,EAAC,8BAAe,CAAC,CAAC;IAEhC,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"}
package/dist/Components/Tab/RouteControl.js CHANGED
@@ -43,3 +43,4 @@ const RouteControl = ({ tabId }) => {
43
43
  return null;
44
44
  };
45
45
  exports.default = RouteControl;
46
+ //# sourceMappingURL=RouteControl.js.map
package/dist/Components/Tab/RouteControl.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"RouteControl.js","sourceRoot":"","sources":["../../../src/Components/Tab/RouteControl.tsx"],"names":[],"mappings":";;AAAA,qDAG4B;AAC5B,iCAMe;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,EACL,QAAQ,EACR,IAAI,EACJ,GAAG,IAAA,kBAAU,EAAC,yBAAU,CAAC,CAAC;IAE3B,MAAM,EACL,QAAQ,EACR,GAAG,IAAA,kBAAU,EAAC,8BAAe,CAAC,CAAC;IAEhC,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/dist/Components/Tab/TabRoute.js CHANGED
@@ -6,3 +6,4 @@ const TabRoute = ({ children, tabPath }) => {
6
6
  return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_router_1.Routes, { children: (0, jsx_runtime_1.jsx)(react_router_1.Route, { element: children, path: tabPath }) }), (0, jsx_runtime_1.jsx)(react_router_1.Outlet, {})] }));
7
7
  };
8
8
  exports.default = TabRoute;
9
+ //# sourceMappingURL=TabRoute.js.map
package/dist/Components/Tab/TabRoute.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"TabRoute.js","sourceRoot":"","sources":["../../../src/Components/Tab/TabRoute.tsx"],"names":[],"mappings":";;;AAIA,+CAIsB;AAEtB,MAAM,QAAQ,GAAqC,CAAC,EACnD,QAAQ,EACR,OAAO,EACP,EAAE,EAAE;IACJ,OAAO,CACN,6DACC,uBAAC,qBAAM,cACN,uBAAC,oBAAK,IACL,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,GACZ,GACM,EACT,uBAAC,qBAAM,KAAG,IACR,CACH,CAAC;AACH,CAAC,CAAC;AAEF,kBAAe,QAAQ,CAAC"}
package/dist/Components/Tab/index.js CHANGED
@@ -10,3 +10,4 @@ var RouteControl_1 = require("./RouteControl");
10
10
  Object.defineProperty(exports, "RouteControl", { enumerable: true, get: function () { return __importDefault(RouteControl_1).default; } });
11
11
  var TabRoute_1 = require("./TabRoute");
12
12
  Object.defineProperty(exports, "TabRoute", { enumerable: true, get: function () { return __importDefault(TabRoute_1).default; } });
13
+ //# sourceMappingURL=index.js.map
package/dist/Components/Tab/index.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Components/Tab/index.ts"],"names":[],"mappings":";;;;;;AAAA,6CAGuB;AAFtB,2HAAA,OAAO,OAAe;AAGvB,+CAGwB;AAFvB,6HAAA,OAAO,OAAgB;AAGxB,uCAGoB;AAFnB,qHAAA,OAAO,OAAY"}
package/dist/DigestRoute.js CHANGED
@@ -7,3 +7,4 @@ const DigestRoute = ({ children }) => {
7
7
  };
8
8
  DigestRoute.displayName = 'DigestRoute';
9
9
  exports.default = DigestRoute;
10
+ //# sourceMappingURL=DigestRoute.js.map
package/dist/DigestRoute.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DigestRoute.js","sourceRoot":"","sources":["../src/DigestRoute.tsx"],"names":[],"mappings":";;;AAIA,+CAGsB;AAEtB,MAAM,WAAW,GAAwC,CAAC,EACzD,QAAQ,EACR,EAAE,EAAE;IACJ,OAAO,CACN,uBAAC,qBAAM,cACN,uBAAC,oBAAK,IACL,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAC,GAAG,GACP,GACM,CACT,CAAC;AACH,CAAC,CAAC;AAEF,WAAW,CAAC,WAAW,GAAG,aAAa,CAAC;AAExC,kBAAe,WAAW,CAAC"}
package/dist/Types.js CHANGED
@@ -1,2 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=Types.js.map
package/dist/Types.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Types.js","sourceRoot":"","sources":["../src/Types.ts"],"names":[],"mappings":""}
package/dist/index.js CHANGED
@@ -24,3 +24,4 @@ __exportStar(require("./Components/Tab"), exports);
24
24
  var DigestRoute_1 = require("./DigestRoute");
25
25
  Object.defineProperty(exports, "DigestRoute", { enumerable: true, get: function () { return __importDefault(DigestRoute_1).default; } });
26
26
  __exportStar(require("./Types"), exports);
27
+ //# sourceMappingURL=index.js.map
package/dist/index.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,0CAG2B;AAF1B,6GAAA,OAAO,OAAQ;AAGhB,mDAAiC;AACjC,6CAGuB;AAFtB,2HAAA,OAAO,OAAe;AAGvB,0CAAwB"}
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.2.0-beta.1",
5
+ "version": "1.3.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,27 +42,27 @@
42
42
  "clean:dist": "rimraf dist"
43
43
  },
44
44
  "devDependencies": {
45
- "@digest/eslint-config-jest": "^4.3.0",
46
- "@digest/eslint-config-react": "^4.3.0",
47
- "@digest/eslint-config-typescript": "^4.3.0",
48
- "@digest/jest-junit": "^4.3.0",
49
- "@digest/jest-react": "^4.3.0",
50
- "@digest/jest-typescript": "^4.3.0",
51
- "@digest/typescript": "^4.3.0",
45
+ "@digest/eslint-config-jest": "^4.3.1",
46
+ "@digest/eslint-config-react": "^4.3.1",
47
+ "@digest/eslint-config-typescript": "^4.3.1",
48
+ "@digest/jest-junit": "^4.3.1",
49
+ "@digest/jest-react": "^4.3.1",
50
+ "@digest/jest-typescript": "^4.3.1",
51
+ "@digest/typescript": "^4.3.1",
52
52
  "@types/jest": "^29.5.12",
53
- "@types/react": "^18.2.55",
54
- "@types/react-test-renderer": "^18.0.7",
53
+ "@types/react": "^18.3.2",
54
+ "@types/react-test-renderer": "^18.3.0",
55
55
  "cross-env": "^7.0.3",
56
56
  "jest-environment-jsdom": "^29.7.0",
57
57
  "jest-environment-jsdom-global": "^4.0.0",
58
58
  "npm-run-all": "^4.1.5",
59
- "react": "^18.2.0",
60
- "react-router": "^6.22.0",
61
- "react-test-renderer": "^18.2.0",
62
- "rimraf": "^5.0.5"
59
+ "react": "^18.3.1",
60
+ "react-router": "^6.23.1",
61
+ "react-test-renderer": "^18.3.1",
62
+ "rimraf": "^5.0.7"
63
63
  },
64
64
  "dependencies": {
65
- "@dgui/react-shared": "^1.0.0"
65
+ "@dgui/react-shared": "^1.3.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": "cc277755c1bcdf0ca2581c6062f04c5e4ec96256"
79
+ "gitHead": "963c267fd7497cfb02fb4f40b7e64e1bf7b0677b"
80
80
  }