@redneckz/wildless-cms-uni-blocks 0.13.21 → 0.13.23

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

@@ -1,8 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { projectSettings } from '../../ProjectSettings';
 import { useRouter } from '../../hooks/useRouter';
 import type { IconVersion } from '../../model/IconVersion';
-import { projectSettings } from '../../ProjectSettings';
 import { adjustHref } from '../../utils/adjustHref';
+import { isOnlyDigits } from '../../utils/isOnlyDigits';
 import { style } from '../../utils/style';
 import { joinPath } from '../../utils/url';
 import type { IconProps } from './IconProps';
@@ -22,7 +23,8 @@ export const Icon = JSX<IconProps>(
     alt = `Иконка ${name}`,
     title = alt,
     iconVersion = 'color',
-    ...imgProps
+    width,
+    height,
   }) => {
     const router = useRouter();
     const href = adjustHref(router)(joinPath(projectSettings.CDN, '/icons', `${name}.svg`));
@@ -32,12 +34,13 @@ export const Icon = JSX<IconProps>(
         <Background className={className}>
           <svg
             className={style(
-              getSvgSize(imgProps.width),
+              getSvgSize(width),
               svgUseStyleMap[iconVersion],
               iconVersion === 'white' ? 'invert' : '',
               imageClassName,
             )}
-            {...imgProps}
+            width={width}
+            height={height}
             aria-hidden="true"
           >
             {title ? <title>{title}</title> : null}
@@ -48,10 +51,6 @@ export const Icon = JSX<IconProps>(
       );
     }
 
-    if (!className.includes('h-')) {
-      imgProps['style'] = { height: `${imgProps.height}px` };
-    }
-
     return (
       <img
         className={className}
@@ -59,12 +58,22 @@ export const Icon = JSX<IconProps>(
         alt={alt}
         title={title}
         aria-hidden="true"
-        {...imgProps}
+        width={width}
+        height={height}
+        style={getInlineStyle(className, height)}
       />
     );
   },
 );
 
+const getInlineStyle = (className?: string, height?: string) => {
+  if (className?.includes('h-')) {
+    return {};
+  }
+
+  return { height: isOnlyDigits(height) ? `${height}px` : height };
+};
+
 const getSvgSize = (width?: string) => (width ? '' : 'w-full h-full');
 
 const Background = JSX<{ className?: string }>(({ className, children }) =>

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

@@ -27,7 +27,7 @@ export const RoundedIcon = JSX<RoundedIconProps>(
           height: `${widthAndHeight}px`,
         }}
         className={style(
-          'rounded-icon object-fit flex justify-center items-center ',
+          'rounded-icon object-fit flex justify-center items-center',
           iconBgStyles[iconBgVersion],
           className,
         )}

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

@@ -1,8 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { BgColorVersion } from '../../model/BgColorVersion';
 import type { LogoType } from '../../model/LogoType';
-import { renderImage } from './renderImage';
-import { renderTitle } from './renderTitle';
 import { style } from '../../utils/style';
