@redneckz/wildless-cms-uni-blocks 0.14.688 → 0.14.690

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

@@ -1 +1 @@
-{"version":3,"file":"ResponseTypeDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/ResponseTypeDialog/ResponseTypeDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAMjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAA4B,UAAU,EACzE,YAAY,EACZ,QAAQ,GACT;IACC,MAAM,UAAU,GAAG,YAAY,KAAK,IAAI,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,kBAAkB,CAAC;IACtE,MAAM,EAAE,KAAK,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACrC,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,KAAK,EAAE,CAAC;IACV,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,MAAM,qBAAqB,GACzB,QAAQ,KAAK,WAAW;QACtB,CAAC,CAAC;;4CAEoC;QACtC,CAAC,CAAC,iCAAiC,CAAC;IAExC,OAAO,CACL,KAAC,MAAM,IAAC,SAAS,EAAC,2CAA2C,YAC3D,eAAK,SAAS,EAAC,wDAAwD,aACrE,KAAC,GAAG,IAAC,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAC,KAAK,EAAC,MAAM,EAAC,KAAK,GAAG,EACpF,KAAC,QAAQ,IACP,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,6BAA6B,EAC5E,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,+BAA+B,EACjF,eAAe,EAAC,IAAI,EACpB,UAAU,EAAE,IAAI,GAChB,EACF,KAAC,MAAM,IAAC,IAAI,EAAC,QAAQ,EAAC,OAAO,EAAE,WAAW,qDAEjC,IACL,GACC,CACV,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ResponseTypeDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/ResponseTypeDialog/ResponseTypeDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAQjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CACnC,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;IACtC,MAAM,UAAU,GAAG,YAAY,KAAK,IAAI,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,kBAAkB,CAAC;IAEtE,MAAM,qBAAqB,GACzB,QAAQ,KAAK,WAAW;QACtB,CAAC,CAAC;;4CAEkC;QACpC,CAAC,CAAC,iCAAiC,CAAC;IAExC,OAAO,CACL,KAAC,MAAM,IAAC,SAAS,EAAC,0CAA0C,EAAC,OAAO,EAAE,OAAO,YAC3E,eAAK,SAAS,EAAC,wDAAwD,aACrE,KAAC,GAAG,IAAC,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAC,KAAK,EAAC,MAAM,EAAC,KAAK,GAAG,EACpF,KAAC,QAAQ,IACP,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,6BAA6B,EAC5E,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,+BAA+B,EACjF,eAAe,EAAC,IAAI,EACpB,UAAU,EAAE,IAAI,GAChB,EACF,KAAC,MAAM,IAAC,IAAI,EAAC,QAAQ,EAAC,OAAO,EAAE,OAAO,qDAE7B,IACL,GACC,CACV,CAAC;AACJ,CAAC,CACF,CAAC"}

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

@@ -3,17 +3,18 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { style } from '../../utils/style.js';
 import { CloseButton } from '../DialogManager/CloseButton.js';
+import { useDialog } from '../DialogManager/useDialog.js';
+import { SearchDialog } from '../SearchDialog/SearchDialog.js';
 import { SearchInput } from '../SearchDialog/SearchInput.js';
