@redneckz/wildless-cms-uni-blocks 0.14.852 → 0.14.854
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/bundle/bundle.umd.js +10 -5
- package/bundle/bundle.umd.min.js +1 -1
- package/dist/hooks/useLink.js +2 -1
- package/dist/hooks/useLink.js.map +1 -1
- package/dist/ui-kit/TabsControl/TabItem.js +3 -2
- package/dist/ui-kit/TabsControl/TabItem.js.map +1 -1
- package/dist/utils/adjustBase.js +4 -1
- package/dist/utils/adjustBase.js.map +1 -1
- package/lib/hooks/useLink.js +2 -1
- package/lib/hooks/useLink.js.map +1 -1
- package/lib/ui-kit/TabsControl/TabItem.js +3 -2
- package/lib/ui-kit/TabsControl/TabItem.js.map +1 -1
- package/lib/utils/adjustBase.js +4 -1
- package/lib/utils/adjustBase.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +10 -5
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/dist/hooks/useLink.js +2 -1
- package/mobile/dist/hooks/useLink.js.map +1 -1
- package/mobile/dist/ui-kit/TabsControl/TabItem.js +3 -2
- package/mobile/dist/ui-kit/TabsControl/TabItem.js.map +1 -1
- package/mobile/dist/utils/adjustBase.js +4 -1
- package/mobile/dist/utils/adjustBase.js.map +1 -1
- package/mobile/lib/hooks/useLink.js +2 -1
- package/mobile/lib/hooks/useLink.js.map +1 -1
- package/mobile/lib/ui-kit/TabsControl/TabItem.js +3 -2
- package/mobile/lib/ui-kit/TabsControl/TabItem.js.map +1 -1
- package/mobile/lib/utils/adjustBase.js +4 -1
- package/mobile/lib/utils/adjustBase.js.map +1 -1
- package/mobile/src/hooks/useLink.ts +3 -1
- package/mobile/src/ui-kit/TabsControl/TabItem.tsx +8 -3
- package/mobile/src/utils/adjustBase.ts +6 -1
- package/package.json +1 -1
- package/src/hooks/useLink.ts +3 -1
- package/src/ui-kit/TabsControl/TabItem.tsx +8 -3
- package/src/utils/adjustBase.ts +6 -1
|
@@ -8,6 +8,7 @@ const adjustBase_1 = require("../utils/adjustBase");
|
|
|
8
8
|
const adjustHref_1 = require("../utils/adjustHref");
|
|
9
9
|
const getBasePath_1 = require("../utils/getBasePath");
|
|
10
10
|
const url_1 = require("../utils/url");
|
|
11
|
+
const RESERVED_PREFIX = ['/api'];
|
|
11
12
|
function useLink() {
|
|
12
13
|
const router = (0, useRouter_1.useRouter)();
|
|
13
14
|
const { closeAll } = (0, useDialogManager_1.useDialogManager)();
|
|
@@ -31,6 +32,6 @@ function useLink() {
|
|
|
31
32
|
}
|
|
32
33
|
exports.useLink = useLink;
|
|
33
34
|
const isClientRouting = (href, target, basePath) => (0, url_1.isLocalURL)(href, target) &&
|
|
34
|
-
!Env_1.env.SUB_PORTALS?.split(',')
|
|
35
|
+
![...RESERVED_PREFIX, ...(Env_1.env.SUB_PORTALS?.split(',') ?? [])].some((0, url_1.hasPrefix)(href)) &&
|
|
35
36
|
(0, url_1.hasPrefix)(href)(basePath || '/');
|
|
36
37
|
//# sourceMappingURL=useLink.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AAAA,gCAA6B;AAC7B,mEAAgE;AAChE,qDAAkD;AAElD,+EAA4E;AAE5E,oDAAiD;AACjD,oDAAiD;AACjD,sDAAmD;AACnD,sCAAqD;
|
|
1
|
+
{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AAAA,gCAA6B;AAC7B,mEAAgE;AAChE,qDAAkD;AAElD,+EAA4E;AAE5E,oDAAiD;AACjD,oDAAiD;AACjD,sDAAmD;AACnD,sCAAqD;AAErD,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,CAAC;AAMjC,SAAgB,OAAO;IACrB,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAExC,OAAO,CAA2C,KAAQ,EAAiB,EAAE;QAC3E,MAAM,IAAI,GAAG,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,IAAA,mCAAgB,EAAC,CAAC,EAAqB,EAAE,EAAE;gBAClD,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEpB,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,SAAG,CAAC,QAAQ,CAAC,CAAC;gBAC3C,IAAI,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;oBACjD,QAAQ,EAAE,CAAC;oBACX,EAAE,EAAE,cAAc,EAAE,CAAC;oBACrB,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;iBACzC;YACH,CAAC,CAAC;SACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAvBD,0BAuBC;AAED,MAAM,eAAe,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,QAAiB,EAAE,EAAE,CACvF,IAAA,gBAAU,EAAC,IAAI,EAAE,MAAM,CAAC;IACxB,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,CAAC,SAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAA,eAAS,EAAC,IAAI,CAAC,CAAC;IACnF,IAAA,eAAS,EAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC"}
|
|
@@ -16,8 +16,9 @@ const LinkTabItem = (0, uni_jsx_1.JSX)((props) => {
|
|
|
16
16
|
});
|
|
17
17
|
// TODO: Update handlerDecorator (support buttons?)
|
|
18
18
|
const ButtonTabItem = (0, uni_jsx_1.JSX)(({ item = {}, onClick, ...rest }) => {
|
|
19
|
-
const handleClick = (0, hooks_1.useCallback)(() => {
|
|
20
|
-
|
|
19
|
+
const handleClick = (0, hooks_1.useCallback)((e) => {
|
|
20
|
+
e.target.scrollIntoView({ block: 'nearest' });
|
|
21
|
+
onClick?.(item);
|
|
21
22
|
}, [onClick, item]);
|
|
22
23
|
return (0, jsx_runtime_1.jsx)(TabItemInner_1.TabItemInner, { item: item, onClick: handleClick, ...rest });
|
|
23
24
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TabItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TabsControl/TabItem.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAA0D;AAC1D,iDAA8C;AAI9C,iDAA8C;
|
|
1
|
+
{"version":3,"file":"TabItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TabsControl/TabItem.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAA0D;AAC1D,iDAA8C;AAI9C,iDAA8C;AAiBjC,QAAA,OAAO,GAAG,IAAA,aAAG,EAAe,CAAC,KAAK,EAAE,EAAE,CACjD,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,uBAAC,WAAW,OAAK,KAAK,GAAI,CAAC,CAAC,CAAC,uBAAC,aAAa,OAAK,KAAK,GAAI,CAC9E,CAAC;AAEF,MAAM,WAAW,GAAG,IAAA,aAAG,EAAe,CAAC,KAAK,EAAE,EAAE;IAC9C,MAAM,IAAI,GAAG,IAAA,iBAAO,GAAE,CAAC;IAEvB,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACnC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAEhC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAE3E,OAAO,uBAAC,2BAAY,OAAK,KAAK,EAAE,GAAG,EAAC,GAAG,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAI,CAAC;AAC3E,CAAC,CAAC,CAAC;AAEH,mDAAmD;AACnD,MAAM,aAAa,GAAG,IAAA,aAAG,EAAe,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC1E,MAAM,WAAW,GAAG,IAAA,mBAAW,EAC7B,CAAC,CAAC,EAAE,EAAE;QACJ,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAC9C,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC,EACD,CAAC,OAAO,EAAE,IAAI,CAAC,CAChB,CAAC;IAEF,OAAO,uBAAC,2BAAY,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,KAAM,IAAI,GAAI,CAAC;AACtE,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
2
2
|
exports.adjustBase = void 0;
|
|
3
|
-
const
|
|
3
|
+
const FORWARD_SLASH = '/';
|
|
4
|
+
const adjustBase = (href = FORWARD_SLASH, basePath = FORWARD_SLASH) => [href, basePath].some((_) => _ === FORWARD_SLASH)
|
|
5
|
+
? href
|
|
6
|
+
: href.replace(basePath, '') || FORWARD_SLASH;
|
|
4
7
|
exports.adjustBase = adjustBase;
|
|
5
8
|
//# sourceMappingURL=adjustBase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":";;AAAA,MAAM,aAAa,GAAG,GAAG,CAAC;AAEnB,MAAM,UAAU,GAAG,CAAC,OAAe,aAAa,EAAE,WAAmB,aAAa,EAAE,EAAE,CAC3F,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,aAAa,CAAC;IAC/C,CAAC,CAAC,IAAI;IACN,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC;AAHrC,QAAA,UAAU,cAG2B"}
|
|
@@ -6,6 +6,7 @@ import { adjustBase } from '../utils/adjustBase.js';
|
|
|
6
6
|
import { adjustHref } from '../utils/adjustHref.js';
|
|
7
7
|
import { getBasePath } from '../utils/getBasePath.js';
|
|
8
8
|
import { hasPrefix, isLocalURL } from '../utils/url.js';
|
|
9
|
+
const RESERVED_PREFIX = ['/api'];
|
|
9
10
|
export function useLink() {
|
|
10
11
|
const router = useRouter();
|
|
11
12
|
const { closeAll } = useDialogManager();
|
|
@@ -28,6 +29,6 @@ export function useLink() {
|
|
|
28
29
|
};
|
|
29
30
|
}
|
|
30
31
|
const isClientRouting = (href, target, basePath) => isLocalURL(href, target) &&
|
|
31
|
-
!env.SUB_PORTALS?.split(',')
|
|
32
|
+
![...RESERVED_PREFIX, ...(env.SUB_PORTALS?.split(',') ?? [])].some(hasPrefix(href)) &&
|
|
32
33
|
hasPrefix(href)(basePath || '/');
|
|
33
34
|
//# sourceMappingURL=useLink.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,CAAC;AAMjC,MAAM,UAAU,OAAO;IACrB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAExC,OAAO,CAA2C,KAAQ,EAAiB,EAAE;QAC3E,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAqB,EAAE,EAAE;gBAClD,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEpB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC3C,IAAI,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;oBACjD,QAAQ,EAAE,CAAC;oBACX,EAAE,EAAE,cAAc,EAAE,CAAC;oBACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;iBACzC;YACH,CAAC,CAAC;SACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,eAAe,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,QAAiB,EAAE,EAAE,CACvF,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACxB,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACnF,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC"}
|
|
@@ -14,8 +14,9 @@ const LinkTabItem = JSX((props) => {
|
|
|
14
14
|
});
|
|
15
15
|
// TODO: Update handlerDecorator (support buttons?)
|
|
16
16
|
const ButtonTabItem = JSX(({ item = {}, onClick, ...rest }) => {
|
|
17
|
-
const handleClick = useCallback(() => {
|
|
18
|
-
|
|
17
|
+
const handleClick = useCallback((e) => {
|
|
18
|
+
e.target.scrollIntoView({ block: 'nearest' });
|
|
19
|
+
onClick?.(item);
|
|
19
20
|
}, [onClick, item]);
|
|
20
21
|
return _jsx(TabItemInner, { item: item, onClick: handleClick, ...rest });
|
|
21
22
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TabItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TabsControl/TabItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"TabItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TabsControl/TabItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAiB9C,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAe,CAAC,KAAK,EAAE,EAAE,CACjD,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,KAAC,WAAW,OAAK,KAAK,GAAI,CAAC,CAAC,CAAC,KAAC,aAAa,OAAK,KAAK,GAAI,CAC9E,CAAC;AAEF,MAAM,WAAW,GAAG,GAAG,CAAe,CAAC,KAAK,EAAE,EAAE;IAC9C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IAEvB,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAEhC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAE3E,OAAO,KAAC,YAAY,OAAK,KAAK,EAAE,GAAG,EAAC,GAAG,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAI,CAAC;AAC3E,CAAC,CAAC,CAAC;AAEH,mDAAmD;AACnD,MAAM,aAAa,GAAG,GAAG,CAAe,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC1E,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,CAAC,EAAE,EAAE;QACJ,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAC9C,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC,EACD,CAAC,OAAO,EAAE,IAAI,CAAC,CAChB,CAAC;IAEF,OAAO,KAAC,YAAY,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,KAAM,IAAI,GAAI,CAAC;AACtE,CAAC,CAAC,CAAC"}
|
|
@@ -1,2 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
const FORWARD_SLASH = '/';
|
|
2
|
+
export const adjustBase = (href = FORWARD_SLASH, basePath = FORWARD_SLASH) => [href, basePath].some((_) => _ === FORWARD_SLASH)
|
|
3
|
+
? href
|
|
4
|
+
: href.replace(basePath, '') || FORWARD_SLASH;
|
|
2
5
|
//# sourceMappingURL=adjustBase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG,GAAG,CAAC;AAE1B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAe,aAAa,EAAE,WAAmB,aAAa,EAAE,EAAE,CAC3F,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,aAAa,CAAC;IAC/C,CAAC,CAAC,IAAI;IACN,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC"}
|
|
@@ -9,6 +9,8 @@ import { adjustHref } from '../utils/adjustHref';
|
|
|
9
9
|
import { getBasePath } from '../utils/getBasePath';
|
|
10
10
|
import { hasPrefix, isLocalURL } from '../utils/url';
|
|
11
11
|
|
|
12
|
+
const RESERVED_PREFIX = ['/api'];
|
|
13
|
+
|
|
12
14
|
export interface Clickable {
|
|
13
15
|
onClick(ev?: PreventableEvent): void;
|
|
14
16
|
}
|
|
@@ -40,5 +42,5 @@ export function useLink() {
|
|
|
40
42
|
|
|
41
43
|
const isClientRouting = (href: string | undefined, target?: Target, basePath?: string) =>
|
|
42
44
|
isLocalURL(href, target) &&
|
|
43
|
-
!env.SUB_PORTALS?.split(',')
|
|
45
|
+
![...RESERVED_PREFIX, ...(env.SUB_PORTALS?.split(',') ?? [])].some(hasPrefix(href)) &&
|
|
44
46
|
hasPrefix(href)(basePath || '/');
|
|
@@ -6,6 +6,7 @@ import { type LinkProps } from '../../model/LinkProps';
|
|
|
6
6
|
import { type IconProps } from '../../model/Picture';
|
|
7
7
|
import { TabItemInner } from './TabItemInner';
|
|
8
8
|
import { type TabsControlProps, type TabsType } from './TabsControlProps';
|
|
9
|
+
|
|
9
10
|
export interface TabItemBase extends LinkProps, TitleProps, DescriptionProps, IconProps {
|
|
10
11
|
name?: string;
|
|
11
12
|
count?: number;
|
|
@@ -38,9 +39,13 @@ const LinkTabItem = JSX<TabItemProps>((props) => {
|
|
|
38
39
|
|
|
39
40
|
// TODO: Update handlerDecorator (support buttons?)
|
|
40
41
|
const ButtonTabItem = JSX<TabItemProps>(({ item = {}, onClick, ...rest }) => {
|
|
41
|
-
const handleClick = useCallback(
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
const handleClick = useCallback(
|
|
43
|
+
(e) => {
|
|
44
|
+
e.target.scrollIntoView({ block: 'nearest' });
|
|
45
|
+
onClick?.(item);
|
|
46
|
+
},
|
|
47
|
+
[onClick, item],
|
|
48
|
+
);
|
|
44
49
|
|
|
45
50
|
return <TabItemInner item={item} onClick={handleClick} {...rest} />;
|
|
46
51
|
});
|
|
@@ -1 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
const FORWARD_SLASH = '/';
|
|
2
|
+
|
|
3
|
+
export const adjustBase = (href: string = FORWARD_SLASH, basePath: string = FORWARD_SLASH) =>
|
|
4
|
+
[href, basePath].some((_) => _ === FORWARD_SLASH)
|
|
5
|
+
? href
|
|
6
|
+
: href.replace(basePath, '') || FORWARD_SLASH;
|
package/package.json
CHANGED
package/src/hooks/useLink.ts
CHANGED
|
@@ -9,6 +9,8 @@ import { adjustHref } from '../utils/adjustHref';
|
|
|
9
9
|
import { getBasePath } from '../utils/getBasePath';
|
|
10
10
|
import { hasPrefix, isLocalURL } from '../utils/url';
|
|
11
11
|
|
|
12
|
+
const RESERVED_PREFIX = ['/api'];
|
|
13
|
+
|
|
12
14
|
export interface Clickable {
|
|
13
15
|
onClick(ev?: PreventableEvent): void;
|
|
14
16
|
}
|
|
@@ -40,5 +42,5 @@ export function useLink() {
|
|
|
40
42
|
|
|
41
43
|
const isClientRouting = (href: string | undefined, target?: Target, basePath?: string) =>
|
|
42
44
|
isLocalURL(href, target) &&
|
|
43
|
-
!env.SUB_PORTALS?.split(',')
|
|
45
|
+
![...RESERVED_PREFIX, ...(env.SUB_PORTALS?.split(',') ?? [])].some(hasPrefix(href)) &&
|
|
44
46
|
hasPrefix(href)(basePath || '/');
|
|
@@ -6,6 +6,7 @@ import { type LinkProps } from '../../model/LinkProps';
|
|
|
6
6
|
import { type IconProps } from '../../model/Picture';
|
|
7
7
|
import { TabItemInner } from './TabItemInner';
|
|
8
8
|
import { type TabsControlProps, type TabsType } from './TabsControlProps';
|
|
9
|
+
|
|
9
10
|
export interface TabItemBase extends LinkProps, TitleProps, DescriptionProps, IconProps {
|
|
10
11
|
name?: string;
|
|
11
12
|
count?: number;
|
|
@@ -38,9 +39,13 @@ const LinkTabItem = JSX<TabItemProps>((props) => {
|
|
|
38
39
|
|
|
39
40
|
// TODO: Update handlerDecorator (support buttons?)
|
|
40
41
|
const ButtonTabItem = JSX<TabItemProps>(({ item = {}, onClick, ...rest }) => {
|
|
41
|
-
const handleClick = useCallback(
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
const handleClick = useCallback(
|
|
43
|
+
(e) => {
|
|
44
|
+
e.target.scrollIntoView({ block: 'nearest' });
|
|
45
|
+
onClick?.(item);
|
|
46
|
+
},
|
|
47
|
+
[onClick, item],
|
|
48
|
+
);
|
|
44
49
|
|
|
45
50
|
return <TabItemInner item={item} onClick={handleClick} {...rest} />;
|
|
46
51
|
});
|
package/src/utils/adjustBase.ts
CHANGED
|
@@ -1 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
const FORWARD_SLASH = '/';
|
|
2
|
+
|
|
3
|
+
export const adjustBase = (href: string = FORWARD_SLASH, basePath: string = FORWARD_SLASH) =>
|
|
4
|
+
[href, basePath].some((_) => _ === FORWARD_SLASH)
|
|
5
|
+
? href
|
|
6
|
+
: href.replace(basePath, '') || FORWARD_SLASH;
|