@redneckz/wildless-cms-uni-blocks 0.14.73 → 0.14.75

package/src/components/VerticalLayout/VerticalLayoutContent.ts

@@ -1,13 +1,15 @@
 import { type UniBlockContent } from '../../model/JSXBlock';
 import { type GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
 
-/**
- * @title Вертикальный компоновщик
- */
-export type VerticalLayoutContent = UniBlockContent & {
+export type LayoutCommitProps = {
   gap?: GapVersion;
-  /** @title Внутренний отступ компоновщика */
-  isPadding?: boolean;
+  /** @title контур на дочерних элементах */
+  isCardBorder?: boolean;
   /** @title Отступы вложенных компонентов */
   isInnerPadding?: boolean;
 };
+
+/**
+ * @title Вертикальный компоновщик
+ */
+export type VerticalLayoutContent = UniBlockContent & LayoutCommitProps;

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

@@ -27,41 +27,42 @@ export const Icon = JSX<IconProps>(
     height,
   }) => {
     const router = useRouter();
-    const href = adjustHref(router)(joinPath(projectSettings.CDN, '/icons', `${name}.svg`));
-
-    if (iconVersion !== 'normal') {
+    const iconName = iconVersion === 'normal' ? `${name}.svg` : `sprites.svg#${name}`;
+    const href = adjustHref(router)(joinPath(projectSettings.CDN, '/icons/', iconName));
+    if (iconVersion === 'normal') {
+      // fix svg gradient color
       return (
-        <Background className={className}>
-          <svg
-            className={style(
-              getSvgSize(width),
-              svgUseStyleMap[iconVersion],
-              iconVersion === 'white' ? 'invert' : '',
-              imageClassName,
-            )}
-            width={width}
-            height={height}
-            aria-hidden="true"
-          >
-            {title ? <title>{title}</title> : null}
-            {alt ? <desc>{alt}</desc> : null}
-            <use href={`${href}#icon`} xlinkHref={`${href}#icon`} />
-          </svg>
-        </Background>
+        <img
+          className={className}
+          src={href}
+          alt={alt}
+          title={title}
+          aria-hidden="true"
+          width={width}
+          height={height}
+          style={getInlineStyle(className, height)}
+        />
       );
     }
 
     return (
-      <img
-        className={className}
-        src={href}
-        alt={alt}
-        title={title}
-        aria-hidden="true"
-        width={width}
-        height={height}
-        style={getInlineStyle(className, height)}
-      />
+      <Background className={className}>
+        <svg
+          className={style(
+            getSvgSize(width),
+            svgUseStyleMap[iconVersion],
+            iconVersion === 'white' ? 'invert' : '',
+            imageClassName,
+          )}
+          width={width}
+          height={height}
+          aria-hidden="true"
+        >
+          {title ? <title>{title}</title> : null}
+          {alt ? <desc>{alt}</desc> : null}
+          <use href={href} xlinkHref={href} />
+        </svg>
+      </Background>
     );
   },
 );