-import { useSearchDialog } from '../SearchDialog/useSearchDialog.js';
 const MIN_QUERY_LEN = 3;
 export const SearchBar = JSX(({ className, search, ...rest }) => {
     const [value, setValue] = useState('');
     const resetQueryOnDialogClose = useCallback(() => setValue(''), []);
-    const searchDialog = useSearchDialog(rest);
+    const searchDialog = useDialog(SearchDialog, rest);
     const handleInitialInputChange = useCallback((_) => {
         setValue(_);
         if (isQueryLongEnough(_)) {
-            searchDialog.open({ initialQuery: _ }, { onClose: resetQueryOnDialogClose });
+            searchDialog.open({ initialQuery: _, onClose: resetQueryOnDialogClose });
         }
     }, [resetQueryOnDialogClose, searchDialog]);
     return (_jsxs("div", { className: style('relative', className), role: "search", children: [_jsx(SearchInput, { value: value, placeholder: search?.placeholder, onChange: handleInitialInputChange }), _jsx(CloseButton, { className: "absolute top-0 right-0 sm:hidden", onClose: resetQueryOnDialogClose })] }));

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

@@ -1 +1 @@
-{"version":3,"file":"SearchBar.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchBar/SearchBar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGpE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAQlE,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAiB,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC9E,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEvC,MAAM,uBAAuB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAE3C,MAAM,wBAAwB,GAAG,WAAW,CAC1C,CAAC,CAAS,EAAE,EAAE;QACZ,QAAQ,CAAC,CAAC,CAAC,CAAC;QACZ,IAAI,iBAAiB,CAAC,CAAC,CAAC,EAAE;YACxB,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;SAC9E;IACH,CAAC,EACD,CAAC,uBAAuB,EAAE,YAAY,CAAC,CACxC,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,IAAI,EAAC,QAAQ,aACzD,KAAC,WAAW,IACV,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,WAAW,EAChC,QAAQ,EAAE,wBAAwB,GAClC,EACF,KAAC,WAAW,IAAC,SAAS,EAAC,kCAAkC,EAAC,OAAO,EAAE,uBAAuB,GAAI,IAC1F,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,aAAa,CAAC"}
+{"version":3,"file":"SearchBar.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchBar/SearchBar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGpE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAQ1D,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAiB,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC9E,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEvC,MAAM,uBAAuB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAEnD,MAAM,wBAAwB,GAAG,WAAW,CAC1C,CAAC,CAAS,EAAE,EAAE;QACZ,QAAQ,CAAC,CAAC,CAAC,CAAC;QACZ,IAAI,iBAAiB,CAAC,CAAC,CAAC,EAAE;YACxB,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;SAC1E;IACH,CAAC,EACD,CAAC,uBAAuB,EAAE,YAAY,CAAC,CACxC,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,IAAI,EAAC,QAAQ,aACzD,KAAC,WAAW,IACV,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,WAAW,EAChC,QAAQ,EAAE,wBAAwB,GAClC,EACF,KAAC,WAAW,IAAC,SAAS,EAAC,kCAAkC,EAAC,OAAO,EAAE,uBAAuB,GAAI,IAC1F,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,aAAa,CAAC"}

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

@@ -2,5 +2,6 @@ import { type TopMenuItemProps } from '../../data/NavigationData';
 export interface SearchDialogProps {
     initialQuery?: string;
     navigationItems?: TopMenuItemProps[];
+    onClose?: () => void;
 }
 export declare const SearchDialog: import("@redneckz/uni-jsx").UNIComponent<SearchDialogProps, any, any>;

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

@@ -7,14 +7,14 @@ import { joinPath } from '../../utils/url.js';
 import { Dialog } from '../DialogManager/Dialog.js';
 import { Sitemap } from '../Sitemap/Sitemap.js';
 import { SearchInput } from './SearchInput.js';
-export const SearchDialog = JSX(({ initialQuery, navigationItems }) => {
+export const SearchDialog = JSX(({ initialQuery, navigationItems, onClose }) => {
     const basePathList = useMemo(() => navigationItems?.map((_) => _.href || '/'), [navigationItems]);
     const [searchResult, searchInputProps] = useSearch({
         basePathList,
         initialQuery,
     });
     const searchItems = useMemo(() => combineTopItemsAndSearchResult(navigationItems)(searchResult), [navigationItems, searchResult]);
-    return (_jsx(Dialog, { head: _jsx(SearchInput, { autoFocus: true, ...searchInputProps }), children: _jsx(Sitemap, { navigationItems: searchItems }) }));
+    return (_jsx(Dialog, { head: _jsx(SearchInput, { autoFocus: true, ...searchInputProps }), onClose: onClose, children: _jsx(Sitemap, { navigationItems: searchItems }) }));
 });
 const combineTopItemsAndSearchResult = (topItems) => (searchResult) => topItems?.length && searchResult?.length
     ? zip(topItems, searchResult).map(([_, portalSearchResult]) => ({

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

@@ -1 +1 @@
-{"version":3,"file":"SearchDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchDialog/SearchDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,OAAO,EAAE,SAAS,EAAqB,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAO5C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAoB,CAAC,EAAE,YAAY,EAAE,eAAe,EAAE,EAAE,EAAE;IACvF,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAClG,MAAM,CAAC,YAAY,EAAE,gBAAgB,CAAC,GAAG,SAAS,CAAC;QACjD,YAAY;QACZ,YAAY;KACb,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,8BAA8B,CAAC,eAAe,CAAC,CAAC,YAAY,CAAC,EACnE,CAAC,eAAe,EAAE,YAAY,CAAC,CAChC,CAAC;IAEF,OAAO,CACL,KAAC,MAAM,IAAC,IAAI,EAAE,KAAC,WAAW,IAAC,SAAS,EAAE,IAAI,KAAM,gBAAgB,GAAI,YAClE,KAAC,OAAO,IAAC,eAAe,EAAE,WAAW,GAAI,GAClC,CACV,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,8BAA8B,GAClC,CAAC,QAAwC,EAAE,EAAE,CAC7C,CAAC,YAA6C,EAAsB,EAAE,CACpE,QAAQ,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM;IACtC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,GAAG,CAAC;QACJ,KAAK,EAAE,kBAAkB,EAAE,GAAG,CAC5B,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAC3E;KACF,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC"}
+{"version":3,"file":"SearchDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchDialog/SearchDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,OAAO,EAAE,SAAS,EAAqB,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQ5C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAoB,CAAC,EAAE,YAAY,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE,EAAE;IAChG,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAClG,MAAM,CAAC,YAAY,EAAE,gBAAgB,CAAC,GAAG,SAAS,CAAC;QACjD,YAAY;QACZ,YAAY;KACb,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,8BAA8B,CAAC,eAAe,CAAC,CAAC,YAAY,CAAC,EACnE,CAAC,eAAe,EAAE,YAAY,CAAC,CAChC,CAAC;IAEF,OAAO,CACL,KAAC,MAAM,IAAC,IAAI,EAAE,KAAC,WAAW,IAAC,SAAS,EAAE,IAAI,KAAM,gBAAgB,GAAI,EAAE,OAAO,EAAE,OAAO,YACpF,KAAC,OAAO,IAAC,eAAe,EAAE,WAAW,GAAI,GAClC,CACV,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,8BAA8B,GAClC,CAAC,QAAwC,EAAE,EAAE,CAC7C,CAAC,YAA6C,EAAsB,EAAE,CACpE,QAAQ,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM;IACtC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,GAAG,CAAC;QACJ,KAAK,EAAE,kBAAkB,EAAE,GAAG,CAC5B,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAC3E;KACF,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC"}

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

@@ -21,7 +21,8 @@ export function useSelectPopup({ isOpen, options, value, query, onChange, onClos
         }
         const inputElement = inputRef.current;
         const { top, left, width, height } = inputElement.getBoundingClientRect();
-        popup.update(_jsx(SelectPopup, { popupRef: popupRef, options: options, value: value, query: query, onChange: handleChange, iconVersion: iconVersion }), {
+        popup.open({
+            popup: (_jsx(SelectPopup, { popupRef: popupRef, options: options, value: value, query: query, onChange: handleChange, iconVersion: iconVersion })),
             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;AAC9E,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,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,MAAM,CACV,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,EACF;YACE,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC,OAAO,GAAG,MAAM;YAClC,IAAI;YACJ,KAAK;SACN,CACF,CAAC;IACJ,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;AAC9E,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,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"}

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

@@ -1,6 +1,4 @@
 export interface VerifyPhoneDialogProps {
-    close?: (smsCode?: string) => void;
-    onClose?: () => void;
     title?: string;
     description?: string;
     code?: boolean;
@@ -8,5 +6,7 @@ export interface VerifyPhoneDialogProps {
     codeLength?: number;
     textButton?: string;
     phoneNumber?: string;
+    onSuccess?: (smsCode?: string) => void;
+    onClose?: () => void;
 }
 export declare const VerifyPhoneDialog: import("@redneckz/uni-jsx").UNIComponent<VerifyPhoneDialogProps, any, any>;

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

@@ -4,8 +4,9 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { sendCode } from '../../api/RetailAPI/sendCode.js';
 import { Headline } from '../../components/Headline/Headline.js';
 import { noop } from '../../utils/noop.js';
-import { useCaptchaDialog } from '../CaptchaDialog/useCaptchaDialog.js';
+import { CaptchaDialog } from '../CaptchaDialog/CaptchaDialog.js';
 import { Dialog } from '../DialogManager/Dialog.js';
+import { useDialog } from '../DialogManager/useDialog.js';
 import { LinkButton } from '../LinkButton/LinkButton.js';
 import { Loader } from '../Loader/Loader.js';
 import { RichText } from '../RichText/RichText.js';
@@ -13,28 +14,28 @@ import { Timer } from '../TimerCircle/Timer.js';
 import { InputCode } from './InputCode.js';
 import { SubmitButton } from './SubmitButton.js';
 import { useVerifyPhoneDialogSubmit } from './useVerifyPhoneDialogSubmit.js';
-export const VerifyPhoneDialog = JSX(({ close = noop, onClose = noop, title, description, __html, code = true, codeLength = 4, textButton = 'Далее', phoneNumber = '+79999999999', }) => {
+export const VerifyPhoneDialog = JSX(({ title, description, __html, code = true, codeLength = 4, textButton = 'Далее', phoneNumber = '+79999999999', onSuccess = noop, onClose = noop, }) => {
     const [values, setValues] = useState(Array(codeLength).fill(''));
-    const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setIsTimerStarted, setAttemps, } = useVerifyPhoneDialogSubmit({ values, close });
+    const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setIsTimerStarted, setAttempts, } = useVerifyPhoneDialogSubmit({ values, onSuccess });
+    const captchaDialog = useDialog(CaptchaDialog);
     const handleSendCode = useCallback(async () => {
         const isSuccessSendCode = await sendCode({
-            phoneNumber: phoneNumber,
+            phoneNumber,
             smsCodesSetName: { key: 'AUTHENTICATION' },
         });
         if (isSuccessSendCode) {
-            setAttemps(0);
+            setAttempts(0);
             setTimeNextReq(180);
             setIsTimerStarted(true);
         }
         else {
-            captchaDialog.open();
+            captchaDialog.open({ phoneNumber, sendCode: handleSendCode, onClose });
         }
-    }, []);
-    const captchaDialog = useCaptchaDialog({ phoneNumber, sendCode: handleSendCode }, onClose);
+    }, [phoneNumber, onClose]);
     useEffect(() => {
         handleSendCode();
     }, []);
-    return (_jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-xl px-5xl py-0", children: _jsxs("div", { className: "flex flex-col gap-xl items-center rounded-md", children: [_jsx(Headline, { className: "w-full", title: title, description: description, headlineVersion: "XS", isEmbedded: true, as: "h6" }), code ? (_jsx(InputCode, { values: values, setValues: setValues, errorText: errorText, hasError: hasError })) : null, renderText(timeNextReq, setTimeNextReq, handleSendCode), _jsx(RichText, { itemSize: "list-s", __html: __html }), renderTextButton(textButton, isSubmitButtonDisabled, handleSubmit), isLoading ? _jsx(Loader, { blur: false }) : null] }) }));
+    return (_jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-xl px-5xl py-0", onClose: onClose, children: _jsxs("div", { className: "flex flex-col gap-xl items-center rounded-md", children: [_jsx(Headline, { className: "w-full", title: title, description: description, headlineVersion: "XS", isEmbedded: true, as: "h6" }), code ? (_jsx(InputCode, { values: values, setValues: setValues, errorText: errorText, hasError: hasError })) : null, renderText(timeNextReq, setTimeNextReq, handleSendCode), _jsx(RichText, { itemSize: "list-s", __html: __html }), renderTextButton(textButton, isSubmitButtonDisabled, handleSubmit), isLoading ? _jsx(Loader, { blur: false }) : null] }) }));
 });
 const renderTextButton = (textButton, isDisabled, handleSubmit) => textButton ? (_jsx(SubmitButton, { isDisabled: isDisabled, onClick: handleSubmit, text: textButton })) : null;
 const renderText = (timeNextReq, setTimeNextReq, handleSendCode) => timeNextReq ? (_jsxs("div", { className: "flex flex-row text-l font-light text-base", children: ["\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434 \u043C\u043E\u0436\u043D\u043E \u0447\u0435\u0440\u0435\u0437", _jsx(Timer, { className: "text-base ml-1", time: timeNextReq, setTime: setTimeNextReq })] })) : (_jsx(LinkButton, { onClick: handleSendCode, className: "text-primary-main", children: "\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434" }));

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

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

package/mobile/lib/ui-kit/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts

@@ -1,8 +1,8 @@
 declare type useVerifyPhoneDialogSubmitProps = {
     values: string[];
-    close?: (smsCode?: string) => void;
+    onSuccess?: (smsCode?: string) => void;
 };
-export declare const useVerifyPhoneDialogSubmit: ({ close, values }: useVerifyPhoneDialogSubmitProps) => {
+export declare const useVerifyPhoneDialogSubmit: ({ values, onSuccess, }: useVerifyPhoneDialogSubmitProps) => {
     handleSubmit: () => Promise<void>;
     hasError: boolean;
     errorText: string;
@@ -11,6 +11,6 @@ export declare const useVerifyPhoneDialogSubmit: ({ close, values }: useVerifyPh
     isSubmitButtonDisabled: boolean;
     setTimeNextReq: (value: number | ((prevState: number) => number)) => void;
     setIsTimerStarted: (value: boolean | ((prevState: boolean) => boolean)) => void;
-    setAttemps: (value: number | ((prevState: number) => number)) => void;
+    setAttempts: (value: number | ((prevState: number) => number)) => void;
 };
 export {};

package/mobile/lib/ui-kit/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js

@@ -1,56 +1,47 @@
-import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { checkCode } from '../../api/RetailAPI/checkCode.js';
-export const useVerifyPhoneDialogSubmit = ({ close, values }) => {
-    const [hasError, setHasError] = useState(false);
+export const useVerifyPhoneDialogSubmit = ({ values, onSuccess, }) => {
     const [errorText, setErrorText] = useState('');
     const [isLoading, setIsLoading] = useState(false);
     const [timeNextReq, setTimeNextReq] = useState(0);
     const [isTimerStarted, setIsTimerStarted] = useState(false);
-    const [attemps, setAttemps] = useState(0);
-    const resetError = useCallback(() => {
-        setHasError(false);
-        setErrorText('');
-    }, []);
-    const isTimeExpired = useMemo(() => timeNextReq === 0 && isTimerStarted, [timeNextReq, isTimerStarted]);
-    const isSubmitButtonDisabled = useMemo(() => attemps > 2 || !values.every(Boolean) || isTimeExpired, [values]);
+    const [attempts, setAttempts] = useState(0);
+    const resetError = useCallback(() => setErrorText(''), []);
+    const isTimeExpired = Boolean(timeNextReq === 0 && isTimerStarted);
+    const isSubmitButtonDisabled = attempts > 2 || isTimeExpired || !values.every(Boolean);
     const handleSubmit = useCallback(async () => {
         try {
             setIsTimerStarted(false);
             setTimeNextReq(0);
-            setAttemps(attemps + 1);
+            setAttempts((_) => _ + 1);
             setIsLoading(true);
             await checkCode({
                 smsText: values.join(''),
                 smsCodesSetName: { key: 'AUTHENTICATION' },
             });
             resetError();
-            close && close(values.join(''));
+            onSuccess?.(values.join(''));
         }
         catch {
+            setErrorText(attempts > 1 ? 'Исчерпан лимит ввода смс-кода' : 'Неверный код');
+        }
+        finally {
             setIsLoading(false);
-            attemps > 1 ? setErrorText('Исчерпан лимит ввода смс-кода') : setErrorText('Неверный код');
-            setHasError(true);
         }
-    }, [values, attemps]);
+    }, [values, attempts]);
     useEffect(() => {
-        if (isTimeExpired) {
-            setHasError(true);
-            setErrorText('Код просрочен');
-        }
-        else {
-            setHasError(false);
-        }
+        setErrorText(isTimeExpired ? 'Код просрочен' : '');
     }, [isTimeExpired]);
     return {
         handleSubmit,
-        hasError,
+        hasError: Boolean(errorText),
         errorText,
         isLoading,
         timeNextReq,
         isSubmitButtonDisabled,
         setTimeNextReq,
         setIsTimerStarted,
-        setAttemps,
+        setAttempts,
     };
 };
 //# sourceMappingURL=useVerifyPhoneDialogSubmit.js.map

package/mobile/lib/ui-kit/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js.map

@@ -1 +1 @@
-{"version":3,"file":"useVerifyPhoneDialogSubmit.js","sourceRoot":"","sources":["../../../src/ui-kit/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAO1D,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,EAAmC,EAAE,EAAE;IAC/F,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAS,CAAC,CAAC,CAAC;IAC1D,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;QAClC,WAAW,CAAC,KAAK,CAAC,CAAC;QACnB,YAAY,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CAAC,WAAW,KAAK,CAAC,IAAI,cAAc,EACzC,CAAC,WAAW,EAAE,cAAc,CAAC,CAC9B,CAAC;IAEF,MAAM,sBAAsB,GAAG,OAAO,CACpC,GAAG,EAAE,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,aAAa,EAC5D,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC1C,IAAI;YACF,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzB,cAAc,CAAC,CAAC,CAAC,CAAC;YAClB,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;YACxB,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,MAAM,SAAS,CAAC;gBACd,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,eAAe,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE;aAC3C,CAAC,CAAC;YACH,UAAU,EAAE,CAAC;YACb,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;SACjC;QAAC,MAAM;YACN,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;YAC3F,WAAW,CAAC,IAAI,CAAC,CAAC;SACnB;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAEtB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,aAAa,EAAE;YACjB,WAAW,CAAC,IAAI,CAAC,CAAC;YAClB,YAAY,CAAC,eAAe,CAAC,CAAC;SAC/B;aAAM;YACL,WAAW,CAAC,KAAK,CAAC,CAAC;SACpB;IACH,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpB,OAAO;QACL,YAAY;QACZ,QAAQ;QACR,SAAS;QACT,SAAS;QACT,WAAW;QACX,sBAAsB;QACtB,cAAc;QACd,iBAAiB;QACjB,UAAU;KACX,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"useVerifyPhoneDialogSubmit.js","sourceRoot":"","sources":["../../../src/ui-kit/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAO1D,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,EACzC,MAAM,EACN,SAAS,GACuB,EAAE,EAAE;IACpC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE5C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAE3D,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,KAAK,CAAC,IAAI,cAAc,CAAC,CAAC;IACnE,MAAM,sBAAsB,GAAG,QAAQ,GAAG,CAAC,IAAI,aAAa,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAEvF,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC1C,IAAI;YACF,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzB,cAAc,CAAC,CAAC,CAAC,CAAC;YAClB,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1B,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,MAAM,SAAS,CAAC;gBACd,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,eAAe,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE;aAC3C,CAAC,CAAC;YACH,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;SAC9B;QAAC,MAAM;YACN,YAAY,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;SAC/E;gBAAS;YACR,YAAY,CAAC,KAAK,CAAC,CAAC;SACrB;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEvB,SAAS,CAAC,GAAG,EAAE;QACb,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpB,OAAO;QACL,YAAY;QACZ,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC;QAC5B,SAAS;QACT,SAAS;QACT,WAAW;QACX,sBAAsB;QACtB,cAAc;QACd,iBAAiB;QACjB,WAAW;KACZ,CAAC;AACJ,CAAC,CAAC"}

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

@@ -5,13 +5,14 @@ import { handleAspects } from '../../hooks/useAspects/handleAspects';
 import { useAspects } from '../../hooks/useAspects/useAspects';
 import { useForm } from '../../hooks/useForm';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
+import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { getConsentDataProcessing } from '../../ui-kit/FormField/getConsentDataProcessing';
 import { getField } from '../../ui-kit/FormField/getField';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
-import { useResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/useResponseTypeDialog';
+import { ResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/ResponseTypeDialog';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { objectValidator } from '../../validation/objectValidator';
@@ -44,7 +45,9 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
     const inputs = (sections?.flatMap((_) => _?.inputs) || []) as FieldDef[];
     const initialFormState = getInitialFormState(inputs, typeForm);
     const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
-    const responseTypeDialog = useResponseTypeDialog({ typeForm });
+
+    const responseTypeDialog = useDialog(ResponseTypeDialog);
+
     const handleSubmit = useCallback(
       async (formData: FormState, ev: PreventableEventWithTarget) => {
         const inputsFiltered = getFilteredInputs(inputs, formData);
@@ -57,7 +60,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
         setResponseType(status);
 
         if (status) {
-          responseTypeDialog.open({ responseType: status });
+          responseTypeDialog.open({ typeForm, responseType: status });
         }
         if (status === 'OK' && data) {
           const aspects = useAspects();
@@ -66,7 +69,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
 
         return status;
       },
-      [],
+      [typeForm],
     );
 
     const [, { field, onSubmit, reset }] = useForm(initialFormState, { onSubmit: handleSubmit });

package/mobile/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -1,12 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
+import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { Loader } from '../../ui-kit/Loader/Loader';
-import { useResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/useResponseTypeDialog';
+import { ResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/ResponseTypeDialog';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { renderInputs } from '../ApplicationForm/renderInputs';
@@ -22,7 +23,6 @@ interface ApplicationLeadFormProps extends ApplicationLeadFormContent, UniBlockP
 export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   ({ className, title, programId = '', nextStepLink = '/credit-lead', button, ...rest }) => {
     const inputs = (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldDef[];
-    const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
 
     const { isLoading } = useInitApplicationLead(nextStepLink);
     const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
@@ -34,19 +34,14 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       saveForm: setLeadForm,
     });
 
-    if (responseStatus) {
-      const responseTypeDialog = useResponseTypeDialog({ responseType: responseStatus });
-      responseTypeDialog.open();
-    }
-
-    const [, { field, onSubmit, reset }] = useForm(initialFormState, { onSubmit: handleSubmit });
+    const [, { field, onSubmit }] = useForm(initialFormState, { onSubmit: handleSubmit });
 
+    const responseTypeDialog = useDialog(ResponseTypeDialog);
     useEffect(() => {
-      if (responseType === 'OK') {
-        setResponseType('');
-        reset();
+      if (responseStatus) {
+        responseTypeDialog.open({ responseType: responseStatus });
       }
-    }, [responseType]);
+    }, [responseStatus]);
 
     return (
       <ApplicationFormLayout

package/mobile/src/components/ApplicationLeadForm/useApplicationLeadApi.ts

@@ -6,9 +6,10 @@ import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
 import { getUpdateUserProfileData } from '../../api/RetailAPI/utils/getUpdateUserProfile';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { useConsentBkiDialog } from '../../ui-kit/ConsentBkiDialog/useConsentBkiDialog';
+import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { useEsiaLoginDialog } from '../../ui-kit/EsiaLoginDialog/useEsiaLoginDialog';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
-import { useVerifyPhoneDialog } from '../../ui-kit/VerifyPhoneDialog/useVerifyPhoneDialog';
+import { VerifyPhoneDialog } from '../../ui-kit/VerifyPhoneDialog/VerifyPhoneDialog';
 import { formatPhone } from '../../utils/formatPhone';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
@@ -42,9 +43,10 @@ export const useApplicationLeadApi = ({
   const [, setProfileId] = useLocalStorage<number>('profileId');
   const [, setParticipantId] = useLocalStorage<number>('participantId');
   const [, setProgramId] = useLocalStorage<string>('programId');
-  const esiaLoginDialog = useEsiaLoginDialog(nextStepLink);
-  const consentBkiDialog = useConsentBkiDialog(esiaLoginDialog.open);
-  const verifyPhoneDialog = useVerifyPhoneDialog();
+
+  const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
+  const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
+  const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
 
   const saveUserData = useCallback(
     ({ participantId, taskId, profileId, programId: programNumber }: UserData) => {
@@ -60,7 +62,7 @@ export const useApplicationLeadApi = ({
   const handleSubmit = useCallback(async (formData: FormState) => {
     const feedbackValidator = objectValidator(getObjectValidator(inputs));
     if (!isValidationSuccess(feedbackValidator(formData))) {
-      return console.warn('validation fail');
+      return;
     }
 
     try {
@@ -89,10 +91,10 @@ export const useApplicationLeadApi = ({
           .filter((_) => formData[_])
           .map((_) => CONSENTS[_]?.text);
 
-        verifyPhoneDialog.open(
-          handleSuccessVerify,
-          verifyPhoneContent(formData?.phone, acceptedConsents),
-        );
+        verifyPhoneDialog.open({
+          ...verifyPhoneContent(formData?.phone, acceptedConsents),
+          onSuccess: handleSuccessVerify,
+        });
       }
     } catch {
       setResponseStatus('Fail');

package/mobile/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -1,5 +1,5 @@
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { updateProfileEsia } from '../../api/RetailAPI/updateProfileEsia';
 import { locationNavigator } from '../../external/locationNavigator';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
@@ -8,36 +8,43 @@ import { parseEsiaProfile } from './pasreEsiaProfile';
 
 export const useInitApplicationLead = (nextStepLink: string) => {
   const navigator = locationNavigator();
-  const [isLoading, setIsLoading] = useState(false);
-  const [profileId] = useLocalStorage<string>('profileId');
-  const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
-  const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
-  const code = params.get('code');
-  const state = params.get('state');
-
-  const updateEsiaProfile = useCallback(async () => {
-    if (profileId && code && state) {
-      const data = await updateProfileEsia({
-        profileId: profileId,
-        code,
-        state,
-        redirectUri: navigator.href,
-      });
+  const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
+  const [, setLeadForm] = useLocalStorage<FormState>('leadForm');
 
-      data &&
-        setLeadForm({
-          ...leadForm,
-          ...parseEsiaProfile(data),
+  const updateEsiaProfile = useCallback(
+    async (profileId: string, code: string, state: string) => {
+      startLoading();
+      try {
+        const data = await updateProfileEsia({
+          profileId,
+          code,
+          state,
+          redirectUri: globalThis.location?.href,
         });
 
-      navigator.assign(nextStepLink);
-    }
-  }, []);
+        if (data) {
+          setLeadForm((_) => ({
+            ..._,
+            ...parseEsiaProfile(data),
+          }));
+        }
+
+        navigator.assign(nextStepLink);
+      } finally {
+        endLoading();
+      }
+    },
+    [nextStepLink],
+  );
 
   useEffect(() => {
-    if (code) {
-      setIsLoading(true);
-      updateEsiaProfile();
+    const profileId: string = JSON.parse(globalThis.localStorage?.getItem('profileId') ?? 'null');
+    const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
+    const code = params.get('code');
+    const state = params.get('state');
+
+    if (profileId && code && state) {
+      updateEsiaProfile(profileId, code, state);
     } else {
       sessionStorage.removeItem('accessToken');
       sessionStorage.removeItem('refreshToken');

package/mobile/src/components/CreditCardForm/StepsNavigationButtons.tsx

@@ -8,7 +8,7 @@ export interface StepsNavigationButtonsProps {
 
 export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(({ step, onPrevStep }) => {
   const isFirstStep = step === 0;
-  const isFinalStep = step === 6;
+  const isFinalStep = step === 5;
 
   return (
     <div className="flex justify-between gap-m">

package/mobile/src/components/CreditCardForm/calculateInputs.ts

@@ -30,9 +30,6 @@ const checkIsRetiree = (step: number, getValue: GetValue) =>
 const checkBusinessOwner = ({ name }: FieldDef, getValue: GetValue) =>
   name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
 
-const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
-  name === 'snils' && !getValue('consentPfrFlg');
-
 const checkAddressFillFromESIA = ({ name, filledByEsia }: FieldDef, getValue: GetValue) =>
   name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
 
@@ -46,3 +43,9 @@ export const checkCondition = ({ condition }: FieldDef, getValue: GetValue) =>
 
     return _ !== ((dataValue as Option)?.key ?? dataValue);
   });
+
+const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
+  name === 'snils' && isSnilsRequired(getValue);
+
+const isSnilsRequired = (getValue: GetValue) =>
+  getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';

package/mobile/src/components/CreditCardForm/creditCardFormStepsData.tsx

@@ -34,8 +34,8 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
         { fieldType: 'common', name: 'middleName', dadata: true, filledByEsia: true },
         { fieldType: 'common', name: 'sex', required: true },
         { fieldType: 'common', name: 'limitedBirthday', required: true, filledByEsia: true },
-        { fieldType: 'common', name: 'birthPlace', required: true },
-        { fieldType: 'common', name: 'phone', required: true },
+        { fieldType: 'common', name: 'birthPlace', required: true, filledByEsia: true },
+        { fieldType: 'common', name: 'phone', required: true, filledByEsia: true },
         { fieldType: 'common', name: 'email', required: true, dadata: true },
       ],
     },
@@ -119,7 +119,7 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'employment' },
+        { fieldType: 'common', name: 'employment', required: true },
         { fieldType: 'common', name: 'organizationName', required: true, dadata: true },
       ],
     },
@@ -132,15 +132,15 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'organization', required: false },
-        { fieldType: 'common', name: 'amountWorkers', required: false },
+        { fieldType: 'common', name: 'organization', required: true },
+        { fieldType: 'common', name: 'amountWorkers', required: true },
       ],
     },
     {
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'employerActivities', required: false },
-        { fieldType: 'common', name: 'employerOrganization', required: false },
+        { fieldType: 'common', name: 'employerActivities', required: true },
+        { fieldType: 'common', name: 'employerOrganization', required: true },
         { fieldType: 'common', name: 'generalSeniority', required: true },
         { fieldType: 'common', name: 'lastJobExperience', required: true },
         { fieldType: 'common', name: 'experience5Years', required: true },
@@ -161,7 +161,7 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
     {
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'positionOrganization', required: false },
+        { fieldType: 'common', name: 'positionOrganization', required: true },
         {
           fieldType: 'common',
           name: 'partInBusiness',
@@ -208,6 +208,10 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
         },
       ],
     },
+    {
+      columns: 1,
+      inputs: [{ fieldType: 'common', name: 'confirmationIncome', required: true }],
+    },
     {
       columns: 1,
       inputs: [{ fieldType: 'common', name: 'wages', required: true }],
@@ -245,7 +249,12 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
       inputs: [{ fieldType: 'common', name: 'shareholderFlg' }],
     },
     {
-      inputs: [{ fieldType: 'common', name: 'legalEntityName' }],
+      inputs: [
+        {
+          fieldType: 'common',
+          name: 'legalEntityName',
+        },
+      ],
     },
     {
       inputs: [{ fieldType: 'common', name: 'creditInRshbCd' }],