@redneckz/wildless-cms-uni-blocks 0.2.108 → 0.2.112

package/mobile/src/ui-kit/TopItem/TopItem.tsx

@@ -0,0 +1,64 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { BgColorVersion } from '../../model/BgColorVersion';
+import type { LinkProps } from '../../model/LinkProps';
+
+export interface TopItemContent extends LinkProps {
+  active?: boolean;
+}
+
+export interface TopItemProps extends TopItemContent {
+  className?: string;
+  flat?: boolean;
+  ariaLabel?: string;
+  onClick?: (ev: MouseEvent) => any;
+  bgColor?: BgColorVersion;
+}
+
+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<TopItemProps>(
+  ({
+    className = '',
+    text,
+    href,
+    target,
+    active,
+    flat,
+    onClick,
+    children,
+    ariaLabel,
+    bgColor = 'bg-white',
+  }) => (
+    <a
+      className={`${getLinkClasses(bgColor, active, flat)} ${className}`}
+      href={href}
+      target={target}
+      onClick={onClick}
+      rel="noopener noreferrer"
+      aria-label={ariaLabel}
+    >
+      <span className={getTextClasses(bgColor, active, flat)}>{text || children}</span>
+    </a>
+  ),
+);
+
+const getLinkClasses = (bgColor: BgColorVersion, active?: boolean, flat?: boolean) => {
+  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: BgColorVersion, active?: boolean, flat?: boolean) => {
+  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}`;
+};

package/mobile/src/utils/addSpacesBetweenNumbers.ts

@@ -0,0 +1,2 @@
+export const addSpacesBetweenNumbers = (number: number) =>
+  new Intl.NumberFormat('ru-RU', { maximumSignificantDigits: 3 }).format(number);

package/mobile/src/utils/adjustHref.spec.ts

@@ -0,0 +1,25 @@
+import { adjustHref } from './adjustHref';
+
+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);
+  });
+});

package/mobile/src/utils/adjustHref.ts

@@ -0,0 +1,24 @@
+import { getOrigin, isURL } from './url';
+import { MOBILE_URL_PATH } from './withoutMobilePath';
+
+export const adjustHref = (
+  href: string | undefined,
+  router: { pathname: string; href?: string },
+) => {
+  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: string | undefined, router: { href?: string }) => {
+  if (!href) {
+    return href;
+  }
+
+  const origin = getOrigin(router?.href);
+  return origin ? href.replace(origin, '') || '/' : href;
+};

package/mobile/src/utils/clamp.ts

@@ -0,0 +1,2 @@
+export const clamp = (value: number, min: number, max: number) =>
+  Math.max(min, Math.min(value, max));

package/mobile/src/utils/getColSpan.ts

@@ -0,0 +1,5 @@
+export const getColSpan = (className: string) => {
+  const colSpanPrefix = 'col-span-';
+  const colSpanStr = className.split(/\s+/).find((_) => _.startsWith(colSpanPrefix));
+  return colSpanStr ? parseInt(colSpanStr.substring(colSpanPrefix.length), 10) : 12;
+};

package/mobile/src/utils/getGeolocation.ts

@@ -0,0 +1,4 @@
+export const getGeolocation = async () =>
+  new Promise<GeolocationCoordinates>((resolve) =>
+    navigator.geolocation.getCurrentPosition(({ coords }) => resolve(coords)),
+  );

package/mobile/src/utils/joinList.ts

@@ -0,0 +1,7 @@
+export function joinList<E>(sep: E): (list: E[]) => E[] {
+  return (list) =>
+    list.reduce(
+      (acc, el, i) => (acc.length ? acc.concat({ ...sep, key: i }, el) : [el]),
+      [] as E[],
+    );
+}

package/mobile/src/utils/maxBy.spec.ts

@@ -0,0 +1,11 @@
+import { maxBy } from './maxBy';
+
+describe('maxBy', () => {
+  it('should return max value', () => {
+    expect(maxBy((_: number) => _)([1, 3, 2])).toBe(3);
+  });
+
+  it('should return max value with respect to discriminator', () => {
+    expect(maxBy((_: string) => _.length)(['123', '123456789', '123456'])).toBe('123456789');
+  });
+});

package/mobile/src/utils/maxBy.ts

@@ -0,0 +1,7 @@
+export const maxBy =
+  <Item, Value>(discriminator: (item: Item) => Value) =>
+  (list: Item[]): Item =>
+    list.reduceRight((a, b) => (discriminator(a) > discriminator(b) ? a : b));
+
+export const minBy = <Item, Value>(discriminator: (item: Item) => Value) =>
+  maxBy((_: Item) => -discriminator(_));

package/mobile/src/utils/url.spec.ts

@@ -0,0 +1,17 @@
+import { getOrigin, 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');
+    });
+  });
+});

package/mobile/src/utils/url.ts

@@ -0,0 +1,15 @@
+export const isURL = (href?: string) => href?.includes('//');
+
+export const withoutQuery = (href?: string) => (href || '').replace(/\/?\?.*/, '');
+
+export const getOrigin = (href?: string) => {
+  if (!href || !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;
+};

package/mobile/src/utils/withoutMobilePath.ts

@@ -0,0 +1,3 @@
+export const MOBILE_URL_PATH = '/mobile';
+
+export const withoutMobilePath = (href?: string) => (href || '').replace(MOBILE_URL_PATH, '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.2.108",
+  "version": "0.2.112",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -14,11 +14,21 @@
       "require": "./dist/index.js",
       "types": "./lib/index.d.ts"
     },
+    "./mobile": {
+      "import": "./mobile/lib/index.js",
+      "require": "./mobile/dist/index.js",
+      "types": "./mobile/lib/index.d.ts"
+    },
     "./lib/*.js": {
       "import": "./lib/*.js",
       "require": "./dist/*.js",
       "types": "./lib/*.d.ts"
     },
+    "./mobile/lib/*.js": {
+      "import": "./mobile/lib/*.js",
+      "require": "./mobile/dist/*.js",
+      "types": "./mobile/lib/*.d.ts"
+    },
     "./lib/common.css": "./lib/common.css",
     "./fonts/ubuntu/*": "./fonts/ubuntu/*",
     "./lib/content-page-repository": {
@@ -44,9 +54,13 @@
   },
   "files": [
     "lib",
+    "mobile/lib",
     "dist",
+    "mobile/dist",
     "bundle",
+    "mobile/bundle",
     "fonts",
+    "mobile/src",
     "src"
   ],
   "repository": {
@@ -57,16 +71,22 @@
   },
   "scripts": {
     "start": "npm run cosmos",
-    "build": "npm run build:lib && npm run build:commonjs && npm run bundle && npm run build:style && npm run build:icons && npm run build:design",
+    "start:mobile": "npm run cosmos:mobile",
+    "prebuild": "rimraf ./mobile/src",
+    "build": "npm run build:lib && npm run build:commonjs && npm run bundle && npm run build:style && npm run build:design && npm run build:mobile && npm run build:design:mobile",
+    "prebuild:mobile": "rimraf ./mobile/src && node ./scripts/prebuild-mobile.js ./src ./mobile",
+    "build:mobile": "npm run --prefix ./mobile build",
     "postbuild": "npm run size",
     "build:design": "npm run cosmos:export || exit 0",
     "postbuild:design": "copyfiles --up 1 \"./docs/**/*\" ./build || exit 0",
+    "build:design:mobile": "npm run cosmos:export:mobile || exit 0",
+    "postbuild:design:mobile": "copyfiles --up 1 \"./docs/mobile/**/*\" ./build || exit 0",
     "build:lib": "rimraf ./lib && tsc --build --verbose",
     "postbuild:lib": "replace-in-file --configFile=replace-config.lib.cjs --verbose",
-    "build:commonjs": "rimraf ./dist && tsc --module commonjs --noImplicitUseStrict --outDir dist",
-    "bundle": "rimraf ./bundle && rollup -c && npm run build:schema && npm run build:schema:sort",
+    "build:commonjs": "rimraf ./dist && tsc --module commonjs --noImplicitUseStrict --outDir ./dist",
+    "bundle": "rimraf ./bundle && rollup --config rollup.config.js && npm run build:schema",
     "build:schema": "ts-json-schema-generator --path './src/**/*Content.ts' --additional-properties --unstable --validation-keywords enumNames --validation-keywords required --minify --no-type-check -o ./bundle/blocks.schema.json",
-    "build:schema:sort": "node ./scripts/sort-bundle.js",
+    "postbuild:schema": "node ./scripts/sort-json-schema.js ./bundle/blocks.schema.json",
     "build:style": "postcss ./src/**/*.css --env production --dir ./lib",
     "build:icons": "svgo -f ./src/icons -o ./cosmos-static/icons",
     "size": "size-limit",
@@ -75,9 +95,13 @@
     "test": "jest --coverage",
     "precosmos": "npm run build:icons",
     "cosmos": "cosmos",
+    "precosmos:mobile": "npm run build:icons",
+    "cosmos:mobile": "cosmos --config cosmos.config.mobile.json",
     "precosmos:export": "npm run build:icons",
-    "cosmos:export": "cosmos-export",
-    "prepare": "husky install && npm run --prefix ./eslint-rules build || exit 0"
+    "cosmos:export": "rimraf ./build && cosmos-export",
+    "prepare": "husky install && npm run --prefix ./eslint-rules build || exit 0",
+    "precosmos:export:mobile": "npm run build:icons",
+    "cosmos:export:mobile": "rimraf ./build && cosmos-export --config cosmos.config.mobile.json"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -110,6 +134,7 @@
     "husky": "^8.0.1",
     "jest": "^28.1.3",
     "lint-staged": "^13.0.1",
+    "npm-watch": "^0.11.0",
     "postcss": "^8.4.14",
     "postcss-cli": "^9.1.0",
     "postcss-loader": "^7.0.0",

package/src/components/BaseTile/BaseTile.tsx

@@ -33,18 +33,18 @@ export const BaseTile = JSX<BaseTileProps>(
       <div className={`font-sans flex flex-col grow h-full items-start`}>
         {title && (
           <Title
-            size={titleSize || getTitleSizeByClassName(className)}
+            size={getTitleSize(titleSize, className)}
             className={`${TITLE_CLASSES} ${version === 'primary' ? 'text-primary-text' : ''}`}
           >
             {title}
           </Title>
         )}
-        <div className={`flex grow w-full justify-between`}>
-          <div className={`flex flex-col justify-between items-start`}>
+        <div className="flex grow w-full justify-between">
+          <div className="flex flex-col justify-between items-start">
             <div>
-              {description ? (
+              {description && (
                 <div className={`font-normal text-base mt-4 max-w-[600px]`}>{description}</div>
-              ) : null}
+              )}
               {children}
               {items?.length ? renderItems(items, version) : null}
             </div>
@@ -63,7 +63,11 @@ export const BaseTile = JSX<BaseTileProps>(
   },
 );
 
-function getTitleSizeByClassName(className = '') {
+function getTitleSize(titleSize, className = '') {
+  if (titleSize) {
+    return titleSize;
+  }
+
   const colSpan = getColSpan(className);
   if (colSpan <= 4) {
     return 'S';
@@ -78,7 +82,12 @@ function renderItems(items: string[] = [], version?: BlockVersion) {
   return (
     <section className="max-w-[600px] mt-5" role="list">
       {items.map((_, i) => (
-        <BlockItem key={String(i)} className={i ? 'mt-2.5' : ''} text={_} version={version} />
+        <BlockItem
+          key={String(i)}
+          className={i ? 'mt-2.5' : ''}
+          text={_}
+          white={version !== 'primary'}
+        />
       ))}
     </section>
   );
@@ -90,7 +99,7 @@ function renderButton({ icon, asSVG, ...button }: BaseTileIconButton, i: number)
   return icon ? (
     <Button
       key={String(i)}
-      appendLeft={<Icon name={icon} asSVG width="24" height="24" />}
+      appendLeft={<Icon name={icon} asSVG={asSVG} width="24" height="24" />}
       {...button}
     />
   ) : (

package/src/components/Blocks.mobile.ts

@@ -0,0 +1,31 @@
+import { ExchangeRateTile } from './ExchangeRateTile/ExchangeRateTile';
+import { Footer } from './Footer/Footer';
+import { Gallery } from './Gallery/Gallery';
+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';
+import { ProductTile } from './ProductTile/ProductTile';
+import { StepsBlock } from './StepsBlock/StepsBlock';
+import { TextBlock } from './TextBlock/TextBlock';
+import { Tile } from './Tile/Tile';
+
+export const Blocks = {
+  ExchangeRateTile,
+  Footer,
+  Gallery,
+  Header,
+  Headline,
+  MobileAppTile,
+  PictureText,
+  Placeholder,
+  ProductBlock,
+  ProductTile,
+  TextBlock,
+  Tile,
+  Navigation,
+  StepsBlock,
+};

package/src/components/ContentPage/ContentPage.fixture.mobile.tsx

@@ -0,0 +1,19 @@
+import { mobileContext } from '../../setup-fixture';
+
+import type { ContentPageDef } from '../../types';
+import { Blocks } from '../Blocks.mobile';
+import { ContentPage } from './ContentPage';
+import { toMobilePage } from './toMobilePage';
+
+import data from './ContentPage.page.json';
+
+export default {
+  default: (
+    <ContentPage
+      className="bg-secondary-text"
+      context={mobileContext}
+      blocksRegistry={Blocks}
+      data={toMobilePage(data as ContentPageDef)}
+    />
+  ),
+};

package/src/components/ContentPage/ContentPage.fixture.tsx

@@ -1,10 +1,8 @@
-import { context, mobileContext } from '../../setup-fixture';
+import { context } from '../../setup-fixture';
 
 import type { ContentPageDef } from '../../types';
 import { Blocks } from '../Blocks';
-import { MobileBlocks } from '../MobileBlocks';
 import { BlockDecorator, ContentPage } from './ContentPage';
-import { toMobilePage } from './toMobilePage';
 
 import data from './ContentPage.page.json';
 
@@ -36,14 +34,6 @@ export default {
       data={data as ContentPageDef}
     />
   ),
-  mobile: (
-    <ContentPage
-      className="bg-secondary-text"
-      context={mobileContext}
-      blocksRegistry={MobileBlocks}
-      data={toMobilePage(data as ContentPageDef)}
-    />
-  ),
   editor: (
     <div style={{ background: "url('grid.svg')", height: '100%' }}>
       <ContentPage

package/src/components/CreditCalculator/CreditCalculator.tsx

@@ -126,7 +126,7 @@ export const CreditCalculator = JSX<CreditCalculatorProps>(
           <div className="flex items-center">
             <Button className="mr-3" text="Отправить заявку" version="primary" href="#" />
             <div
-              className="w-80 text-xxs leading-4 text-secondary-text"
+              className="w-80 text-2xs leading-4 text-secondary-text"
               aria-label="Соглашение на обработку персональных данных"
             >
               Отправляя заявку, вы соглашаетесь на обработку персональных данных соответственно

package/src/components/Gallery/Gallery.example.json

@@ -53,19 +53,6 @@
       "description": "Описание 4",
       "href": "/credit-cards",
       "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"]
-    },
-    {
-      "image": {
-        "format": "webp",
-        "size": {
-          "width": 140,
-          "height": 140
-        }
-      },
-      "title": "Заголовок 5",
-      "description": "Описание 5",
-      "href": "/credit-cards",
-      "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"]
     }
   ]
 }

package/src/components/Gallery/Gallery.fixture.tsx

@@ -1,8 +1,8 @@
 import type { Picture } from '../../model/Picture';
 import { context } from '../../setup-fixture';
 import type { ButtonCommonProps } from '../../ui-kit/Button/Button';
-import { Gallery, GalleryProps } from './Gallery';
-import { Gallery as MobileGallery } from './Gallery.mobile';
+import { Gallery } from './Gallery';
+import type { GalleryProps } from './GalleryProps';
 
 const image: Picture = {
   src: 'money-1.png',
@@ -211,9 +211,4 @@ export default {
       <Gallery className="col-span-12" {...onlyTitleProps} />
     </div>
   ),
-  mobile: (
-    <div className="container grid grid-cols-12">
-      <MobileGallery className="col-span-12" {...defaultProps} />
-    </div>
-  ),
 };

package/src/components/Gallery/Gallery.mobile.tsx

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { GalleryProps } from './Gallery';
-import type { GalleryCard } from './GalleryContent';
 import { BlockItem } from '../../ui-kit/BlockItem/BlockItem';
 import { Button } from '../../ui-kit/Button/Button';
 import { Img } from '../../ui-kit/Img';
 import { Title } from '../../ui-kit/Title/Title';
+import type { GalleryCard } from './GalleryContent';
+import type { GalleryProps } from './GalleryProps';
 
 export const Gallery = JSX<GalleryProps>(({ title, description, cards = [], className }) => {
   return (

package/src/components/Gallery/Gallery.tsx

@@ -1,8 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { GalleryContent } from './GalleryContent';
 import { GalleryInner } from './GalleryInner';
-import type { UniBlockProps } from '../../types';
-
-export interface GalleryProps extends GalleryContent, UniBlockProps {}
+import type { GalleryProps } from './GalleryProps';
 
 export const Gallery = JSX<GalleryProps>((props) => <GalleryInner {...props} version="normal" />);

package/src/components/Gallery/GalleryCardInner.tsx

@@ -28,7 +28,7 @@ export const GalleryCardInner = JSX<GalleryCard>(
             </section>
           ) : null}
         </div>
-        {button?.href && <Button className="mt-6" {...button} />}
+        {button?.text && <Button className="mt-6" {...button} />}
       </div>
     );
   },

package/src/components/Gallery/GalleryContent.ts

@@ -11,12 +11,9 @@ export interface GalleryCard {
   /** @title Описание */
   description?: string;
   image?: Picture;
-  /** @title Ссылка */
+  /** @title Кнопка */
   button?: BaseTileIconButton;
-  /**
-   * @title Список
-   * @minItems 4
-   */
+  /** @title Список */
   items?: string[];
   version?: BlockVersion;
 }
@@ -29,6 +26,9 @@ export interface GalleryContent {
   title?: string;
   /** @title Описание */
   description?: string;
-  /** @title Карточки */
+  /**
+   * @title Карточки
+   * @minItems 4
+   */
   cards?: GalleryCard[];
 }

package/src/components/Gallery/GalleryProps.ts

@@ -0,0 +1,4 @@
+import type { UniBlockProps } from '../../types';
+import { GalleryContent } from './GalleryContent';
+
+export interface GalleryProps extends GalleryContent, UniBlockProps {}

package/src/components/MiniGallery/MiniGallery.example.json

@@ -45,17 +45,6 @@
       },
       "title": "Заголовок 4",
       "description": "Описание 4"
-    },
-    {
-      "image": {
-        "format": "webp",
-        "size": {
-          "width": 120,
-          "height": 70
-        }
-      },
-      "title": "Заголовок 5",
-      "description": "Описание 5"
     }
   ]
 }

package/src/components/ProductBlock/ProductBlock.mobile.tsx

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
-import type { ProductBlockInnerCommonProps } from './ProductBlockContent';
+import type { ProductBlockContent } from './ProductBlockContent';
 import { ProductBlockInner } from './ProductBlockInner';
 
-export interface ProductBlockProps extends ProductBlockInnerCommonProps, UniBlockProps {}
+export interface ProductBlockProps extends ProductBlockContent, UniBlockProps {}
 
 export const ProductBlock = JSX<ProductBlockProps>(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars