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

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

@@ -11,66 +11,63 @@ import { Logo } from '../Logo/Logo';
 export interface CaptchaDialogProps {
   phoneNumber: string;
   sendCode?: () => void;
-  close?: () => void;
   onClose?: () => void;
 }
 
-export const CaptchaDialog = JSX<CaptchaDialogProps>(
-  ({ phoneNumber, close, sendCode, onClose }) => {
-    const [captcha, setCaptcha] = useState('');
-    const [code, setCode] = useState('');
-    const [hasError, setHasError] = useState(false);
+export const CaptchaDialog = JSX<CaptchaDialogProps>(({ phoneNumber, sendCode, onClose }) => {
+  const [captcha, setCaptcha] = useState('');
+  const [code, setCode] = useState('');
+  const [hasError, setHasError] = useState(false);
 
-    const handleCheckCaptcha = useCallback(async () => {
-      const isValidCode = await checkCaptcha({ captchaText: code });
+  const handleCheckCaptcha = useCallback(async () => {
+    const isValidCode = await checkCaptcha({ captchaText: code });
 
-      if (isValidCode) {
-        sendCode?.();
-        close?.();
-      } else {
-        setHasError(isValidCode);
-      }
-    }, [code]);
+    if (isValidCode) {
+      sendCode?.();
+      onClose?.();
+    } else {
+      setHasError(isValidCode);
+    }
+  }, [code, sendCode]);
 
-    const handleCreateCaptcha = useCallback(() => {
-      (async () => setCaptcha(URL.createObjectURL(await createCaptcha(phoneNumber))))();
-    }, []);
+  const handleCreateCaptcha = useCallback(() => {
+    (async () => setCaptcha(URL.createObjectURL(await createCaptcha(phoneNumber))))();
+  }, []);
 
-    useEffect(handleCreateCaptcha, []);
+  useEffect(handleCreateCaptcha, []);
 
-    return (
-      <Dialog
-        head={<Logo />}
-        onClose={onClose}
-        className="my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg"
-      >
-        <div className="flex flex-col gap-lg items-center rounded-md">
-          <div className="flex h-36 w-72">
-            <img className="grow" src={captcha}></img>
-            <div
-              onClick={handleCreateCaptcha}
-              className="flex w-8 items-center justify-center cursor-pointer"
-            >
-              <Icon iconVersion="normal" name="RefreshIcon" />
-            </div>
-          </div>
-          <Input
-            className="w-[300px]"
-            onChange={setCode}
-            value={code}
-            placeholder="Введите код с картинки"
-          />
-          {hasError ? <div className="text-error">Неверный код</div> : null}
-          <div className="flex w-[310px] justify-between">
-            <Button onClick={close} version="secondary">
-              Вернуться
-            </Button>
-            <Button type="submit" disabled={!code} onClick={handleCheckCaptcha} version="secondary">
-              Отправить
-            </Button>
+  return (
+    <Dialog
+      className="my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg"
+      head={<Logo />}
+      onClose={onClose}
+    >
+      <div className="flex flex-col gap-lg items-center rounded-md">
+        <div className="flex h-36 w-72">
+          <img className="grow" src={captcha}></img>
+          <div
+            onClick={handleCreateCaptcha}
+            className="flex w-8 items-center justify-center cursor-pointer"
+          >
+            <Icon iconVersion="normal" name="RefreshIcon" />
           </div>
         </div>
-      </Dialog>
-    );
-  },
-);
+        <Input
+          className="w-[300px]"
+          onChange={setCode}
+          value={code}
+          placeholder="Введите код с картинки"
+        />
+        {hasError ? <div className="text-error">Неверный код</div> : null}
+        <div className="flex w-[310px] justify-between">
+          <Button onClick={close} version="secondary">
+            Вернуться
+          </Button>
+          <Button type="submit" disabled={!code} onClick={handleCheckCaptcha} version="secondary">
+            Отправить
+          </Button>
+        </div>
+      </div>
+    </Dialog>
+  );
+});