+import { Text } from '../Text/Text';
+import type { TextColor } from '../Text/TextProps';
+import { ICON_SIZE } from './iconSize';
+import { logoTitleSizeStyle } from './logoTitleSizeStyle';
+import { renderImage } from './renderImage';
 
 export interface LogoProps {
   className: string;
@@ -13,12 +17,17 @@ export interface LogoProps {
   logo?: LogoType;
 }
 
+const TEXT_COLOR: Record<BgColorVersion, TextColor> = {
+  'bg-white': 'text-primary-text',
+  transparent: 'text-white',
+};
+
 export const Logo = JSX<Partial<LogoProps>>(
   ({
-    className = '',
+    className,
     href = '/',
     logo,
-    children = logo?.title,
+    children,
     targetBlank,
     bgColor = 'bg-white',
     showTitle = true,
@@ -29,8 +38,16 @@ export const Logo = JSX<Partial<LogoProps>>(
       target={targetBlank ? '_blank' : '_self'}
       aria-label={logo?.title || 'Россельхозбанк'}
     >
-      {renderImage(bgColor, logo?.image, { width: '40', height: '45' })}
-      {showTitle ? renderTitle(children || logo?.title, bgColor) : null}
+      {renderImage(bgColor, logo?.image, ICON_SIZE)}
+      {showTitle
+        ? children ?? (
+            <div className="ml-s">
+              <Text font="font-medium" color={TEXT_COLOR[bgColor]} size={logoTitleSizeStyle}>
+                {logo?.title}
+              </Text>
+            </div>
+          )
+        : null}
     </a>
   ),
 );

package/src/ui-kit/Logo/iconSize.mobile.ts

@@ -0,0 +1 @@
+export const ICON_SIZE = { width: '34', height: '34' };

package/src/ui-kit/Logo/iconSize.ts

@@ -0,0 +1 @@
+export const ICON_SIZE = { width: '40', height: '45' };

package/src/ui-kit/Logo/logoTitleSizeStyle.mobile.ts

@@ -0,0 +1 @@
+export const logoTitleSizeStyle = 'text-s';

package/src/ui-kit/Logo/logoTitleSizeStyle.ts

@@ -0,0 +1 @@
+export const logoTitleSizeStyle = '';

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

@@ -21,7 +21,6 @@ export const SearchDialog = JSX<SearchDialogProps>(({ initialQuery }) => {
   const [searchResult, searchInputProps] = useSearch({
     basePathList,
     initialQuery,
-    wasOpened: false,
   });
 
   const searchItems = useMemo(

package/src/utils/Nullable.ts

@@ -0,0 +1 @@
+export type Nullable<T> = T | null | undefined;

package/src/utils/isOnlyDigits.ts

@@ -0,0 +1 @@
+export const isOnlyDigits = (str?: string) => str && !/\D/.test(str);

package/bundle/ui-kit/Logo/Logo.mobile.d.ts

@@ -1,10 +0,0 @@
-import type { LogoType } from '../../model/LogoType';
-export interface LogoProps {
-    className: string;
-    href: string;
-    targetBlank: boolean;
-    bgColor?: string;
-    showTitle?: boolean;
-    logo?: LogoType;
-}
-export declare const Logo: import("@redneckz/uni-jsx").UNIComponent<Partial<LogoProps>, any, any>;

package/bundle/ui-kit/Logo/renderTitle.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="react" />
-import type { VNode } from '../../model/VNode';
-export declare const renderTitle: (title: VNode, bgColor: string, className?: string) => JSX.Element;

package/dist/ui-kit/Logo/Logo.mobile.d.ts

@@ -1,10 +0,0 @@
-import type { LogoType } from '../../model/LogoType';
-export interface LogoProps {
-    className: string;
-    href: string;
-    targetBlank: boolean;
-    bgColor?: string;
-    showTitle?: boolean;
-    logo?: LogoType;
-}
-export declare const Logo: import("@redneckz/uni-jsx").UNIComponent<Partial<LogoProps>, any, any>;

package/dist/ui-kit/Logo/Logo.mobile.js

@@ -1,10 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logo = void 0;
-const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
-const uni_jsx_1 = require("@redneckz/uni-jsx");
-const renderImage_1 = require("./renderImage");
-const renderTitle_1 = require("./renderTitle");
-exports.Logo = (0, uni_jsx_1.JSX)(({ bgColor = 'bg-white', children, className = '', href, logo, showTitle = true, targetBlank, }) => {
-    return ((0, jsx_runtime_1.jsxs)("a", { className: `inline-flex items-center font-sans no-underline ${className}`, href: href || 'https://rshb.ru/', target: targetBlank ? '_blank' : '_self', "aria-label": logo?.title || 'Россельхозбанк', children: [(0, renderImage_1.renderImage)(bgColor, logo?.image, { width: '34', height: '34' }), showTitle ? (0, renderTitle_1.renderTitle)(children || logo?.title, bgColor, 'text-s') : null] }));
-});
-//# sourceMappingURL=Logo.mobile.js.map

package/dist/ui-kit/Logo/Logo.mobile.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Logo.mobile.js","sourceRoot":"","sources":["../../../src/ui-kit/Logo/Logo.mobile.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,+CAA4C;AAC5C,+CAA4C;AAW/B,QAAA,IAAI,GAAG,IAAA,aAAG,EACrB,CAAC,EACC,OAAO,GAAG,UAAU,EACpB,QAAQ,EACR,SAAS,GAAG,EAAE,EACd,IAAI,EACJ,IAAI,EACJ,SAAS,GAAG,IAAI,EAChB,WAAW,GACZ,EAAE,EAAE;IACH,OAAO,CACL,+BACE,SAAS,EAAE,mDAAmD,SAAS,EAAE,EACzE,IAAI,EAAE,IAAI,IAAI,kBAAkB,EAChC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,gBAC5B,IAAI,EAAE,KAAK,IAAI,gBAAgB,aAE1C,IAAA,yBAAW,EAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAChE,SAAS,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,QAAQ,IAAI,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,IACzE,CACL,CAAC;AACJ,CAAC,CACF,CAAC"}

package/dist/ui-kit/Logo/renderTitle.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="react" />
-import type { VNode } from '../../model/VNode';
-export declare const renderTitle: (title: VNode, bgColor: string, className?: string) => JSX.Element;

package/dist/ui-kit/Logo/renderTitle.js

@@ -1,12 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderTitle = void 0;
-const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
-const TEXT_COLOR = {
-    'bg-white': 'text-primary-text',
-    transparent: 'text-white',
-};
-const renderTitle = (title, bgColor, className) => {
-    return ((0, jsx_runtime_1.jsx)("span", { className: `${TEXT_COLOR[bgColor]} ml-s font-medium ${className || ''}`, children: title || 'Россельхозбанк' }));
-};
-exports.renderTitle = renderTitle;
-//# sourceMappingURL=renderTitle.js.map

package/dist/ui-kit/Logo/renderTitle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"renderTitle.js","sourceRoot":"","sources":["../../../src/ui-kit/Logo/renderTitle.tsx"],"names":[],"mappings":";;;AAGA,MAAM,UAAU,GAAmC;IACjD,UAAU,EAAE,mBAAmB;IAC/B,WAAW,EAAE,YAAY;CAC1B,CAAC;AAEK,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,OAAe,EAAE,SAAkB,EAAE,EAAE;IAC/E,OAAO,CACL,iCAAM,SAAS,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,SAAS,IAAI,EAAE,EAAE,YAC1E,KAAK,IAAI,gBAAgB,GACrB,CACR,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,WAAW,eAMtB"}

package/lib/ui-kit/Logo/Logo.mobile.d.ts

@@ -1,10 +0,0 @@
-import type { LogoType } from '../../model/LogoType';
-export interface LogoProps {
-    className: string;
-    href: string;
-    targetBlank: boolean;
-    bgColor?: string;
-    showTitle?: boolean;
-    logo?: LogoType;
-}
-export declare const Logo: import("@redneckz/uni-jsx").UNIComponent<Partial<LogoProps>, any, any>;

package/lib/ui-kit/Logo/Logo.mobile.js

@@ -1,8 +0,0 @@
-import { jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
-import { JSX } from '@redneckz/uni-jsx';
-import { renderImage } from './renderImage.js';
-import { renderTitle } from './renderTitle.js';
-export const Logo = JSX(({ bgColor = 'bg-white', children, className = '', href, logo, showTitle = true, targetBlank, }) => {
-    return (_jsxs("a", { className: `inline-flex items-center font-sans no-underline ${className}`, href: href || 'https://rshb.ru/', target: targetBlank ? '_blank' : '_self', "aria-label": logo?.title || 'Россельхозбанк', children: [renderImage(bgColor, logo?.image, { width: '34', height: '34' }), showTitle ? renderTitle(children || logo?.title, bgColor, 'text-s') : null] }));
-});
-//# sourceMappingURL=Logo.mobile.js.map

package/lib/ui-kit/Logo/Logo.mobile.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Logo.mobile.js","sourceRoot":"","sources":["../../../src/ui-kit/Logo/Logo.mobile.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAW5C,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CACrB,CAAC,EACC,OAAO,GAAG,UAAU,EACpB,QAAQ,EACR,SAAS,GAAG,EAAE,EACd,IAAI,EACJ,IAAI,EACJ,SAAS,GAAG,IAAI,EAChB,WAAW,GACZ,EAAE,EAAE;IACH,OAAO,CACL,aACE,SAAS,EAAE,mDAAmD,SAAS,EAAE,EACzE,IAAI,EAAE,IAAI,IAAI,kBAAkB,EAChC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,gBAC5B,IAAI,EAAE,KAAK,IAAI,gBAAgB,aAE1C,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAChE,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,IAAI,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,IACzE,CACL,CAAC;AACJ,CAAC,CACF,CAAC"}

package/lib/ui-kit/Logo/renderTitle.d.ts

@@ -1,2 +0,0 @@
-import type { VNode } from '../../model/VNode';
-export declare const renderTitle: (title: VNode, bgColor: string, className?: string) => JSX.Element;

package/lib/ui-kit/Logo/renderTitle.js

@@ -1,9 +0,0 @@
-import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
-const TEXT_COLOR = {
-    'bg-white': 'text-primary-text',
-    transparent: 'text-white',
-};
-export const renderTitle = (title, bgColor, className) => {
-    return (_jsx("span", { className: `${TEXT_COLOR[bgColor]} ml-s font-medium ${className || ''}`, children: title || 'Россельхозбанк' }));
-};
-//# sourceMappingURL=renderTitle.js.map

package/lib/ui-kit/Logo/renderTitle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"renderTitle.js","sourceRoot":"","sources":["../../../src/ui-kit/Logo/renderTitle.tsx"],"names":[],"mappings":";AAGA,MAAM,UAAU,GAAmC;IACjD,UAAU,EAAE,mBAAmB;IAC/B,WAAW,EAAE,YAAY;CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,OAAe,EAAE,SAAkB,EAAE,EAAE;IAC/E,OAAO,CACL,eAAM,SAAS,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,SAAS,IAAI,EAAE,EAAE,YAC1E,KAAK,IAAI,gBAAgB,GACrB,CACR,CAAC;AACJ,CAAC,CAAC"}

package/mobile/bundle/ui-kit/Logo/renderTitle.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="react" />
-import type { VNode } from '../../model/VNode';
-export declare const renderTitle: (title: VNode, bgColor: string, className?: string) => JSX.Element;

package/mobile/dist/ui-kit/Logo/renderTitle.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="react" />
-import type { VNode } from '../../model/VNode';
-export declare const renderTitle: (title: VNode, bgColor: string, className?: string) => JSX.Element;

package/mobile/dist/ui-kit/Logo/renderTitle.js

@@ -1,12 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderTitle = void 0;
-const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
-const TEXT_COLOR = {
-    'bg-white': 'text-primary-text',
-    transparent: 'text-white',
-};
-const renderTitle = (title, bgColor, className) => {
-    return ((0, jsx_runtime_1.jsx)("span", { className: `${TEXT_COLOR[bgColor]} ml-s font-medium ${className || ''}`, children: title || 'Россельхозбанк' }));
-};
-exports.renderTitle = renderTitle;
-//# sourceMappingURL=renderTitle.js.map

package/mobile/dist/ui-kit/Logo/renderTitle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"renderTitle.js","sourceRoot":"","sources":["../../../src/ui-kit/Logo/renderTitle.tsx"],"names":[],"mappings":";;;AAGA,MAAM,UAAU,GAAmC;IACjD,UAAU,EAAE,mBAAmB;IAC/B,WAAW,EAAE,YAAY;CAC1B,CAAC;AAEK,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,OAAe,EAAE,SAAkB,EAAE,EAAE;IAC/E,OAAO,CACL,iCAAM,SAAS,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,SAAS,IAAI,EAAE,EAAE,YAC1E,KAAK,IAAI,gBAAgB,GACrB,CACR,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,WAAW,eAMtB"}

package/mobile/lib/ui-kit/Logo/renderTitle.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="react" />
-import type { VNode } from '../../model/VNode';
-export declare const renderTitle: (title: VNode, bgColor: string, className?: string) => JSX.Element;

package/mobile/lib/ui-kit/Logo/renderTitle.js

@@ -1,9 +0,0 @@
-import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
-const TEXT_COLOR = {
-    'bg-white': 'text-primary-text',
-    transparent: 'text-white',
-};
-export const renderTitle = (title, bgColor, className) => {
-    return (_jsx("span", { className: `${TEXT_COLOR[bgColor]} ml-s font-medium ${className || ''}`, children: title || 'Россельхозбанк' }));
-};
-//# sourceMappingURL=renderTitle.js.map

package/mobile/lib/ui-kit/Logo/renderTitle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"renderTitle.js","sourceRoot":"","sources":["../../../src/ui-kit/Logo/renderTitle.tsx"],"names":[],"mappings":";AAGA,MAAM,UAAU,GAAmC;IACjD,UAAU,EAAE,mBAAmB;IAC/B,WAAW,EAAE,YAAY;CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,OAAe,EAAE,SAAkB,EAAE,EAAE;IAC/E,OAAO,CACL,eAAM,SAAS,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,SAAS,IAAI,EAAE,EAAE,YAC1E,KAAK,IAAI,gBAAgB,GACrB,CACR,CAAC;AACJ,CAAC,CAAC"}

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

@@ -1,15 +0,0 @@
-import type { BgColorVersion } from '../../model/BgColorVersion';
-import type { VNode } from '../../model/VNode';
-
-const TEXT_COLOR: Record<BgColorVersion, string> = {
-  'bg-white': 'text-primary-text',
-  transparent: 'text-white',
-};
-
-export const renderTitle = (title: VNode, bgColor: string, className?: string) => {
-  return (
-    <span className={`${TEXT_COLOR[bgColor]} ml-s font-medium ${className || ''}`}>
-      {title || 'Россельхозбанк'}
-    </span>
-  );
-};

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

@@ -1,37 +0,0 @@
-import { JSX } from '@redneckz/uni-jsx';
-import type { LogoType } from '../../model/LogoType';
-import { renderImage } from './renderImage';
-import { renderTitle } from './renderTitle';
-
-export interface LogoProps {
-  className: string;
-  href: string;
-  targetBlank: boolean;
-  bgColor?: string;
-  showTitle?: boolean;
-  logo?: LogoType;
-}
-
-export const Logo = JSX<Partial<LogoProps>>(
-  ({
-    bgColor = 'bg-white',
-    children,
-    className = '',
-    href,
-    logo,
-    showTitle = true,
-    targetBlank,
-  }) => {
-    return (
-      <a
-        className={`inline-flex items-center font-sans no-underline ${className}`}
-        href={href || 'https://rshb.ru/'}
-        target={targetBlank ? '_blank' : '_self'}
-        aria-label={logo?.title || 'Россельхозбанк'}
-      >
-        {renderImage(bgColor, logo?.image, { width: '34', height: '34' })}
-        {showTitle ? renderTitle(children || logo?.title, bgColor, 'text-s') : null}
-      </a>
-    );
-  },
-);

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

@@ -1,15 +0,0 @@
-import type { BgColorVersion } from '../../model/BgColorVersion';
-import type { VNode } from '../../model/VNode';
-
-const TEXT_COLOR: Record<BgColorVersion, string> = {
-  'bg-white': 'text-primary-text',
-  transparent: 'text-white',
-};
-
-export const renderTitle = (title: VNode, bgColor: string, className?: string) => {
-  return (
-    <span className={`${TEXT_COLOR[bgColor]} ml-s font-medium ${className || ''}`}>
-      {title || 'Россельхозбанк'}
-    </span>
-  );
-};