@redneckz/wildless-cms-uni-blocks 0.2.99 → 0.2.103

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

@@ -1,10 +1,22 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-export const TopItem = JSX(({ className, text, href, target, active, flat, onClick, children, ariaLabel }) => {
-    const linkStyle = active ? 'border-primary-main rounded-md' : 'border-transparent';
-    const textStyle = active
-        ? 'text-primary-main'
-        : `${flat ? 'text-primary-text' : 'text-secondary-text'} hover:text-primary-main`;
-    return (_jsx("a", { className: `inline-block border border-solid bg-transparent text-center no-underline ${flat ? '' : 'px-4 py-2'} ${linkStyle} ${className || ''}`, href: href, target: target, onClick: onClick, rel: "noopener noreferrer", "aria-label": ariaLabel, children: _jsx("span", { className: `font-sans font-normal text-sm ${textStyle}`, children: text || children }) }));
-});
+const TEXT_CLASSES = 'font-sans font-normal text-sm';
+const LINK_CLASSES = 'inline-block border border-solid bg-transparent text-center no-underline';
+export const TopItem = JSX(({ className = '', text, href, target, active, flat, onClick, children, ariaLabel, bgColor = 'bg-white', }) => (_jsx("a", { className: `${getLinkClasses(bgColor, active, flat)} ${className}`, href: href, target: target, onClick: onClick, rel: "noopener noreferrer", "aria-label": ariaLabel, children: _jsx("span", { className: getTextClasses(bgColor, active, flat), children: text || children }) })));
+const getLinkClasses = (bgColor, active, flat) => {
+    let classes = 'border-transparent';
+    if (active) {
+        classes = `rounded-md ${bgColor === 'bg-white' ? 'border-primary-main' : 'border-white'}`;
+    }
+    return `${classes} ${LINK_CLASSES} ${flat ? '' : 'px-4 py-2'}`;
+};
+const getTextClasses = (bgColor, active, flat) => {
+    let classes = 'text-white';
+    if (bgColor === 'bg-white') {
+        classes = active
+            ? 'text-primary-main'
+            : `${flat ? 'text-primary-text' : 'text-secondary-text'} hover:text-primary-main`;
+    }
+    return `${classes} ${TEXT_CLASSES}`;
+};
 //# sourceMappingURL=TopItem.js.map

package/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,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CACxB,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;IAChF,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC,oBAAoB,CAAC;IACnF,MAAM,SAAS,GAAG,MAAM;QACtB,CAAC,CAAC,mBAAmB;QACrB,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,0BAA0B,CAAC;IAEpF,OAAO,CACL,YACE,SAAS,EAAE,4EACT,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WACd,IAAI,SAAS,IAAI,SAAS,IAAI,EAAE,EAAE,EAClC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAC,qBAAqB,gBACb,SAAS,YAErB,eAAM,SAAS,EAAE,iCAAiC,SAAS,EAAE,YAAG,IAAI,IAAI,QAAQ,GAAQ,GACtF,CACL,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"TopItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TopItem/TopItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAgBxC,MAAM,YAAY,GAAG,+BAA+B,CAAC;AACrD,MAAM,YAAY,GAAG,0EAA0E,CAAC;AAEhG,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CACxB,CAAC,EACC,SAAS,GAAG,EAAE,EACd,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,MAAM,EACN,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,SAAS,EACT,OAAO,GAAG,UAAU,GACrB,EAAE,EAAE,CAAC,CACJ,YACE,SAAS,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,SAAS,EAAE,EAClE,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAC,qBAAqB,gBACb,SAAS,YAErB,eAAM,SAAS,EAAE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,YAAG,IAAI,IAAI,QAAQ,GAAQ,GAC/E,CACL,CACF,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,OAAuB,EAAE,MAAgB,EAAE,IAAc,EAAE,EAAE;IACnF,IAAI,OAAO,GAAG,oBAAoB,CAAC;IACnC,IAAI,MAAM,EAAE;QACV,OAAO,GAAG,cAAc,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC;KAC3F;IAED,OAAO,GAAG,OAAO,IAAI,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,OAAuB,EAAE,MAAgB,EAAE,IAAc,EAAE,EAAE;IACnF,IAAI,OAAO,GAAG,YAAY,CAAC;IAC3B,IAAI,OAAO,KAAK,UAAU,EAAE;QAC1B,OAAO,GAAG,MAAM;YACd,CAAC,CAAC,mBAAmB;YACrB,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,0BAA0B,CAAC;KACrF;IAED,OAAO,GAAG,OAAO,IAAI,YAAY,EAAE,CAAC;AACtC,CAAC,CAAC"}

