@redneckz/wildless-cms-uni-blocks 0.14.876 → 0.14.878

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

@@ -1,26 +1,34 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
+import { debounce } from '../../utils/debounce.js';
 import { style } from '../../utils/style.js';
 import { Icon } from '../Icon/Icon.js';
 import { Input } from '../Input/Input.js';
 import { renderLabel } from '../Input/renderLabel.js';
 import { formatOption } from './formatOption.js';
 import { useSelectPopup } from './useSelectPopup.js';
-export const Select = JSX(({ className, label, options = [], value, valid = true, isBorder = true, placeholder = '', isSearch = false, disabled = false, iconVersion = 'black', onChange, }) => {
+export const Select = JSX(({ className, label, options = [], value, valid = true, isBorder = true, placeholder = '', isSearch = false, isManualInput = false, disabled = false, iconVersion = 'black', onChange, onSearchQuery, }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
     const [query, setQuery] = useState('');
-    const isDisabled = getDisabled(disabled, options.length);
+    const isDisabled = getDisabled(disabled, options.length, isManualInput);
+    const isIconHidden = getIconHidden(isManualInput, options);
     const hasOpen = isOpen && !isDisabled;
+    const debouncedOnSearchQuery = useMemo(() => onSearchQuery && getDebouncedSearchQuery(onSearchQuery), [onSearchQuery]);
     const handleOpen = useCallback(() => {
         if (isDisabled) {
             return;
         }
         open();
     }, [isDisabled]);
+    const handleChangeQuery = (newQuery) => {
+        setQuery(newQuery);
+        setOption(newQuery, onChange);
+        debouncedOnSearchQuery && debouncedOnSearchQuery(newQuery);
+    };
     const handleClose = useCallback(() => {
-        setQuery('');
+        !isManualInput && setQuery('');
         close();
     }, []);
     const inputRef = useSelectPopup({
@@ -31,10 +39,24 @@ export const Select = JSX(({ className, label, options = [], value, valid = true
         onChange,
         onClose: handleClose,
         iconVersion,
+        onChangeQuery: setQuery,
     });
-    return (_jsxs("div", { className: style('space-y-xs', className), children: [renderLabel(label), _jsxs("div", { className: style('relative', hasOpen ? 'z-20' : 'z-10'), ref: inputRef, children: [_jsxs("div", { className: style('h-14 [&>*]:p-m pr-6 text-l flex items-center justify-between text-primary-text relative z-10 overflow-hidden', getStyle(isBorder, valid, isDisabled)), onClick: hasOpen ? handleClose : handleOpen, children: [_jsx("p", { className: "line-clamp-2 text-ellipsis", children: formatOption(value) || placeholder }), renderIcon(hasOpen, iconVersion)] }), isSearch && hasOpen ? (_jsx("div", { className: style('absolute top-0 w-full z-20'), children: _jsx(Input, { type: "text", value: query, autoFocus: true, disabled: isDisabled, onChange: setQuery }) })) : null] })] }));
+    return (_jsxs("div", { className: style('space-y-xs', className), children: [renderLabel(label), _jsxs("div", { className: style('relative', hasOpen ? 'z-20' : 'z-10'), ref: inputRef, children: [_jsxs("div", { className: style('h-14 [&>*]:p-m pr-6 text-l flex items-center justify-between text-primary-text relative z-10 overflow-hidden', getStyle(isBorder, valid, isDisabled)), onClick: hasOpen ? handleClose : handleOpen, children: [_jsx("p", { className: "line-clamp-2 text-ellipsis", children: useRenderOptionText({ isManualInput, query, value, placeholder }) }), isIconHidden ? '' : renderIcon(hasOpen, iconVersion)] }), isSearch && hasOpen ? renderSearchInput(query, isDisabled, handleChangeQuery) : null] })] }));
 });
+const useRenderOptionText = (data) => useMemo(() => {
+    if (data.isManualInput && data.query) {
+        return data.query;
+    }
+    return formatOption(data.value) || data.placeholder;
+}, [data.isManualInput, data.query, data.value, data.placeholder]);
+const renderSearchInput = (query, isDisabled, onChangeQuery) => (_jsx("div", { className: style('absolute top-0 w-full z-20'), children: _jsx(Input, { type: "text", value: query, autoFocus: true, disabled: isDisabled, onChange: (value) => onChangeQuery(value) }) }));
 const renderIcon = (isOpen, iconVersion) => (_jsx(Icon, { className: style('absolute right-0 flex self-center', { 'rotate-180': !isOpen }), iconVersion: iconVersion, name: "ArrowUpIcon", width: "16", height: "16" }));
 const getStyle = (isBorder, valid, disabled) => style(isBorder ? 'border rounded-md ' : '', isBorder && !disabled ? 'hover:border-primary-hover' : '', disabled ? 'bg-main-divider' : 'cursor-pointer ', valid ? 'border-gray' : 'border-error');
-const getDisabled = (disabled, length) => disabled || length === 0;
+// TODO Нужен рефактор и декомпозиция компонента getDisabled, setOption, getIconHidden
+const getDisabled = (disabled, length, isManualInput) => disabled || (!isManualInput && length === 0);
+const setOption = (query, onChange) => {
+    onChange && query.trim() !== '' && onChange({ key: query, text: query, innDaData: {} });
+};
+const getIconHidden = (isManualInput, options) => isManualInput && !options.length;
+const getDebouncedSearchQuery = (onSearchQuery) => debounce((searchValue) => onSearchQuery(searchValue), 300);
 //# sourceMappingURL=Select.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/Select.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/Select.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/ui-kit/Select/SelectPopup.d.ts

@@ -8,5 +8,6 @@ export interface SelectPopupProps extends ControlProps<Option> {
         current: HTMLDivElement | null;
     };
     query?: string;
+    onChangeQuery?: (value: string) => void;
 }
 export declare const SelectPopup: import("@redneckz/uni-jsx").UNIComponent<SelectPopupProps, any, any>;

package/mobile/lib/ui-kit/Select/SelectPopup.js

@@ -2,14 +2,16 @@ import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { style } from '../../utils/style.js';
 import { Icon } from '../Icon/Icon.js';
+import { Text } from '../Text/Text.js';
 import { filterOptions } from './filterOptions.js';
 import { formatOption } from './formatOption.js';
-export const SelectPopup = JSX(({ popupRef, options, value, query, onChange, iconVersion }) => options?.length ? (_jsx("div", { className: "bg-white text-l max-h-64 overflow-y-auto overflow-x-hidden rounded-md shadow-2xl", role: "list", ref: popupRef, children: filterOptions(options, query).map((option) => (_jsxs("div", { className: "flex px-m py-s cursor-pointer hover:bg-main-divider pr-5xl relative", role: "listitem", "aria-selected": option.key === value?.key, onClick: (e) => {
+export const SelectPopup = JSX(({ popupRef, options, value, query, onChange, iconVersion, onChangeQuery }) => options?.length ? (_jsx("div", { className: "bg-white text-l max-h-64 overflow-y-auto overflow-x-hidden rounded-md shadow-2xl", role: "list", ref: popupRef, children: filterOptions(options, query).map((option) => (_jsxs("div", { className: "flex px-m py-s cursor-pointer hover:bg-main-divider pr-5xl relative", role: "listitem", "aria-selected": option.key === value?.key, onClick: (e) => {
             e.stopPropagation();
             if (onChange) {
+                onChangeQuery?.('');
                 onChange(option);
             }
-        }, children: [_jsx("span", { className: "min-h-6", children: formatOption(option) }), _jsx(Icon, { name: "DoneSimpleIcon", width: "16", height: "16", iconVersion: iconVersion, className: style('absolute right-4 pt-3xs', {
+        }, children: [option?.innDaData ? (_jsxs("span", { children: [_jsx(Text, { size: "text-s", children: option?.innDaData?.companyName }), _jsxs("div", { className: "space-x-2", children: [_jsx(Text, { size: "text-s", font: "font-light", children: formatOption(option) }), _jsx(Text, { size: "text-s", font: "font-light", children: option?.innDaData?.companyAddress })] })] })) : (_jsx("span", { className: "min-h-6", children: formatOption(option) })), _jsx(Icon, { name: "DoneSimpleIcon", width: "16", height: "16", iconVersion: iconVersion, className: style('absolute right-4 pt-3xs', {
                     hidden: option.key !== value?.key,
                 }) })] }, option.key))) })) : null);
 //# sourceMappingURL=SelectPopup.js.map

package/mobile/lib/ui-kit/Select/SelectPopup.js.map

@@ -1 +1 @@
-{"version":3,"file":"SelectPopup.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/SelectPopup.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAU9C,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAC5B,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,CAC7D,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAChB,cACE,SAAS,EAAC,kFAAkF,EAC5F,IAAI,EAAC,MAAM,EACX,GAAG,EAAE,QAAQ,YAEZ,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAC7C,eAEE,SAAS,EAAC,qEAAqE,EAC/E,IAAI,EAAC,UAAU,mBACA,MAAM,CAAC,GAAG,KAAK,KAAK,EAAE,GAAG,EACxC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACb,CAAC,CAAC,eAAe,EAAE,CAAC;YACpB,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,MAAM,CAAC,CAAC;aAClB;QACH,CAAC,aAED,eAAM,SAAS,EAAC,SAAS,YAAE,YAAY,CAAC,MAAM,CAAC,GAAQ,EACvD,KAAC,IAAI,IACH,IAAI,EAAC,gBAAgB,EACrB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,KAAK,CAAC,yBAAyB,EAAE;oBAC1C,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,KAAK,EAAE,GAAG;iBAClC,CAAC,GACF,KApBG,MAAM,CAAC,GAAG,CAqBX,CACP,CAAC,GACE,CACP,CAAC,CAAC,CAAC,IAAI,CACX,CAAC"}
+{"version":3,"file":"SelectPopup.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/SelectPopup.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAW9C,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAC5B,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE,CAC5E,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAChB,cACE,SAAS,EAAC,kFAAkF,EAC5F,IAAI,EAAC,MAAM,EACX,GAAG,EAAE,QAAQ,YAEZ,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAC7C,eAEE,SAAS,EAAC,qEAAqE,EAC/E,IAAI,EAAC,UAAU,mBACA,MAAM,CAAC,GAAG,KAAK,KAAK,EAAE,GAAG,EACxC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACb,CAAC,CAAC,eAAe,EAAE,CAAC;YACpB,IAAI,QAAQ,EAAE;gBACZ,aAAa,EAAE,CAAC,EAAE,CAAC,CAAC;gBACpB,QAAQ,CAAC,MAAM,CAAC,CAAC;aAClB;QACH,CAAC,aAEA,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CACnB,2BACE,KAAC,IAAI,IAAC,IAAI,EAAC,QAAQ,YAAE,MAAM,EAAE,SAAS,EAAE,WAAW,GAAQ,EAC3D,eAAK,SAAS,EAAC,WAAW,aACxB,KAAC,IAAI,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,YAAY,YAClC,YAAY,CAAC,MAAM,CAAC,GAChB,EACP,KAAC,IAAI,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,YAAY,YAClC,MAAM,EAAE,SAAS,EAAE,cAAc,GAC7B,IACH,IACD,CACR,CAAC,CAAC,CAAC,CACF,eAAM,SAAS,EAAC,SAAS,YAAE,YAAY,CAAC,MAAM,CAAC,GAAQ,CACxD,EAED,KAAC,IAAI,IACH,IAAI,EAAC,gBAAgB,EACrB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,KAAK,CAAC,yBAAyB,EAAE;oBAC1C,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,KAAK,EAAE,GAAG;iBAClC,CAAC,GACF,KApCG,MAAM,CAAC,GAAG,CAqCX,CACP,CAAC,GACE,CACP,CAAC,CAAC,CAAC,IAAI,CACX,CAAC"}

package/mobile/lib/ui-kit/Select/useSelectPopup.d.ts

@@ -2,8 +2,9 @@ import type { OnCloseProps } from '../../model/OnCloseProps';
 import { type SelectPopupProps } from './SelectPopup';
 interface SelectPopupOptions extends SelectPopupProps, OnCloseProps {
     isOpen?: boolean;
+    onChangeQuery?: (value: string) => void;
 }
-export declare function useSelectPopup({ isOpen, options, value, query, onChange, onClose, iconVersion, }: SelectPopupOptions): {
+export declare function useSelectPopup({ isOpen, options, value, query, onChange, onClose, iconVersion, onChangeQuery, }: SelectPopupOptions): {
     current: HTMLDivElement | null;
 };
 export {};

package/mobile/lib/ui-kit/Select/useSelectPopup.js

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
 import { useOutsideClick } from '@redneckz/uni-jsx/lib/hooks/useOutsideClick';
 import { usePopupManager } from '../PopupManager/usePopupManager.js';
 import { SelectPopup } from './SelectPopup.js';
-export function useSelectPopup({ isOpen, options, value, query, onChange, onClose, iconVersion, }) {
+export function useSelectPopup({ isOpen, options, value, query, onChange, onClose, iconVersion, onChangeQuery, }) {
     const popup = usePopupManager();
     const close = useCallback(() => {
         popup.close();
@@ -12,6 +12,7 @@ export function useSelectPopup({ isOpen, options, value, query, onChange, onClos
     const handleChange = useCallback((option) => {
         close();
         onChange && onChange(option);
+        onChangeQuery && onChangeQuery('');
     }, [close, onChange]);
     const inputRef = useRef(null);
     const popupRef = useOutsideClick(close);
@@ -22,7 +23,7 @@ export function useSelectPopup({ isOpen, options, value, query, onChange, onClos
         const inputElement = inputRef.current;
         const { top, left, width, height } = inputElement.getBoundingClientRect();
         popup.open({
-            popup: (_jsx(SelectPopup, { popupRef: popupRef, options: options, value: value, query: query, onChange: handleChange, iconVersion: iconVersion })),
+            popup: (_jsx(SelectPopup, { popupRef: popupRef, options: options, value: value, query: query, onChange: handleChange, iconVersion: iconVersion, onChangeQuery: onChangeQuery })),
             top: top + window.scrollY + height,
             left,
             width,

package/mobile/lib/ui-kit/Select/useSelectPopup.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSelectPopup.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/useSelectPopup.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,WAAW,EAAyB,MAAM,eAAe,CAAC;AAMnE,MAAM,UAAU,cAAc,CAAC,EAC7B,MAAM,EACN,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,OAAO,EACP,WAAW,GACQ;IACnB,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAEhC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7B,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,OAAO,IAAI,OAAO,EAAE,CAAC;IACvB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,MAAc,EAAE,EAAE;QACjB,KAAK,EAAE,CAAC;QACR,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC,EACD,CAAC,KAAK,EAAE,QAAQ,CAAC,CAClB,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,eAAe,CAAiB,KAAK,CAAC,CAAC;IAExD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;YAChC,OAAO;SACR;QAED,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC;QACtC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC,qBAAqB,EAAE,CAAC;QAE1E,KAAK,CAAC,IAAI,CAAC;YACT,KAAK,EAAE,CACL,KAAC,WAAW,IACV,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE,WAAW,GACxB,CACH;YACD,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC,OAAO,GAAG,MAAM;YAClC,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC;IAElD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"useSelectPopup.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/useSelectPopup.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,WAAW,EAAyB,MAAM,eAAe,CAAC;AAOnE,MAAM,UAAU,cAAc,CAAC,EAC7B,MAAM,EACN,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,OAAO,EACP,WAAW,EACX,aAAa,GACM;IACnB,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAEhC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7B,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,OAAO,IAAI,OAAO,EAAE,CAAC;IACvB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,MAAc,EAAE,EAAE;QACjB,KAAK,EAAE,CAAC;QACR,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7B,aAAa,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC,EACD,CAAC,KAAK,EAAE,QAAQ,CAAC,CAClB,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,eAAe,CAAiB,KAAK,CAAC,CAAC;IAExD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;YAChC,OAAO;SACR;QAED,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC;QACtC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC,qBAAqB,EAAE,CAAC;QAE1E,KAAK,CAAC,IAAI,CAAC;YACT,KAAK,EAAE,CACL,KAAC,WAAW,IACV,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,GAC5B,CACH;YACD,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC,OAAO,GAAG,MAAM;YAClC,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC;IAElD,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/mobile/src/api/LeadServiceAPI.ts

@@ -9,7 +9,18 @@ export type LeadRequest = Record<string, JSONRecord | JSONScalar | null> & {
   phone?: string;
   email?: string;
   inn?: string;
+  innDadata?: string;
+  fullRegion?: string;
   secondaryPhoneNumber?: string;
+  partnerSymbolCode?: string;
+  companyNameByInn?: string;
+};
+
+type PFFormData = {
+  innDadata?: string;
+  fullRegion?: string;
+  partnerSymbolCode?: string;
+  companyNameByInn?: string;
 };
 
 export function LeadServiceAPI() {
@@ -22,11 +33,15 @@ export function LeadServiceAPI() {
       birthday,
       desiredMeetingDate,
       inn,
+      innDadata,
+      fullRegion,
       addressBranch,
       secondaryPhone = '',
       bankEmpolee,
       applicationDate,
       serviceDirection,
+      partnerSymbolCode,
+      companyNameByInn,
       ...staticBody
     } = body;
     const isNaturalPerson = isIndividualType && serviceDirection !== 'Юридическое лицо / ИП';
@@ -46,6 +61,7 @@ export function LeadServiceAPI() {
             applicationDate,
             ...getSecondaryPhone(secondaryPhone as string),
           }),
+      ...formatPFForm(typeForm, { innDadata, fullRegion, partnerSymbolCode, companyNameByInn }),
       ...staticBody,
     };
 
@@ -85,8 +101,17 @@ const getEmail = (email?: string, isNaturalPerson = true) => ({
   [isNaturalPerson ? 'email' : 'mail']: email,
 });
 
-const getSecondaryPhone = (secondaryPhone = '') => {
-  return !secondaryPhone || secondaryPhone === '+7 ('
+const getSecondaryPhone = (secondaryPhone = '') =>
+  !secondaryPhone || secondaryPhone === '+7 ('
     ? {}
     : { secondaryPhoneNumber: formatPhone(secondaryPhone) };
-};
+
+const formatPFForm = (typeForm?: string, data?: PFFormData) =>
+  typeForm === 'PF'
+    ? {
+        inn: data?.innDadata,
+        region: data?.fullRegion,
+        partnerComments: data?.partnerSymbolCode,
+        fullname: data?.companyNameByInn,
+      }
+    : {};

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

@@ -1378,5 +1378,89 @@
         }
       }
     }
+  ],
+  [
+    "Онлайн-заявка от партнера",
+    {
+      "content": {
+        "version": "primary",
+        "title": "Онлайн-заявка от партнера",
+        "typeForm": "PF",
+        "endpoint": "sendcorporatedlead",
+        "sections": [
+          {
+            "title": "Информация о партнере",
+            "inputs": [
+              {
+                "name": "partnerSymbolCode",
+                "required": true
+              }
+            ]
+          },
+          {
+            "title": "Информация о компании",
+            "columns": 2,
+            "inputs": [
+              {
+                "name": "innDadata",
+                "required": true
+              },
+              {
+                "name": "companyNameByInn",
+                "required": true
+              }
+            ]
+          },
+          {
+            "title": "Данные контактного лица",
+            "columns": 2,
+            "inputs": [
+              {
+                "name": "surname",
+                "required": true
+              },
+              {
+                "name": "name",
+                "required": true
+              },
+              {
+                "name": "phone",
+                "required": true
+              },
+              {
+                "name": "email"
+              }
+            ]
+          },
+          {
+            "title": "Регион компании",
+            "inputs": [
+              {
+                "name": "fullRegion",
+                "required": true
+              }
+            ]
+          },
+          {
+            "title": "Комментарий",
+            "inputs": [
+              {
+                "name": "comment"
+              }
+            ]
+          }
+        ],
+        "button": {
+          "text": "Отправить заявку",
+          "version": "primary"
+        },
+        "link": {
+          "text": "Согласен на обработку персональных данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        },
+        "isPremium": false
+      }
+    }
   ]
 ]

package/mobile/src/components/ApplicationForm/ApplicationForm.tsx

@@ -1,9 +1,10 @@
-import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { LeadServiceAPI } from '../../api/LeadServiceAPI';
 import { handleAspects } from '../../hooks/useAspects/handleAspects';
 import { useAspects } from '../../hooks/useAspects/useAspects';
-import { useForm } from '../../hooks/useForm/useForm';
+import { useForm, type FormFieldRegisterer } from '../../hooks/useForm/useForm';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
+import { type SectionsProps } from '../../model/InputSectionsType';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { getConsentDataProcessing } from '../../ui-kit/FormField/getConsentDataProcessing';
@@ -13,19 +14,29 @@ import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
 import { ResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/ResponseTypeDialog';
+import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
-import { type ApplicationFormContent, type FieldDef } from './ApplicationFormContent';
+import {
+  type additionalParamsType,
+  type ApplicationFormContent,
+  type FieldDef,
+} from './ApplicationFormContent';
 import { getFormatData } from './getFormatData';
 import { getInitialFormState, type FormState } from './getInitialFormState';
 import { renderAgreementSubmit } from './renderAgreementSubmit';
 import { renderContacts } from './renderContacts';
 
-interface ApplicationFormProps extends ApplicationFormContent, UniBlockProps {}
+export interface ApplicationFormProps extends ApplicationFormContent, UniBlockProps {}
+
+type renderSectionsType = {
+  typeForm: FormTypeFieldDef;
+  additionalParams?: additionalParamsType;
+};
 
 const API = LeadServiceAPI();
 
-export const ApplicationForm = JSX<ApplicationFormProps>(
+export const ApplicationForm = UniBlock<ApplicationFormProps>(
   ({
     className,
     title,
@@ -80,15 +91,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
         {...rest}
       >
         <form onSubmit={onSubmit}>
-          {sections.map((_, i) => (
-            <div
-              key={`section-${i}`}
-              className={style(inputColumnStyles(_.columns), 'grid gap-x-m')}
-            >
-              {renderTitle(_.title)}
-              {(_?.inputs || [])?.map(getField<FieldDef>(field, { typeForm }))}
-            </div>
-          ))}
+          {renderSections(sections, field, { typeForm, additionalParams })}
           {renderAgreementSubmit(
             fieldName ? field('consentDataProcessing') : undefined,
             link,
@@ -100,3 +103,15 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
     );
   },
 );
+
+const renderSections = (
+  sections: SectionsProps[],
+  field: FormFieldRegisterer<Record<string, any>>,
+  { typeForm, additionalParams }: renderSectionsType,
+) =>
+  sections.map((_, i) => (
+    <div key={`section-${i}`} className={style(inputColumnStyles(_.columns), 'grid gap-x-m')}>
+      {renderTitle(_.title)}
+      {(_?.inputs || [])?.map(getField<FieldDef>(field, { typeForm, ...additionalParams }))}
+    </div>
+  ));

package/mobile/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -1,6 +1,3 @@
-/* eslint-disable max-lines */
-/* eslint-disable max-len */
-
 import { type AspectsProps } from '../../model/AspectsProps';
 import { type ColumnsCount } from '../../model/ColumnCount';
 import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
@@ -71,11 +68,16 @@ type productType = {
   product?: string;
 };
 
+type premiumForm = {
+  /** @title Форма для премиума */
+  isPremium?: boolean;
+};
+
 /**
  * @title Отображать выбор продукта
  * @default { "showProduct": "" }
  */
-type additionalParamsType = hideProductDef | showProductDef;
+export type additionalParamsType = premiumForm | hideProductDef | showProductDef;
 
 /**
  * @title Форма заявки настраиваемая

package/mobile/src/hooks/useInn.ts

@@ -0,0 +1,16 @@
+import { getDaDataHints } from '../retail/api/dadataHints/dadataHints';
+
+const INN_DADATA_URL = 'suggest/party';
+
+interface InnHint {
+  fullName?: string;
+  address?: string;
+  inn?: string;
+}
+
+export const useInn = async (searchQuery: string): Promise<InnHint[]> =>
+  (await getDaDataHints({ url: INN_DADATA_URL, query: searchQuery })).map((_) => ({
+    fullName: _?.value,
+    address: _?.data?.address?.value,
+    inn: _?.data?.inn,
+  }));

package/mobile/src/model/FormTypeFieldDef.ts

@@ -23,4 +23,5 @@ export type FormTypeFieldDef =
   | 'CONT'
   | 'SUPPORT'
   | 'INVESTADVISER'
-  | 'FINOMBUDSMAN';
+  | 'FINOMBUDSMAN'
+  | 'PF';

package/mobile/src/retail/adaptors/getPersonalInfoData.tsx

@@ -37,7 +37,7 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
     dulIssuedBy,
     dulNumber,
     dulSerie,
-    dulSubdivisionCode,
+    dulSubdivisionCode: dulSubdivisionCode?.replace('-', ''),
     educationLevelCd: education,
     registrationDate: participantDateRegistration
       ? formatDate(participantDateRegistration, true)

package/mobile/src/retail/api/dadataHints/dadataHints.ts

@@ -2,19 +2,29 @@ import { type DaDataSuggestion, type ListRequestOption } from './dadataHintsType
 
 const DEFAULT_HINTS_COUNT = 10;
 
-const defaultResponseItemHandler = (item?: DaDataSuggestion): string => item?.value || '';
+const defaultResponseItemHandler = (item?: DaDataSuggestion) => ({
+  value: item?.value || '',
+});
 
 const getResponseHandler =
-  (itemHandler: (item?: DaDataSuggestion) => string) =>
+  (
+    itemHandler: (item?: DaDataSuggestion) => {
+      value: string;
+      additionalValue?: string;
+    },
+    responseFilter?: (item?: DaDataSuggestion) => boolean,
+  ) =>
   (response: { suggestions: Array<DaDataSuggestion> }) => {
     const responseData: Array<DaDataSuggestion> = response?.suggestions || [];
+    const filteredData = responseFilter ? responseData.filter(responseFilter) : responseData;
 
-    return responseData.map((item) => {
-      const value = itemHandler(item);
+    return filteredData.map((item) => {
+      const data = itemHandler(item);
 
       return {
         ...item,
-        processedValue: value,
+        processedValue: data.value,
+        additionalValue: data.additionalValue,
       };
     });
   };
@@ -26,8 +36,9 @@ export const getDaDataHints = (options: ListRequestOption): Promise<Array<DaData
     queryPrefix,
     requestData = {},
     responseItemHandler = defaultResponseItemHandler,
+    responseFilter,
   } = options;
-  const responseHandler = getResponseHandler(responseItemHandler);
+  const responseHandler = getResponseHandler(responseItemHandler, responseFilter);
   const queryPrefixValue = queryPrefix ? `${queryPrefix}, ` : '';
   const combinedQuery = `${queryPrefixValue}${query}`;
 

package/mobile/src/retail/api/dadataHints/dadataHintsType.ts

@@ -1,11 +1,11 @@
 import { type Nullable } from '@redneckz/uni-jsx/lib/utils/ts/Nullable';
-import { type HintOption } from './hintsListsOptions';
 
 export interface DaDataSuggestion {
   value: string;
   unrestricted_value: string;
   data: DaDataResponseItem;
   processedValue: string;
+  additionalValue?: string;
 }
 
 type DaDataGender = 'MALE' | 'FEMALE' | 'UNKNOWN';
@@ -74,6 +74,13 @@ export interface ListRequestOption {
   url: string;
   query?: string;
   queryPrefix?: string;
-  requestData?: HintOption['requestData'];
-  responseItemHandler?: (item?: DaDataSuggestion) => string;
+  requestData?: {
+    parts?: string[];
+    gender?: string;
+  };
+  responseItemHandler?: (item?: DaDataSuggestion) => {
+    value: string;
+    additionalValue?: string;
+  };
+  responseFilter?: (item?: DaDataSuggestion) => boolean;
 }

package/mobile/src/retail/api/dadataHints/hintsListsOptions.ts

@@ -1,4 +1,4 @@
-import { type DaDataSuggestion } from './dadataHintsType';
+import { type DaDataSuggestion, type ListRequestOption } from './dadataHintsType';
 
 const NAME_HINTS_LIST_OPTIONS = {
   url: 'suggest/fio',
@@ -34,23 +34,39 @@ const PASSPORT_FMS_HINTS_LIST_OPTIONS = {
 
 const PASSPORT_CODE_HINTS_LIST_OPTIONS = {
   url: 'suggest/fms_unit',
-  responseItemHandler: (item?: DaDataSuggestion) => item?.data?.code?.replace('-', '') || '',
+  responseItemHandler: (item?: DaDataSuggestion) => ({
+    value: item?.data?.code || '',
+    additionalValue: item?.data?.name,
+  }),
 };
 
 const ORGANIZATION_NAME_HINTS_LIST_OPTIONS = {
   url: 'suggest/party',
+  responseItemHandler: (item?: DaDataSuggestion) => {
+    const inn = item?.data?.inn;
+    const address = item?.data?.address?.value || '';
+    const additionalValue = address ? `${inn} ${address}` : inn;
+
+    return {
+      value: item?.value || '',
+      additionalValue,
+    };
+  },
 };
 
 const ORGANIZATION_INN_HINTS_LIST_OPTIONS = {
   url: 'suggest/party',
-  responseItemHandler: (item?: DaDataSuggestion) => item?.data?.inn || '',
+  responseItemHandler: (item?: DaDataSuggestion) => ({
+    value: item?.data?.inn || '',
+  }),
 };
 
 const ADDRESS_HINTS_LIST_OPTIONS = {
   url: 'suggest/address',
+  responseFilter: (item?: DaDataSuggestion) => Boolean(item?.data?.postal_code),
 };
 
-export type HintsListOptions = Record<string, HintOption>;
+export type HintsListOptions = Record<string, ListRequestOption>;
 
 export const hintsListsOptions: HintsListOptions = {
   name: NAME_HINTS_LIST_OPTIONS,
@@ -66,12 +82,3 @@ export const hintsListsOptions: HintsListOptions = {
   organizationAddress: ADDRESS_HINTS_LIST_OPTIONS,
   addressCourier: ADDRESS_HINTS_LIST_OPTIONS,
 };
-
-export type HintOption = {
-  url: string;
-  requestData?: {
-    parts?: string[];
-    gender?: string;
-  };
-  responseItemHandler?: (item?: DaDataSuggestion) => string;
-};

package/mobile/src/retail/components/DaDataInputControl/DaDataInputControl.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { type InputProps } from '../../../ui-kit/Input/InputProps';
 import { InputWrapper } from '../../../ui-kit/Input/InputWrapper';
@@ -20,6 +21,7 @@ export const DaDataInputControl = JSX<DaDataInputProps>(
     name = '',
     daDataQueryPrefix,
     dadata = false,
+    type,
     ...rest
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
@@ -33,10 +35,22 @@ export const DaDataInputControl = JSX<DaDataInputProps>(
       onDaDataChange,
     });
 
+    const handleChange = useCallback(
+      (e?: string) => {
+        let formattedValue = e ?? '';
+
+        if (type === 'number') {
+          formattedValue = formattedValue.replace(/^0+(?=\d)/, '');
+        }
+        onChange?.(formattedValue);
+      },
+      [onChange],
+    );
+
     return (
       <InputWrapper
         value={value}
-        onChange={onChange}
+        onChange={handleChange}
         inputRef={inputRef}
         isOpen={isOpen}
         onOpen={open}