@redneckz/wildless-cms-uni-blocks 0.13.16 → 0.13.18

package/src/components/ErrorBlock/ErrorBlockContent.ts

@@ -1,4 +1,4 @@
-import type { SubtitleProps, TitleProps } from '../../model/HeadlineType';
+import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
@@ -8,14 +8,14 @@ import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
  */
 export type ErrorImageDef = ImageContent & {
   /** @default Image */
-  errorContentType: 'Image';
+  contentType: 'Image';
 };
 
 /**
  * @title Код ошибки
  */
 export type ErrorCodeDef = {
-  errorContentType: 'Code';
+  contentType: 'Code';
   code?: ErrorType;
 };
 
@@ -42,7 +42,7 @@ export type ErrorType =
  */
 export type ErrorBlockContent = UniBlockContent &
   TitleProps &
-  SubtitleProps & {
+  DescriptionProps & {
     error?: ErrorContentDef;
     /** @title Кнопка */
     button?: ButtonContent;

package/src/components/ExchangeRateTile/ExchangeCurrencyCalculator.tsx

@@ -71,11 +71,7 @@ export const ExchangeCurrencyCalculator = JSX<ExchangeCurrencyCalculatorProps>(
               calcState.selectSell,
             ),
         })}
-        {button?.text ? (
-          <Button className="py-4 px-9" version={button?.version} {...button}>
-            {button.text}
-          </Button>
-        ) : null}
+        {button?.text ? <Button text={button.text} version={button?.version} {...button} /> : null}
       </div>
     );
   },

package/src/ui-kit/Button/ButtonInner.tsx

@@ -30,11 +30,11 @@ const getButtonStyle = (props: ButtonContent) => {
 
   const withTextStyle = `${aboveText ? 'py-2.5 px-9' : 'py-4 px-9'}`;
 
-  return [
+  return style(
     'group/btn items-center justify-center',
     isWithText(props) ? withTextStyle : 'h-12 w-12',
     rounded ? 'rounded-full' : '',
-  ].join(' ');
+  );
 };
 
 const isWithText = ({ text, aboveText, appendLeft }: ButtonProps) =>