@redneckz/wildless-cms-uni-blocks 0.3.60 → 0.3.62

package/src/components/Headline/Headline.tsx

@@ -19,18 +19,18 @@ export const Headline = JSX<HeadlineProps>(
     const STYLE_MAPS = HEADLINE_BLOCK_STYLE_MAPS[bgColorHeadline];
     return (
       <section className={`p-[50px] ${STYLE_MAPS.background} ${className}`} id={anchor}>
-        {title && (
+        {title ? (
           <Heading
             headingType="h2"
             className={`text-primary-text ${STYLE_MAPS.text} ${ALIGN_TEXT[align]}`}
             title={title}
           />
-        )}
-        {description && (
+        ) : null}
+        {description ? (
           <p className={`font-normal text-base mt-4 ${STYLE_MAPS.text} ${ALIGN_TEXT[align]}`}>
             {description}
           </p>
-        )}
+        ) : null}
       </section>
     );
   },

package/src/components/MobileAppTile/MobileAppTile.tsx

@@ -28,13 +28,13 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
         <BaseTile
           context={context}
           title={
-            title && (
+            title ? (
               <Heading
                 headingType="h3"
                 title={title}
                 className={`whitespace-pre-wrap max-w-[600px] mb-[30px]`}
               />
-            )
+            ) : null
           }
           buttons={
             buttons?.length ? (

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

@@ -35,13 +35,13 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
           <BaseTile
             context={context}
             title={
-              title && (
+              title ? (
                 <Heading
                   headingType={headingType}
                   title={title}
                   className="whitespace-pre-wrap max-w-[600px]"
                 />
-              )
+              ) : null
             }
             buttons={
               buttons?.length ? (

package/src/components/ProductBlock/ProductBlockInner.tsx

@@ -36,12 +36,12 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
             title={getTitle(title, headingType)}
             buttons={getButtons(context, buttons)}
           >
-            {description && (
+            {description ? (
               <Description
                 className={`mt-4 max-w-[600px] text-md font-light ${textColor}`}
                 description={description}
               />
-            )}
+            ) : null}
             {benefits?.filter((items) => items.label)?.length ? (
               <div className="flex gap-6 mt-6">
                 {benefits.map((benefit, i) =>
@@ -67,15 +67,13 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
 );
 
 const getTitle = (title, headingType) => {
-  return (
-    title && (
-      <Heading
-        headingType={headingType}
-        title={title}
-        className="whitespace-pre-wrap max-w-[600px]"
-      />
-    )
-  );
+  return title ? (
+    <Heading
+      headingType={headingType}
+      title={title}
+      className="whitespace-pre-wrap max-w-[600px]"
+    />
+  ) : null;
 };
 
 const getButtons = (context, buttons) => {

package/src/components/ProductTile/ProductTile.tsx

@@ -42,14 +42,14 @@ export const ProductTile = JSX<ProductTileProps>(
         <BaseTile
           context={context}
           title={
-            title && (
+            title ? (
               <Heading
                 headingType={headingType}
                 as="h3"
                 title={title}
                 className={`whitespace-pre-wrap max-w-[600px]`}
               />
-            )
+            ) : null
           }
           buttons={
             buttons?.length ? (

package/src/components/Recommendation/Recommendation.tsx

@@ -87,20 +87,20 @@ const renderNavButtons = ({
 
   return (
     <div>
-      {showPrevButton && (
+      {showPrevButton ? (
         <ArrowButton
           className="absolute top-1/2 left-8 z-10 mt-6"
           onClick={handlePrevClick}
           ariaLabel="Пролистать влево"
         />
-      )}
-      {showNextButton && (
+      ) : null}
+      {showNextButton ? (
         <ArrowButton
           className="absolute top-1/2 right-8 z-10 mt-6 rotate-180"
           onClick={handleNextClick}
           ariaLabel="Пролистать вправо"
         />
-      )}
+      ) : null}
     </div>
   );
 };

package/src/components/StepsBlock/StepsBlock.mobile.tsx

@@ -53,14 +53,14 @@ export const StepsBlock = JSX<StepsBlockProps>(
         className={`box-border font-sans bg-white px-4 py-6 flex flex-col
         ${style.background} ${style.title} ${className || ''}`}
       >
-        {title && (
+        {title ? (
           <Heading headingType="h3" className={`text-center ${style.title}`} title={title} />
-        )}
-        {description && (
+        ) : null}
+        {description ? (
           <p className={`text-m-md text-center ${style.description} ${title && 'mt-2'}`}>
             {description}
           </p>
-        )}
+        ) : null}
         {steps?.length ? (
           <div className={`box-border py-0.5 mb-0.5 mt-5`}>
             <div className="flex flex-col justify-between gap-x-[101px]">
@@ -94,17 +94,17 @@ const renderStepTitle = (params: RenderStepTitleParams) => {
       <div key={String(i)} className="flex flex-row text-center relative">
         <div className="overflow-hidden">
           {renderIconArea(params)}
-          {!isLastStep && (
+          {isLastStep ? null : (
             <div className={`min-h-8 h-full w-[2px] ${style.iconConnector} ${margin}`} />
           )}
         </div>
         <div
           className={`flex flex-col justify-center h-fit ${STEPS_TILE_DESCRIPTION_HEIGHT_MAP[size]}`}
         >
-          {step.label && (
+          {step.label ? (
             <div className="font-medium text-m-title-xs m-0 text-left">{step.label}</div>
-          )}
-          {step.description && (
+          ) : null}
+          {step.description ? (
             <div
               className={`font-normal text-sm ${style.description} text-left ${
                 step.label ? 'mt-1' : ''
@@ -112,7 +112,7 @@ const renderStepTitle = (params: RenderStepTitleParams) => {
             >
               {step.description}
             </div>
-          )}
+          ) : null}
         </div>
       </div>
     </div>

package/src/components/TextBlock/TextBlock.tsx

@@ -49,12 +49,12 @@ export const TextBlock = JSX<TextBlockProps>(
         {iconVersion === 'small' ? renderIcon(textBlockStyleMap.icon) : null}
         {iconVersion === 'big' ? renderImage(image) : null}
         <div className="py-0.5">
-          {title && (
+          {title ? (
             <div className={`font-medium text-base mb-1 ${textBlockStyleMap.title}`}>{title}</div>
-          )}
-          {description && (
+          ) : null}
+          {description ? (
             <div className={`text-sm ${textBlockStyleMap.description}`}>{description}</div>
-          )}
+          ) : null}
         </div>
       </section>
     );

package/src/components/Tile/Tile.tsx

@@ -47,7 +47,7 @@ export const Tile = JSX<TileProps>((props) => {
       <BaseTile
         context={context}
         title={
-          title && (
+          title ? (
             <Heading
               headingType={headingType}
               as="h3"
@@ -55,7 +55,7 @@ export const Tile = JSX<TileProps>((props) => {
               className={`whitespace-pre-wrap max-w-[600px] ${title ? 'mb-3' : ''}
               ${version === 'primary' ? 'text-primary-text' : ''}`}
             />
-          )
+          ) : null
         }
         buttons={
           buttons?.length ? (
@@ -68,12 +68,12 @@ export const Tile = JSX<TileProps>((props) => {
         }
         image={image?.src && <Img className="mt-auto ml-7" image={image} />}
       >
-        {description && (
+        {description ? (
           <Description
             className="max-w-[600px] text-title-new-sm font-light"
             description={description}
           />
-        )}
+        ) : null}
         {children}
         {renderList(items, version)}
       </BaseTile>

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

@@ -40,7 +40,7 @@ export const Logo = JSX<Partial<LogoProps>>(
           viewBox="0 0 40 45"
           paths={LOGO_PATHS.map((d) => ({ d }))}
         />
-        {!hideTitle && (
+        {hideTitle ? null : (
           <span className={`${TEXT_COLOR[bgColor]} text-sm font-medium ml-2.5`}>
             {children || 'Россельхозбанк'}
           </span>

package/src/ui-kit/Logo/Logo.tsx

@@ -1,6 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { BgColorVersion } from '../../model/BgColorVersion';
 import { SVG } from '../SVG';
+import { Img } from '../Img/Img';
+import type { Picture } from '../../model/Picture';
 
 export interface LogoProps {
   className: string;
@@ -8,6 +10,10 @@ export interface LogoProps {
   targetBlank: boolean;
   bgColor?: string;
   hideTitle?: boolean;
+  logo?: {
+    image?: Picture;
+    title?: string;
+  };
 }
 
 const LOGO_PATHS = [
@@ -27,25 +33,38 @@ const TEXT_COLOR: Record<BgColorVersion, string> = {
 };
 
 export const Logo = JSX<Partial<LogoProps>>(
-  ({ className, href, children, targetBlank, bgColor = 'bg-white', hideTitle }) => {
+  ({
+    className = '',
+    href,
+    logo,
+    children = logo?.title,
+    targetBlank,
+    bgColor = 'bg-white',
+    hideTitle,
+  }) => {
     return (
       <a
-        className={`inline-flex items-center font-sans no-underline ${className || ''}`}
+        className={`inline-flex items-center font-sans no-underline ${className}`}
         href={href || 'https://rshb.ru/'}
         target={targetBlank ? '_blank' : '_self'}
-        aria-label="Россельхозбанк"
+        aria-label={logo?.title || 'Россельхозбанк'}
       >
-        <SVG
-          className={`${SVG_COLOR[bgColor]} w-10`}
-          viewBox="0 0 40 45"
-          paths={LOGO_PATHS.map((d) => ({ d }))}
-        />
-        {!hideTitle && (
-          <span className={`${TEXT_COLOR[bgColor]} font-medium ml-2.5`}>
-            {children || 'Россельхозбанк'}
-          </span>
+        {logo?.image?.src ? (
+          <Img image={logo.image} className={SVG_COLOR[bgColor]} width="40" height="45" asSVG />
+        ) : (
+          <SVG
+            className={`${SVG_COLOR[bgColor]} w-10`}
+            viewBox="0 0 40 45"
+            paths={LOGO_PATHS.map((d) => ({ d }))}
+          />
         )}
+        {hideTitle ? null : renderTitle(children, bgColor, logo?.title)}
       </a>
     );
   },
 );
+
+const renderTitle = (children, bgColor, title) => {
+  const text = children || title || 'Россельхозбанк';
+  return <span className={`${TEXT_COLOR[bgColor]} font-medium ml-2.5`}>{text}</span>;
+};

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

@@ -10,7 +10,7 @@ export const SearchBar = JSX<UniBlockProps>(({ className, context }) => {
         <div className="w-[20px] h-[20px]">
           <Img image="LoupeIcon" width="24" height="24" />
         </div>
-        {!term && (
+        {term ? null : (
           <label
             htmlFor="search-bar-input"
             className="font-sans font-normal text-sm text-secondary-text"

package/src/ui-kit/SearchBar/SearchBar.tsx

@@ -11,7 +11,7 @@ export const SearchBar = JSX<UniBlockProps>(({ className, context }) => {
         <div className="w-[24px] h-[24px]">
           <Img image="LoupeIcon" width="24" height="24" />
         </div>
-        {!term && (
+        {term ? null : (
           <label
             htmlFor="search-bar-input"
             className="font-sans font-light text-base text-secondary-text"

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

@@ -11,7 +11,7 @@ export const SearchBar = JSX<UniBlockProps>(({ className, context }) => {
         <div className="w-[20px] h-[20px]">
           <Img image="LoupeIcon" width="24" height="24" />
         </div>
-        {!term && (
+        {term ? null : (
           <label
             htmlFor="search-bar-input"
             className="font-sans font-normal text-sm text-secondary-text"