package/lib/utils/adjustHref.d.ts

@@ -0,0 +1,4 @@
+export declare const adjustHref: (href: string | undefined, router: {
+    pathname: string;
+    href?: string | undefined;
+}) => string | undefined;

package/lib/utils/adjustHref.js

@@ -0,0 +1,18 @@
+import { getOrigin, isURL } from './url.js';
+import { MOBILE_URL_PATH } from './withoutMobilePath.js';
+export const adjustHref = (href, router) => {
+    if (!href) {
+        return href;
+    }
+    const relativeHref = toRelativeHref(href, router) || '';
+    const isMobilePage = router?.pathname.startsWith(MOBILE_URL_PATH);
+    return isMobilePage && !isURL(relativeHref) ? `${MOBILE_URL_PATH}${relativeHref}` : relativeHref;
+};
+const toRelativeHref = (href, router) => {
+    if (!href) {
+        return href;
+    }
+    const origin = getOrigin(router?.href);
+    return origin ? href.replace(origin, '') || '/' : href;
+};
+//# sourceMappingURL=adjustHref.js.map

package/lib/utils/adjustHref.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adjustHref.js","sourceRoot":"","sources":["../../src/utils/adjustHref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,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,CAAC,IAAI,EAAE,CAAC;IACxD,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,GAAG,CAAC,IAAwB,EAAE,MAAyB,EAAE,EAAE;IAC7E,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/lib/utils/maxBy.d.ts

@@ -0,0 +1,2 @@
+export declare const maxBy: <Item, Value>(discriminator: (item: Item) => Value) => (list: Item[]) => Item;
+export declare const minBy: <Item, Value>(discriminator: (item: Item) => Value) => (list: Item[]) => Item;

package/lib/utils/maxBy.js

@@ -0,0 +1,3 @@
+export const maxBy = (discriminator) => (list) => list.reduceRight((a, b) => (discriminator(a) > discriminator(b) ? a : b));
+export const minBy = (discriminator) => maxBy((_) => -discriminator(_));
+//# sourceMappingURL=maxBy.js.map

package/lib/utils/maxBy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"maxBy.js","sourceRoot":"","sources":["../../src/utils/maxBy.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,KAAK,GAChB,CAAc,aAAoC,EAAE,EAAE,CACtD,CAAC,IAAY,EAAQ,EAAE,CACrB,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9E,MAAM,CAAC,MAAM,KAAK,GAAG,CAAc,aAAoC,EAAE,EAAE,CACzE,KAAK,CAAC,CAAC,CAAO,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC"}

package/lib/utils/url.d.ts

