@evergis/react 3.1.92 → 3.1.94

package/dist/react.esm.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs, Fragment as Fragment$1 } from 'react/jsx-runtime';
 import { IconButton, Flex, transition, Chip, Icon, Description, FlexSpan, IconToggle, Popup, Menu, DraggableTree, shadows, Divider, LegendToggler, Tooltip as Tooltip$1, DropdownField, MultiSelectContainer, IconButtonButton, FlatButton, DraggableTreeContainer, Dialog, DialogTitle, ThemeProvider, darkTheme, DialogContent, CircularProgress, LinearProgress, H2, defaultTheme, Preview, Dropdown, Blank, Popover, UploaderItemArea, UploaderTitleWrapper, Uploader, NumberRangeSlider, useAsyncAutocomplete, AutoComplete, Checkbox, RangeNumberInput, dateFormat } from '@evergis/uilib-gl';
-import { createContext, memo, useRef, useState, useEffect, useCallback, useContext, useMemo, Fragment } from 'react';
+import { createContext, memo, useRef, useState, useCallback, useEffect, useContext, useMemo, Fragment } from 'react';
 import styled, { createGlobalStyle, css, useTheme } from 'styled-components';
 import { lineChartClassNames, BarChart as BarChart$1, barChartClassNames, LineChart, PieChart } from '@evergis/charts';
 import { AttributeType, generateId, GeometryType, RemoteTaskStatus } from '@evergis/api';
@@ -21,6 +21,8 @@ import '@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css';
 import 'mapbox-gl/dist/mapbox-gl.css';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import ReactMarkdown from 'react-markdown';
+import rehypeRaw from 'rehype-raw';
+import rehypeSanitize, { defaultSchema } from 'rehype-sanitize';
 import remarkGfm from 'remark-gfm';
 import { Terminal } from '@xterm/xterm';
 import { FitAddon } from '@xterm/addon-fit';
@@ -3933,6 +3935,15 @@ const ServerNotificationsContext = createContext({});
 const useServerNotifications = (url, initialized) => {
     const hubConnection = useRef(null);
     const [connection, setConnection] = useState(null);
+    const subscribeNotifications = useCallback(() => {
+        if (!connection || connection.state !== "Connected") {
+            return;
+        }
+        connection
+            .invoke("SubscribeNotifications", [])
+            .then(() => console.info("Подписка `SubscribeNotifications` оформлена"))
+            .catch(err => console.info("Ошибка подписки `SubscribeNotifications`:", err));
+    }, [connection]);
     useEffect(() => {
         if (!initialized) {
             return;
@@ -3941,6 +3952,7 @@ const useServerNotifications = (url, initialized) => {
             .withUrl(`${url}?clientId=${generateId()}`, {
             withCredentials: true,
         })
+            .withAutomaticReconnect({ nextRetryDelayInMilliseconds: () => 3000 })
             .configureLogging(LogLevel.Information)
             .build();
         hubConnection.current
@@ -3953,10 +3965,9 @@ const useServerNotifications = (url, initialized) => {
         if (!connection || connection.state !== "Connected") {
             return;
         }
-        connection
-            .invoke("SubscribeNotifications", [])
-            .then(() => console.info("Подписка `SubscribeNotifications` оформлена"))
-            .catch(err => console.info("Ошибка подписки `SubscribeNotifications`:", err));
+        connection.onreconnecting(() => console.info("Переподключение к серверным нотификациям"));
+        connection.onreconnected(subscribeNotifications);
+        subscribeNotifications();
     }, [connection]);
     return connection;
 };
@@ -8061,6 +8072,13 @@ const MarkdownWrapper = styled.div `
   }
 `;
 
+const sanitizeSchema = {
+    ...defaultSchema,
+    attributes: {
+        ...defaultSchema.attributes,
+        "*": [...(defaultSchema.attributes?.["*"] || []), "style"],
+    },
+};
 const ElementMarkdown = memo(({ elementConfig, type }) => {
     const { attributes } = useWidgetContext(type);
     const { t } = useGlobalContext();
@@ -8081,16 +8099,16 @@ const ElementMarkdown = memo(({ elementConfig, type }) => {
     const shouldShowExpand = expandLength > 0 && markdownString.length > expandLength;
     // If expand is not needed, show full content
     if (!shouldShowExpand) {
-        return (jsx(MarkdownWrapper, { children: jsx(ReactMarkdown, { remarkPlugins: [remarkGfm], children: markdownString }) }));
+        return (jsx(MarkdownWrapper, { children: jsx(ReactMarkdown, { remarkPlugins: [remarkGfm], rehypePlugins: [rehypeRaw, [rehypeSanitize, sanitizeSchema]], children: markdownString }) }));
     }
     // Collapsed state
     if (!expanded) {
         // Truncated content for collapsed state
         const truncatedContent = markdownString.substring(0, expandLength);
-        return (jsxs(MarkdownWrapper, { children: [jsx(ReactMarkdown, { remarkPlugins: [remarkGfm], children: truncatedContent }), jsx(LegendToggler, { onClick: () => setExpanded(true), children: t("more", { ns: "dashboard", defaultValue: "Подробнее" }) })] }));
+        return (jsxs(MarkdownWrapper, { children: [jsx(ReactMarkdown, { remarkPlugins: [remarkGfm], rehypePlugins: [rehypeRaw, [rehypeSanitize, sanitizeSchema]], children: truncatedContent }), jsx(LegendToggler, { onClick: () => setExpanded(true), children: t("more", { ns: "dashboard", defaultValue: "Подробнее" }) })] }));
     }
     // Expanded state
-    return (jsxs(MarkdownWrapper, { children: [jsx(ReactMarkdown, { remarkPlugins: [remarkGfm], children: markdownString }), jsx(LegendToggler, { toggled: true, onClick: () => setExpanded(false), children: t("hide", { ns: "dashboard", defaultValue: "Свернуть" }) })] }));
+    return (jsxs(MarkdownWrapper, { children: [jsx(ReactMarkdown, { remarkPlugins: [remarkGfm], rehypePlugins: [rehypeRaw, rehypeSanitize], children: markdownString }), jsx(LegendToggler, { toggled: true, onClick: () => setExpanded(false), children: t("hide", { ns: "dashboard", defaultValue: "Свернуть" }) })] }));
 });
 
 const SmallPreviewContainer = styled.div `
@@ -8423,7 +8441,7 @@ const ElementUploader = memo(({ elementConfig, type }) => {
         if (index === -1)
             return;
         const resourceId = files[index].id;
-        await api.file.deleteResource(resourceId);
+        await api.file.deleteResource({ resourceId });
         setFiles(currentFiles => currentFiles.filter(({ id }) => id !== resourceId));
     }, [files]);
     const renderTitle = useMemo(() => {