@redneckz/wildless-cms-uni-blocks 0.14.630 → 0.14.631

package/mobile/bundle/utils/adjustBase.d.ts

@@ -1 +1 @@
-export declare const adjustBase: (href: string, basePath?: string) => string;
+export declare const adjustBase: (href?: string, basePath?: string) => string;

package/mobile/dist/Env.d.ts

@@ -1,5 +1,7 @@
 export interface Env {
     SITE_URL?: string;
+    SUB_PORTALS?: string;
+    MOBILE?: string;
 }
 export declare const env: Env & {
     _: Env;

package/mobile/dist/Env.js.map

@@ -1 +1 @@
-{"version":3,"file":"Env.js","sourceRoot":"","sources":["../src/Env.ts"],"names":[],"mappings":";;AAIa,QAAA,GAAG,GAGZ,IAAI,KAAK,CACX;IACE,CAAC,EAAE,EAAS;IAEZ,KAAK,CAAC,CAAM;QACV,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,EACD;IACE,GAAG,CAAC,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACF,CACF,CAAC"}
+{"version":3,"file":"Env.js","sourceRoot":"","sources":["../src/Env.ts"],"names":[],"mappings":";;AAMa,QAAA,GAAG,GAGZ,IAAI,KAAK,CACX;IACE,CAAC,EAAE,EAAS;IAEZ,KAAK,CAAC,CAAM;QACV,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,EACD;IACE,GAAG,CAAC,MAAM,EAAE,CAAY;QACtB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACF,CACF,CAAC"}

package/mobile/dist/hooks/useLink.js

@@ -23,10 +23,9 @@ function useLink() {
     };
     function handleHref({ href, target, onClick }) {
         return (ev) => {
-            onClick && onClick(ev);
-            const isRemote = !(0, url_1.hasPrefix)(href, basePath || '/');
-            if (!href || isRemote || !(0, url_1.isLocalURL)(href, target)) {
-                //? Default routing
+            onClick?.(ev);
+            if (checkIsRemote(href, target, basePath)) {
+                //? Native routing
                 return;
             }
             closeAll();
@@ -37,4 +36,14 @@ function useLink() {
     }
 }
 exports.useLink = useLink;
+const checkIsRemote = (href, target, basePath) => {
+    if (!(0, url_1.isLocalURL)(href, target)) {
+        return true;
+    }
+    const subPortals = Env_1.env.SUB_PORTALS?.split(',');
+    if (subPortals?.some((_) => (0, url_1.hasPrefix)(href, _))) {
+        return true;
+    }
+    return !(0, url_1.hasPrefix)(href, basePath || '/');
+};
 //# sourceMappingURL=useLink.js.map

package/mobile/dist/hooks/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AAAA,gCAA6B;AAE7B,+EAA4E;AAE5E,oDAAiD;AACjD,oDAAiD;AACjD,sDAAmD;AACnD,sCAAqD;AACrD,yDAAsD;AACtD,2CAAwC;AAMxC,SAAgB,OAAO;IACrB,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,SAAG,CAAC,QAAQ,CAAC,CAAC;IAE3C,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,UAAU,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC;IACJ,CAAC,CAAC;IAEF,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,MAAM,QAAQ,GAAG,CAAC,IAAA,eAAS,EAAC,IAAI,EAAE,QAAQ,IAAI,GAAG,CAAC,CAAC;YAEnD,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,IAAA,gBAAU,EAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,mBAAmB;gBACnB,OAAO;aACR;YAED,QAAQ,EAAE,CAAC;YAEX,kBAAkB;YAClB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAnCD,0BAmCC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AAAA,gCAA6B;AAE7B,+EAA4E;AAE5E,oDAAiD;AACjD,oDAAiD;AACjD,sDAAmD;AACnD,sCAAqD;AACrD,yDAAsD;AACtD,2CAAwC;AAMxC,SAAgB,OAAO;IACrB,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,SAAG,CAAC,QAAQ,CAAC,CAAC;IAE3C,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,UAAU,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC;IACJ,CAAC,CAAC;IAEF,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;YAEd,IAAI,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE;gBACzC,kBAAkB;gBAClB,OAAO;aACR;YAED,QAAQ,EAAE,CAAC;YAEX,kBAAkB;YAClB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAjCD,0BAiCC;AAED,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,MAAe,EAAE,QAAiB,EAAE,EAAE;IAC1E,IAAI,CAAC,IAAA,gBAAU,EAAC,IAAI,EAAE,MAAM,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,SAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/C,IAAI,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAS,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;QAC/C,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CAAC,IAAA,eAAS,EAAC,IAAI,EAAE,QAAQ,IAAI,GAAG,CAAC,CAAC;AAC3C,CAAC,CAAC"}

package/mobile/dist/utils/adjustBase.d.ts

@@ -1 +1 @@
-export declare const adjustBase: (href: string, basePath?: string) => string;
+export declare const adjustBase: (href?: string, basePath?: string) => string;

package/mobile/dist/utils/adjustBase.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.adjustBase = void 0;
-const adjustBase = (href, basePath = '') => href.replace(basePath, '') || '/';
+const adjustBase = (href, basePath = '') => href?.replace(basePath, '') || '/';
 exports.adjustBase = adjustBase;
 //# sourceMappingURL=adjustBase.js.map

package/mobile/dist/utils/adjustBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":";;AAAO,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC;AAAhF,QAAA,UAAU,cAAsE"}
+{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":";;AAAO,MAAM,UAAU,GAAG,CAAC,IAAa,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC;AAAlF,QAAA,UAAU,cAAwE"}

package/mobile/dist/utils/getBasePath.js

@@ -2,8 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBasePath = void 0;
 function getBasePath(siteUrl = '') {
     try {
-        const [, ...tail] = new URL(siteUrl).pathname.split('/');
-        return `/${tail.filter(Boolean).join('/')}`;
+        return new URL(siteUrl).pathname;
     }
     catch (_) {
         return '';

package/mobile/dist/utils/getBasePath.js.map

@@ -1 +1 @@
-{"version":3,"file":"getBasePath.js","sourceRoot":"","sources":["../../src/utils/getBasePath.ts"],"names":[],"mappings":";;AAAA,SAAgB,WAAW,CAAC,OAAO,GAAG,EAAE;IACtC,IAAI;QACF,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEzD,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,kCAQC"}
+{"version":3,"file":"getBasePath.js","sourceRoot":"","sources":["../../src/utils/getBasePath.ts"],"names":[],"mappings":";;AAAA,SAAgB,WAAW,CAAC,OAAO,GAAG,EAAE;IACtC,IAAI;QACF,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;KAClC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAND,kCAMC"}

package/mobile/dist/utils/url.js

@@ -12,15 +12,16 @@ const joinPath = (...path) => path
     .filter(Boolean)
     .join('/')
     .replace(/\/+/g, '/')
-    .replace(/^(.+):\//, '$1://')
-    .replace(/^file:/, 'file:/')
-    .replace(/\/(\?|&|#[^!])/g, '$1')
-    .replace(/\?/g, '&')
-    .replace('&', '?');
+    .replace(/^(.+):\//, '$1://');
 exports.joinPath = joinPath;
-const hasPrefix = (href, prefix) => Boolean(prefix &&
-    href &&
-    href.startsWith(prefix) &&
-    [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean));
+const hasPrefix = (href, prefix) => {
+    if (!href || !prefix) {
+        return false;
+    }
+    if (href.startsWith(prefix)) {
+        return [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean);
+    }
+    return false;
+};
 exports.hasPrefix = hasPrefix;
 //# sourceMappingURL=url.js.map

package/mobile/dist/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAEO,MAAM,KAAK,GAAG,CAAC,IAAa,EAAiC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAAvF,QAAA,KAAK,SAAkF;AAE7F,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AADtD,QAAA,UAAU,cAC4C;AAE5D,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAAjF,QAAA,MAAM,UAA2E;AAEvF,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AADzC,QAAA,YAAY,gBAC6B;AAE/C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC;KAC5B,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAC3B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;KAChC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;KACnB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AATV,QAAA,QAAQ,YASE;AAEhB,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,MAA2B,EAAE,EAAE,CACtE,OAAO,CACL,MAAM;IACJ,IAAI;IACJ,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,EAAE,IAAI,KAAK,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAC/E,CAAC;AANS,QAAA,SAAS,aAMlB"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAEO,MAAM,KAAK,GAAG,CAAC,IAAa,EAAiC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAAvF,QAAA,KAAK,SAAkF;AAE7F,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AADtD,QAAA,UAAU,cAC4C;AAE5D,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAAjF,QAAA,MAAM,UAA2E;AAEvF,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AADzC,QAAA,YAAY,gBAC6B;AAE/C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AALrB,QAAA,QAAQ,YAKa;AAE3B,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,MAA2B,EAAE,EAAE;IACtE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;QACpB,OAAO,KAAK,CAAC;KACd;IAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC3B,OAAO,CAAC,MAAM,KAAK,GAAG,EAAE,IAAI,KAAK,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACrF;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAVW,QAAA,SAAS,aAUpB"}

package/mobile/lib/Env.d.ts

@@ -1,5 +1,7 @@
 export interface Env {
     SITE_URL?: string;
+    SUB_PORTALS?: string;
+    MOBILE?: string;
 }
 export declare const env: Env & {
     _: Env;

package/mobile/lib/Env.js.map

@@ -1 +1 @@
-{"version":3,"file":"Env.js","sourceRoot":"","sources":["../src/Env.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,GAAG,GAGZ,IAAI,KAAK,CACX;IACE,CAAC,EAAE,EAAS;IAEZ,KAAK,CAAC,CAAM;QACV,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,EACD;IACE,GAAG,CAAC,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACF,CACF,CAAC"}
+{"version":3,"file":"Env.js","sourceRoot":"","sources":["../src/Env.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,GAAG,GAGZ,IAAI,KAAK,CACX;IACE,CAAC,EAAE,EAAS;IAEZ,KAAK,CAAC,CAAM;QACV,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,EACD;IACE,GAAG,CAAC,MAAM,EAAE,CAAY;QACtB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACF,CACF,CAAC"}

package/mobile/lib/hooks/useLink.js

@@ -21,10 +21,9 @@ export function useLink() {
     };
     function handleHref({ href, target, onClick }) {
         return (ev) => {
-            onClick && onClick(ev);
-            const isRemote = !hasPrefix(href, basePath || '/');
-            if (!href || isRemote || !isLocalURL(href, target)) {
-                //? Default routing
+            onClick?.(ev);
+            if (checkIsRemote(href, target, basePath)) {
+                //? Native routing
                 return;
             }
             closeAll();
@@ -34,4 +33,14 @@ export function useLink() {
         };
     }
 }
+const checkIsRemote = (href, target, basePath) => {
+    if (!isLocalURL(href, target)) {
+        return true;
+    }
+    const subPortals = env.SUB_PORTALS?.split(',');
+    if (subPortals?.some((_) => hasPrefix(href, _))) {
+        return true;
+    }
+    return !hasPrefix(href, basePath || '/');
+};
 //# sourceMappingURL=useLink.js.map

package/mobile/lib/hooks/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,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;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,MAAM,UAAU,OAAO;IACrB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE3C,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,UAAU,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC;IACJ,CAAC,CAAC;IAEF,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,MAAM,QAAQ,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,IAAI,GAAG,CAAC,CAAC;YAEnD,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,mBAAmB;gBACnB,OAAO;aACR;YAED,QAAQ,EAAE,CAAC;YAEX,kBAAkB;YAClB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,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;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,MAAM,UAAU,OAAO;IACrB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE3C,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,UAAU,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC;IACJ,CAAC,CAAC;IAEF,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;YAEd,IAAI,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE;gBACzC,kBAAkB;gBAClB,OAAO;aACR;YAED,QAAQ,EAAE,CAAC;YAEX,kBAAkB;YAClB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,MAAe,EAAE,QAAiB,EAAE,EAAE;IAC1E,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/C,IAAI,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;QAC/C,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,IAAI,GAAG,CAAC,CAAC;AAC3C,CAAC,CAAC"}

package/mobile/lib/utils/adjustBase.d.ts

@@ -1 +1 @@
-export declare const adjustBase: (href: string, basePath?: string) => string;
+export declare const adjustBase: (href?: string, basePath?: string) => string;

package/mobile/lib/utils/adjustBase.js

@@ -1,2 +1,2 @@
-export const adjustBase = (href, basePath = '') => href.replace(basePath, '') || '/';
+export const adjustBase = (href, basePath = '') => href?.replace(basePath, '') || '/';
 //# sourceMappingURL=adjustBase.js.map

package/mobile/lib/utils/adjustBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC"}
+{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAa,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC"}

package/mobile/lib/utils/getBasePath.js

@@ -1,7 +1,6 @@
 export function getBasePath(siteUrl = '') {
     try {
-        const [, ...tail] = new URL(siteUrl).pathname.split('/');
-        return `/${tail.filter(Boolean).join('/')}`;
+        return new URL(siteUrl).pathname;
     }
     catch (_) {
         return '';

package/mobile/lib/utils/getBasePath.js.map

@@ -1 +1 @@
-{"version":3,"file":"getBasePath.js","sourceRoot":"","sources":["../../src/utils/getBasePath.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,OAAO,GAAG,EAAE;IACtC,IAAI;QACF,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEzD,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC"}
+{"version":3,"file":"getBasePath.js","sourceRoot":"","sources":["../../src/utils/getBasePath.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,OAAO,GAAG,EAAE;IACtC,IAAI;QACF,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;KAClC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC"}

package/mobile/lib/utils/url.js

@@ -6,13 +6,14 @@ export const joinPath = (...path) => path
     .filter(Boolean)
     .join('/')
     .replace(/\/+/g, '/')
-    .replace(/^(.+):\//, '$1://')
-    .replace(/^file:/, 'file:/')
-    .replace(/\/(\?|&|#[^!])/g, '$1')
-    .replace(/\?/g, '&')
-    .replace('&', '?');
-export const hasPrefix = (href, prefix) => Boolean(prefix &&
-    href &&
-    href.startsWith(prefix) &&
-    [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean));
+    .replace(/^(.+):\//, '$1://');
+export const hasPrefix = (href, prefix) => {
+    if (!href || !prefix) {
+        return false;
+    }
+    if (href.startsWith(prefix)) {
+        return [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean);
+    }
+    return false;
+};
 //# sourceMappingURL=url.js.map

package/mobile/lib/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAiC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAEpG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC;KAC5B,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAC3B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;KAChC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;KACnB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEvB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,MAA2B,EAAE,EAAE,CACtE,OAAO,CACL,MAAM;IACJ,IAAI;IACJ,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,EAAE,IAAI,KAAK,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAC/E,CAAC"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAiC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAEpG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAElC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,MAA2B,EAAE,EAAE;IACtE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;QACpB,OAAO,KAAK,CAAC;KACd;IAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC3B,OAAO,CAAC,MAAM,KAAK,GAAG,EAAE,IAAI,KAAK,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACrF;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/mobile/src/Env.ts

@@ -1,5 +1,7 @@
 export interface Env {
   SITE_URL?: string;
+  SUB_PORTALS?: string;
+  MOBILE?: string;
 }
 
 export const env: Env & {
@@ -14,7 +16,7 @@ export const env: Env & {
     },
   },
   {
-    get(target, p) {
+    get(target, p: keyof Env) {
       return target._[p] || target[p];
     },
   },

package/mobile/src/hooks/useLink.ts

@@ -1,5 +1,5 @@
 import { env } from '../Env';
-import { type LinkProps } from '../model/LinkProps';
+import { type LinkProps, type Target } from '../model/LinkProps';
 import { useDialogManager } from '../ui-kit/DialogManager/useDialogManager';
 import { type PreventableEvent } from '../ui-kit/PreventableEvent';
 import { adjustBase } from '../utils/adjustBase';
@@ -32,12 +32,10 @@ export function useLink() {
 
   function handleHref({ href, target, onClick }: Partial<LinkProps & Clickable>) {
     return (ev?: PreventableEvent) => {
-      onClick && onClick(ev);
+      onClick?.(ev);
 
-      const isRemote = !hasPrefix(href, basePath || '/');
-
-      if (!href || isRemote || !isLocalURL(href, target)) {
-        //? Default routing
+      if (checkIsRemote(href, target, basePath)) {
+        //? Native routing
         return;
       }
 
@@ -49,3 +47,17 @@ export function useLink() {
     };
   }
 }
+
+const checkIsRemote = (href?: string, target?: Target, basePath?: string) => {
+  if (!isLocalURL(href, target)) {
+    return true;
+  }
+
+  const subPortals = env.SUB_PORTALS?.split(',');
+
+  if (subPortals?.some((_) => hasPrefix(href, _))) {
+    return true;
+  }
+
+  return !hasPrefix(href, basePath || '/');
+};

package/mobile/src/utils/adjustBase.ts

@@ -1 +1 @@
-export const adjustBase = (href: string, basePath = '') => href.replace(basePath, '') || '/';
+export const adjustBase = (href?: string, basePath = '') => href?.replace(basePath, '') || '/';

package/mobile/src/utils/getBasePath.ts

@@ -1,8 +1,6 @@
 export function getBasePath(siteUrl = '') {
   try {
-    const [, ...tail] = new URL(siteUrl).pathname.split('/');
-
-    return `/${tail.filter(Boolean).join('/')}`;
+    return new URL(siteUrl).pathname;
   } catch (_) {
     return '';
   }

package/mobile/src/utils/url.ts

@@ -15,16 +15,16 @@ export const joinPath = (...path: (string | undefined | null)[]): string =>
     .filter(Boolean)
     .join('/')
     .replace(/\/+/g, '/')
-    .replace(/^(.+):\//, '$1://')
-    .replace(/^file:/, 'file:/')
-    .replace(/\/(\?|&|#[^!])/g, '$1')
-    .replace(/\?/g, '&')
-    .replace('&', '?');
-
-export const hasPrefix = (href?: string, prefix?: string | undefined) =>
-  Boolean(
-    prefix &&
-      href &&
-      href.startsWith(prefix) &&
-      [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean), //? consider case with url "/natural_index_mortgage_0_1.svg"
-  );
+    .replace(/^(.+):\//, '$1://');
+
+export const hasPrefix = (href?: string, prefix?: string | undefined) => {
+  if (!href || !prefix) {
+    return false;
+  }
+
+  if (href.startsWith(prefix)) {
+    return [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean);
+  }
+
+  return false;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.630",
+  "version": "0.14.631",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/Env.ts

@@ -1,5 +1,7 @@
 export interface Env {
   SITE_URL?: string;
+  SUB_PORTALS?: string;
+  MOBILE?: string;
 }
 
 export const env: Env & {
@@ -14,7 +16,7 @@ export const env: Env & {
     },
   },
   {
-    get(target, p) {
+    get(target, p: keyof Env) {
       return target._[p] || target[p];
     },
   },

package/src/hooks/useLink.ts

@@ -1,5 +1,5 @@
 import { env } from '../Env';
-import { type LinkProps } from '../model/LinkProps';
+import { type LinkProps, type Target } from '../model/LinkProps';
 import { useDialogManager } from '../ui-kit/DialogManager/useDialogManager';
 import { type PreventableEvent } from '../ui-kit/PreventableEvent';
 import { adjustBase } from '../utils/adjustBase';
@@ -32,12 +32,10 @@ export function useLink() {
 
   function handleHref({ href, target, onClick }: Partial<LinkProps & Clickable>) {
     return (ev?: PreventableEvent) => {
-      onClick && onClick(ev);
+      onClick?.(ev);
 
-      const isRemote = !hasPrefix(href, basePath || '/');
-
-      if (!href || isRemote || !isLocalURL(href, target)) {
-        //? Default routing
+      if (checkIsRemote(href, target, basePath)) {
+        //? Native routing
         return;
       }
 
@@ -49,3 +47,17 @@ export function useLink() {
     };
   }
 }
+
+const checkIsRemote = (href?: string, target?: Target, basePath?: string) => {
+  if (!isLocalURL(href, target)) {
+    return true;
+  }
+
+  const subPortals = env.SUB_PORTALS?.split(',');
+
+  if (subPortals?.some((_) => hasPrefix(href, _))) {
+    return true;
+  }
+
+  return !hasPrefix(href, basePath || '/');
+};

package/src/utils/adjustBase.ts

@@ -1 +1 @@
-export const adjustBase = (href: string, basePath = '') => href.replace(basePath, '') || '/';
+export const adjustBase = (href?: string, basePath = '') => href?.replace(basePath, '') || '/';

package/src/utils/getBasePath.ts

@@ -1,8 +1,6 @@
 export function getBasePath(siteUrl = '') {
   try {
-    const [, ...tail] = new URL(siteUrl).pathname.split('/');
-
-    return `/${tail.filter(Boolean).join('/')}`;
+    return new URL(siteUrl).pathname;
   } catch (_) {
     return '';
   }

package/src/utils/url.ts

@@ -15,16 +15,16 @@ export const joinPath = (...path: (string | undefined | null)[]): string =>
     .filter(Boolean)
     .join('/')
     .replace(/\/+/g, '/')
-    .replace(/^(.+):\//, '$1://')
-    .replace(/^file:/, 'file:/')
-    .replace(/\/(\?|&|#[^!])/g, '$1')
-    .replace(/\?/g, '&')
-    .replace('&', '?');
-
-export const hasPrefix = (href?: string, prefix?: string | undefined) =>
-  Boolean(
-    prefix &&
-      href &&
-      href.startsWith(prefix) &&
-      [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean), //? consider case with url "/natural_index_mortgage_0_1.svg"
-  );
+    .replace(/^(.+):\//, '$1://');
+
+export const hasPrefix = (href?: string, prefix?: string | undefined) => {
+  if (!href || !prefix) {
+    return false;
+  }
+
+  if (href.startsWith(prefix)) {
+    return [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean);
+  }
+
+  return false;
+};