@redneckz/wildless-cms-uni-blocks 0.3.39 → 0.3.42

package/src/components/NavigatorTabs/NavigatorTabs.tsx

@@ -10,7 +10,7 @@ export interface TabsBlockProps extends UniBlockProps, NavigatorTabsContent {}
 export const NavigatorTabs = JSX<TabsBlockProps>(
   ({ className = '', navigatorTabs, context, anchor = null }) => {
     const router = context.useRouter();
-    const href = globalThis.location.href;
+    const href = globalThis.location?.href; // TODO: remove globalThis, use href from router
 
     return (
       <section

package/src/components/ProductBlock/renderBackwardButton.tsx

@@ -1,6 +1,6 @@
-import { Img } from '../../ui-kit/Img/Img';
-import { Button } from '../../ui-kit/Button/Button';
 import type { BlockVersion } from '../../model/BlockVersion';
+import { Button } from '../../ui-kit/Button/Button';
+import { Img } from '../../ui-kit/Img/Img';
 
 const backwardBgStyleMap: Record<BlockVersion, string> = {
   primary: 'bg-primary-main',
@@ -23,7 +23,6 @@ export function renderBackwardButton(text: string, version: BlockVersion, classN
         <Img
           className={`w-4 h-4 min-w-4 min-h-4 rounded-full box-border ${backwardIconStyleMap[version]}`}
           image={{ icon: 'ArrowLeftIcon' }}
-          color="none"
           width="24"
           height="24"
           asSVG

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

@@ -21,7 +21,6 @@ export function renderBenefit(benefit: Benefit, i: number, version: BlockVersion
           width="24"
           height="24"
           asSVG
-          color={version}
         />
       ) : null}
       <div className={`font-medium text-m-title-xs m-0 ${benefitTitleStyleMap[version]}`}>

package/src/components/Recommendation/RecommendationCard.tsx

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../../types';
 import { Description } from '../../ui-kit/Description/Description';
+import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
 import { BaseTile } from '../BaseTile/BaseTile';
 import { SocialMedia } from '../Footer/SocialMedia';
-import type { UniBlockProps } from '../../types';
 import type { RecommendationCardTypes } from './RecommendationContent';
-import { Heading } from '../../ui-kit/Heading/Heading';
 
 export interface RecommendationCardProps extends RecommendationCardTypes, UniBlockProps {}
 
@@ -35,7 +35,12 @@ export const RecommendationCard = JSX<RecommendationCardProps>(
               version={version}
             />
           ) : null}
-          <SocialMedia className="pt-[42px] pb-0" media={socialMedia} context={context} />
+          <SocialMedia
+            className="pt-[42px] pb-0"
+            media={socialMedia}
+            version={version}
+            context={context}
+          />
         </BaseTile>
       </section>
     );

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

@@ -1,13 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { projectSettings } from '../../ProjectSettings';
-import type { IconColor, IconProps } from './IconProps';
 import { IconTitleMap } from '../../icons/IconName';
-
-const svgColorsMap: Record<IconColor, string> = {
-  none: '',
-  primary: 'text-white',
-  secondary: 'text-white',
-};
+import { projectSettings } from '../../ProjectSettings';
+import type { IconProps } from './IconProps';
 
 export const Icon = JSX<IconProps>(
   ({
@@ -16,19 +10,13 @@ export const Icon = JSX<IconProps>(
     alt = `Иконка ${IconTitleMap[name] || name}`,
     title = alt,
     asSVG,
-    color = 'primary',
     ...imgProps
   }) => {
     const href = `${projectSettings.CDN || ''}icons/${name}.svg`;
 
     if (asSVG) {
       return (
-        <svg
-          className={`${svgColorsMap[color]} ${className}`}
-          {...imgProps}
-          aria-hidden="true"
-          style={color === 'secondary' ? { filter: 'invert(1)' } : null}
-        >
+        <svg className={className} {...imgProps} aria-hidden="true">
           {title ? <title>{title}</title> : null}
           {alt ? <desc>{alt}</desc> : null}
           <use href={`${href}#icon`} xlinkHref={`${href}#icon`} />

package/src/ui-kit/Icon/IconProps.ts

@@ -2,12 +2,6 @@ import type { IconName } from '../../icons/IconName';
 
 export type { IconName };
 
-/**
- * @title Цвет иконки (svg)
- * @enumNames ["Нет", "Основной", "Второстепенный"]
- */
-export type IconColor = 'none' | 'primary' | 'secondary';
-
 export interface IconCompatibilityFields {
   /** @title Альтернативный текст (alt) */
   alt?: string;
@@ -19,8 +13,6 @@ export interface IconCompatibilityFields {
   height?: string;
   /** @hidden */
   asSVG?: boolean;
-  /** @hidden */
-  color?: IconColor;
 }
 
 export type IconProps = IconCompatibilityFields & {

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

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { ListItem } from './ListItem';
-import type { ListProps, ListItemVersion } from './ListProps';
+import type { ListItemVersion, ListProps } from './ListProps';
 
 const TEXT_STYLE_MAP: Record<ListItemVersion, string> = {
   primary: 'text-primary-text',
@@ -23,7 +23,7 @@ export const List = JSX<ListProps>((props) => {
               isDotted={isDotted}
               version={version}
             >
-              {_}
+              {_}12
             </ListItem>
           ))
         : null}

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

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

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

@@ -40,7 +40,11 @@ const renderTab =
   };
 
 const renderIcon = (tab: Tab, isActive: boolean) => (
-  <div className="h-full mt-1" style={isActive ? { filter: 'invert(1)' } : null}>
-    <Img className="w-5 h-5 mr-3" image={tab?.icon || 'CardIcon'} asSVG={!isActive} />
+  <div className="h-full mt-1">
+    <Img
+      className={`w-5 h-5 mr-3 ${isActive ? 'invert-full' : ''}`}
+      image={tab?.icon || 'CardIcon'}
+      asSVG={!isActive}
+    />
   </div>
 );

package/src/utils/changeHashOnScroll.ts

@@ -2,7 +2,7 @@ import { Router } from '../components/ContentPage/ContentPageContext';
 
 export const changeHashOnScroll = (router: Router, blocks: NodeListOf<Element> | null) => {
   blocks?.forEach((block) => {
-    const currentHash = globalThis.location.hash;
+    const currentHash = globalThis.location?.hash; // TODO: remove globalThis, use href from router
     const anchorHash = `#${block?.id}`;
 
     if (currentHash === anchorHash) return;