package/mobile/src/ui-kit/Checkbox/CheckboxWithDoc.tsx

@@ -1,7 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useMobileMode } from '../../hooks/useMobileMode';
-import { openDocument } from '../DialogManager/openDocument';
-import { useDialogManager } from '../DialogManager/useDialogManager';
+import { useDocumentDialog } from '../DocumentDialog/uaeDocumentDialog';
 import { renderErrorText } from '../Input/renderErrorText';
 import { LinkButton } from '../LinkButton/LinkButton';
 import { Text } from '../Text/Text';
@@ -16,18 +14,14 @@ interface CheckboxWithDocProps extends CheckboxProps {
 
 export const CheckboxWithDoc = JSX<CheckboxWithDocProps>(
   ({ className, error, docId, ...props }) => {
-    const { open, close } = useDialogManager();
-    const isMobile = useMobileMode();
+    const openDocument = useDocumentDialog(docId);
 
     return (
       <div className={className}>
         <div className="flex flex-wrap gap-x-m">
           <Checkbox {...props} />
           {docId ? (
-            <LinkButton
-              className="text-primary-main"
-              onClick={() => openDocument({ open, close, id: docId, convertToPng: isMobile })}
-            >
+            <LinkButton className="text-primary-main" onClick={openDocument}>
               <Text>{OPEN_DOC_BUTTON_TEXT}</Text>
             </LinkButton>
           ) : null}

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

@@ -1,17 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { useMobileMode } from '../../hooks/useMobileMode';
 import { noop } from '../../utils/noop';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
-import { openDocument } from '../DialogManager/openDocument';
-import { useDialogManager } from '../DialogManager/useDialogManager';
+import { useDocumentDialog } from '../DocumentDialog/uaeDocumentDialog';
 import { Heading } from '../Heading/Heading';
 import { Paragraph } from '../Paragraph/Paragraph';
 import { RadioButtonGroup } from '../RadioButtonGroup/RadioButtonGroup';
 
 export interface ConsentBkiDialogProps {
-  handleSubmit?: (confirmStatus: string) => void;
+  onSubmit?: (confirmStatus: string) => void;
   onClose?: () => void;
 }
 
@@ -25,62 +23,58 @@ const refuseConsentText = {
   description: 'Согласие на запрос в Бюро кредитных историй (БКИ) повысит вероятность одобрения',
 };
 
-export const ConsentBkiDialog = JSX<ConsentBkiDialogProps>(function ({
-  handleSubmit = noop,
-  onClose = noop,
-}) {
-  const [confirmStatus, setConfirmStatus] = useState('');
-  const [showRefuceContent, setShowRefuceContent] = useState(false);
-  const { open, close } = useDialogManager();
-  const isMobile = useMobileMode();
-  const handleClose = useCallback(() => {
-    close();
-    handleSubmit(confirmStatus);
-  }, [confirmStatus]);
-
-  const handleConfirmChange = useCallback((value: string) => {
-    setConfirmStatus(value);
-    if (value === 'REFUSE') {
-      setShowRefuceContent(true);
-    }
-  }, []);
-  const consentText = showRefuceContent ? refuseConsentText : defaultConsentText;
-
-  return (
-    <Dialog
-      className="my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg py-0 px-5xl"
-      onClose={onClose}
-    >
-      <div className="flex flex-col gap-xl items-center">
-        <div
-          role="button"
-          onClick={() => openDocument({ open, close, id: CONSENT_BKI_ID, convertToPng: isMobile })}
-        >
-          <Heading
-            className="text-center text-balance"
-            headingType="h2"
-            title={consentText.title}
-          />
-        </div>
-        <Paragraph align="text-center">{consentText.description}</Paragraph>
-        <RadioButtonGroup
-          className="whitespace-normal"
-          orientation="horizontal"
-          items={ITEMS}
-          value={confirmStatus}
-          onChange={handleConfirmChange}
-        />
-        <Button disabled={!confirmStatus} type="button" onClick={handleClose}>
-          Продолжить
-        </Button>
-      </div>
-    </Dialog>
-  );
-});
-
 const ITEMS = [
   { id: 'SIGNED', text: 'Подписать' },
   { id: 'REFUSE', text: 'Отказаться' },
 ];
 
 const CONSENT_BKI_ID = 2;
+
+export const ConsentBkiDialog = JSX<ConsentBkiDialogProps>(
+  ({ onSubmit = noop, onClose = noop }) => {
+    const [confirmStatus, setConfirmStatus] = useState('');
+    const [showRefuseContent, setShowRefuseContent] = useState(false);
+
+    const openDocument = useDocumentDialog(CONSENT_BKI_ID);
+
+    const handleSubmit = useCallback(() => {
+      onSubmit(confirmStatus);
+    }, [onSubmit, confirmStatus]);
+
+    const handleConfirmChange = useCallback((value: string) => {
+      setConfirmStatus(value);
+      if (value === 'REFUSE') {
+        setShowRefuseContent(true);
+      }
+    }, []);
+    const consentText = showRefuseContent ? refuseConsentText : defaultConsentText;
+
+    return (
+      <Dialog
+        className="my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg py-0 px-5xl"
+        onClose={onClose}
+      >
+        <div className="flex flex-col gap-xl items-center">
+          <div role="button" onClick={openDocument}>
+            <Heading
+              className="text-center text-balance"
+              headingType="h2"
+              title={consentText.title}
+            />
+          </div>
+          <Paragraph align="text-center">{consentText.description}</Paragraph>
+          <RadioButtonGroup
+            className="whitespace-normal"
+            orientation="horizontal"
+            items={ITEMS}
+            value={confirmStatus}
+            onChange={handleConfirmChange}
+          />
+          <Button disabled={!confirmStatus} type="button" onClick={handleSubmit}>
+            Продолжить
+          </Button>
+        </div>
+      </Dialog>
+    );
+  },
+);

package/mobile/src/ui-kit/ConsentBkiDialog/useConsentBkiDialog.tsx

@@ -1,12 +1,12 @@
 import { updateUserProfile } from '../../api/RetailAPI/updateUserProfile';
 import { formatPhone } from '../../utils/formatPhone';
-import { useDialogManager } from '../DialogManager/useDialogManager';
-import { useVerifyPhoneDialog } from '../VerifyPhoneDialog/useVerifyPhoneDialog';
+import { useDialog } from '../DialogManager/useDialog';
+import { VerifyPhoneDialog } from '../VerifyPhoneDialog/VerifyPhoneDialog';
 import { ConsentBkiDialog } from './ConsentBkiDialog';
 
 export const useConsentBkiDialog = (onClose: () => void) => {
-  const { open, close } = useDialogManager();
-  const verifyPhoneDialog = useVerifyPhoneDialog();
+  const { open } = useDialog(ConsentBkiDialog);
+  const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
 
   const handleSuccessVerify = (profileId?: number) => async (smsCode?: string) => {
     try {
@@ -28,10 +28,11 @@ export const useConsentBkiDialog = (onClose: () => void) => {
 
   const handleSubmitBkiConstent =
     (phone?: string, profileId?: number) => async (confirmStatus: string) => {
-      close();
-
       if (confirmStatus === 'SIGNED' && phone) {
-        verifyPhoneDialog.open(handleSuccessVerify(profileId), verifyPhoneContent(phone));
+        verifyPhoneDialog.open({
+          ...verifyPhoneContent(phone),
+          onSuccess: handleSuccessVerify(profileId),
+        });
       } else {
         onClose();
       }
@@ -39,12 +40,7 @@ export const useConsentBkiDialog = (onClose: () => void) => {
 
   return {
     open: (phone?: string, profileId?: number) =>
-      open(
-        <ConsentBkiDialog
-          handleSubmit={handleSubmitBkiConstent(phone, profileId)}
-          onClose={onClose}
-        />,
-      ),
+      open({ onSubmit: handleSubmitBkiConstent(phone, profileId), onClose }),
   };
 };
 

package/mobile/src/ui-kit/DialogManager/Dialog.tsx

@@ -1,10 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type VNode } from '../../model/VNode';
 import { style } from '../../utils/style';
 import { type PreventableEvent } from '../PreventableEvent';
 import { CloseButton } from './CloseButton';
-import { useDialogManager } from './useDialogManager';
 
 export interface DialogProps {
   className?: string;
@@ -13,25 +11,16 @@ export interface DialogProps {
   onClick?: (e: PreventableEvent) => void;
 }
 
-export const Dialog = JSX<DialogProps>(({ className, head, children, onClose, onClick }) => {
-  const { close } = useDialogManager();
-
-  const handleClose = useCallback(() => {
-    close();
-    onClose && onClose();
-  }, [onClose]);
-
-  return (
-    <div
-      onClick={onClick}
-      className={style('relative min-h-full bg-white pt-0 p-lg', className)}
-      role="dialog"
-    >
-      <div className="sticky py-xl top-0 bg-white z-10">
-        <CloseButton className="absolute top-0 right-0" onClose={handleClose} />
-        <div className="container">{head}</div>
-      </div>
-      <div className="container pb-6xl">{children}</div>
+export const Dialog = JSX<DialogProps>(({ className, head, children, onClose, onClick }) => (
+  <div
+    className={style('relative min-h-full bg-white pt-0 p-lg', className)}
+    role="dialog"
+    onClick={onClick}
+  >
+    <div className="sticky py-xl top-0 bg-white z-10">
+      <CloseButton className="absolute top-0 right-0" onClose={onClose} />
+      <div className="container">{head}</div>
     </div>
-  );
-});
+    <div className="container pb-6xl">{children}</div>
+  </div>
+));

package/mobile/src/ui-kit/DialogManager/DialogAction.ts

@@ -1,15 +1,13 @@
-import { type VNode } from '../../model/VNode';
+import type { ActionsMap } from '@redneckz/uni-jsx/lib/EventBus/Action';
+import type { VNode } from '../../model/VNode';
 
-export type DialogAction = DialogOpenAction | DialogCloseAction;
-
-export interface DialogOpenAction {
-  type: 'open';
+export interface DialogOptions {
   id?: string; // Singleton
   dialog: VNode;
-  onClose?: () => void;
 }
 
-export interface DialogCloseAction {
-  type: 'close';
-  all?: boolean;
-}
+export type DialogAction = ActionsMap<{
+  open(options: DialogOptions): void;
+  close(): void;
+  closeAll(): void;
+}>;

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

@@ -1,45 +1,24 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
-import { useEventListener } from '@redneckz/uni-jsx/lib/hooks/useEventListener';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useOnEscape } from '../../hooks/useOnEscape';
 import { style } from '../../utils/style';
-import { type DialogOpenAction } from './DialogAction';
-import { useDialogManager } from './useDialogManager';
 import { useDialogsList } from './useDialogsList';
 
 export const DialogManager = JSX(() => {
-  const handleCloseAll = useCallback((dialogActions: DialogOpenAction[]) => {
-    for (const _ of dialogActions) {
-      _?.onClose && _.onClose();
-    }
-  }, []);
-
-  const handleClose = useCallback((_: DialogOpenAction) => {
-    _?.onClose && _.onClose();
-  }, []);
-
-  const dialogs = useDialogsList({ onCloseAll: handleCloseAll, onClose: handleClose });
-
-  const { close } = useDialogManager();
-
-  const escapeHandler = useCallback(({ key }: { key: string }) => {
-    if (key === 'Escape') {
-      close();
-    }
-  }, []);
+  const [dialogs, { close }] = useDialogsList();
+  const hasDialogs = Boolean(dialogs.length);
 
-  useEventListener(globalThis.document, 'keydown', escapeHandler);
+  useOnEscape(close);
 
   useEffect(() => {
-    if (dialogs.length) {
-      globalThis.document?.body.classList.add('no-scrollbar');
-      globalThis.document?.body.classList.add('overflow-hidden');
+    if (hasDialogs) {
+      globalThis.document?.body.classList.add('no-scrollbar', 'overflow-hidden');
     } else {
-      globalThis.document?.body.classList.remove('no-scrollbar');
-      globalThis.document?.body.classList.remove('overflow-hidden');
+      globalThis.document?.body.classList.remove('no-scrollbar', 'overflow-hidden');
     }
-  }, [dialogs]);
+  }, [hasDialogs]);
 
-  return dialogs.length ? (
+  return hasDialogs ? (
     <div className="fixed inset-0 z-50" role="dialog">
       {dialogs.map(({ dialog, id }, i) => (
         <div
@@ -47,7 +26,7 @@ export const DialogManager = JSX(() => {
           className={style(
             'absolute inset-0 overflow-x-hidden overflow-y-scroll no-scrollbar bg-black/50',
             {
-              hidden: i !== dialogs.length - 1,
+              hidden: i !== dialogs.length - 1, // TODO Чего?)
             },
           )}
         >

package/mobile/src/ui-kit/DialogManager/isDialogOpen.ts

@@ -1,4 +1,4 @@
-import { type DialogOpenAction } from './DialogAction';
+import type { DialogOptions } from './DialogAction';
 
-export const isDialogOpen = (id: string, dialogs: DialogOpenAction[]): boolean =>
+export const isDialogOpen = (id: string, dialogs: DialogOptions[]): boolean =>
   Boolean(dialogs.find((item) => item.id === id, id));

package/mobile/src/ui-kit/DialogManager/useDialog.tsx

@@ -0,0 +1,31 @@
+import type { UNIComponent } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import type { DialogOptions } from './DialogAction';
+import { useDialogManager } from './useDialogManager';
+
+export function useDialog<Props extends { onClose?: () => void }>(
+  Dialog: UNIComponent<Props>,
+  initialProps: Partial<Props> = {},
+) {
+  const { open, close, ...rest } = useDialogManager();
+
+  const openDialog = useCallback(
+    (props: Props, options: Partial<DialogOptions> = {}) =>
+      open({
+        dialog: (
+          <Dialog
+            {...initialProps}
+            {...props}
+            onClose={() => {
+              close();
+              props.onClose?.();
+            }}
+          />
+        ),
+        ...options,
+      }),
+    [Dialog, open, close],
+  );
+
+  return { open: openDialog, close, ...rest };
+}

package/mobile/src/ui-kit/DialogManager/useDialogManager.ts

@@ -1,14 +1,4 @@
+import { useEmitterWithActions } from '@redneckz/uni-jsx/lib/EventBus/useEmitterWithActions';
 import { defaultEventBus } from '../../EventBus/defaultEventBus';
-import { type VNode } from '../../model/VNode';
 
-export interface DialogOptions {
-  id?: string;
-  onClose?: () => void;
-}
-
-export const useDialogManager = () => ({
-  open: (dialog: VNode, options: DialogOptions = {}) =>
-    defaultEventBus.fire('dialog', { type: 'open', dialog, ...options }),
-  close: () => defaultEventBus.fire('dialog', { type: 'close' }),
-  closeAll: () => defaultEventBus.fire('dialog', { type: 'close', all: true }),
-});
+export const useDialogManager = () => useEmitterWithActions(defaultEventBus.emitter, 'dialog');

package/mobile/src/ui-kit/DialogManager/useDialogsList.ts

@@ -1,53 +1,19 @@
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useObservableWithActions } from '@redneckz/uni-jsx/lib/EventBus/useObservableWithActions';
 import { useList } from '@redneckz/uni-jsx/lib/hooks/useList';
 import { defaultEventBus } from '../../EventBus/defaultEventBus';
-import { assertUnreachable } from '../../utils/assertUnreachable';
-import { type DialogOpenAction } from './DialogAction';
+import type { DialogOptions } from './DialogAction';
 
-interface DialogsListOptions {
-  onCloseAll?: (dialogs: DialogOpenAction[]) => void;
-  onClose?: (_: DialogOpenAction) => void;
-}
+export const useDialogsList = (): [
+  DialogOptions[],
+  { closeAll: () => void; close: () => void },
+] => {
+  const [dialogs, { push, pop, clear }] = useList<DialogOptions>();
 
-export const useDialogsList = ({
-  onCloseAll,
-  onClose,
-}: DialogsListOptions = {}): DialogOpenAction[] => {
-  const [dialogs, { push, pop, clear }] = useList<DialogOpenAction>();
+  useObservableWithActions(defaultEventBus.observable, 'dialog', {
+    open: push,
+    close: pop,
+    closeAll: clear,
+  });
 
-  const closeAll = useCallback(() => {
-    onCloseAll && onCloseAll(dialogs);
-    clear();
-  }, [dialogs, onCloseAll]);
-
-  const close = useCallback(() => {
-    onClose && onClose(dialogs[dialogs.length - 1]);
-    pop();
-  }, [dialogs, onClose]);
-
-  useEffect(
-    () =>
-      defaultEventBus.subscribe('dialog', (action) => {
-        if (!action) {
-          return;
-        }
-        switch (action.type) {
-          case 'open':
-            push(action);
-            break;
-          case 'close':
-            if (action.all) {
-              closeAll();
-            } else {
-              close();
-            }
-            break;
-          default:
-            assertUnreachable(action);
-        }
-      }),
-    [closeAll, close],
-  );
-
-  return dialogs;
+  return [dialogs, { close: pop, closeAll: clear }];
 };

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

@@ -0,0 +1,23 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { Button } from '../Button/Button';
+import { Dialog } from '../DialogManager/Dialog';
+
+export interface DocumentDialogProps {
+  src: string;
+  convertToPng?: boolean;
+  onClose?: () => void;
+}
+
+// TODO Перенесено как есть из openDocument. Требует рефакторинга
+export const DocumentDialog = JSX<DocumentDialogProps>(({ src, convertToPng, onClose }) => (
+  <Dialog className="my-6xl max-w-4xl mx-auto px-0 min-h-0 pb-0" onClose={onClose}>
+    {convertToPng ? (
+      <img src={src} />
+    ) : (
+      <iframe src={`${src}#toolbar=0`} className="w-full h-[80vh]" id="iframe-dialog" />
+    )}
+    <Button className="mx-auto mt-m" type="button" onClick={onClose}>
+      Ознакомиться
+    </Button>
+  </Dialog>
+));

package/mobile/src/ui-kit/DocumentDialog/uaeDocumentDialog.ts

@@ -0,0 +1,18 @@
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { feedbackById } from '../../api/RetailAPI/feedbackById';
+import { useMobileMode } from '../../hooks/useMobileMode';
+import type { Nullable } from '../../utils/Nullable';
+import { useDialog } from '../DialogManager/useDialog';
+import { DocumentDialog } from './DocumentDialog';
+
+export const useDocumentDialog = (docId: Nullable<number>) => {
+  const { open } = useDialog(DocumentDialog);
+  const isMobileMode = useMobileMode();
+
+  return useCallback(async () => {
+    if (docId) {
+      const src = URL.createObjectURL(await feedbackById(docId, isMobileMode));
+      open({ src });
+    }
+  }, [open, docId, isMobileMode]);
+};