@skbkontur/markdown 2.5.8-alpha.11 → 2.5.8-alpha.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skbkontur/markdown",
-  "version": "2.5.8-alpha.11",
+  "version": "2.5.8-alpha.12",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"

package/src/Markdown/Markdown.js

@@ -83,7 +83,7 @@ export var Markdown = function (props) {
     useEffect(function () {
         if (fullscreen && isEditMode && textareaRef) {
             var textareaNode_1 = getTextareaNode();
-            if (textareaNode_1) {
+            if (textareaNode_1 && !textareaNode_1.selectionStart && !textareaNode_1.selectionEnd) {
                 textareaNode_1.focus();
                 textareaNode_1.selectionStart = selectionStart !== null && selectionStart !== void 0 ? selectionStart : 0;
                 textareaNode_1.selectionEnd = selectionEnd !== null && selectionEnd !== void 0 ? selectionEnd : 0;

package/src/Markdown/MarkdownActions/AIActionsDropdown/AIActionsDropdown.js

@@ -35,9 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { Button, Hint, Spinner, Toast, Tooltip } from '@skbkontur/react-ui';
+import { useTheme } from '@skbkontur/react-ui/lib/theming/useTheme';
 import React, { useEffect, useRef, useState } from 'react';
 import { DropdownCaptionWrapper, TooltipButtonsWrapper, TooltipContentWrapper, TooltipWrapper, } from './AIActionsDropdown.styled';
-import { COPY_BUTTON_TEXT, ERRORS_NOT_FOUND_TEXT } from './constants';
+import { COPY_BUTTON_TEXT, ERRORS_NOT_FOUND_TEXT, MAX_HEIGHT } from './constants';
 import { Copy } from '../../../MarkdownIcons/Copy';
 import { NatureFxSparkleA2 } from '../../../MarkdownIcons/NatureFxSparkleA2';
 import { MarkdownMenuItem } from '../../Markdown.styled';
@@ -47,6 +48,7 @@ import { MarkdownDropdown } from '../MarkdownDropdown/MarkdownDropdown';
 export var AIActionsDropdown = function (_a) {
     var _b;
     var textareaRef = _a.textareaRef, isPreviewMode = _a.isPreviewMode, api = _a.api;
+    var tooltipPaddingX = useTheme().tooltipPaddingX;
     var _c = useState(), processedText = _c[0], setProcessedText = _c[1];
     var _d = useState(RequestStatus.Default), requestStatus = _d[0], setRequestStatus = _d[1];
     var tooltipRef = useRef(null);
@@ -62,7 +64,7 @@ export var AIActionsDropdown = function (_a) {
         return null;
     var value = htmlTextArea.value.substring(Number(selectionStart), selectionEnd !== null && selectionEnd !== void 0 ? selectionEnd : undefined);
     var isEmptySelected = selectionEnd === selectionStart;
-    return (React.createElement(Tooltip, { ref: tooltipRef, pos: "top right", allowedPositions: ['top right', 'right middle', 'bottom right'], trigger: "manual", render: renderTooltipContent, onClose: handleCloseTooltip },
+    return (React.createElement(Tooltip, { ref: tooltipRef, pos: "top right", allowedPositions: ['top right', 'right middle', 'bottom right', 'bottom left'], trigger: "manual", render: renderTooltipContent, style: { height: MAX_HEIGHT + parseInt(tooltipPaddingX) * 2 }, onClose: handleCloseTooltip },
         React.createElement(MarkdownDropdown, { hintText: isEmptySelected ? 'Выдели текст' : 'ИИ-помощник', caption: React.createElement(DropdownCaptionWrapper, null,
                 React.createElement(NatureFxSparkleA2, null),
                 " \u0418\u0418"), menuWidth: 180, disabled: isPreviewMode || isEmptySelected, onOpen: handleCloseTooltip }, availableMethods.map(function (_a) {
@@ -86,24 +88,28 @@ export var AIActionsDropdown = function (_a) {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _b.trys.push([0, 2, , 3]);
-                        (_a = tooltipRef === null || tooltipRef === void 0 ? void 0 : tooltipRef.current) === null || _a === void 0 ? void 0 : _a.show();
                         taskId = taskIdRef.current.generate();
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        (_a = tooltipRef === null || tooltipRef === void 0 ? void 0 : tooltipRef.current) === null || _a === void 0 ? void 0 : _a.show();
                         setRequestStatus(RequestStatus.isFetching);
                         return [4 /*yield*/, onSendMessage(value, method)];
-                    case 1:
+                    case 2:
                         response = _b.sent();
                         if (response && taskId === taskIdRef.current.generated) {
                             setRequestStatus(RequestStatus.isLoaded);
                             setProcessedText(value === response ? ERRORS_NOT_FOUND_TEXT : response);
                         }
-                        return [3 /*break*/, 3];
-                    case 2:
+                        return [3 /*break*/, 4];
+                    case 3:
                         e_1 = _b.sent();
-                        handleCloseTooltip();
-                        Toast.push('Ошибка обработки текста');
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        if (taskId === taskIdRef.current.generated) {
+                            handleCloseTooltip();
+                            Toast.push('Ошибка обработки текста');
+                        }
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
                 }
             });
         });

package/src/Markdown/MarkdownActions/AIActionsDropdown/AIActionsDropdown.styled.js

@@ -2,9 +2,10 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
     if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
     return cooked;
 };
+import { MAX_HEIGHT } from './constants';
 import styled from '../../../styles/styled-components';
-export var TooltipWrapper = styled.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  max-width: 300px;\n  max-height: 400px;\n  overflow-y: auto;\n"], ["\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  max-width: 300px;\n  max-height: 400px;\n  overflow-y: auto;\n"])));
-export var TooltipContentWrapper = styled.div(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  max-height: 400px;\n  white-space: pre-wrap;\n  overflow-y: auto;\n"], ["\n  max-height: 400px;\n  white-space: pre-wrap;\n  overflow-y: auto;\n"])));
+export var TooltipWrapper = styled.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  max-width: 300px;\n"], ["\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  max-width: 300px;\n"])));
+export var TooltipContentWrapper = styled.div(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  max-height: ", "px;\n  white-space: pre-wrap;\n  overflow-y: auto;\n"], ["\n  max-height: ", "px;\n  white-space: pre-wrap;\n  overflow-y: auto;\n"])), MAX_HEIGHT);
 export var TooltipButtonsWrapper = styled.div(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n  display: flex;\n  align-items: center;\n  gap: 8px;\n"], ["\n  display: flex;\n  align-items: center;\n  gap: 8px;\n"])));
 export var DropdownCaptionWrapper = styled.div(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n  display: flex;\n  align-items: center;\n  gap: 4px;\n"], ["\n  display: flex;\n  align-items: center;\n  gap: 4px;\n"])));
 var templateObject_1, templateObject_2, templateObject_3, templateObject_4;

package/src/Markdown/MarkdownActions/AIActionsDropdown/constants.d.ts

@@ -1,2 +1,3 @@
 export declare const ERRORS_NOT_FOUND_TEXT = "\u041E\u0448\u0438\u0431\u043E\u043A \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u043E";
 export declare const COPY_BUTTON_TEXT = "\u0421\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C";
+export declare const MAX_HEIGHT = 400;

package/src/Markdown/MarkdownActions/AIActionsDropdown/constants.js

@@ -1,2 +1,3 @@
 export var ERRORS_NOT_FOUND_TEXT = 'Ошибок не найдено';
 export var COPY_BUTTON_TEXT = 'Скопировать';
+export var MAX_HEIGHT = 400;