@@ -1,16 +1,3 @@
-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 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,12 +1,7 @@
-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)) {
+    if (!href || !isURL(href)) {
         return undefined;
     }
     const url = href;
@@ -15,19 +10,4 @@ export const getOrigin = (href) => {
     const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
     return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
 };
-export const adjustHref = (href, router) => {
-    if (!href) {
-        return href;
-    }
-    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, router) => {
-    if (!href) {
-        return href;
-    }
-    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,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"}
+{"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,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAI,CAAC;IACjB,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"}

package/lib/utils/withoutMobilePath.d.ts

@@ -0,0 +1,2 @@
+export declare const MOBILE_URL_PATH = "/mobile";
+export declare const withoutMobilePath: (href?: string) => string;

package/lib/utils/withoutMobilePath.js

@@ -0,0 +1,3 @@
+export const MOBILE_URL_PATH = '/mobile';
+export const withoutMobilePath = (href) => (href || '').replace(MOBILE_URL_PATH, '');
+//# sourceMappingURL=withoutMobilePath.js.map

package/lib/utils/withoutMobilePath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"withoutMobilePath.js","sourceRoot":"","sources":["../../src/utils/withoutMobilePath.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAC;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.2.99",
+  "version": "0.2.103",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -142,7 +142,9 @@
   ],
   "lint-staged": {
     "src/**/*.{js,jsx,ts,tsx,css}": [
-      "prettier --write",
+      "prettier --write"
+    ],
+    "src/**/*.{js,jsx,ts,tsx}": [
       "eslint"
     ],
     "*.{js,jsx,ts,tsx,css,json}": [

package/src/components/BlockContent.ts

@@ -6,6 +6,7 @@ import type { GalleryContent } from './Gallery/GalleryContent';
 import type { HeaderContent } from './Header/HeaderContent';
 import type { LinkDocsContent } from './LinkDocs/LinkDocsContent';
 import type { MobileAppTileContent } from './MobileAppTile/MobileAppTileContent';
+import type { NavigationContent } from './Navigation/NavigationContent';
 import type { PictureTextContent } from './PictureText/PictureTextContent';
 import type { PlaceholderContent } from './Placeholder/PlaceholderContent';
 import type { ProductBlockContent } from './ProductBlock/ProductBlockContent';
@@ -13,9 +14,9 @@ import type { ProductGalleryContent } from './ProductGallery/ProductGalleryConte
 import type { ProductTileContent } from './ProductTile/ProductTileContent';
 import type { PromoTileContent } from './PromoTile/PromoTileContent';
 import type { StepsBlockContent } from './StepsBlock/StepsBlockContent';
+import type { TariffsTableContent } from './TariffsTable/TariffsTableContent';
 import type { TextBlockContent } from './TextBlock/TextBlockContent';
 import type { TileContent } from './Tile/TileContent';
-import { TariffsTableContent } from './TariffsTable/TariffsTableContent';
 
 /**
  * @hidden
@@ -38,4 +39,5 @@ export type BlockContent =
   | StepsBlockContent
   | TariffsTableContent
   | TextBlockContent
-  | TileContent;
+  | TileContent
+  | NavigationContent;

package/src/components/Blocks.ts

@@ -10,6 +10,7 @@ import { Headline } from './Headline/Headline';
 import { LinkDocs } from './LinkDocs/LinkDocs';
 import { MiniGallery } from './MiniGallery/MiniGallery';
 import { MobileAppTile } from './MobileAppTile/MobileAppTile';
+import { Navigation } from './Navigation/Navigation';
 import { PictureText } from './PictureText/PictureText';
 import { Placeholder } from './Placeholder/Placeholder';
 import { ProductBlock } from './ProductBlock/ProductBlock';
@@ -44,4 +45,5 @@ export const Blocks = {
   TariffsTable,
   TextBlock,
   Tile,
+  Navigation,
 };

package/src/components/ContentPage/ContentPage.page.json

@@ -18,25 +18,38 @@
           "type": "Header",
           "style": ["-mx-20", "mb-5", "shadow-[0_8px_32px_0px_#00000014]"],
           "content": {
-            "defaultLocation": "Москва",
-            "topItems": [
-              {
-                "href": "https://rshb.ru/",
-                "text": "Бизнес клиентам",
-                "target": "_blank"
-              },
-              {
-                "href": "https://rshb.ru/",
-                "text": "Частным клиентам",
-                "target": "_blank"
-              }
-            ]
+            "defaultLocation": "Москва"
           }
         }
       ]
     }
   },
   "blocks": [
+    {
+      "type": "Navigation",
+      "style": ["col-span-12"],
+      "content": {
+        "title": "Потребительский кредит наличными",
+        "buttons": [
+          {
+            "href": "/credits",
+            "text": "Оформить"
+          },
+          {
+            "href": "/tariffs",
+            "text": "Тарифы"
+          },
+          {
+            "href": "/harvest",
+            "text": "Урожай"
+          },
+          {
+            "href": "/faq",
+            "text": "Частые вопросы"
+          }
+        ]
+      }
+    },
     {
       "type": "ProductGallery",
       "style": ["col-span-12"],
@@ -1838,12 +1851,12 @@
           {
             "label": "Кредит по одному документу",
             "description": "До 300 тыс ₽ по упрощённой процедуре получения кредита",
-            "icon": "DocumentText"
+            "icon": "DocumentTextIcon"
           },
           {
             "label": "Кредит на общих условиях",
             "description": "До 5 млн ₽ на общих условиях получения кредита",
-            "icon": "DiscountShape"
+            "icon": "DiscountShapeIcon"
           }
         ],
         "image": {

package/src/components/CreditCalculator/CreditCalculator.tsx

@@ -72,12 +72,10 @@ export const CreditCalculator = JSX<CreditCalculatorProps>(
     }
 
     return (
-      <section className={`font-sans text-primary-text bg-white p-4 w-[847px] ${className || ''}`}>
-        <div
-          className={`box-border p-[49px] pr-[53px] flex flex-col justify-between ${borderStyle}`}
-        >
+      <section className={`font-sans text-primary-text p-10 bg-white ${className || ''}`}>
+        <div className={`box-border p-[49px] pr-[56px] mx-auto w-max ${borderStyle}`}>
           <div className="flex justify-between ">
-            <div className="grow mr-[42px] w-[465px]">
+            <div className="mr-[42px]">
               <InputRange
                 title="Желаемая сумма кредита, ₽"
                 items={[
@@ -115,7 +113,7 @@ export const CreditCalculator = JSX<CreditCalculatorProps>(
                 onChange={setIsInsuranceChecked}
               />
             </div>
-            <div className="basis-[226px] shrink-0 box-border h-fit p-9 bg-primary-main rounded-md text-white">
+            <div className="box-border h-fit p-9 bg-primary-main rounded-md text-white">
               <div className="text-base mb-[18px]">Наше предложение</div>
               <div className="text-sm opacity-60">Ежемесячный платёж</div>
               <div className="text-lg mb-3">

package/src/components/Footer/FooterContent.ts

@@ -1,5 +1,5 @@
 import type { LinkProps } from '../../model/LinkProps';
-import type { SitemapProps } from '../../model/SitemapProps';
+import type { SitemapProps } from '../../services/sitemap/SitemapProps';
 
 /**
  * @title Тип контакта

package/src/components/Footer/Sitemap.tsx

@@ -1,10 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import { useSitemap } from '../../hooks/useSitemap';
-import { mergeTopItems } from '../../mergeTopItems';
 import type { LinkProps } from '../../model/LinkProps';
-import type { TopMenuItem } from '../../model/SitemapProps';
+import { mergeTopItems } from '../../services/sitemap/mergeTopItems';
+import type { TopMenuItem } from '../../services/sitemap/SitemapProps';
+import { useSitemap } from '../../services/sitemap/useSitemap';
 import type { UniBlockProps } from '../../types';
+
 export interface SitemapProps extends UniBlockProps {
   items?: TopMenuItem[];
 }

package/src/components/Header/Header.fixture.tsx

@@ -1,21 +1,7 @@
 import { context } from '../../setup-fixture';
 import { Header } from './Header';
 
-export default (
-  <Header
-    context={context}
-    defaultLocation="Москва"
-    topItems={[
-      {
-        href: 'https://rshb.ru/',
-        text: 'Бизнес клиентам',
-        target: '_blank',
-      },
-      {
-        href: 'https://rshb.ru/',
-        text: 'Частным клиентам',
-        target: '_blank',
-      },
-    ]}
-  />
-);
+export default {
+  default: <Header context={context} defaultLocation="Москва" />,
+  transparent: <Header context={context} defaultLocation="Москва" bgColor="transparent" />,
+};

package/src/components/Header/Header.tsx

@@ -1,61 +1,72 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import { useSitemap } from '../../hooks/useSitemap';
-import { mergeTopItems } from '../../mergeTopItems';
+import type { BgColorVersion } from '../../model/BgColorVersion';
+import { findActiveSubItem } from '../../services/sitemap/findActiveSubItem';
+import { isTopItemActive } from '../../services/sitemap/isTopItemActive';
+import { mergeTopItems } from '../../services/sitemap/mergeTopItems';
+import { useSitemap } from '../../services/sitemap/useSitemap';
 import type { UniBlockProps } from '../../types';
 import { HeaderItem } from '../../ui-kit/HeaderItem/HeaderItem';
 import { Logo } from '../../ui-kit/Logo/Logo';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
 import type { HeaderContent } from './HeaderContent';
 import { HeaderSecondaryMenu } from './HeaderSecondaryMenu';
-import { isSubItemActive } from './isSubItemActive';
-import { isTopItemActive } from './isTopItemActive';
+
+const BORDER_COLORS: Record<BgColorVersion, string> = {
+  'bg-white': 'bg-main-divider',
+  transparent: 'bg-main-divider opacity-30',
+};
 
 export interface HeaderProps extends HeaderContent, UniBlockProps {}
 
-export const Header = JSX<HeaderProps>(({ className, defaultLocation, context, topItems }) => {
-  const router = context.useRouter();
-  const sitemap = useSitemap(context.useAsyncData);
-  const { handlerDecorator } = context;
+export const Header = JSX<HeaderProps>(
+  ({ className, defaultLocation, bgColor = 'bg-white', context, topItems }) => {
+    const router = context.useRouter();
+    const sitemap = useSitemap(context.useAsyncData);
+    const { handlerDecorator } = context;
 
-  const mergedItems = mergeTopItems(sitemap.topItems, topItems);
-  const activeTopItem = mergedItems.find(isTopItemActive(router));
-  const subItems = activeTopItem?.items;
-  const activeSubItem = subItems?.find(isSubItemActive(router));
+    const mergedItems = mergeTopItems(sitemap.topItems, topItems);
+    const activeTopItem = mergedItems.find(isTopItemActive(router));
+    const subItems = activeTopItem?.items;
+    const activeSubItem = findActiveSubItem(router)(subItems);
 
-  const topMenu = mergedItems.map((_, i) => (
-    <TopItem
-      key={String(i)}
-      active={_ === activeTopItem}
-      {...useLink({ router, handlerDecorator }, _)}
-      ariaLabel={_.text}
-    />
-  ));
+    const topMenu = mergedItems.map((_, i) => (
+      <TopItem
+        key={String(i)}
+        active={_ === activeTopItem}
+        {...useLink({ router, handlerDecorator }, _)}
+        ariaLabel={_.text}
+        bgColor={bgColor}
+      />
+    ));
 
-  const subMenu = subItems?.map((_) => (
-    <HeaderItem
-      key={_.href}
-      className="mr-8"
-      active={_ === activeSubItem}
-      {...useLink({ router, handlerDecorator }, _)}
-    />
-  ));
+    const subMenu = subItems?.map((_) => (
+      <HeaderItem
+        key={_.href}
+        className="mr-8"
+        active={_ === activeSubItem}
+        {...useLink({ router, handlerDecorator }, _)}
+        bgColor={bgColor}
+      />
+    ));
 
-  return (
-    <header className={`pt-5 pb-8 px-20 bg-white ${className || ''}`}>
-      <div className="container">
-        <div className="flex items-center">
-          <Logo className="mr-8" />
-          {topMenu}
-          <HeaderSecondaryMenu
-            context={context}
-            className="ml-auto"
-            defaultLocation={defaultLocation}
-          />
+    return (
+      <header className={`pt-5 pb-8 px-20 ${bgColor} ${className || ''}`}>
+        <div className="container">
+          <div className="flex items-center">
+            <Logo className="mr-8" bgColor={bgColor} />
+            {topMenu}
+            <HeaderSecondaryMenu
+              context={context}
+              className="ml-auto"
+              defaultLocation={defaultLocation}
+              bgColor={bgColor}
+            />
+          </div>
+          <div className={`mt-5 h-[1px] ${BORDER_COLORS[bgColor]}`} />
+          <nav className="mt-5">{subMenu}</nav>
         </div>
-        <div className="mt-5 h-[1px] bg-main-divider" />
-        <nav className="mt-5">{subMenu}</nav>
-      </div>
-    </header>
-  );
-});
+      </header>
+    );
+  },
+);

package/src/components/Header/HeaderContent.ts

@@ -1,4 +1,5 @@
-import type { SitemapProps } from '../../model/SitemapProps';
+import { BgColorVersion } from '../../model/BgColorVersion';
+import type { SitemapProps } from '../../services/sitemap/SitemapProps';
 
 /**
  * @title Шапка
@@ -10,4 +11,10 @@ export interface HeaderContent extends SitemapProps {
    * @default Москва
    */
   defaultLocation?: string;
+  /**
+   * @title Фон элемента
+   * @hidden
+   * @default white
+   */
+  bgColor?: BgColorVersion;
 }

package/src/components/Header/HeaderSecondaryMenu.tsx

@@ -1,20 +1,34 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { UniBlockProps } from '../../types';
 import { Icon } from '../../ui-kit/Icon/Icon';
+import type { IconName } from '../../ui-kit/Icon/IconProps';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
 import { HeaderSecondaryMenuButton } from './HeaderSecondaryMenuButton';
 
 interface HeaderSecondaryMenuContent {
   defaultLocation?: string;
-  className?: string;
+  bgColor?: BgColorVersion;
 }
 
 export interface HeaderSecondaryMenuProps extends HeaderSecondaryMenuContent, UniBlockProps {}
 
+const COLORS_MAP: Record<BgColorVersion, string> = {
+  'bg-white': 'text-primary-text hover:text-primary-main',
+  transparent: 'text-white',
+};
+const DOP_LINKS_COLORS_MAP: Record<BgColorVersion, string> = {
+  'bg-white': 'text-secondary-light hover:text-secondary-hover',
+  transparent: 'text-white',
+};
+const DOP_LINKS_ICON_NAME_MAP: Record<BgColorVersion, IconName> = {
+  'bg-white': 'GridIcon',
+  transparent: 'GridIconWhite',
+};
+
 export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
-  ({ context, className, defaultLocation = '' }) => {
+  ({ context, className, defaultLocation = '', bgColor = 'bg-white' }) => {
     const [city, getCity] = context.useGeolocation(defaultLocation);
-
     return (
       <div className={`flex items-center ${className || ''}`}>
         <TopItem
@@ -24,6 +38,7 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
           text={city}
           ariaLabel="Местоположение"
           onClick={getCity}
+          bgColor={bgColor}
         />
         <TopItem
           className="mr-7"
@@ -31,24 +46,22 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
           href="#"
           text="Офисы и банкоматы"
           ariaLabel="Список всех доступных офисов и банкоматов"
+          bgColor={bgColor}
         />
         <HeaderSecondaryMenuButton
-          className="mr-5 text-primary-text hover:text-primary-main"
+          className={`mr-5 ${COLORS_MAP[bgColor]}`}
           ariaLabel="Поиск по сайту"
         >
-          <Icon name="LoupeIcon" aria-hidden="true" className="h-full" asSVG />
+          <Icon name="LoupeIcon" className="h-full" asSVG />
         </HeaderSecondaryMenuButton>
-        <HeaderSecondaryMenuButton
-          className="mr-5 text-primary-text hover:text-primary-main"
-          ariaLabel="Профиль"
-        >
-          <Icon name="ProfileIcon" aria-hidden="true" className="h-full" asSVG />
+        <HeaderSecondaryMenuButton className={`mr-5 ${COLORS_MAP[bgColor]}`} ariaLabel="Профиль">
+          <Icon name="ProfileIcon" className="h-full" asSVG />
         </HeaderSecondaryMenuButton>
         <HeaderSecondaryMenuButton
-          className="min-w-[32px] min-h-[32px] fill-secondary-light hover:fill-secondary-hover"
+          className={`${DOP_LINKS_COLORS_MAP[bgColor]} min-w-[32px] min-h-[32px]`}
           ariaLabel="Дополнительные ссылки"
         >
-          <Icon name="GridIcon" aria-hidden="true" className="h-full" asSVG />
+          <Icon name={DOP_LINKS_ICON_NAME_MAP[bgColor]} className="h-full" asSVG />
         </HeaderSecondaryMenuButton>
       </div>
     );

package/src/components/Header/HeaderSecondaryMenuButton.tsx

@@ -6,12 +6,10 @@ interface HeaderSecondaryMenuButtonProps {
 }
 
 export const HeaderSecondaryMenuButton = JSX<HeaderSecondaryMenuButtonProps>(
-  ({ className, children, ariaLabel }) => (
+  ({ className = '', children, ariaLabel }) => (
     <button
       type="button"
-      className={`border-0 p-0 w-[24px] h-[24px] flex items-center bg-inherit cursor-pointer ${
-        className || ''
-      }`}
+      className={`border-0 p-0 w-[24px] h-[24px] flex items-center bg-inherit cursor-pointer ${className}`}
       disabled={true}
       aria-label={ariaLabel}
     >

package/src/components/Headline/HeadlineContent.ts

@@ -1,18 +1,10 @@
+import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { BaseTileCommonProps } from '../BaseTile/BaseTileProps';
 
-/**
- * @title Цвет фона
- * @enumNames [
- *    "Прозрачный",
- *    "Белый"
- * ]
- */
-export type HeadlineBgColor = 'transparent' | 'bg-white';
-
 /**
  * @title Заголовок
  */
 export interface HeadlineContent
   extends Pick<BaseTileCommonProps, 'title' | 'titleSize' | 'description' | 'align'> {
-  bgColor?: HeadlineBgColor;
+  bgColor?: BgColorVersion;
 }

package/src/components/MobileBlocks.ts

@@ -4,6 +4,7 @@ import { Gallery } from './Gallery/Gallery.mobile';
 import { Header } from './Header/Header';
 import { Headline } from './Headline/Headline';
 import { MobileAppTile } from './MobileAppTile/MobileAppTile';
+import { Navigation } from './Navigation/Navigation';
 import { PictureText } from './PictureText/PictureText';
 import { Placeholder } from './Placeholder/Placeholder';
 import { ProductBlock } from './ProductBlock/ProductBlock.mobile';
@@ -24,4 +25,5 @@ export const MobileBlocks = {
   ProductTile,
   TextBlock,
   Tile,
+  Navigation,
 };