@redneckz/wildless-cms-uni-blocks 0.2.65 → 0.2.67

package/dist/Header/isSubItemActive.d.ts

@@ -1,3 +1,3 @@
 import type { Router } from '../ContentPageContext';
 import type { LinkContent } from '../types';
-export declare function isSubItemActive({ href, pathname }: Router): (item: LinkContent) => boolean;
+export declare function isSubItemActive(router: Router): (subItem: LinkContent) => boolean;

package/dist/Header/isSubItemActive.js

@@ -1,10 +1,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSubItemActive = void 0;
 const url_1 = require("../utils/url");
-function isSubItemActive({ href, pathname }) {
-    return (item) => {
-        return (0, url_1.withoutQuery)(item.href) === ((0, url_1.isURL)(item.href) ? (0, url_1.withoutQuery)(href) : pathname);
-    };
+function isSubItemActive(router) {
+    return (subItem) => (0, url_1.isHrefActive)(subItem.href, router);
 }
 exports.isSubItemActive = isSubItemActive;
 //# sourceMappingURL=isSubItemActive.js.map

package/dist/Header/isSubItemActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isSubItemActive.js","sourceRoot":"","sources":["../../src/Header/isSubItemActive.ts"],"names":[],"mappings":";;AAEA,sCAAmD;AAEnD,SAAgB,eAAe,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAU;IACxD,OAAO,CAAC,IAAiB,EAAW,EAAE;QACpC,OAAO,IAAA,kBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAA,WAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAY,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC,CAAC;AACJ,CAAC;AAJD,0CAIC"}
+{"version":3,"file":"isSubItemActive.js","sourceRoot":"","sources":["../../src/Header/isSubItemActive.ts"],"names":[],"mappings":";;AAEA,sCAA4C;AAE5C,SAAgB,eAAe,CAAC,MAAc;IAC5C,OAAO,CAAC,OAAoB,EAAW,EAAE,CAAC,IAAA,kBAAY,EAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC/E,CAAC;AAFD,0CAEC"}

package/dist/Header/isTopItemActive.d.ts

@@ -1,3 +1,3 @@
 import type { Router } from '../ContentPageContext';
 import type { LinkContent } from '../types';
-export declare function isTopItemActive({ href, pathname }: Router): (item: LinkContent) => boolean;
+export declare function isTopItemActive(router: Router): (topItem: LinkContent) => boolean;

package/dist/Header/isTopItemActive.js

@@ -1,14 +1,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isTopItemActive = void 0;
 const url_1 = require("../utils/url");
-function isTopItemActive({ href, pathname }) {
-    return (item) => {
-        const itemHref = (0, url_1.withoutQuery)(item.href);
-        if ((0, url_1.isURL)(itemHref)) {
-            return Boolean(href && href.startsWith(itemHref));
-        }
-        return Boolean(itemHref && pathname.startsWith(itemHref));
-    };
+function isTopItemActive(router) {
+    return (topItem) => (0, url_1.isHrefActive)(topItem.href, router, (topItemHref, baseHref) => baseHref.startsWith(topItemHref));
 }
 exports.isTopItemActive = isTopItemActive;
 //# sourceMappingURL=isTopItemActive.js.map

package/dist/Header/isTopItemActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isTopItemActive.js","sourceRoot":"","sources":["../../src/Header/isTopItemActive.ts"],"names":[],"mappings":";;AAEA,sCAAmD;AAEnD,SAAgB,eAAe,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAU;IACxD,OAAO,CAAC,IAAiB,EAAW,EAAE;QACpC,MAAM,QAAQ,GAAG,IAAA,kBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,IAAA,WAAK,EAAC,QAAQ,CAAC,EAAE;YACnB,OAAO,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;SACnD;QACD,OAAO,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC;AARD,0CAQC"}
+{"version":3,"file":"isTopItemActive.js","sourceRoot":"","sources":["../../src/Header/isTopItemActive.ts"],"names":[],"mappings":";;AAEA,sCAA4C;AAE5C,SAAgB,eAAe,CAAC,MAAc;IAC5C,OAAO,CAAC,OAAoB,EAAW,EAAE,CACvC,IAAA,kBAAY,EAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;AACpG,CAAC;AAHD,0CAGC"}

package/dist/MobileBlocks.d.ts

@@ -4,11 +4,8 @@ export declare const MobileBlocks: {
     Placeholder: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./Placeholder").PlaceholderProps, any>, context?: any) => any;
     Tile: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./Tile").TileProps, any>, context?: any) => any;
     ProductTile: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./ProductTile").ProductTileProps, any>, context?: any) => any;
-    ProductBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./ProductBlock").ProductBlockProps, any>, context?: any) => any;
-    StepsBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./StepsBlock").StepsBlockProps, any>, context?: any) => any;
+    ProductBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./ProductBlock.mobile").ProductBlockProps, any>, context?: any) => any;
     TextBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./TextBlock").TextBlockProps, any>, context?: any) => any;
-    BenefitsBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./BenefitsBlock").BenefitsBlockProps, any>, context?: any) => any;
-    ProductGallery: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./ProductGallery").ProductGalleryProps, any>, context?: any) => any;
     ExchangeRateTile: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./ExchangeRateTile").ExchangeRateTileProps, any>, context?: any) => any;
     MobileAppTile: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./MobileAppTile").MobileAppTileProps, any>, context?: any) => any;
 };

package/dist/MobileBlocks.js

@@ -1,15 +1,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MobileBlocks = void 0;
-const BenefitsBlock_1 = require("./BenefitsBlock");
 const ExchangeRateTile_1 = require("./ExchangeRateTile");
 const Footer_mobile_1 = require("./Footer/Footer.mobile");
 const index_1 = require("./Header/index");
 const MobileAppTile_1 = require("./MobileAppTile");
 const Placeholder_1 = require("./Placeholder");
-const ProductBlock_1 = require("./ProductBlock");
-const ProductGallery_1 = require("./ProductGallery");
+const ProductBlock_mobile_1 = require("./ProductBlock.mobile");
 const ProductTile_1 = require("./ProductTile");
-const StepsBlock_1 = require("./StepsBlock");
 const TextBlock_1 = require("./TextBlock");
 const Tile_1 = require("./Tile");
 exports.MobileBlocks = {
@@ -18,12 +15,12 @@ exports.MobileBlocks = {
     Placeholder: Placeholder_1.Placeholder,
     Tile: Tile_1.Tile,
     ProductTile: ProductTile_1.ProductTile,
-    ProductBlock: ProductBlock_1.ProductBlock,
-    StepsBlock: StepsBlock_1.StepsBlock,
+    ProductBlock: ProductBlock_mobile_1.ProductBlock,
     TextBlock: TextBlock_1.TextBlock,
-    BenefitsBlock: BenefitsBlock_1.BenefitsBlock,
-    ProductGallery: ProductGallery_1.ProductGallery,
     ExchangeRateTile: ExchangeRateTile_1.ExchangeRateTile,
     MobileAppTile: MobileAppTile_1.MobileAppTile,
+    // TODO StepsBlock,
+    // TODO BenefitsBlock,
+    // TODO ProductGallery
 };
 //# sourceMappingURL=MobileBlocks.js.map

package/dist/MobileBlocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"MobileBlocks.js","sourceRoot":"","sources":["../src/MobileBlocks.ts"],"names":[],"mappings":";;AAAA,mDAAgD;AAChD,yDAAsD;AACtD,0DAAgD;AAChD,0CAAwC;AACxC,mDAAgD;AAChD,+CAA4C;AAC5C,iDAA8C;AAC9C,qDAAkD;AAClD,+CAA4C;AAC5C,6CAA0C;AAC1C,2CAAwC;AACxC,iCAA8B;AAEjB,QAAA,YAAY,GAAG;IAC1B,MAAM,EAAN,cAAM;IACN,MAAM,EAAN,sBAAM;IACN,WAAW,EAAX,yBAAW;IACX,IAAI,EAAJ,WAAI;IACJ,WAAW,EAAX,yBAAW;IACX,YAAY,EAAZ,2BAAY;IACZ,UAAU,EAAV,uBAAU;IACV,SAAS,EAAT,qBAAS;IACT,aAAa,EAAb,6BAAa;IACb,cAAc,EAAd,+BAAc;IACd,gBAAgB,EAAhB,mCAAgB;IAChB,aAAa,EAAb,6BAAa;CACd,CAAC"}
+{"version":3,"file":"MobileBlocks.js","sourceRoot":"","sources":["../src/MobileBlocks.ts"],"names":[],"mappings":";;AAAA,yDAAsD;AACtD,0DAAgD;AAChD,0CAAwC;AACxC,mDAAgD;AAChD,+CAA4C;AAC5C,+DAAqD;AACrD,+CAA4C;AAC5C,2CAAwC;AACxC,iCAA8B;AAEjB,QAAA,YAAY,GAAG;IAC1B,MAAM,EAAN,cAAM;IACN,MAAM,EAAN,sBAAM;IACN,WAAW,EAAX,yBAAW;IACX,IAAI,EAAJ,WAAI;IACJ,WAAW,EAAX,yBAAW;IACX,YAAY,EAAZ,kCAAY;IACZ,SAAS,EAAT,qBAAS;IACT,gBAAgB,EAAhB,mCAAgB;IAChB,aAAa,EAAb,6BAAa;IACb,mBAAmB;IACnB,sBAAsB;IACtB,sBAAsB;CACvB,CAAC"}

package/dist/Placeholder.js

@@ -5,7 +5,7 @@ const uni_jsx_1 = require("@redneckz/uni-jsx");
 const Tile_1 = require("./Tile");
 const GOLDEN_RATIO = 1.618;
 exports.Placeholder = (0, uni_jsx_1.JSX)(({ className, context, title }) => {
-    return ((0, jsx_runtime_1.jsx)(Tile_1.Tile, { className: className, context: context, title: title, children: (0, jsx_runtime_1.jsx)("figure", { className: "m-0 min-w-[600px]", children: renderShimmer() }) }));
+    return ((0, jsx_runtime_1.jsx)(Tile_1.Tile, { className: className, context: context, title: title, description: "\u0411\u043B\u043E\u043A \u0432 \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u043A\u0435...", children: (0, jsx_runtime_1.jsx)("figure", { className: "m-0 min-w-[600px]", children: renderShimmer() }) }));
 });
 const renderShimmer = (size = 3) => goldenSequence(100, size)
     .map((_) => Math.floor(_))

package/dist/Placeholder.js.map

@@ -1 +1 @@
-{"version":3,"file":"Placeholder.js","sourceRoot":"","sources":["../src/Placeholder.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,iCAA8B;AAW9B,MAAM,YAAY,GAAG,KAAK,CAAC;AAEd,QAAA,WAAW,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;IACjF,OAAO,CACL,uBAAC,WAAI,IAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,YACxD,mCAAQ,SAAS,EAAC,mBAAmB,YAAE,aAAa,EAAE,GAAU,GAC3D,CACR,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,OAAe,CAAC,EAAE,EAAE,CACzC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC;KACtB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACzB,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAE5B,MAAM,iBAAiB,GAAG,CAAC,QAAgB,GAAG,EAAE,KAAa,EAAE,EAAE,CAAC,CAChE,gCAAyB,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,KAAK,GAAG,EAAE,EAAE,SAAS,EAAC,6BAA6B,IAArF,MAAM,CAAC,KAAK,CAAC,CAA2E,CACnG,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,IAAY,EAAY,EAAE,CAC/D,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,GAAG,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC"}
+{"version":3,"file":"Placeholder.js","sourceRoot":"","sources":["../src/Placeholder.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,iCAA8B;AAW9B,MAAM,YAAY,GAAG,KAAK,CAAC;AAEd,QAAA,WAAW,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;IACjF,OAAO,CACL,uBAAC,WAAI,IAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAC,iGAAsB,YAC5F,mCAAQ,SAAS,EAAC,mBAAmB,YAAE,aAAa,EAAE,GAAU,GAC3D,CACR,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,OAAe,CAAC,EAAE,EAAE,CACzC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC;KACtB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACzB,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAE5B,MAAM,iBAAiB,GAAG,CAAC,QAAgB,GAAG,EAAE,KAAa,EAAE,EAAE,CAAC,CAChE,gCAAyB,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,KAAK,GAAG,EAAE,EAAE,SAAS,EAAC,6BAA6B,IAArF,MAAM,CAAC,KAAK,CAAC,CAA2E,CACnG,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,IAAY,EAAY,EAAE,CAC/D,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,GAAG,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC"}

package/dist/ProductBlock.mobile.d.ts

@@ -0,0 +1,5 @@
+import type { ProductBlockInnerContent } from './ProductBlockInner';
+import type { UniBlockProps } from './types';
+export interface ProductBlockProps extends ProductBlockInnerContent, UniBlockProps {
+}
+export declare const ProductBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<ProductBlockProps, any>, context?: any) => any;

package/dist/ProductBlock.mobile.js

@@ -0,0 +1,10 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProductBlock = void 0;
+const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
+const uni_jsx_1 = require("@redneckz/uni-jsx");
+const ProductBlockInner_1 = require("./ProductBlockInner");
+exports.ProductBlock = (0, uni_jsx_1.JSX)(({ titleSize, image, benefits, ...props } /* Get rid of image and benefits */) => {
+    const { className } = props;
+    return ((0, jsx_runtime_1.jsx)("section", { className: `font-sans bg-white pt-10 pl-[50px] pb-[50px] pr-[7.5rem] ${className || ''}`, children: (0, jsx_runtime_1.jsx)(ProductBlockInner_1.ProductBlockInner, { ...props, titleSize: "L" }) }));
+});
+//# sourceMappingURL=ProductBlock.mobile.js.map

package/dist/ProductBlock.mobile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProductBlock.mobile.js","sourceRoot":"","sources":["../src/ProductBlock.mobile.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,2DAAwD;AAK3C,QAAA,YAAY,GAAG,IAAA,aAAG,EAC7B,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,CAAC,mCAAmC,EAAE,EAAE;IAC/E,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,OAAO,CACL,oCACE,SAAS,EAAE,4DAA4D,SAAS,IAAI,EAAE,EAAE,YAExF,uBAAC,qCAAiB,OAAK,KAAK,EAAE,SAAS,EAAC,GAAG,GAAG,GACtC,CACX,CAAC;AACJ,CAAC,CACF,CAAC"}

package/dist/ProductBlockInner.js

@@ -6,8 +6,10 @@ const BaseTile_1 = require("./BaseTile");
 const Img_1 = require("./Img");
 const Icon_1 = require("./ui-kit/Icon");
 const Title_1 = require("./ui-kit/Title");
-exports.ProductBlockInner = (0, uni_jsx_1.JSX)(({ className, context, title, description, benefits, buttons, image, items }) => {
-    return ((0, jsx_runtime_1.jsxs)("div", { className: `flex grow justify-between items-stretch ${className || ''}`, children: [(0, jsx_runtime_1.jsxs)("div", { className: 'flex flex-col', children: [title && ((0, jsx_runtime_1.jsx)(Title_1.Title, { size: "XL", className: "font-medium m-0 mb-4 whitespace-pre-wrap max-w-[600px]", children: title })), (0, jsx_runtime_1.jsx)(BaseTile_1.BaseTile, { context: context, description: description, items: items, buttons: buttons, children: benefits?.length ? ((0, jsx_runtime_1.jsx)("div", { className: "flex gap-6 mt-6 mb-3.5", children: benefits.map(renderBenefit) })) : null })] }), image?.src && (0, jsx_runtime_1.jsx)(Img_1.Img, { className: "mt-auto", image: image })] }));
+exports.ProductBlockInner = (0, uni_jsx_1.JSX)(({ className, context, title, titleSize, description, benefits, buttons, image, items }) => {
+    return ((0, jsx_runtime_1.jsxs)("div", { className: `flex grow justify-between items-stretch ${className || ''}`, children: [(0, jsx_runtime_1.jsxs)("div", { className: 'flex flex-col', children: [title && (
+                    /* TODO Why <Title> is duplicated here?  */
+                    (0, jsx_runtime_1.jsx)(Title_1.Title, { size: titleSize || 'XL', className: "font-medium m-0 mb-4 whitespace-pre-wrap max-w-[600px]", children: title })), (0, jsx_runtime_1.jsx)(BaseTile_1.BaseTile, { context: context, description: description, items: items, buttons: buttons, children: benefits?.length ? ((0, jsx_runtime_1.jsx)("div", { className: "flex gap-6 mt-6 mb-3.5", children: benefits.map(renderBenefit) })) : null })] }), image?.src && (0, jsx_runtime_1.jsx)(Img_1.Img, { className: "mt-auto", image: image })] }));
 });
 function renderBenefit(benefit, i) {
     return ((0, jsx_runtime_1.jsxs)("div", { className: "flex gap-4 items-center", children: [benefit.icon && ((0, jsx_runtime_1.jsx)(Icon_1.Icon, { className: "w-[50px] h-[50px] min-w-[50px] min-h-[50px] bg-main rounded-full p-[10px] box-border", name: benefit.icon, width: "24", height: "24" })), (0, jsx_runtime_1.jsxs)("div", { className: "flex gap-1 flex-col h-full", children: [(0, jsx_runtime_1.jsx)("h4", { className: "font-medium text-xl m-0", children: benefit.label }), benefit.description && ((0, jsx_runtime_1.jsx)("div", { className: "font-normal text-sm text-secondary-text", children: benefit.description }))] })] }, String(i)));

package/dist/ProductBlockInner.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProductBlockInner.js","sourceRoot":"","sources":["../src/ProductBlockInner.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,yCAAsC;AAEtC,+BAA4B;AAE5B,wCAAqC;AACrC,0CAAuC;AAQ1B,QAAA,iBAAiB,GAAG,IAAA,aAAG,EAClC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC9E,OAAO,CACL,iCAAK,SAAS,EAAE,2CAA2C,SAAS,IAAI,EAAE,EAAE,aAC1E,iCAAK,SAAS,EAAE,eAAe,aAC5B,KAAK,IAAI,CACR,uBAAC,aAAK,IAAC,IAAI,EAAC,IAAI,EAAC,SAAS,EAAC,wDAAwD,YAChF,KAAK,GACA,CACT,EACD,uBAAC,mBAAQ,IAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,YACjF,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAClB,gCAAK,SAAS,EAAC,wBAAwB,YAAE,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,GAAO,CAC5E,CAAC,CAAC,CAAC,IAAI,GACC,IACP,EACL,KAAK,EAAE,GAAG,IAAI,uBAAC,SAAG,IAAC,SAAS,EAAC,SAAS,EAAC,KAAK,EAAE,KAAK,GAAI,IACpD,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,aAAa,CAAC,OAAgB,EAAE,CAAS;IAChD,OAAO,CACL,iCAAqB,SAAS,EAAC,yBAAyB,aACrD,OAAO,CAAC,IAAI,IAAI,CACf,uBAAC,WAAI,IACH,SAAS,EAAC,sFAAsF,EAChG,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,GACX,CACH,EACD,iCAAK,SAAS,EAAC,4BAA4B,aACzC,+BAAI,SAAS,EAAC,yBAAyB,YAAE,OAAO,CAAC,KAAK,GAAM,EAC3D,OAAO,CAAC,WAAW,IAAI,CACtB,gCAAK,SAAS,EAAC,yCAAyC,YAAE,OAAO,CAAC,WAAW,GAAO,CACrF,IACG,KAdE,MAAM,CAAC,CAAC,CAAC,CAeb,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ProductBlockInner.js","sourceRoot":"","sources":["../src/ProductBlockInner.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,yCAAsC;AAEtC,+BAA4B;AAE5B,wCAAqC;AACrC,0CAAuC;AAQ1B,QAAA,iBAAiB,GAAG,IAAA,aAAG,EAClC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACzF,OAAO,CACL,iCAAK,SAAS,EAAE,2CAA2C,SAAS,IAAI,EAAE,EAAE,aAC1E,iCAAK,SAAS,EAAE,eAAe,aAC5B,KAAK,IAAI;oBACR,2CAA2C;oBAC3C,uBAAC,aAAK,IACJ,IAAI,EAAE,SAAS,IAAI,IAAI,EACvB,SAAS,EAAC,wDAAwD,YAEjE,KAAK,GACA,CACT,EACD,uBAAC,mBAAQ,IAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,YACjF,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAClB,gCAAK,SAAS,EAAC,wBAAwB,YAAE,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,GAAO,CAC5E,CAAC,CAAC,CAAC,IAAI,GACC,IACP,EACL,KAAK,EAAE,GAAG,IAAI,uBAAC,SAAG,IAAC,SAAS,EAAC,SAAS,EAAC,KAAK,EAAE,KAAK,GAAI,IACpD,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,aAAa,CAAC,OAAgB,EAAE,CAAS;IAChD,OAAO,CACL,iCAAqB,SAAS,EAAC,yBAAyB,aACrD,OAAO,CAAC,IAAI,IAAI,CACf,uBAAC,WAAI,IACH,SAAS,EAAC,sFAAsF,EAChG,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,GACX,CACH,EACD,iCAAK,SAAS,EAAC,4BAA4B,aACzC,+BAAI,SAAS,EAAC,yBAAyB,YAAE,OAAO,CAAC,KAAK,GAAM,EAC3D,OAAO,CAAC,WAAW,IAAI,CACtB,gCAAK,SAAS,EAAC,yCAAyC,YAAE,OAAO,CAAC,WAAW,GAAO,CACrF,IACG,KAdE,MAAM,CAAC,CAAC,CAAC,CAeb,CACP,CAAC;AACJ,CAAC"}

package/dist/useLink.js

@@ -3,7 +3,7 @@ exports.useLink = void 0;
 const url_1 = require("./utils/url");
 const defaultHandlerDecorator = (handler, targetContent) => handler;
 function useLink({ router, handlerDecorator = defaultHandlerDecorator, }, link) {
-    const href = (0, url_1.toRelativeHref)(link.href, router.href);
+    const href = (0, url_1.adjustHref)(link.href, router);
     return {
         ...link,
         href,

package/dist/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../src/useLink.ts"],"names":[],"mappings":";;AAEA,qCAAoD;AAEpD,MAAM,uBAAuB,GAAqB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,OAAO,CAAC;AAEtF,SAAgB,OAAO,CACrB,EACE,MAAM,EACN,gBAAgB,GAAG,uBAAuB,GACc,EAC1D,IAA0B;IAE1B,MAAM,IAAI,GAAG,IAAA,oBAAc,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACpD,OAAO;QACL,GAAG,IAAI;QACP,IAAI;QACJ,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAc,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,IAAA,WAAK,EAAC,IAAI,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC;YAC9D,IAAI,WAAW,IAAI,aAAa,EAAE;gBAChC,EAAE,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,EAAE,IAAI,CAAC;KACT,CAAC;AACJ,CAAC;AArBD,0BAqBC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../src/useLink.ts"],"names":[],"mappings":";;AAEA,qCAAgD;AAEhD,MAAM,uBAAuB,GAAqB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,OAAO,CAAC;AAEtF,SAAgB,OAAO,CACrB,EACE,MAAM,EACN,gBAAgB,GAAG,uBAAuB,GACc,EAC1D,IAA0B;IAE1B,MAAM,IAAI,GAAG,IAAA,gBAAU,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO;QACL,GAAG,IAAI;QACP,IAAI;QACJ,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAc,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,IAAA,WAAK,EAAC,IAAI,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC;YAC9D,IAAI,WAAW,IAAI,aAAa,EAAE;gBAChC,EAAE,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,EAAE,IAAI,CAAC;KACT,CAAC;AACJ,CAAC;AArBD,0BAqBC"}

package/dist/utils/url.d.ts

@@ -1,4 +1,16 @@
+export declare const MOBILE_URL_PATH = "/mobile";
 export declare const isURL: (href?: string) => boolean | undefined;
+export declare const isHrefActive: (href: string | undefined, router: {
+    pathname?: string | undefined;
+    href?: string | undefined;
+}, cmp?: (href: string, baseHref: string) => boolean) => boolean;
 export declare const withoutQuery: (href?: string) => string;
+export declare const withoutMobilePath: (href?: string) => string;
 export declare const getOrigin: (href?: string) => string | undefined;
-export declare const toRelativeHref: (href?: string, baseURL?: string) => string | undefined;
+export declare const adjustHref: (href: string | undefined, router: {
+    pathname: string;
+    href?: string | undefined;
+}) => string | undefined;
+export declare const toRelativeHref: (href: string | undefined, router: {
+    href?: string | undefined;
+}) => string | undefined;

package/dist/utils/url.js

@@ -1,25 +1,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toRelativeHref = exports.getOrigin = exports.withoutQuery = exports.isURL = void 0;
+exports.toRelativeHref = exports.adjustHref = exports.getOrigin = exports.withoutMobilePath = exports.withoutQuery = exports.isHrefActive = exports.isURL = exports.MOBILE_URL_PATH = void 0;
+exports.MOBILE_URL_PATH = '/mobile';
 const isURL = (href) => href?.includes('//');
 exports.isURL = isURL;
+const isHrefActive = (href, router, cmp = (href, baseHref) => href === baseHref) => {
+    return cmp((0, exports.withoutQuery)(href), (0, exports.withoutMobilePath)((0, exports.withoutQuery)((0, exports.isURL)(href) ? router.href : router.pathname)));
+};
+exports.isHrefActive = isHrefActive;
 const withoutQuery = (href) => (href || '').replace(/\/?\?.*/, '');
 exports.withoutQuery = withoutQuery;
+const withoutMobilePath = (href) => (href || '').replace(exports.MOBILE_URL_PATH, '');
+exports.withoutMobilePath = withoutMobilePath;
 const getOrigin = (href) => {
-    if ((0, exports.isURL)(href)) {
-        const url = href;
-        const protoSeparator = '://';
-        const endOfProto = url.indexOf(protoSeparator);
-        const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
-        return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
+    if (!(0, exports.isURL)(href)) {
+        return undefined;
     }
-    return undefined;
+    const url = href;
+    const protoSeparator = '//';
+    const endOfProto = url.indexOf(protoSeparator);
+    const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
+    return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
 };
 exports.getOrigin = getOrigin;
-const toRelativeHref = (href, baseURL) => {
+const adjustHref = (href, router) => {
+    if (!href) {
+        return href;
+    }
+    const relativeHref = (0, exports.toRelativeHref)(href, router);
+    const isMobilePage = router?.pathname.startsWith(exports.MOBILE_URL_PATH);
+    return isMobilePage && !(0, exports.isURL)(relativeHref) ? `${exports.MOBILE_URL_PATH}${relativeHref}` : relativeHref;
+};
+exports.adjustHref = adjustHref;
+const toRelativeHref = (href, router) => {
     if (!href) {
         return href;
     }
-    const origin = (0, exports.getOrigin)(baseURL);
+    const origin = (0, exports.getOrigin)(router?.href);
     return origin ? href.replace(origin, '') || '/' : href;
 };
 exports.toRelativeHref = toRelativeHref;

package/dist/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAAO,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAAhD,QAAA,KAAK,SAA2C;AAEtD,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAAtE,QAAA,YAAY,gBAA0D;AAE5E,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;IACzC,IAAI,IAAA,aAAK,EAAC,IAAI,CAAC,EAAE;QACf,MAAM,GAAG,GAAG,IAAK,CAAC;QAClB,MAAM,cAAc,GAAG,KAAK,CAAC;QAC7B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACzE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;KACjE;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AATW,QAAA,SAAS,aASpB;AAEK,MAAM,cAAc,GAAG,CAAC,IAAa,EAAE,OAAgB,EAAE,EAAE;IAChE,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IACD,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACzD,CAAC,CAAC;AANW,QAAA,cAAc,kBAMzB"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAAa,QAAA,eAAe,GAAG,SAAS,CAAC;AAElC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAAhD,QAAA,KAAK,SAA2C;AAEtD,MAAM,YAAY,GAAG,CAC1B,IAAwB,EACxB,MAA4C,EAC5C,MAAmD,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,EACxF,EAAE;IACF,OAAO,GAAG,CACR,IAAA,oBAAY,EAAC,IAAI,CAAC,EAClB,IAAA,yBAAiB,EAAC,IAAA,oBAAY,EAAC,IAAA,aAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAC7E,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,YAAY,gBASvB;AAEK,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAAtE,QAAA,YAAY,gBAA0D;AAE5E,MAAM,iBAAiB,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,uBAAe,EAAE,EAAE,CAAC,CAAC;AAAjF,QAAA,iBAAiB,qBAAgE;AAEvF,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;IACzC,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAK,CAAC;IAClB,MAAM,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACzE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAClE,CAAC,CAAC;AAVW,QAAA,SAAS,aAUpB;AAEK,MAAM,UAAU,GAAG,CACxB,IAAwB,EACxB,MAA2C,EAC3C,EAAE;IACF,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,MAAM,YAAY,GAAG,IAAA,sBAAc,EAAC,IAAI,EAAE,MAAM,CAAE,CAAC;IACnD,MAAM,YAAY,GAAG,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAe,CAAC,CAAC;IAClE,OAAO,YAAY,IAAI,CAAC,IAAA,aAAK,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,uBAAe,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;AACnG,CAAC,CAAC;AAXW,QAAA,UAAU,cAWrB;AAEK,MAAM,cAAc,GAAG,CAAC,IAAwB,EAAE,MAAyB,EAAE,EAAE;IACpF,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACzD,CAAC,CAAC;AAPW,QAAA,cAAc,kBAOzB"}

package/lib/Header/isSubItemActive.d.ts

@@ -1,3 +1,3 @@
 import type { Router } from '../ContentPageContext';
 import type { LinkContent } from '../types';
-export declare function isSubItemActive({ href, pathname }: Router): (item: LinkContent) => boolean;
+export declare function isSubItemActive(router: Router): (subItem: LinkContent) => boolean;

package/lib/Header/isSubItemActive.js

@@ -1,7 +1,5 @@
-import { isURL, withoutQuery } from '../utils/url.js';
-export function isSubItemActive({ href, pathname }) {
-    return (item) => {
-        return withoutQuery(item.href) === (isURL(item.href) ? withoutQuery(href) : pathname);
-    };
+import { isHrefActive } from '../utils/url.js';
+export function isSubItemActive(router) {
+    return (subItem) => isHrefActive(subItem.href, router);
 }
 //# sourceMappingURL=isSubItemActive.js.map

package/lib/Header/isSubItemActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isSubItemActive.js","sourceRoot":"","sources":["../../src/Header/isSubItemActive.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,UAAU,eAAe,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAU;IACxD,OAAO,CAAC,IAAiB,EAAW,EAAE;QACpC,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"isSubItemActive.js","sourceRoot":"","sources":["../../src/Header/isSubItemActive.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,OAAO,CAAC,OAAoB,EAAW,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC/E,CAAC"}

package/lib/Header/isTopItemActive.d.ts

@@ -1,3 +1,3 @@
 import type { Router } from '../ContentPageContext';
 import type { LinkContent } from '../types';
-export declare function isTopItemActive({ href, pathname }: Router): (item: LinkContent) => boolean;
+export declare function isTopItemActive(router: Router): (topItem: LinkContent) => boolean;

package/lib/Header/isTopItemActive.js

@@ -1,11 +1,5 @@
-import { isURL, withoutQuery } from '../utils/url.js';
-export function isTopItemActive({ href, pathname }) {
-    return (item) => {
-        const itemHref = withoutQuery(item.href);
-        if (isURL(itemHref)) {
-            return Boolean(href && href.startsWith(itemHref));
-        }
-        return Boolean(itemHref && pathname.startsWith(itemHref));
-    };
+import { isHrefActive } from '../utils/url.js';
+export function isTopItemActive(router) {
+    return (topItem) => isHrefActive(topItem.href, router, (topItemHref, baseHref) => baseHref.startsWith(topItemHref));
 }
 //# sourceMappingURL=isTopItemActive.js.map

package/lib/Header/isTopItemActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isTopItemActive.js","sourceRoot":"","sources":["../../src/Header/isTopItemActive.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,UAAU,eAAe,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAU;IACxD,OAAO,CAAC,IAAiB,EAAW,EAAE;QACpC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE;YACnB,OAAO,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;SACnD;QACD,OAAO,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"isTopItemActive.js","sourceRoot":"","sources":["../../src/Header/isTopItemActive.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,OAAO,CAAC,OAAoB,EAAW,EAAE,CACvC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;AACpG,CAAC"}

package/lib/MobileBlocks.d.ts

@@ -4,11 +4,8 @@ export declare const MobileBlocks: {
     Placeholder: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./Placeholder").PlaceholderProps, any>, context?: any) => any;
     Tile: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./Tile").TileProps, any>, context?: any) => any;
     ProductTile: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./ProductTile").ProductTileProps, any>, context?: any) => any;
-    ProductBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./ProductBlock").ProductBlockProps, any>, context?: any) => any;
-    StepsBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./StepsBlock").StepsBlockProps, any>, context?: any) => any;
+    ProductBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./ProductBlock.mobile").ProductBlockProps, any>, context?: any) => any;
     TextBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./TextBlock").TextBlockProps, any>, context?: any) => any;
-    BenefitsBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./BenefitsBlock").BenefitsBlockProps, any>, context?: any) => any;
-    ProductGallery: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./ProductGallery").ProductGalleryProps, any>, context?: any) => any;
     ExchangeRateTile: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./ExchangeRateTile").ExchangeRateTileProps, any>, context?: any) => any;
     MobileAppTile: (props: import("@redneckz/uni-jsx").PropsWithChildren<import("./MobileAppTile").MobileAppTileProps, any>, context?: any) => any;
 };

package/lib/MobileBlocks.js

@@ -1,13 +1,10 @@
-import { BenefitsBlock } from './BenefitsBlock.js';
 import { ExchangeRateTile } from './ExchangeRateTile.js';
 import { Footer } from './Footer/Footer.mobile.js';
 import { Header } from './Header/index.js';
 import { MobileAppTile } from './MobileAppTile.js';
 import { Placeholder } from './Placeholder.js';
-import { ProductBlock } from './ProductBlock.js';
-import { ProductGallery } from './ProductGallery.js';
+import { ProductBlock } from './ProductBlock.mobile.js';
 import { ProductTile } from './ProductTile.js';
-import { StepsBlock } from './StepsBlock.js';
 import { TextBlock } from './TextBlock.js';
 import { Tile } from './Tile.js';
 export const MobileBlocks = {
@@ -17,11 +14,11 @@ export const MobileBlocks = {
     Tile,
     ProductTile,
     ProductBlock,
-    StepsBlock,
     TextBlock,
-    BenefitsBlock,
-    ProductGallery,
     ExchangeRateTile,
     MobileAppTile,
+    // TODO StepsBlock,
+    // TODO BenefitsBlock,
+    // TODO ProductGallery
 };
 //# sourceMappingURL=MobileBlocks.js.map

package/lib/MobileBlocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"MobileBlocks.js","sourceRoot":"","sources":["../src/MobileBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM;IACN,MAAM;IACN,WAAW;IACX,IAAI;IACJ,WAAW;IACX,YAAY;IACZ,UAAU;IACV,SAAS;IACT,aAAa;IACb,cAAc;IACd,gBAAgB;IAChB,aAAa;CACd,CAAC"}
+{"version":3,"file":"MobileBlocks.js","sourceRoot":"","sources":["../src/MobileBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM;IACN,MAAM;IACN,WAAW;IACX,IAAI;IACJ,WAAW;IACX,YAAY;IACZ,SAAS;IACT,gBAAgB;IAChB,aAAa;IACb,mBAAmB;IACnB,sBAAsB;IACtB,sBAAsB;CACvB,CAAC"}

package/lib/Placeholder.js

@@ -3,7 +3,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { Tile } from './Tile.js';
 const GOLDEN_RATIO = 1.618;
 export const Placeholder = JSX(({ className, context, title }) => {
-    return (_jsx(Tile, { className: className, context: context, title: title, children: _jsx("figure", { className: "m-0 min-w-[600px]", children: renderShimmer() }) }));
+    return (_jsx(Tile, { className: className, context: context, title: title, description: "\u0411\u043B\u043E\u043A \u0432 \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u043A\u0435...", children: _jsx("figure", { className: "m-0 min-w-[600px]", children: renderShimmer() }) }));
 });
 const renderShimmer = (size = 3) => goldenSequence(100, size)
     .map((_) => Math.floor(_))

package/lib/Placeholder.js.map

@@ -1 +1 @@
-{"version":3,"file":"Placeholder.js","sourceRoot":"","sources":["../src/Placeholder.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAW9B,MAAM,YAAY,GAAG,KAAK,CAAC;AAE3B,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAmB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;IACjF,OAAO,CACL,KAAC,IAAI,IAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,YACxD,iBAAQ,SAAS,EAAC,mBAAmB,YAAE,aAAa,EAAE,GAAU,GAC3D,CACR,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,OAAe,CAAC,EAAE,EAAE,CACzC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC;KACtB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACzB,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAE5B,MAAM,iBAAiB,GAAG,CAAC,QAAgB,GAAG,EAAE,KAAa,EAAE,EAAE,CAAC,CAChE,cAAyB,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,KAAK,GAAG,EAAE,EAAE,SAAS,EAAC,6BAA6B,IAArF,MAAM,CAAC,KAAK,CAAC,CAA2E,CACnG,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,IAAY,EAAY,EAAE,CAC/D,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,GAAG,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC"}
+{"version":3,"file":"Placeholder.js","sourceRoot":"","sources":["../src/Placeholder.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAW9B,MAAM,YAAY,GAAG,KAAK,CAAC;AAE3B,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAmB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;IACjF,OAAO,CACL,KAAC,IAAI,IAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAC,iGAAsB,YAC5F,iBAAQ,SAAS,EAAC,mBAAmB,YAAE,aAAa,EAAE,GAAU,GAC3D,CACR,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,OAAe,CAAC,EAAE,EAAE,CACzC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC;KACtB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACzB,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAE5B,MAAM,iBAAiB,GAAG,CAAC,QAAgB,GAAG,EAAE,KAAa,EAAE,EAAE,CAAC,CAChE,cAAyB,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,KAAK,GAAG,EAAE,EAAE,SAAS,EAAC,6BAA6B,IAArF,MAAM,CAAC,KAAK,CAAC,CAA2E,CACnG,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,IAAY,EAAY,EAAE,CAC/D,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,GAAG,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC"}

package/lib/ProductBlock.mobile.d.ts

@@ -0,0 +1,5 @@
+import type { ProductBlockInnerContent } from './ProductBlockInner';
+import type { UniBlockProps } from './types';
+export interface ProductBlockProps extends ProductBlockInnerContent, UniBlockProps {
+}
+export declare const ProductBlock: (props: import("@redneckz/uni-jsx").PropsWithChildren<ProductBlockProps, any>, context?: any) => any;

package/lib/ProductBlock.mobile.js

@@ -0,0 +1,8 @@
+import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
+import { JSX } from '@redneckz/uni-jsx';
+import { ProductBlockInner } from './ProductBlockInner.js';
+export const ProductBlock = JSX(({ titleSize, image, benefits, ...props } /* Get rid of image and benefits */) => {
+    const { className } = props;
+    return (_jsx("section", { className: `font-sans bg-white pt-10 pl-[50px] pb-[50px] pr-[7.5rem] ${className || ''}`, children: _jsx(ProductBlockInner, { ...props, titleSize: "L" }) }));
+});
+//# sourceMappingURL=ProductBlock.mobile.js.map

package/lib/ProductBlock.mobile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProductBlock.mobile.js","sourceRoot":"","sources":["../src/ProductBlock.mobile.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKxD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,CAAC,mCAAmC,EAAE,EAAE;IAC/E,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,OAAO,CACL,kBACE,SAAS,EAAE,4DAA4D,SAAS,IAAI,EAAE,EAAE,YAExF,KAAC,iBAAiB,OAAK,KAAK,EAAE,SAAS,EAAC,GAAG,GAAG,GACtC,CACX,CAAC;AACJ,CAAC,CACF,CAAC"}

package/lib/ProductBlockInner.js

@@ -4,8 +4,10 @@ import { BaseTile } from './BaseTile.js';
 import { Img } from './Img.js';
 import { Icon } from './ui-kit/Icon.js';
 import { Title } from './ui-kit/Title.js';
-export const ProductBlockInner = JSX(({ className, context, title, description, benefits, buttons, image, items }) => {
-    return (_jsxs("div", { className: `flex grow justify-between items-stretch ${className || ''}`, children: [_jsxs("div", { className: 'flex flex-col', children: [title && (_jsx(Title, { size: "XL", className: "font-medium m-0 mb-4 whitespace-pre-wrap max-w-[600px]", children: title })), _jsx(BaseTile, { context: context, description: description, items: items, buttons: buttons, children: benefits?.length ? (_jsx("div", { className: "flex gap-6 mt-6 mb-3.5", children: benefits.map(renderBenefit) })) : null })] }), image?.src && _jsx(Img, { className: "mt-auto", image: image })] }));
+export const ProductBlockInner = JSX(({ className, context, title, titleSize, description, benefits, buttons, image, items }) => {
+    return (_jsxs("div", { className: `flex grow justify-between items-stretch ${className || ''}`, children: [_jsxs("div", { className: 'flex flex-col', children: [title && (
+                    /* TODO Why <Title> is duplicated here?  */
+                    _jsx(Title, { size: titleSize || 'XL', className: "font-medium m-0 mb-4 whitespace-pre-wrap max-w-[600px]", children: title })), _jsx(BaseTile, { context: context, description: description, items: items, buttons: buttons, children: benefits?.length ? (_jsx("div", { className: "flex gap-6 mt-6 mb-3.5", children: benefits.map(renderBenefit) })) : null })] }), image?.src && _jsx(Img, { className: "mt-auto", image: image })] }));
 });
 function renderBenefit(benefit, i) {
     return (_jsxs("div", { className: "flex gap-4 items-center", children: [benefit.icon && (_jsx(Icon, { className: "w-[50px] h-[50px] min-w-[50px] min-h-[50px] bg-main rounded-full p-[10px] box-border", name: benefit.icon, width: "24", height: "24" })), _jsxs("div", { className: "flex gap-1 flex-col h-full", children: [_jsx("h4", { className: "font-medium text-xl m-0", children: benefit.label }), benefit.description && (_jsx("div", { className: "font-normal text-sm text-secondary-text", children: benefit.description }))] })] }, String(i)));

package/lib/ProductBlockInner.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProductBlockInner.js","sourceRoot":"","sources":["../src/ProductBlockInner.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAQvC,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAClC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC9E,OAAO,CACL,eAAK,SAAS,EAAE,2CAA2C,SAAS,IAAI,EAAE,EAAE,aAC1E,eAAK,SAAS,EAAE,eAAe,aAC5B,KAAK,IAAI,CACR,KAAC,KAAK,IAAC,IAAI,EAAC,IAAI,EAAC,SAAS,EAAC,wDAAwD,YAChF,KAAK,GACA,CACT,EACD,KAAC,QAAQ,IAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,YACjF,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAClB,cAAK,SAAS,EAAC,wBAAwB,YAAE,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,GAAO,CAC5E,CAAC,CAAC,CAAC,IAAI,GACC,IACP,EACL,KAAK,EAAE,GAAG,IAAI,KAAC,GAAG,IAAC,SAAS,EAAC,SAAS,EAAC,KAAK,EAAE,KAAK,GAAI,IACpD,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,aAAa,CAAC,OAAgB,EAAE,CAAS;IAChD,OAAO,CACL,eAAqB,SAAS,EAAC,yBAAyB,aACrD,OAAO,CAAC,IAAI,IAAI,CACf,KAAC,IAAI,IACH,SAAS,EAAC,sFAAsF,EAChG,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,GACX,CACH,EACD,eAAK,SAAS,EAAC,4BAA4B,aACzC,aAAI,SAAS,EAAC,yBAAyB,YAAE,OAAO,CAAC,KAAK,GAAM,EAC3D,OAAO,CAAC,WAAW,IAAI,CACtB,cAAK,SAAS,EAAC,yCAAyC,YAAE,OAAO,CAAC,WAAW,GAAO,CACrF,IACG,KAdE,MAAM,CAAC,CAAC,CAAC,CAeb,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ProductBlockInner.js","sourceRoot":"","sources":["../src/ProductBlockInner.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAQvC,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAClC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACzF,OAAO,CACL,eAAK,SAAS,EAAE,2CAA2C,SAAS,IAAI,EAAE,EAAE,aAC1E,eAAK,SAAS,EAAE,eAAe,aAC5B,KAAK,IAAI;oBACR,2CAA2C;oBAC3C,KAAC,KAAK,IACJ,IAAI,EAAE,SAAS,IAAI,IAAI,EACvB,SAAS,EAAC,wDAAwD,YAEjE,KAAK,GACA,CACT,EACD,KAAC,QAAQ,IAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,YACjF,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAClB,cAAK,SAAS,EAAC,wBAAwB,YAAE,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,GAAO,CAC5E,CAAC,CAAC,CAAC,IAAI,GACC,IACP,EACL,KAAK,EAAE,GAAG,IAAI,KAAC,GAAG,IAAC,SAAS,EAAC,SAAS,EAAC,KAAK,EAAE,KAAK,GAAI,IACpD,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,aAAa,CAAC,OAAgB,EAAE,CAAS;IAChD,OAAO,CACL,eAAqB,SAAS,EAAC,yBAAyB,aACrD,OAAO,CAAC,IAAI,IAAI,CACf,KAAC,IAAI,IACH,SAAS,EAAC,sFAAsF,EAChG,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,GACX,CACH,EACD,eAAK,SAAS,EAAC,4BAA4B,aACzC,aAAI,SAAS,EAAC,yBAAyB,YAAE,OAAO,CAAC,KAAK,GAAM,EAC3D,OAAO,CAAC,WAAW,IAAI,CACtB,cAAK,SAAS,EAAC,yCAAyC,YAAE,OAAO,CAAC,WAAW,GAAO,CACrF,IACG,KAdE,MAAM,CAAC,CAAC,CAAC,CAeb,CACP,CAAC;AACJ,CAAC"}

package/lib/useLink.js

@@ -1,7 +1,7 @@
-import { isURL, toRelativeHref } from './utils/url.js';
+import { adjustHref, isURL } from './utils/url.js';
 const defaultHandlerDecorator = (handler, targetContent) => handler;
 export function useLink({ router, handlerDecorator = defaultHandlerDecorator, }, link) {
-    const href = toRelativeHref(link.href, router.href);
+    const href = adjustHref(link.href, router);
     return {
         ...link,
         href,

package/lib/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../src/useLink.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,uBAAuB,GAAqB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,OAAO,CAAC;AAEtF,MAAM,UAAU,OAAO,CACrB,EACE,MAAM,EACN,gBAAgB,GAAG,uBAAuB,GACc,EAC1D,IAA0B;IAE1B,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACpD,OAAO;QACL,GAAG,IAAI;QACP,IAAI;QACJ,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAc,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC;YAC9D,IAAI,WAAW,IAAI,aAAa,EAAE;gBAChC,EAAE,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,EAAE,IAAI,CAAC;KACT,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../src/useLink.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,uBAAuB,GAAqB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,OAAO,CAAC;AAEtF,MAAM,UAAU,OAAO,CACrB,EACE,MAAM,EACN,gBAAgB,GAAG,uBAAuB,GACc,EAC1D,IAA0B;IAE1B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO;QACL,GAAG,IAAI;QACP,IAAI;QACJ,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAc,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC;YAC9D,IAAI,WAAW,IAAI,aAAa,EAAE;gBAChC,EAAE,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,EAAE,IAAI,CAAC;KACT,CAAC;AACJ,CAAC"}

package/lib/utils/url.d.ts

@@ -1,4 +1,16 @@
+export declare const MOBILE_URL_PATH = "/mobile";
 export declare const isURL: (href?: string) => boolean | undefined;
+export declare const isHrefActive: (href: string | undefined, router: {
+    pathname?: string | undefined;
+    href?: string | undefined;
+}, cmp?: (href: string, baseHref: string) => boolean) => boolean;
 export declare const withoutQuery: (href?: string) => string;
+export declare const withoutMobilePath: (href?: string) => string;
 export declare const getOrigin: (href?: string) => string | undefined;
-export declare const toRelativeHref: (href?: string, baseURL?: string) => string | undefined;
+export declare const adjustHref: (href: string | undefined, router: {
+    pathname: string;
+    href?: string | undefined;
+}) => string | undefined;
+export declare const toRelativeHref: (href: string | undefined, router: {
+    href?: string | undefined;
+}) => string | undefined;

package/lib/utils/url.js

@@ -1,20 +1,33 @@
+export const MOBILE_URL_PATH = '/mobile';
 export const isURL = (href) => href?.includes('//');
+export const isHrefActive = (href, router, cmp = (href, baseHref) => href === baseHref) => {
+    return cmp(withoutQuery(href), withoutMobilePath(withoutQuery(isURL(href) ? router.href : router.pathname)));
+};
 export const withoutQuery = (href) => (href || '').replace(/\/?\?.*/, '');
+export const withoutMobilePath = (href) => (href || '').replace(MOBILE_URL_PATH, '');
 export const getOrigin = (href) => {
-    if (isURL(href)) {
-        const url = href;
-        const protoSeparator = '://';
-        const endOfProto = url.indexOf(protoSeparator);
-        const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
-        return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
+    if (!isURL(href)) {
+        return undefined;
+    }
+    const url = href;
+    const protoSeparator = '//';
+    const endOfProto = url.indexOf(protoSeparator);
+    const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
+    return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
+};
+export const adjustHref = (href, router) => {
+    if (!href) {
+        return href;
     }
-    return undefined;
+    const relativeHref = toRelativeHref(href, router);
+    const isMobilePage = router?.pathname.startsWith(MOBILE_URL_PATH);
+    return isMobilePage && !isURL(relativeHref) ? `${MOBILE_URL_PATH}${relativeHref}` : relativeHref;
 };
-export const toRelativeHref = (href, baseURL) => {
+export const toRelativeHref = (href, router) => {
     if (!href) {
         return href;
     }
-    const origin = getOrigin(baseURL);
+    const origin = getOrigin(router?.href);
     return origin ? href.replace(origin, '') || '/' : href;
 };
 //# sourceMappingURL=url.js.map

package/lib/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAEnF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;IACzC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE;QACf,MAAM,GAAG,GAAG,IAAK,CAAC;QAClB,MAAM,cAAc,GAAG,KAAK,CAAC;QAC7B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACzE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;KACjE;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAa,EAAE,OAAgB,EAAE,EAAE;IAChE,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IACD,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACzD,CAAC,CAAC"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAC;AAEzC,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,IAAwB,EACxB,MAA4C,EAC5C,MAAmD,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,EACxF,EAAE;IACF,OAAO,GAAG,CACR,YAAY,CAAC,IAAI,CAAC,EAClB,iBAAiB,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAC7E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAEnF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;IACzC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAK,CAAC;IAClB,MAAM,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACzE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,IAAwB,EACxB,MAA2C,EAC3C,EAAE;IACF,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,EAAE,MAAM,CAAE,CAAC;IACnD,MAAM,YAAY,GAAG,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAClE,OAAO,YAAY,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,eAAe,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;AACnG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAwB,EAAE,MAAyB,EAAE,EAAE;IACpF,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACzD,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.2.65",
+  "version": "0.2.67",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",

package/src/ContentPage.fixture.tsx

@@ -1,4 +1,4 @@
-import { context } from './setup-fixture';
+import { context, mobileContext } from './setup-fixture';
 
 import { Blocks } from './Blocks';
 import { BlockDecorator, ContentPage } from './ContentPage';
@@ -39,7 +39,7 @@ export default {
   mobile: (
     <ContentPage
       className="bg-secondary-text"
-      context={context}
+      context={mobileContext}
       blocksRegistry={MobileBlocks}
       data={toMobilePage(data as ContentPageDef)}
     />

package/src/ContentPage.page.json

@@ -430,7 +430,7 @@
       "type": "Unknown",
       "style": ["col-span-12"],
       "content": {
-        "title": "Неизвестный блок"
+        "title": "Какой то новый блок"
       }
     },
     {

package/src/Header/isSubItemActive.ts

@@ -1,9 +1,7 @@
 import type { Router } from '../ContentPageContext';
 import type { LinkContent } from '../types';
-import { isURL, withoutQuery } from '../utils/url';
+import { isHrefActive } from '../utils/url';
 
-export function isSubItemActive({ href, pathname }: Router) {
-  return (item: LinkContent): boolean => {
-    return withoutQuery(item.href) === (isURL(item.href) ? withoutQuery(href) : pathname);
-  };
+export function isSubItemActive(router: Router) {
+  return (subItem: LinkContent): boolean => isHrefActive(subItem.href, router);
 }

package/src/Header/isTopItemActive.ts

@@ -1,13 +1,8 @@
 import type { Router } from '../ContentPageContext';
 import type { LinkContent } from '../types';
-import { isURL, withoutQuery } from '../utils/url';
+import { isHrefActive } from '../utils/url';
 
-export function isTopItemActive({ href, pathname }: Router) {
-  return (item: LinkContent): boolean => {
-    const itemHref = withoutQuery(item.href);
-    if (isURL(itemHref)) {
-      return Boolean(href && href.startsWith(itemHref));
-    }
-    return Boolean(itemHref && pathname.startsWith(itemHref));
-  };
+export function isTopItemActive(router: Router) {
+  return (topItem: LinkContent): boolean =>
+    isHrefActive(topItem.href, router, (topItemHref, baseHref) => baseHref.startsWith(topItemHref));
 }

package/src/MobileBlocks.ts

@@ -1,13 +1,10 @@
-import { BenefitsBlock } from './BenefitsBlock';
 import { ExchangeRateTile } from './ExchangeRateTile';
 import { Footer } from './Footer/Footer.mobile';
 import { Header } from './Header/index';
 import { MobileAppTile } from './MobileAppTile';
 import { Placeholder } from './Placeholder';
-import { ProductBlock } from './ProductBlock';
-import { ProductGallery } from './ProductGallery';
+import { ProductBlock } from './ProductBlock.mobile';
 import { ProductTile } from './ProductTile';
-import { StepsBlock } from './StepsBlock';
 import { TextBlock } from './TextBlock';
 import { Tile } from './Tile';
 
@@ -18,10 +15,10 @@ export const MobileBlocks = {
   Tile,
   ProductTile,
   ProductBlock,
-  StepsBlock,
   TextBlock,
-  BenefitsBlock,
-  ProductGallery,
   ExchangeRateTile,
   MobileAppTile,
+  // TODO StepsBlock,
+  // TODO BenefitsBlock,
+  // TODO ProductGallery
 };

package/src/Placeholder.tsx

@@ -14,7 +14,7 @@ const GOLDEN_RATIO = 1.618;
 
 export const Placeholder = JSX<PlaceholderProps>(({ className, context, title }) => {
   return (
-    <Tile className={className} context={context} title={title}>
+    <Tile className={className} context={context} title={title} description="Блок в разработке...">
       <figure className="m-0 min-w-[600px]">{renderShimmer()}</figure>
     </Tile>
   );

package/src/ProductBlock.mobile.tsx

@@ -0,0 +1,19 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { ProductBlockInnerContent } from './ProductBlockInner';
+import { ProductBlockInner } from './ProductBlockInner';
+import type { UniBlockProps } from './types';
+
+export interface ProductBlockProps extends ProductBlockInnerContent, UniBlockProps {}
+
+export const ProductBlock = JSX<ProductBlockProps>(
+  ({ titleSize, image, benefits, ...props } /* Get rid of image and benefits */) => {
+    const { className } = props;
+    return (
+      <section
+        className={`font-sans bg-white pt-10 pl-[50px] pb-[50px] pr-[7.5rem] ${className || ''}`}
+      >
+        <ProductBlockInner {...props} titleSize="L" />
+      </section>
+    );
+  },
+);

package/src/ProductBlockInner.tsx

@@ -14,12 +14,16 @@ export interface ProductBlockInnerContent extends BaseTileContent {
 export interface ProductBlockInnerProps extends ProductBlockInnerContent, UniBlockProps {}
 
 export const ProductBlockInner = JSX<ProductBlockInnerProps>(
-  ({ className, context, title, description, benefits, buttons, image, items }) => {
+  ({ className, context, title, titleSize, description, benefits, buttons, image, items }) => {
     return (
       <div className={`flex grow justify-between items-stretch ${className || ''}`}>
         <div className={'flex flex-col'}>
           {title && (
-            <Title size="XL" className="font-medium m-0 mb-4 whitespace-pre-wrap max-w-[600px]">
+            /* TODO Why <Title> is duplicated here?  */
+            <Title
+              size={titleSize || 'XL'}
+              className="font-medium m-0 mb-4 whitespace-pre-wrap max-w-[600px]"
+            >
               {title}
             </Title>
           )}

package/src/setup-fixture.ts

@@ -70,3 +70,15 @@ export const context: ContentPageContext = {
     };
   },
 };
+
+export const mobileContext: ContentPageContext = {
+  ...context,
+  useRouter: () => ({
+    href: `${TEST_ORIGIN}/mobile/credits`,
+    pathname: '/mobile/credits',
+    query: {},
+    push: (url: string) => {
+      console.log(url);
+    },
+  }),
+};

package/src/useLink.ts

@@ -1,6 +1,6 @@
 import { HandlerDecorator, Router } from './ContentPageContext';
 import type { LinkContent } from './types';
-import { isURL, toRelativeHref } from './utils/url';
+import { adjustHref, isURL } from './utils/url';
 
 const defaultHandlerDecorator: HandlerDecorator = (handler, targetContent) => handler;
 
@@ -11,7 +11,7 @@ export function useLink(
   }: { router: Router; handlerDecorator?: HandlerDecorator },
   link: Partial<LinkContent>,
 ) {
-  const href = toRelativeHref(link.href, router.href);
+  const href = adjustHref(link.href, router);
   return {
     ...link,
     href,

package/src/utils/url.spec.ts

@@ -0,0 +1,53 @@
+import { adjustHref, getOrigin, toRelativeHref, withoutQuery } from './url';
+
+describe('url', () => {
+  describe('withoutQuery', () => {
+    it('should return URL without query params', () => {
+      expect(withoutQuery('http://foo.ru/other/path?first=1&second=2')).toBe(
+        'http://foo.ru/other/path',
+      );
+    });
+  });
+
+  describe('getOrigin', () => {
+    it('should return origin of specified URL', () => {
+      expect(getOrigin('http://foo.ru/other/path?first=1&second=2')).toBe('http://foo.ru');
+    });
+  });
+
+  describe('adjustHref', () => {
+    it('should compute URL relative to some base URL', () => {
+      expect(
+        adjustHref('http://foo.ru/other/path', {
+          pathname: '/some/path',
+          href: 'http://foo.ru/some/path',
+        }),
+      ).toBe('/other/path');
+    });
+
+    it('should compute mobile URL for mobile pages', () => {
+      expect(
+        adjustHref('http://foo.ru/other/path', {
+          pathname: '/mobile/some/path',
+          href: 'http://foo.ru/mobile/some/path',
+        }),
+      ).toBe('/mobile/other/path');
+    });
+
+    it('should return nothing if nothing provided', () => {
+      expect(adjustHref(undefined, { pathname: '/mobile/some/path' })).toBe(undefined);
+    });
+  });
+
+  describe('toRelativeHref', () => {
+    it('should compute URL relative to some base URL', () => {
+      expect(toRelativeHref('http://foo.ru/other/path', { href: 'http://foo.ru/some/path' })).toBe(
+        '/other/path',
+      );
+    });
+
+    it('should return nothing if nothing provided', () => {
+      expect(toRelativeHref(undefined, {})).toBe(undefined);
+    });
+  });
+});

package/src/utils/url.ts

@@ -1,22 +1,52 @@
+export const MOBILE_URL_PATH = '/mobile';
+
 export const isURL = (href?: string) => href?.includes('//');
 
+export const isHrefActive = (
+  href: string | undefined,
+  router: { pathname?: string; href?: string },
+  cmp: (href: string, baseHref: string) => boolean = (href, baseHref) => href === baseHref,
+) => {
+  return cmp(
+    withoutQuery(href),
+    withoutMobilePath(withoutQuery(isURL(href) ? router.href : router.pathname)),
+  );
+};
+
 export const withoutQuery = (href?: string) => (href || '').replace(/\/?\?.*/, '');
 
+export const withoutMobilePath = (href?: string) => (href || '').replace(MOBILE_URL_PATH, '');
+
 export const getOrigin = (href?: string) => {
-  if (isURL(href)) {
-    const url = href!;
-    const protoSeparator = '://';
-    const endOfProto = url.indexOf(protoSeparator);
-    const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
-    return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
+  if (!isURL(href)) {
+    return undefined;
+  }
+
+  const url = href!;
+  const protoSeparator = '//';
+  const endOfProto = url.indexOf(protoSeparator);
+  const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
+  return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
+};
+
+export const adjustHref = (
+  href: string | undefined,
+  router: { pathname: string; href?: string },
+) => {
+  if (!href) {
+    return href;
   }
-  return undefined;
+
+  const relativeHref = toRelativeHref(href, router)!;
+  const isMobilePage = router?.pathname.startsWith(MOBILE_URL_PATH);
+  return isMobilePage && !isURL(relativeHref) ? `${MOBILE_URL_PATH}${relativeHref}` : relativeHref;
 };
 
-export const toRelativeHref = (href?: string, baseURL?: string) => {
+export const toRelativeHref = (href: string | undefined, router: { href?: string }) => {
   if (!href) {
     return href;
   }
-  const origin = getOrigin(baseURL);
+
+  const origin = getOrigin(router?.href);
   return origin ? href.replace(origin, '') || '/' : href;
 };