@redneckz/wildless-cms-uni-blocks 0.8.2 → 0.8.4

package/mobile/lib/components/Footer/MediaButton.d.ts

@@ -1,7 +1,7 @@
 import type { IconVersion } from '../../model/IconVersion';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 export declare type ButtonSize = 'default' | 'small';
-interface MediaButtonProps extends ButtonProps {
+interface MediaButtonProps extends ButtonWithIconProps {
     iconVersion?: IconVersion;
     buttonSize?: ButtonSize;
 }

package/mobile/lib/hooks/useLink.d.ts

@@ -4,5 +4,5 @@ interface ClickHandler {
         preventDefault: () => void;
     }): void;
 }
-export declare function useLink(): <L extends Partial<LinkProps & ClickHandler>>(props: L) => L & ClickHandler;
+export declare function useLink(isRemote?: boolean): <L extends Partial<LinkProps & ClickHandler>>(props: L) => L & ClickHandler;
 export {};

package/mobile/lib/hooks/useLink.js

@@ -2,11 +2,11 @@ import { useBlockRouter } from '../services/BlockRouter/useBlockRouter.js';
 import { isHash, isLocalURL } from '../utils/url.js';
 import { handlerDecorator } from './handlerDecorator.js';
 import { useRouter } from './useRouter.js';
-export function useLink() {
+export function useLink(isRemote) {
     const router = useRouter();
     const blockRouter = useBlockRouter();
     const handleLocalURL = (href, target) => (ev) => {
-        if (!isLocalURL(href, target)) {
+        if (isRemote || !isLocalURL(href, target)) {
             // Proceed with native handle
             return;
         }

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

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,MAAM,UAAU,OAAO;IAGrB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,MAAM,cAAc,GAClB,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CAAC,CAAC,EAAmC,EAAE,EAAE;QACrF,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YAC7B,6BAA6B;YAC7B,OAAO;SACR;QAED,iBAAiB;QACjB,EAAE,EAAE,cAAc,EAAE,CAAC;QACrB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;YAChB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACxB;aAAM,IAAI,IAAI,EAAE;YACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;IACH,CAAC,CAAC;IAEJ,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjB,GAAG,KAAK;QACR,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAmC,EAAE,EAAE;YAChE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAEnC,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC,EAAE,KAAK,CAAC;KACV,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,MAAM,UAAU,OAAO,CACrB,QAAkB;IAElB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,MAAM,cAAc,GAClB,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CAAC,CAAC,EAAmC,EAAE,EAAE;QACrF,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YACzC,6BAA6B;YAC7B,OAAO;SACR;QAED,iBAAiB;QACjB,EAAE,EAAE,cAAc,EAAE,CAAC;QACrB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;YAChB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACxB;aAAM,IAAI,IAAI,EAAE;YACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;IACH,CAAC,CAAC;IAEJ,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjB,GAAG,KAAK;QACR,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAmC,EAAE,EAAE;YAChE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAEnC,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC,EAAE,KAAK,CAAC;KACV,CAAC,CAAC;AACL,CAAC"}

package/mobile/lib/services/sitemap/findActiveSubItem.js

@@ -1,7 +1,7 @@
 import { maxBy } from '../../utils/maxBy.js';
-import { isSubItemActive } from './isSubItemActive.js';
+import { isHrefActive } from './isHrefActive.js';
 export const findActiveSubItem = (router) => (items = []) => {
-    const possibleActiveSubItems = items?.filter(isSubItemActive(router));
+    const possibleActiveSubItems = items?.filter(isHrefActive(router));
     return possibleActiveSubItems?.length
         ? maxBy((_) => _.href?.length || 0)(possibleActiveSubItems) // More specific item with max length
         : undefined;

package/mobile/lib/services/sitemap/findActiveSubItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"findActiveSubItem.js","sourceRoot":"","sources":["../../../src/services/sitemap/findActiveSubItem.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,iBAAiB,GAC5B,CAAC,MAAc,EAAE,EAAE,CACnB,CAAsB,QAAa,EAAE,EAAiB,EAAE;IACtD,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtE,OAAO,sBAAsB,EAAE,MAAM;QACnC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,qCAAqC;QACpG,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"findActiveSubItem.js","sourceRoot":"","sources":["../../../src/services/sitemap/findActiveSubItem.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,CAAC,MAAM,iBAAiB,GAC5B,CAAC,MAAc,EAAE,EAAE,CACnB,CAAsB,QAAa,EAAE,EAAiB,EAAE;IACtD,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnE,OAAO,sBAAsB,EAAE,MAAM;QACnC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,qCAAqC;QACpG,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC"}

package/mobile/lib/services/sitemap/isHrefActive.d.ts

@@ -1,3 +1,4 @@
-export declare const isHrefActive: (href: string | undefined, router: {
+import type { Router } from '../../hooks/useRouter';
+export declare const isHrefActive: (router: Router) => ({ href }: {
     href?: string | undefined;
 }) => boolean;

package/mobile/lib/services/sitemap/isHrefActive.js

@@ -1,4 +1,8 @@
-import { adjustHref } from '../../utils/adjustHref.js';
-import { getPathname, isURL, withoutQuery } from '../../utils/url.js';
-export const isHrefActive = (href, router) => withoutQuery(isURL(href) ? router.href : getPathname(router.href)).startsWith(withoutQuery(adjustHref(href)));
+import { projectSettings } from '../../ProjectSettings.js';
+import { isURL, withoutQuery } from '../../utils/url.js';
+export const isHrefActive = (router) => ({ href }) => {
+    const { BASE_PATH } = projectSettings;
+    const relativeHref = BASE_PATH && href?.startsWith(BASE_PATH) ? href.substring(BASE_PATH.length) : href;
+    return withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(withoutQuery(relativeHref));
+};
 //# sourceMappingURL=isHrefActive.js.map

package/mobile/lib/services/sitemap/isHrefActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isHrefActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isHrefActive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEnE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAwB,EAAE,MAAyB,EAAE,EAAE,CAClF,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAC3E,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAC/B,CAAC"}
+{"version":3,"file":"isHrefActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isHrefActive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEtD,MAAM,CAAC,MAAM,YAAY,GACvB,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,EAAE,IAAI,EAAqB,EAAW,EAAE;IACvC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;IACtC,MAAM,YAAY,GAChB,SAAS,IAAI,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAErF,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,CACzE,YAAY,CAAC,YAAY,CAAC,CAC3B,CAAC;AACJ,CAAC,CAAC"}

package/mobile/lib/services/sitemap/isTopItemActive.d.ts

@@ -1,4 +1,3 @@
+import type { Router } from '../../hooks/useRouter';
 import { TopMenuItem } from './SitemapProps';
-export declare const isTopItemActive: (router: {
-    href?: string;
-}) => (topItem: TopMenuItem) => boolean;
+export declare const isTopItemActive: (router: Router) => (topItem: TopMenuItem) => boolean;

package/mobile/lib/services/sitemap/isTopItemActive.js

@@ -1,4 +1,3 @@
 import { isHrefActive } from './isHrefActive.js';
-import { isSubItemActive } from './isSubItemActive.js';
-export const isTopItemActive = (router) => (topItem) => topItem.items?.some(isSubItemActive(router)) || isHrefActive(topItem.href, router);
+export const isTopItemActive = (router) => (topItem) => topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
 //# sourceMappingURL=isTopItemActive.js.map

package/mobile/lib/services/sitemap/isTopItemActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isTopItemActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isTopItemActive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAyB,EAAE,EAAE,CAC9B,CAAC,OAAoB,EAAW,EAAE,CAChC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC"}
+{"version":3,"file":"isTopItemActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isTopItemActive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,OAAoB,EAAW,EAAE,CAChC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC"}

package/mobile/lib/ui-kit/TopItem/TopItem.js

@@ -3,7 +3,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink.js';
 import { style } from '../../utils/style.js';
 export const TopItem = JSX(({ className = '', active, flat, children, ...rest }) => {
-    const link = useLink();
+    const link = useLink(true);
     const { href, target, text, onClick } = link(rest);
     return (_jsx("a", { className: style(getLinkStyle(active, flat), className), href: href, target: target, onClick: onClick, rel: "noopener noreferrer", "aria-label": text, children: _jsx("span", { className: getTextStyle(active, flat), children: text || children }) }));
 });

package/mobile/lib/ui-kit/TopItem/TopItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"TopItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TopItem/TopItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAa1C,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAe,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC/F,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAEnD,OAAO,CACL,YACE,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,CAAC,EACvD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAC,qBAAqB,gBACb,IAAI,YAEhB,eAAM,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,YAAG,IAAI,IAAI,QAAQ,GAAQ,GACpE,CACL,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,0EAA0E,EAC1E,MAAM;IACJ,CAAC,CAAC,oEAAoE;IACtE,CAAC,CAAC,oBAAoB,EACxB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CACxB,CAAC;AAEJ,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,wBAAwB,EACxB,MAAM;IACJ,CAAC,CAAC,mBAAmB;IACrB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,EACxF,mFAAmF,CACpF,CAAC"}
+{"version":3,"file":"TopItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TopItem/TopItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAa1C,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAe,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC/F,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAEnD,OAAO,CACL,YACE,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,CAAC,EACvD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAC,qBAAqB,gBACb,IAAI,YAEhB,eAAM,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,YAAG,IAAI,IAAI,QAAQ,GAAQ,GACpE,CACL,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,0EAA0E,EAC1E,MAAM;IACJ,CAAC,CAAC,oEAAoE;IACtE,CAAC,CAAC,oBAAoB,EACxB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CACxB,CAAC;AAEJ,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,wBAAwB,EACxB,MAAM;IACJ,CAAC,CAAC,mBAAmB;IACrB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,EACxF,mFAAmF,CACpF,CAAC"}

package/mobile/lib/utils/url.js

@@ -1,11 +1,5 @@
-import { projectSettings } from '../ProjectSettings.js';
 export const isURL = (href) => Boolean(href?.includes('//'));
-export const isLocalURL = (href, target) => Boolean(href &&
-    !isURL(href) &&
-    (projectSettings.BASE_PATH
-        ? href.startsWith(projectSettings.BASE_PATH)
-        : !href.startsWith('/')) &&
-    (!target || target === '_self'));
+export const isLocalURL = (href, target) => Boolean(href && !isURL(href) && (!target || target === '_self'));
 export const isHash = (href) => Boolean(href?.startsWith('#'));
 export const withoutQuery = (href) => (href || '').replace(/\/?\?.*/, '');
 export const getOrigin = (href) => (isURL(href) ? new URL(href).origin : undefined);

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

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAkC,EAAE,CACrE,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CACL,IAAI;IACF,CAAC,KAAK,CAAC,IAAI,CAAC;IACZ,CAAC,eAAe,CAAC,SAAS;QACxB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,SAAS,CAAC;QAC5C,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAClC,CAAC;AAEJ,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,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAE3F,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAC7F,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AACjG,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAkC,EAAE,CACrE,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;AAEhC,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,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAE3F,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAC7F,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AACjG,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC"}

package/mobile/src/common.css

@@ -92,6 +92,23 @@ html {
     text-fill-color: transparent;
   }
 
+  .gradient-color-text-on-green {
+    background: linear-gradient(180deg, #cec833 0%, #7dae3c 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    text-fill-color: transparent;
+    opacity: 0.5;
+  }
+
+  .gradient-color-text-on-yellow {
+    background: linear-gradient(0deg, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)),
+      linear-gradient(180deg, #cec833 0%, #7dae3c 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    text-fill-color: transparent;
+    opacity: 0.5;
+  }
+
   input[type='range'].slider {
     -webkit-appearance: none;
     height: 4px;

package/mobile/src/components/Carousel/Carousel.tsx

@@ -1,15 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { renderChildren } from '../../BlockRenderer/renderChildren';
+import { BlockDef } from '../../model/ContentPageDef';
 import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { ScrollLeftButton, ScrollRightButton } from '../../ui-kit/Button/ArrowButton';
 import { SwipeListContainer } from '../../ui-kit/SwipeListControl/SwipeListContainer';
-import {
-  SwipeListScroll,
-  useSwipeListScroll,
-} from '../../ui-kit/SwipeListControl/useSwipeListScroll';
-import type { CarouselContent } from './CarouselContent';
+import { useSwipeListScroll } from '../../ui-kit/SwipeListControl/useSwipeListScroll';
 import { style } from '../../utils/style';
+import type { CarouselContent } from './CarouselContent';
+import { CarouselScrollButtons } from './CarouselScrollButtons';
 
 export interface CarouselProps extends CarouselContent, UniBlockProps {
   itemCount?: number;
@@ -17,9 +16,6 @@ export interface CarouselProps extends CarouselContent, UniBlockProps {
 
 const ITEMS_GAP = 4;
 
-const blurBaseStyle = 'absolute top-0 bottom-0 z-50 w-[84px] pointer-events-none';
-const scrollButtonStyle = 'absolute top-[calc(50%-12px)] z-50';
-
 export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
   ({
     className = '',
@@ -27,17 +23,25 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
     visibleItemCount,
     isBlur = true,
     isCyclic = false,
+    arrowsPadded = true,
     isPadding = true,
     ...rest
   }) => {
     const { blocks: childBlocks } = rest.block || {};
     const count = itemCount || childBlocks?.length || 0;
 
+    const [activeIndex, setActiveIndex] = useState<number>(Math.floor((visibleItemCount || 0) / 2));
+
+    const increaseActiveIndex = useCallback(() => setActiveIndex((_) => _ + 1), []);
+    const decreaseActiveIndex = useCallback(() => setActiveIndex((_) => _ - 1), []);
+
     const [containerRef, scroll] = useSwipeListScroll<HTMLDivElement>({
       itemCount: count,
       isCyclic,
     });
 
+    const isBankHistoryCarousel = childBlocks && childBlocks[0]?.type === 'CarouselBankHistoryCard';
+
     return (
       <BlockWrapper className={style(getPaddingStyle(isPadding), className)} {...rest}>
         <div className="relative max-w-full">
@@ -48,15 +52,21 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
             gap={ITEMS_GAP}
             onVisibleIndicesChange={scroll.handleVisibleIndicesChange}
           >
-            {renderChildren(rest)}
+            {renderChildren({
+              ...rest,
+              block: { ...rest.block, blocks: buildBlocks(childBlocks, activeIndex) },
+            })}
           </SwipeListContainer>
-          {(scroll.canScrollLeft || scroll.canScrollRight) && isBlur ? (
-            <div>
-              <div className={`${blurBaseStyle} left-0 bg-opacity-from-white`} />
-              <div className={`${blurBaseStyle} right-0 bg-opacity-to-white`} />
-            </div>
-          ) : null}
-          {renderScrollButtons(scroll)}
+          <CarouselScrollButtons
+            scroll={scroll}
+            isBlur={isBlur}
+            arrowsPadded={arrowsPadded}
+            onScrollLeft={decreaseActiveIndex}
+            onScrollRight={increaseActiveIndex}
+            hasEdgeBlocks={isBankHistoryCarousel}
+            activeIndex={activeIndex}
+            itemCount={count}
+          />
         </div>
       </BlockWrapper>
     );
@@ -65,6 +75,7 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
 
 Carousel.childrenTypes = [
   'CarouselCard',
+  'CarouselBankHistoryCard',
   'CarouselCatalogCard',
   'CarouselInvestmentCard',
   'CarouselProductCard',
@@ -74,20 +85,20 @@ Carousel.childrenTypes = [
   'CarouselInvestmentCard',
 ];
 
-const renderScrollButtons = ({
-  scrollLeft,
-  scrollRight,
-  canScrollLeft,
-  canScrollRight,
-}: SwipeListScroll) => (
-  <div>
-    {canScrollLeft ? (
-      <ScrollLeftButton className={`${scrollButtonStyle} left-8`} onClick={scrollLeft} />
-    ) : null}
-    {canScrollRight ? (
-      <ScrollRightButton className={`${scrollButtonStyle} right-8`} onClick={scrollRight} />
-    ) : null}
-  </div>
-);
+const buildBlocks = (blocks?: BlockDef[], activeIndex?: number) => {
+  return blocks && blocks[0].type === 'CarouselBankHistoryCard'
+    ? blocks.map((_, i) => {
+        return {
+          ..._,
+          content: {
+            ..._.content,
+            orderNumber: i,
+            isActive: activeIndex === i,
+            blocksLength: blocks.length,
+          },
+        };
+      })
+    : blocks;
+};
 
 const getPaddingStyle = (isPadding: boolean): string => (isPadding ? 'p-12' : '');

package/mobile/src/components/Carousel/CarouselContent.ts

@@ -7,8 +7,13 @@ export interface CarouselContent {
    * @enumNames ["auto", "1", "2", "3"]
    */
   visibleItemCount?: 0 | 1 | 2 | 3 | 4;
-  /** @title Добавление  блюра */
+  /** @title Добавление  блюра на стрелках*/
   isBlur?: boolean;
+  /**
+   * @title Добавление  отступа на стрелках
+   * @default true
+   * */
+  arrowsPadded?: boolean;
   /** @title Цикличность */
   isCyclic?: boolean;
   /** @title Внутренний отступ  */

package/mobile/src/components/Carousel/CarouselScrollButtons.tsx

@@ -0,0 +1,81 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { ScrollLeftButton, ScrollRightButton } from '../../ui-kit/Button/ArrowButton';
+import { SwipeListScroll } from '../../ui-kit/SwipeListControl/useSwipeListScroll';
+import { style } from '../../utils/style';
+
+interface CarouselScrollButtonsProps {
+  scroll: SwipeListScroll;
+  arrowsPadded: boolean;
+  isBlur: boolean;
+  onScrollLeft: () => void;
+  onScrollRight: () => void;
+  hasEdgeBlocks?: boolean;
+  activeIndex: number;
+  itemCount: number;
+}
+
+const scrollButtonStyle = 'absolute top-[calc(50%-24px)] z-50';
+const blurBaseStyle = 'absolute top-0 bottom-0 z-50 w-[84px] pointer-events-none';
+
+export const CarouselScrollButtons = JSX<CarouselScrollButtonsProps>(
+  ({
+    scroll,
+    arrowsPadded,
+    isBlur,
+    onScrollLeft,
+    onScrollRight,
+    hasEdgeBlocks,
+    activeIndex,
+    itemCount,
+  }) => {
+    const { canScrollLeft, canScrollRight, scrollLeft, scrollRight } = scroll;
+
+    const canMoveLeft = hasEdgeBlocks ? activeIndex > 0 : canScrollLeft;
+    const canMoveRight = hasEdgeBlocks ? activeIndex < itemCount - 1 : canScrollRight;
+
+    const handleScrollLeft = useCallback(() => {
+      if (!hasEdgeBlocks) {
+        scrollLeft();
+      } else {
+        canScrollLeft && activeIndex !== itemCount - 1 && scrollLeft();
+        onScrollLeft();
+      }
+    }, [scrollLeft, onScrollLeft, hasEdgeBlocks, canScrollLeft, activeIndex, itemCount]);
+
+    const handleScrollRight = useCallback(() => {
+      if (!hasEdgeBlocks) {
+        scrollRight();
+      } else {
+        canScrollRight && activeIndex !== 0 && scrollRight();
+        onScrollRight();
+      }
+    }, [scrollRight, onScrollRight, hasEdgeBlocks, canScrollLeft, activeIndex, itemCount]);
+
+    return (
+      <div>
+        {renderBlur(isBlur, scroll)}
+        {canMoveLeft ? (
+          <ScrollLeftButton
+            className={style(scrollButtonStyle, arrowsPadded ? 'left-8' : 'left-0')}
+            onClick={handleScrollLeft}
+          />
+        ) : null}
+        {canMoveRight ? (
+          <ScrollRightButton
+            className={style(scrollButtonStyle, arrowsPadded ? 'right-8' : 'right-0')}
+            onClick={handleScrollRight}
+          />
+        ) : null}
+      </div>
+    );
+  },
+);
+
+const renderBlur = (isBlur: boolean, scroll: SwipeListScroll) =>
+  (scroll.canScrollLeft || scroll.canScrollRight) && isBlur ? (
+    <div>
+      <div className={style(blurBaseStyle, 'left-0 bg-opacity-from-white')} />
+      <div className={style(blurBaseStyle, 'right-0 bg-opacity-to-white')} />
+    </div>
+  ) : null;

package/mobile/src/components/CarouselBankHistoryCard/CarouselBankHistoryCard.example.json

@@ -0,0 +1,4 @@
+{
+  "title": "Заголовок 1",
+  "description": "Описание 1"
+}

package/mobile/src/components/CarouselBankHistoryCard/CarouselBankHistoryCard.tsx

@@ -0,0 +1,85 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { style } from '../../utils/style';
+import { Headline } from '../Headline/Headline';
+import type { CarouselBankHistoryCardContent } from './CarouselBankHistoryCardContent';
+
+interface CarouselBankHistoryCardProps extends CarouselBankHistoryCardContent, UniBlockProps {
+  isActive?: boolean;
+  orderNumber?: number;
+  blocksLength?: number;
+}
+
+export const CarouselBankHistoryCard = JSX<CarouselBankHistoryCardProps>(
+  ({ title, description, isActive, orderNumber = 0, blocksLength = 0 }) => {
+    return (
+      <BlockWrapper className="flex h-[485px]">
+        {isActive ? (
+          <div className="relative flex items-center w-full">
+            <Headline
+              headlineVersion="S"
+              title={title}
+              description={description}
+              align="text-left"
+              className={style(
+                'absolute z-10 h-[385px] w-[440px] text-white shadow-dark-blue',
+                getActiveBlockPosition(orderNumber, blocksLength),
+                getBackgroundColor(orderNumber),
+              )}
+            />
+          </div>
+        ) : (
+          <div className="flex w-full items-center justify-center">
+            <div
+              className={style(
+                'flex justify-center items-center h-[300px] w-[340px] font-mohave text-title-large tracking-[-0.03em]',
+                getBackgroundColor(orderNumber),
+              )}
+            >
+              <span className={getTextColor(orderNumber)}>{title}</span>
+            </div>
+          </div>
+        )}
+      </BlockWrapper>
+    );
+  },
+);
+
+const getBackgroundColor = (orderNumber: number) => {
+  const division = orderNumber % 3;
+  switch (division) {
+    case 0:
+      return 'bg-primary-main';
+    case 1:
+      return 'bg-green-light';
+    case 2:
+      return 'bg-yellow-light';
+
+    default:
+      return 'bg-primary-main';
+  }
+};
+
+const getTextColor = (orderNumber: number) => {
+  const division = orderNumber % 3;
+  switch (division) {
+    case 1:
+      return 'gradient-color-text-on-yellow';
+    case 2:
+      return 'gradient-color-text-on-yellow';
+
+    default:
+      return 'gradient-color-text-on-green';
+  }
+};
+
+const getActiveBlockPosition = (orderNumber: number, blocksLength: number) => {
+  if (orderNumber === 0) {
+    return 'left-9';
+  } else if (orderNumber === blocksLength - 1) {
+    return 'right-9';
+  } else {
+    return '-left-[25px]';
+  }
+};

package/mobile/src/components/CarouselBankHistoryCard/CarouselBankHistoryCard.ui.json

@@ -0,0 +1 @@
+{}

package/mobile/src/components/CarouselBankHistoryCard/CarouselBankHistoryCardContent.ts

@@ -0,0 +1,9 @@
+/**
+ * @title Карточка карусели истории банка
+ */
+export interface CarouselBankHistoryCardContent {
+  /** @title Заголовок */
+  title?: string;
+  /** @title Описание */
+  description?: string;
+}

package/mobile/src/components/CarouselCard/CarouselCard.tsx

@@ -17,13 +17,13 @@ const CARD_WIDTH_MAP: Record<CarouselCardVersion, string> = {
 export const CarouselCard = JSX<CarouselCardProps>(
   ({ className = '', button, description, title, carouselVersion = 'normal' }) => (
     <section
-      className={`flex pb-9 pl-12 border-box ${CARD_WIDTH_MAP[carouselVersion]} ${className}`}
+      className={`flex pb-9 pl-12 border-box h-full ${CARD_WIDTH_MAP[carouselVersion]} ${className}`}
     >
       <div className="relative w-full">
         <div className={`${BLOCK_CLASSES} z-10 top-9 right-12 bg-green-dark`} />
         <div className={`${BLOCK_CLASSES} z-10 top-6 right-8 bg-green`} />
         <div className={`${BLOCK_CLASSES} z-10 top-3 right-4 bg-green-light`} />
-        <div className="relative bg-white z-10 p-10 border border-solid border-green-light">
+        <div className="relative h-full bg-white z-10 p-10 border border-solid border-green-light">
           <Headline
             className="!p-0"
             title={title}

package/mobile/src/components/CarouselCatalogCard/CarouselCatalogCard.tsx

@@ -19,7 +19,7 @@ const cardStyleMap: Record<ProductColorVersion, string> = {
 export const CarouselCatalogCard = JSX<CarouselCatalogCardProps>(
   ({ className = '', title, description, image, price, button, colors, ...rest }) => (
     <BlockWrapper
-      className={`border box-border border-gray p-7 min-w-[392px] flex flex-col justify-left ${className}`}
+      className={`border box-border border-gray p-7 min-w-[392px] h-full flex flex-col justify-left ${className}`}
       {...rest}
     >
       {image?.src ? <Img className="mb-5 flex justify-center" image={image} /> : null}

package/mobile/src/components/CarouselRecommendationCard/CarouselRecommendationCard.tsx

@@ -36,7 +36,7 @@ export const CarouselRecommendationCard = JSX<RecommendationCardProps>(
     return (
       <BlockWrapper
         className={style(
-          'relative p-7 min-w-[524px] text-left box-border group-data-gray:bg-main-divider/50',
+          'relative p-7 min-w-[524px] h-full text-left box-border group-data-gray:bg-main-divider/50',
           BORDER_STYLE,
           className,
         )}

package/mobile/src/components/CarouselRecommendationCard/CarouselRecommendationCard.ui.json

@@ -1,14 +1,15 @@
 {
   "content": {
-    "items": {
-      "image": {
-        "ui:field": "picture"
-      }, 
-      "socialMedia": {
-        "items": {
-          "icon": {
-            "ui:field": "picture"
-          }
+    "image": {
+      "ui:field": "picture"
+    }, 
+    "socialMedia": {
+      "items": {
+        "icon": {
+          "ui:field": "icon"
+        },
+        "iconRight": {
+          "ui:field": "icon"
         }
       }
     }

package/mobile/src/components/CarouselRecommendationCard/CarouselRecommendationCardContent.ts

@@ -10,7 +10,6 @@ import type { ListContent } from '../../ui-kit/List/ListContent';
 export interface CarouselRecommendationCardContent extends HeadlineCommonProps, ListContent {
   /**
    * @title Соц сети
-   * @minItems 1
    */
   socialMedia?: ButtonWithIconProps[];
   /**

package/mobile/src/components/Footer/MediaButton.tsx

@@ -5,7 +5,7 @@ import { style } from '../../utils/style';
 import type { Picture } from '../../model/Picture';
 import type { IconVersion } from '../../model/IconVersion';
 import { Button } from '../../ui-kit/Button/Button';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
 const ICONS_MAP: Array<{
   origins: string[];
@@ -46,7 +46,7 @@ const ICONS_MAP: Array<{
 
 export type ButtonSize = 'default' | 'small';
 
-interface MediaButtonProps extends ButtonProps {
+interface MediaButtonProps extends ButtonWithIconProps {
   iconVersion?: IconVersion;
   buttonSize?: ButtonSize;
 }

package/mobile/src/hooks/useLink.ts

@@ -8,15 +8,15 @@ interface ClickHandler {
   onClick(ev?: { preventDefault: () => void }): void;
 }
 
-export function useLink(): <L extends Partial<LinkProps & ClickHandler>>(
-  props: L,
-) => L & ClickHandler {
+export function useLink(
+  isRemote?: boolean,
+): <L extends Partial<LinkProps & ClickHandler>>(props: L) => L & ClickHandler {
   const router = useRouter();
   const blockRouter = useBlockRouter();
 
   const handleLocalURL =
     (href: string | undefined, target?: Target) => (ev?: { preventDefault: () => void }) => {
-      if (!isLocalURL(href, target)) {
+      if (isRemote || !isLocalURL(href, target)) {
         // Proceed with native handle
         return;
       }

package/mobile/src/services/sitemap/findActiveSubItem.ts

@@ -1,12 +1,12 @@
 import type { Router } from '../../hooks/useRouter';
 import type { LinkProps } from '../../model/LinkProps';
 import { maxBy } from '../../utils/maxBy';
-import { isSubItemActive } from './isSubItemActive';
+import { isHrefActive } from './isHrefActive';
 
 export const findActiveSubItem =
   (router: Router) =>
   <T extends LinkProps>(items: T[] = []): T | undefined => {
-    const possibleActiveSubItems = items?.filter(isSubItemActive(router));
+    const possibleActiveSubItems = items?.filter(isHrefActive(router));
 
     return possibleActiveSubItems?.length
       ? maxBy((_: T) => _.href?.length || 0)(possibleActiveSubItems) // More specific item with max length