@redneckz/wildless-cms-uni-blocks 0.6.26 → 0.6.27

package/src/components/ContactsBlock/ContactsBlock.fixture.tsx

@@ -1,4 +1,4 @@
-import { context } from '../../react/setup-fixture';
+import '../../react/setup-fixture';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { ContactsBlock } from './ContactsBlock';
 
@@ -49,16 +49,8 @@ const contacts = [
 ];
 
 export default {
-  secondary: (
-    <ContactsBlock className="col-span-12" info={info} contacts={contacts} context={context} />
-  ),
+  secondary: <ContactsBlock className="col-span-12" info={info} contacts={contacts} />,
   primary: (
-    <ContactsBlock
-      className="col-span-12"
-      version="primary"
-      info={info}
-      contacts={contacts}
-      context={context}
-    />
+    <ContactsBlock className="col-span-12" version="primary" info={info} contacts={contacts} />
   ),
 };

package/src/components/ContactsBlock/ContactsBlock.tsx

@@ -19,10 +19,9 @@ const contactsBlockStyleMap = {
 };
 
 export const ContactsBlock = JSX<ContactsBlockProps>(
-  ({ className = '', contacts, context, info, version = 'secondary', ...rest }) => {
+  ({ className = '', contacts, info, version = 'secondary', ...rest }) => {
     return (
       <BlockWrapper
-        context={context}
         className={`${contactsBlockStyleMap[version]} flex p-12 ${className}`}
         {...rest}
       >

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

@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/rules-of-hooks */
-import { mobileContext } from '../../react/setup-fixture';
+import '../../react/setup-fixture';
 
 import type { ContentPageDef } from '../../model/ContentPageDef';
 import { Blocks } from '../Blocks';
@@ -12,11 +12,7 @@ export default {
     const data = useContentPageData(Blocks);
 
     return (
-      <ContentPage
-        context={mobileContext}
-        blocksRegistry={Blocks}
-        data={normalizePage(Blocks)(data as ContentPageDef)}
-      />
+      <ContentPage blocksRegistry={Blocks} data={normalizePage(Blocks)(data as ContentPageDef)} />
     );
   },
 };

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

@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/rules-of-hooks */
-import { context } from '../../react/setup-fixture';
+import '../../react/setup-fixture';
 
 import type { BlockDecorator } from '../../model/BlockDecorator';
 import type { ContentPageDef } from '../../model/ContentPageDef';
@@ -34,7 +34,6 @@ export default {
     return (
       <ContentPage
         className="bg-main"
-        context={context}
         blocksRegistry={Blocks}
         data={normalizePage(Blocks)(data as ContentPageDef)}
       />
@@ -47,7 +46,6 @@ export default {
       <div style={{ background: "url('grid.svg')", height: '100%' }}>
         <ContentPage
           className="bg-transparent"
-          context={context}
           blocksRegistry={Blocks}
           data={normalizePage(Blocks)(data as ContentPageDef)}
           blockDecorator={blockDecorator}

package/src/components/ContentPage/ContentPage.tsx

@@ -5,7 +5,6 @@ import type { ContentPageDef } from '../../model/ContentPageDef';
 import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
 import { style2className } from '../../utils/style2className';
 import { LikeControl } from '../LikeControl/LikeControl';
-import type { ContentPageContext } from './ContentPageContext';
 import { RenderBlockOptions } from './renderBlock';
 import { renderBlocksList } from './renderBlockList';
 import { renderSlots } from './renderSlots';
@@ -20,7 +19,7 @@ const defaultBlockDecorator: BlockDecorator = ({ blockClassName, block, render }
   render({ blockClassName, block });
 
 export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>((props) => {
-  const { className = '', blocksRegistry, blockDecorator, context, data = {} } = props;
+  const { className = '', blocksRegistry, blockDecorator, data = {} } = props;
 
   const { style: pageStyle, blocks, slots, likeControl, colorPalette = 'pc' } = data;
 
@@ -29,7 +28,6 @@ export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>((pr
     blocksRegistry,
     page: data,
     blockDecorator: blockDecorator || defaultBlockDecorator,
-    context,
   };
 
   const pageSlots = renderSlots({ slots, parent: data, options });
@@ -50,7 +48,7 @@ export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>((pr
         </div>
       ) : null}
 
-      {likeControl ? renderLikeControl(context) : null}
+      {likeControl ? renderLikeControl() : null}
     </section>
   );
 });
@@ -58,14 +56,10 @@ export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>((pr
 ContentPage.childrenTypes = [];
 ContentPage.slots = () => ['header', 'footer'];
 
-function renderLikeControl(context: ContentPageContext) {
+function renderLikeControl() {
   return (
     <div className="flex items-end absolute bottom-0 right-0 h-full pointer-events-none">
-      <LikeControl
-        key="LikeControl"
-        className="rounded-tl-lg sticky bottom-0 pointer-events-auto"
-        context={context}
-      />
+      <LikeControl className="rounded-tl-lg sticky bottom-0 pointer-events-auto" />
     </div>
   );
 }

package/src/components/ContentPage/renderBlock.tsx

@@ -2,7 +2,6 @@ import { BlockAncestors, BlockDecorator } from '../../model/BlockDecorator';
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
 import type { BlockDef, ContentPageDef } from '../../model/ContentPageDef';
 import { style2className } from '../../utils/style2className';
-import type { ContentPageContext } from './ContentPageContext';
 import { renderBlocksList } from './renderBlockList';
 import { renderSlots } from './renderSlots';
 
@@ -11,7 +10,6 @@ export interface RenderBlockOptions {
   page: ContentPageDef;
   blockDecorator: BlockDecorator;
   blocksRegistry: BlocksRegistry;
-  context: ContentPageContext;
 }
 
 export interface RenderBlockProps {
@@ -21,7 +19,7 @@ export interface RenderBlockProps {
 }
 
 export function renderBlock({ block = {}, options, ancestors = [] }: RenderBlockProps) {
-  const { key, page, blockDecorator, blocksRegistry = {}, context } = options;
+  const { key, page, blockDecorator, blocksRegistry = {} } = options;
   const { type, slots, blocks: childBlocks } = block;
 
   if (!(type && type in blocksRegistry)) {
@@ -41,18 +39,15 @@ export function renderBlock({ block = {}, options, ancestors = [] }: RenderBlock
       ancestors,
       // Adjusted by decorator block and blockClassName
       render: ({ block: adjustedBlock, blockClassName: adjustedBlockClassName }) => {
-        const { version, anchor, labels, content } = adjustedBlock;
+        const { content } = adjustedBlock;
 
         return BlockComponent ? (
           <BlockComponent
             key={key}
-            className={adjustedBlockClassName}
-            context={context}
             page={page}
+            block={adjustedBlock}
+            className={adjustedBlockClassName}
             ancestors={ancestors}
-            version={version}
-            anchor={anchor}
-            labels={labels}
             slots={blockSlots}
             {...content}
           >

package/src/components/ContentPage/renderBlockList.tsx

@@ -12,28 +12,17 @@ interface RenderBlockListProps {
   ancestors?: BlockAncestors; // Recursion context
 }
 
-const defaultChildRenderer = (_: VNode) => _;
-
-export function renderBlocksList({
-  blocks = [],
+export const renderBlocksList = ({
+  blocks,
   parent,
   slotName = DEFAULT_SLOT_NAME,
   options,
   ancestors = [],
-}: RenderBlockListProps): Record<string, VNode> {
-  const { blocksRegistry = {} } = options;
-  const { type } = parent as BlockDef;
-  const BlockComponent = type && blocksRegistry[type];
-  const { renderChild = defaultChildRenderer } = BlockComponent || {};
-
-  return blocks.map((_: BlockDef, j: number) =>
-    renderChild(
-      renderBlock({
-        block: _,
-        options: { ...options, key: `${options.key ? options.key : _.type}-${j}` },
-        ancestors: [...ancestors, [parent, slotName]],
-      }),
-      j,
-    ),
+}: RenderBlockListProps): VNode[] =>
+  (blocks || []).map((_: BlockDef, j: number) =>
+    renderBlock({
+      block: _,
+      options: { ...options, key: `${options.key ? options.key : _.type}-${j}` },
+      ancestors: [...ancestors, [parent, slotName]],
+    }),
   );
-}

package/src/components/ContentPage/renderSlots.tsx

@@ -11,13 +11,13 @@ interface RenderSlotsProps {
   ancestors?: BlockAncestors;
 }
 
-export function renderSlots({
-  slots = {},
+export const renderSlots = ({
+  slots,
   parent,
   options,
   ancestors = [],
-}: RenderSlotsProps): Record<string, VNode> {
-  return Object.entries(slots).reduce(
+}: RenderSlotsProps): Record<string, VNode[]> =>
+  Object.entries(slots || {}).reduce(
     (res, [slotName, slotBlocks]) => ({
       ...res,
       [slotName]: renderBlocksList({
@@ -30,4 +30,3 @@ export function renderSlots({
     }),
     {},
   );
-}

package/src/components/ErrorBlock/ErrorBlock.fixture.tsx

@@ -1,5 +1,5 @@
-import { context } from '../../react/setup-fixture';
 import type { Picture } from '../../model/Picture';
+import '../../react/setup-fixture';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { ErrorBlock } from './ErrorBlock';
 
@@ -25,7 +25,6 @@ export default {
     <div className="container grid grid-cols-12">
       <ErrorBlock
         className="col-span-12"
-        context={context}
         title="Страница не найдена"
         subtitle="Возможно неправильно набран адрес или такой странице не существует"
         error={{
@@ -40,7 +39,6 @@ export default {
     <div className="container grid grid-cols-12">
       <ErrorBlock
         className="col-span-12"
-        context={context}
         title="Ваш браузер устарел"
         subtitle="Чтобы открыть наш сайт обновите Ваш браузер или скачайте обновленные версии браузеров"
         error={{

package/src/components/ErrorBlock/ErrorBlock.tsx

@@ -1,5 +1,4 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLink } from '../../hooks/useLink';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { Button } from '../../ui-kit/Button/Button';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -21,27 +20,18 @@ const renderErrorContent = (error: ErrorBlockContent['error']) => {
 };
 
 export const ErrorBlock = JSX<ErrorBlockProps>(
-  ({ context, className = '', title, subtitle, error, button }) => {
-    const { useRouter, handlerDecorator } = context;
-    const router = useRouter();
-
-    return (
-      <section className={`flex flex-col justify-center items-center mt-12 ${className}`}>
-        <div className="flex justify-center py-20">{renderErrorContent(error)}</div>
-        {title ? <Heading headingType="h1" className="text-left mb-4" title={title} /> : null}
-        {subtitle ? (
-          <div className="font-sans text-xl-light mb-7 max-w-[613px] text-center">{subtitle}</div>
-        ) : null}
-        {button?.text ? (
-          <Button
-            className="py-4 px-9"
-            version={button?.version}
-            {...useLink({ router, handlerDecorator }, button)}
-          >
-            {button.text}
-          </Button>
-        ) : null}
-      </section>
-    );
-  },
+  ({ className = '', title, subtitle, error, button }) => (
+    <section className={`flex flex-col justify-center items-center mt-12 ${className}`}>
+      <div className="flex justify-center py-20">{renderErrorContent(error)}</div>
+      {title ? <Heading headingType="h1" className="text-left mb-4" title={title} /> : null}
+      {subtitle ? (
+        <div className="font-sans text-xl-light mb-7 max-w-[613px] text-center">{subtitle}</div>
+      ) : null}
+      {button?.text ? (
+        <Button className="py-4 px-9" version={button?.version} {...button}>
+          {button.text}
+        </Button>
+      ) : null}
+    </section>
+  ),
 );

package/src/components/ExchangeRateTile/ExchangeCurrencyCalculator.tsx

@@ -1,7 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import { useLink } from '../../hooks/useLink';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import { Button } from '../../ui-kit/Button/Button';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { calculateResult, formatValue } from './calculateResult';
@@ -18,7 +16,7 @@ export interface ExchangeCurrencyItem {
   buyExchangeRate?: number;
   saleExchangeRate?: number;
 }
-export interface ExchangeCurrencyCalculatorProps extends UniBlockProps {
+export interface ExchangeCurrencyCalculatorProps {
   className?: string;
   currencyRatesBuy: ExchangeCurrencyItem[];
   currencyRatesSell: ExchangeCurrencyItem[];
@@ -32,10 +30,7 @@ export interface CalcState {
 }
 
 export const ExchangeCurrencyCalculator = JSX<ExchangeCurrencyCalculatorProps>(
-  ({ context, className = '', currencyRatesBuy, currencyRatesSell, button }) => {
-    const { useRouter, handlerDecorator } = context;
-    const router = useRouter();
-
+  ({ className = '', currencyRatesBuy, currencyRatesSell, button }) => {
     const [calcState, setCalcState] = useState<CalcState>({
       inputSell: '',
       inputBuy: '',
@@ -76,11 +71,7 @@ export const ExchangeCurrencyCalculator = JSX<ExchangeCurrencyCalculatorProps>(
             ),
         })}
         {button?.text ? (
-          <Button
-            className="py-4 mr-1"
-            version={button?.version}
-            {...useLink({ router, handlerDecorator }, button)}
-          >
+          <Button className="py-4 mr-1" version={button?.version} {...button}>
             {button.text}
           </Button>
         ) : null}

package/src/components/ExchangeRateTile/ExchangeRateTile.fixture.tsx

@@ -1,7 +1,7 @@
-import { context } from '../../react/setup-fixture';
+import '../../react/setup-fixture';
 
-import { ExchangeRateTile } from './ExchangeRateTile';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import { ExchangeRateTile } from './ExchangeRateTile';
 
 const button: ButtonProps = {
   href: 'https://coins.rshb.ru/exchange',
@@ -13,7 +13,7 @@ const button: ButtonProps = {
 export default {
   default: (
     <div className="container grid grid-cols-12">
-      <ExchangeRateTile context={context} button={button} className="col-span-8" />
+      <ExchangeRateTile button={button} className="col-span-8" />
     </div>
   ),
 };

package/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -13,7 +13,7 @@ import { useFetchExchangeRateData } from './useFetchExchangeRateData';
 export interface ExchangeRateTileProps extends ExchangeRateTileContent, UniBlockProps {}
 
 export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
-  ({ className = '', context, title = 'Курсы обмена валют', button, ...rest }) => {
+  ({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
     const { exchangeRates } = useFetchExchangeRateData();
 
     const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);
@@ -26,12 +26,10 @@ export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
 
     return (
       <BlockWrapper
-        context={context}
         className={`bg-white text-primary-text font-sans p-9 box-border min-h-[320px] ${className}`}
         {...rest}
       >
         <BaseTile
-          context={context}
           title={
             <Heading headingType="h4" title={title} className="whitespace-pre-wrap text-h4 mb-5" />
           }
@@ -46,7 +44,6 @@ export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
             {currencyRates.length && currencyRatesBuy.length && currencyRatesSell.length ? (
               <ExchangeCurrencyCalculator
                 className="grow"
-                context={context}
                 currencyRatesBuy={currencyRatesBuy}
                 currencyRatesSell={currencyRatesSell}
                 button={button}

package/src/components/Footer/Contacts.tsx

@@ -1,39 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLink } from '../../hooks/useLink';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import { Button } from '../../ui-kit/Button/Button';
 import type { ContactInfo } from './FooterContent';
 
-export interface ContactsProps extends UniBlockProps {
+export interface ContactsProps {
+  className?: string;
   items?: ContactInfo[];
   hasButton?: boolean;
 }
 
-export const Contacts = JSX<ContactsProps>(({ className = '', items, hasButton, context }) => {
-  const router = context.useRouter();
-  const { handlerDecorator } = context;
-
-  return (
-    <div className={className}>
-      {items?.length ? items.map(renderContact) : null}
-      {hasButton ? (
-        <Button
-          version="primary"
-          className="mb-6 w-full"
-          {...useLink(
-            { router, handlerDecorator },
-            {
-              text: 'Обратная связь',
-              href: '/',
-              target: '_blank',
-            },
-          )}
-          ariaLabel="Обратная связь"
-        />
-      ) : null}
-    </div>
-  );
-});
+export const Contacts = JSX<ContactsProps>(({ className = '', items, hasButton }) => (
+  <div className={className}>
+    {items?.length ? items.map(renderContact) : null}
+    {hasButton ? (
+      <Button
+        version="primary"
+        className="mb-6 w-full"
+        href="/"
+        target="_blank"
+        ariaLabel="Обратная связь"
+        text="Обратная связь"
+      />
+    ) : null}
+  </div>
+));
 
 const renderContact = (item: ContactInfo, index: number) => {
   const { type, text, description } = item;

package/src/components/Footer/Footer.fallback.ts

@@ -0,0 +1,13 @@
+import { readFile } from 'fs/promises';
+import type { FallbackMap } from '../../model/Fallback';
+import { projectSettings } from '../../ProjectSettings';
+
+export const fallback = (): FallbackMap => ({
+  ...fallbackWCMSResource(projectSettings.SITEMAP || 'sitemap'),
+  ...fallbackWCMSResource(projectSettings.FOOTER || 'footer'),
+});
+
+const fallbackWCMSResource = (filename: string): FallbackMap => ({
+  [filename]: async () =>
+    JSON.parse(await readFile(`./content/wcms-resources/${filename}.json`, 'utf-8')),
+});

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

@@ -1,92 +1,10 @@
-import { context } from '../../react/setup-fixture';
+import '../../react/setup-fixture';
 import { Footer } from './Footer';
 
-const DEFAULT_ORIGIN = 'https://rshb.ru/';
-
 export default {
   default: (
     <div className="container grid grid-cols-12">
-      <Footer
-        className="col-span-12"
-        socialMedia={[
-          { href: 'https://t.me' },
-          { href: 'https://vk.com' },
-          { href: 'https://ok.ru' },
-        ]}
-        contacts={[
-          {
-            text: '+7 (495) 787-7-787',
-            description: 'Для звонков из-за границы',
-            type: 'tel',
-          },
-          {
-            text: '8 (800) 100-01-00',
-            description: 'По России',
-            type: 'tel',
-          },
-          {
-            text: '7787',
-            description: 'Абонентам МТС, Мегафон, Билайн и Tele2',
-            type: 'tel',
-          },
-        ]}
-        horizontalNavigationTitle="Компании Россельхозбанка"
-        relatedEnterprises={[
-          {
-            text: 'РСХБ Страхование',
-            href: DEFAULT_ORIGIN,
-            target: '_blank',
-          },
-          {
-            text: 'РСХБ Страхование жизни',
-            href: DEFAULT_ORIGIN,
-            target: '_blank',
-          },
-          {
-            text: 'РСХБ Управление активами',
-            href: DEFAULT_ORIGIN,
-            target: '_blank',
-          },
-          {
-            text: 'РСХБ Лизинг',
-            href: DEFAULT_ORIGIN,
-            target: '_blank',
-          },
-          {
-            text: 'РСХБ Факторинг',
-            href: DEFAULT_ORIGIN,
-            target: '_blank',
-          },
-        ]}
-        documents={[
-          {
-            text: 'Информация о процентных ставках по договорам банковского вклада с физическими лицами',
-            href: DEFAULT_ORIGIN,
-            target: '_blank',
-          },
-          {
-            text: 'Раскрытие информации профессиональным участником рынка ценных бумаг',
-            href: DEFAULT_ORIGIN,
-            target: '_blank',
-          },
-          {
-            text: 'Раскрытие информации',
-            href: DEFAULT_ORIGIN,
-            target: '_blank',
-          },
-          {
-            text: 'Удостоверяющий центр',
-            href: DEFAULT_ORIGIN,
-            target: '_blank',
-          },
-          {
-            text: 'Финансовая культура',
-            href: DEFAULT_ORIGIN,
-            target: '_blank',
-          },
-        ]}
-        context={context}
-      />
+      <Footer className="col-span-12" />
     </div>
   ),
 };