@redneckz/wildless-cms-uni-blocks 0.9.15 → 0.10.0

package/mobile/src/hooks/useLink.ts

@@ -10,13 +10,20 @@ interface Clickable {
   onClick(ev?: PreventableEvent): void;
 }
 
-export function useLink(isRemote = false) {
+interface UseLinkParams {
+  isRemote?: boolean;
+  basePath?: string;
+}
+
+export function useLink(params: UseLinkParams = {}) {
+  const { isRemote, basePath } = params;
+
   const router = useRouter();
   const { close } = useDialog();
 
   return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
     ...props,
-    href: isRemote ? props.href : adjustHref(router)(props.href),
+    href: isRemote ? props.href : adjustHref(router)(props.href, basePath),
     'aria-label': props.text,
     onClick: handlerDecorator(handleHref(props), props),
   });

package/mobile/src/services/sitemap/SitemapData.ts

@@ -6,7 +6,7 @@ import type { IconProps, Picture } from '../../model/Picture';
  * @title Ссылка
  * @required ["text", "href"]
  */
-export interface TopMenuItem extends LinkProps {
+export interface TopMenuItemProps extends LinkProps {
   /** @hidden */
   items?: LinkProps[];
 }
@@ -27,7 +27,7 @@ export interface DispositionItem extends LinkProps {
 export type ForeignOffice = LinkProps & IconProps;
 
 export interface SitemapData {
-  topItems?: TopMenuItem[];
+  topItems?: TopMenuItemProps[];
   dispositions?: DispositionItem[];
   logo?: LogoType;
   foreignOffices?: ForeignOffice[];

package/mobile/src/ui-kit/Button/getRegularButtonClasses.ts

@@ -8,7 +8,7 @@ export const getRegularButtonClasses = ({
 }: GetButtonClassParams): string =>
   [
     buttonStyle,
-    'border border-transparent inline-block cursor-pointer no-underline focus:border-primary-text focus:border',
+    'border border-transparent inline-block cursor-pointer no-underline focus:border-primary-text focus:border h-fit',
     version ? buttonStyleMap[version] : '',
     rounded ? 'rounded-full' : 'rounded-md',
     className,

package/mobile/src/ui-kit/Button/renderButtonsSection.tsx

@@ -14,7 +14,7 @@ export const renderButtonsSection = (
   buttons?: (ButtonWithIconProps | undefined)[],
   { className = '', buttonClassName, isVertical }: ButtonsSectionOptions = {},
 ) =>
-  buttons?.length && buttons.some((_) => _?.text) ? (
+  buttons?.length && buttons.some((_) => _?.text || _?.icon?.icon) ? (
     <div className={style('flex', isVertical ? 'flex-col gap-2' : 'gap-4', className)}>
       {buttons.map(renderButton(buttonClassName))}
     </div>
@@ -26,7 +26,7 @@ const renderButton =
     const { text, icon, iconRight, version, ...rest } = button || {};
     const iconVersion = version === 'secondary' ? 'color' : 'white';
 
-    return text ? (
+    return text || icon?.icon ? (
       <Button
         key={index ? String(index) : ''}
         className={buttonClassName}

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

@@ -1,8 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { style } from '../../utils/style';
 import type { RichTextProps } from './RichTextProps';
 
 export const RichText = JSX<RichTextProps>((props) => {
-  const { __html = '' } = props;
+  const { __html = '', richVersion = '' } = props;
 
-  return <div className="md-container" dangerouslySetInnerHTML={{ __html }} />;
+  return (
+    <div className={style(richVersion, 'md-container')} dangerouslySetInnerHTML={{ __html }} />
+  );
 });

package/mobile/src/ui-kit/RichText/RichTextProps.ts

@@ -5,7 +5,7 @@ export interface RichTextProps {
   __html?: HTML;
   /**
    * @title Стиль форматированного текста
-   * @enumNames ["по умолчанию", "в полоску"]
+   * @enumNames ["по умолчанию", "Строки разного цвета", "Горизонтальные разделители"]
    */
-  richVersion?: '' | 'striped';
+  richVersion?: '' | 'striped' | 'horizontal-separator';
 }

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

@@ -2,7 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import type { LinkProps } from '../../model/LinkProps';
 import { useSearch, type SearchResult } from '../../services/search/useSearch';
-import type { TopMenuItem } from '../../services/sitemap/SitemapData';
+import type { TopMenuItemProps } from '../../services/sitemap/SitemapData';
 import { joinPath } from '../../utils/url';
 import { zip } from '../../utils/zip';
 import { Dialog } from '../Dialog/Dialog';
@@ -11,7 +11,7 @@ import { Sitemap } from '../Sitemap/Sitemap';
 import { SearchInput } from './SearchInput';
 
 export interface SearchDialogProps {
-  topItems?: TopMenuItem[];
+  topItems?: TopMenuItemProps[];
 }
 
 export const SEARCH_DIALOG_ID = 'search';
@@ -44,8 +44,8 @@ export const SearchDialog = JSX<SearchDialogProps>(({ topItems }) => {
 });
 
 const combineTopItemsAndSearchResult =
-  (topItems: TopMenuItem[] | undefined) =>
-  (searchResult: SearchResult | null | undefined): TopMenuItem[] =>
+  (topItems: TopMenuItemProps[] | undefined) =>
+  (searchResult: SearchResult | null | undefined): TopMenuItemProps[] =>
     topItems?.length && searchResult?.length
       ? zip(topItems, searchResult).map(([_, portalSearchResult]) => ({
           ..._,
@@ -56,7 +56,7 @@ const combineTopItemsAndSearchResult =
       : [];
 
 // Temp
-function printSearchItems(topItems: TopMenuItem[]) {
+function printSearchItems(topItems: TopMenuItemProps[]) {
   for (const _ of topItems.filter(({ items }) => items?.length)) {
     console.group(_.text);
     console.table(_.items, ['text', 'href']);

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

@@ -17,10 +17,22 @@ export type SelectProps = LabelProps & {
   options: OptionProps[];
   isBorder?: boolean;
   placeholder?: string;
+  valid?: boolean;
+  onValidate?: (value: string) => void;
 };
 
 export const Select = JSX<SelectProps>(
-  ({ className = '', isBorder = true, label, options = [], value, onChange, placeholder = '' }) => {
+  ({
+    className = '',
+    isBorder = true,
+    label,
+    options = [],
+    value,
+    onChange,
+    placeholder = '',
+    valid = true,
+    onValidate,
+  }) => {
     const [selectedItem, setSelectedItem] = useState(options[0] || { key: '', text: '' });
     const [isOpen, setIsOpen] = useState(false);
     const handleClickOutside = useCallback(() => setIsOpen(false), []);
@@ -30,6 +42,7 @@ export const Select = JSX<SelectProps>(
       setSelectedItem(option);
       setIsOpen(false);
       onChange(option);
+      onValidate && onValidate(option.text);
     };
 
     const isSelected = (option: OptionProps) => Boolean(option.key === selectedItem.key);
@@ -50,7 +63,7 @@ export const Select = JSX<SelectProps>(
         <div className={`relative ${isOpen ? 'z-20' : 'z-10'}`}>
           <div
             className={`text-l flex justify-between items-center mb-0.5 text-primary-text cursor-pointer
-            ${getBorderStyle(isBorder)}`}
+            ${getBorderStyle(isBorder, valid)}`}
             onClick={() => setIsOpen(!isOpen)}
           >
             <p className="p-4 pr-8 h-14 overflow-hidden text-ellipsis whitespace-nowrap">
@@ -108,5 +121,7 @@ const renderOption =
     );
   };
 
-const getBorderStyle = (isBorder: boolean) =>
-  isBorder ? 'border border-gray rounded-md hover:border-primary-hover' : '';
+const getBorderStyle = (isBorder: boolean, valid: boolean) => `
+  ${isBorder ? 'border rounded-md hover:border-primary-hover' : ''} ${
+  valid ? ' border-gray' : 'border-error'
+} `;

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

@@ -2,17 +2,16 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import type { LinkProps } from '../../model/LinkProps';
 import { projectSettings } from '../../ProjectSettings';
-import type { TopMenuItem } from '../../services/sitemap/SitemapData';
+import type { TopMenuItemProps } from '../../services/sitemap/SitemapData';
 import { style } from '../../utils/style';
-import { joinPath } from '../../utils/url';
 
 export interface SitemapProps {
   className?: string;
-  topItems?: TopMenuItem[];
+  topItems?: TopMenuItemProps[];
 }
 
 export const Sitemap = JSX<SitemapProps>(({ className, topItems }) => {
-  const link = useLink(true);
+  const link = useLink({ isRemote: true });
 
   return (
     <div className={style('flex items-start justify-between', className)}>
@@ -21,7 +20,7 @@ export const Sitemap = JSX<SitemapProps>(({ className, topItems }) => {
   );
 });
 
-const renderColumn = (menuItem: TopMenuItem & { onClick: () => void }, index: number) => {
+const renderColumn = (menuItem: TopMenuItemProps & { onClick: () => void }, index: number) => {
   const { text, items, href, target, onClick } = menuItem;
 
   return (
@@ -50,7 +49,7 @@ const ColumnItem = JSX<ColumnItemProps>(({ text, index, basePath, ...rest }) =>
   const isAnotherPortal =
     projectSettings.BASE_PATH && basePath ? !projectSettings.BASE_PATH.startsWith(basePath) : false;
 
-  const link = useLink(isAnotherPortal);
+  const link = useLink({ isRemote: isAnotherPortal });
   const { href, target, onClick } = link(rest);
 
   return (
@@ -59,7 +58,7 @@ const ColumnItem = JSX<ColumnItemProps>(({ text, index, basePath, ...rest }) =>
         'text-l-light text-secondary-text hover:text-primary-main no-underline',
         'overflow-x-hidden overflow-ellipsis whitespace-nowrap',
       )}
-      href={isAnotherPortal ? joinPath(basePath, href) : href}
+      href={href}
       target={target || '_self'}
       onClick={onClick}
     >

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

@@ -15,7 +15,7 @@ export interface TopItemProps extends TopItemContent {
 }
 
 export const TopItem = JSX<TopItemProps>(({ className = '', active, flat, children, ...rest }) => {
-  const link = useLink(true);
+  const link = useLink({ isRemote: true });
   const { href, target, text, onClick } = link(rest);
 
   return (

package/mobile/src/utils/adjustHref.ts

@@ -2,16 +2,21 @@ import { projectSettings } from '../ProjectSettings';
 import { dirname } from './dirname';
 import { isURL, joinPath } from './url';
 
-export const adjustHref = (router: { pathname: string }) => (href: string | undefined) => {
-  if (!href || isURL(href) || (projectSettings.CDN && href.startsWith(projectSettings.CDN))) {
-    return href;
-  }
+export const adjustHref =
+  (router: { pathname: string }) =>
+  (href: string | undefined, basePath = projectSettings.BASE_PATH) => {
+    if (!href || isURL(href) || hasPrefix(href, projectSettings.CDN)) {
+      return href;
+    }
 
-  const isRelativeToBase = href.startsWith('/');
+    const isRelativeToBase = href.startsWith('/');
 
-  return joinPath(
-    projectSettings.BASE_PATH,
-    isRelativeToBase ? '/' : dirname(router.pathname),
-    href,
-  );
-};
+    return joinPath(
+      hasPrefix(href, basePath) ? '' : basePath,
+      isRelativeToBase ? '/' : dirname(router.pathname),
+      href,
+    );
+  };
+
+const hasPrefix = (href: string, prefix: string | undefined) =>
+  prefix && href && href.startsWith(prefix);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.9.15",
+  "version": "0.10.0",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -189,7 +189,7 @@
       "path": "lib/common.css"
     },
     {
-      "limit": "53 kB",
+      "limit": "54 kB",
       "path": "bundle/bundle.umd.min.js"
     }
   ],

package/src/common.css

@@ -17,6 +17,7 @@ html {
 /* Private clients | Green */
 [data-theme='pc'] {
   --color-primary-main: var(--color-green-dark);
+  --color-primary-divider: 235, 237, 240;
   --color-primary-hover: 36, 131, 65;
   --color-primary-active: 36, 95, 52;
   --color-secondary-hover: 36, 131, 65;
@@ -242,29 +243,47 @@ html {
 
   .md-container a {
     @apply text-primary-main;
+    font-weight: 400;
   }
 
   .md-container strong {
     @apply font-bold;
   }
 
-  .striped .md-container table {
+  .striped.md-container table {
     width: 100%;
     table-layout: fixed;
     text-align: left;
   }
-  .striped .md-container table thead {
+  .striped.md-container table thead,
+  .horizontal-separator.md-container table thead {
     color: rgb(var(--color-secondary-text));
   }
 
-  .striped .md-container table td,
-  .striped .md-container table th {
+  .striped.md-container table td,
+  .striped.md-container table th {
     padding: 8px 14px 5px;
   }
 
-  .striped .md-container table tbody tr:nth-child(2n-1) {
+  .striped.md-container table tbody tr:nth-child(2n-1) {
     background-color: rgb(var(--color-secondary-light));
   }
+
+  .horizontal-separator.md-container table {
+    width: 100%;
+    text-align: left;
+  }
+
+  .horizontal-separator.md-container table td,
+  .horizontal-separator.md-container table th {
+    padding: 12px 8px 12px 0;
+    font-size: 18px;
+    min-width: 116px;
+  }
+
+  .horizontal-separator.md-container table tr {
+    border-bottom: 1px solid rgb(var(--color-primary-divider));
+  }
 }
 
 /*

package/src/components/ApplicationForm/ApplicationForm.example.json

@@ -3,6 +3,7 @@
     "button": {
       "text": "Отправить заявку"
     },
-    "typeForm": "credit"
+    "typeForm": "credit",
+    "version": "primary"
   }
 }

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -31,10 +31,10 @@ export const ApplicationForm = JSX<ApplicationFormProps>((props) => {
   const [responceType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
 
   const handleSubmit = useCallback(async (data: Record<string, string>) => {
-    const status = await API.send(data);
-    setResponseType(status ? 'OK' : 'Fail');
+    const status = (await API.send(data)) ? 'OK' : 'Fail';
+    setResponseType(status);
 
-    return 'OK';
+    return status;
   }, []);
 
   return (

package/src/components/ApplicationForm/ApplicationFormAcquiring.tsx

@@ -1,18 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { Input } from '../../ui-kit/Input/Input';
 import type { PreventableEvent } from '../../ui-kit/PreventableEvent';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
-import { ACQUIRING_TYPES } from './acquiringTypes';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
-import type { HandleFormStateChange } from './models';
-import { normalizeSelectedRegion } from './normalizeSelectedRegion';
-import { renderSelects } from './renderSelects';
+import { renderAcquiringDataOrganization } from './renderAcquiringDataOrganization';
+import { renderAcquiringRegion } from './renderAcquiringRegion';
 import { renderSlideCheckboxes } from './renderSlideCheckboxes';
 import { renderSubmitButton } from './renderSubmitButton';
-import { useFormHandlers } from './useFormHandlers';
+import { useForm } from './useForm';
 
 export interface AcquiringFormState {
   acquiringType: string;
@@ -25,67 +21,76 @@ export interface AcquiringFormState {
   posTerminal: boolean;
 }
 
+const initialFormState = {
+  acquiringType: 'Торговый эквайринг',
+  region: '',
+  fullName: '',
+  inn: '',
+  name: '',
+  phone: '',
+  onlineСheckout: false,
+  posTerminal: false,
+};
+
+const errorsInitialState = {
+  acquiringType: '',
+  region: '',
+  fullName: '',
+  inn: '',
+  name: '',
+  phone: '',
+};
+
 export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
   const { button, link, handleSubmit } = props;
 
-  const [formState, setFormState] = useState<AcquiringFormState>({
-    acquiringType: '',
-    region: '',
-    fullName: '',
-    inn: '',
-    name: '',
-    phone: '',
-    onlineСheckout: false,
-    posTerminal: false,
-  });
+  const { formState, errors, handleChange, handleChangeErrors, sendForm } =
+    useForm<AcquiringFormState>({
+      initialFormState,
+      errorsInitialState,
+      handleSubmit,
+    });
 
   const { acquiringType, region, fullName, inn, name, phone, onlineСheckout, posTerminal } =
     formState;
 
   const regions = useGetRegions();
 
-  const { handleChange } = useFormHandlers<AcquiringFormState>({
-    setFormState,
-  });
-
-  const selectedRegion = normalizeSelectedRegion(region, regions);
-
-  useEffect(() => {
-    setFormState((oldState) => ({
-      ...oldState,
-      acquiringType:
-        ACQUIRING_TYPES?.length && ACQUIRING_TYPES[0]?.name ? ACQUIRING_TYPES[0].name : '',
-    }));
-  }, []);
-
-  const onSubmit = async (e: PreventableEvent) => {
+  const onSubmit = (e: PreventableEvent) => {
     e.preventDefault();
 
-    const partnerComments = `Вид эквайринга=${acquiringType}/Онлайн касса=${onlineСheckout}/POS-терминал=${posTerminal}`;
-
-    handleSubmit &&
-      (await handleSubmit({
-        typeForm: 'acqr',
-        region: regions.find((_) => _.code === selectedRegion)?.name || '',
-        partnerComments,
-        fullName,
-        inn,
-        name,
-        phone,
-      }));
+    sendForm({
+      typeForm: 'acqr',
+      region: regions.find((_) => _.code === region)?.name || '',
+      partnerComments: `Вид эквайринга=${acquiringType}/Онлайн касса=${onlineСheckout}/POS-терминал=${posTerminal}`,
+      fullName,
+      inn,
+      name,
+      phone,
+    });
   };
 
   return (
     <form onSubmit={onSubmit} className="container">
       <Heading headingType="h6" title="Вид эквайринга и регион" className="text-center mb-4" />
-      {renderSelects({
+      {renderAcquiringRegion({
         acquiringType,
         regions,
-        region: selectedRegion,
+        region,
         handleChange,
+        errors,
+        handleChangeErrors,
       })}
       <Heading headingType="h6" title="Данные организации" className="text-center mb-4" />
-      {renderDataOrganization({ fullName, inn, name, phone, handleChange })}
+      {renderAcquiringDataOrganization({
+        fullName,
+        inn,
+        name,
+        phone,
+        handleChange,
+        errors,
+        handleChangeErrors,
+      })}
       {renderSlideCheckboxes({
         onlineСheckout,
         posTerminal,
@@ -96,58 +101,3 @@ export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
     </form>
   );
 });
-
-interface RenderDataOrganizationProps {
-  fullName: string;
-  inn: string;
-  name: string;
-  phone: string;
-  handleChange: HandleFormStateChange<AcquiringFormState>;
-}
-
-const renderDataOrganization = ({
-  fullName,
-  inn,
-  name,
-  phone,
-  handleChange,
-}: RenderDataOrganizationProps) => (
-  <div className="flex justify-between gap-5 mb-5">
-    <div className="w-1/2">
-      <Input
-        className="shrink-0 text-l w-full mb-5"
-        type="text"
-        aria-label="Наименование организации"
-        label="Наименование организации"
-        value={fullName}
-        onChange={(value) => handleChange({ fullName: value })}
-      />
-      <Input
-        className="shrink-0 text-l w-full"
-        type="text"
-        aria-label="Контактное лицо"
-        label="Контактное лицо"
-        value={name}
-        onChange={(value) => handleChange({ name: value })}
-      />
-    </div>
-    <div className="w-1/2">
-      <Input
-        className="shrink-0 text-l w-full mb-5"
-        type="text"
-        label="ИНН"
-        aria-label="ИНН"
-        value={inn}
-        onChange={(value) => handleChange({ inn: value })}
-      />
-      <Input
-        className="shrink-0 text-l w-full"
-        type="text"
-        label="Телефон"
-        aria-label="Телефон"
-        value={phone}
-        onChange={(value) => handleChange({ phone: value })}
-      />
-    </div>
-  </div>
-);