@evergis/react 4.0.139 → 4.0.141

package/dist/components/Dashboard/containers/VoteContainer/styled.d.ts

@@ -23,7 +23,8 @@ export declare const VoteVariantHead: import('styled-components').StyledComponen
 export declare const VoteVariantText: import('styled-components').StyledComponent<"span", any, {}, never>;
 export declare const VoteVariantCount: import('styled-components').StyledComponent<"span", any, {}, never>;
 export declare const VoteAcceptedBadge: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;
-export declare const VoteAuthHint: import('styled-components').StyledComponent<"div", any, {}, never>;
+/** Мелкая серая подпись под контролами: почему нельзя голосовать или почему кнопка неактивна. */
+export declare const VoteHint: import('styled-components').StyledComponent<"div", any, {}, never>;
 export declare const VoteEditLink: import('styled-components').StyledComponent<"button", any, {}, never>;
 export declare const VoteShareBlock: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;
 export declare const VoteShareChips: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;

package/dist/index.js

@@ -6250,7 +6250,6 @@ const useMapImages = ({ images }) => {
     const { map, loaded: mapLoaded } = useMapContext();
     const [loaded, setLoaded] = React.useState(false);
     const [errors, setErrors] = React.useState({});
-    const loadedImagesRef = React.useRef(new Set());
     const previouslyLoadedImages = React.useRef([]);
     const hasImage = React.useCallback((name) => {
         if (!map?.current) {
@@ -6264,7 +6263,6 @@ const useMapImages = ({ images }) => {
         }
         if (map.current.hasImage(name)) {
             map.current.removeImage(name);
-            loadedImagesRef.current.delete(name);
         }
     }, [map]);
     const addImage = React.useCallback(async (config) => {
@@ -6285,7 +6283,6 @@ const useMapImages = ({ images }) => {
                     sdf,
                     pixelRatio,
                 });
-                loadedImagesRef.current.add(config.name);
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : "Unknown error";
@@ -6301,7 +6298,6 @@ const useMapImages = ({ images }) => {
                     sdf,
                     pixelRatio,
                 });
-                loadedImagesRef.current.add(config.name);
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : "Unknown error";
@@ -6318,7 +6314,6 @@ const useMapImages = ({ images }) => {
                             sdf,
                             pixelRatio,
                         });
-                        loadedImagesRef.current.add(config.name);
                         resolve();
                     }
                 }).catch(error => {
@@ -6359,16 +6354,19 @@ const useMapImages = ({ images }) => {
         if (!mapLoaded) {
             return;
         }
-        map.current.on("styleimagemissing", async (e) => {
-            const missingImage = images.find(item => item.name === e.id);
-            if (missingImage && !map.current.hasImage(e.id)) {
+        map.current.on("style.load", async () => {
+            if (previouslyLoadedImages.current.length === 0) {
+                return;
+            }
+            const loadPromises = previouslyLoadedImages.current.map(async (config) => {
                 try {
-                    await addImage(missingImage);
+                    await addImage(config);
                 }
                 catch {
                     // Ошибка уже записана в errors
                 }
-            }
+            });
+            await Promise.all(loadPromises);
         });
     }, [mapLoaded]);
     return { loaded, errors, addImage, removeImage, hasImage };
@@ -11908,7 +11906,8 @@ const VoteAcceptedBadge = styled(uilibGl.Flex).withConfig({ displayName: "VoteAc
   color: #ffffff;
   font-size: 0.875rem;
 `;
-const VoteAuthHint = styled.div.withConfig({ displayName: "VoteAuthHint", componentId: "sc-8uftsh" }) `
+/** Мелкая серая подпись под контролами: почему нельзя голосовать или почему кнопка неактивна. */
+const VoteHint = styled.div.withConfig({ displayName: "VoteHint", componentId: "sc-li8usz" }) `
   font-size: 0.8125rem;
   color: ${({ theme: { palette } }) => palette.textSecondary};
 `;
@@ -12010,8 +12009,18 @@ const useVoteForm = (initialValues) => {
     const removeVariant = React.useCallback((index) => {
         setVariants(prev => prev.filter((_, itemIndex) => itemIndex !== index));
     }, []);
-    const isValid = React.useMemo(() => Boolean(categoryId && text.trim() && variants.length >= MIN_VARIANTS), [categoryId, text, variants.length]);
-    const values = React.useMemo(() => ({ categoryId, text: text.trim(), multiSelect, variants }), [categoryId, text, multiSelect, variants]);
+    /**
+     * Варианты вместе с недобавленным черновиком.
+     *
+     * Последний вариант часто набирают и жмут «Создать», не нажав Enter: чипсом он ещё не стал, но
+     * пользователь его уже ввёл. Считать такой текст вариантом честнее, чем гасить кнопку и молчать.
+     */
+    const allVariants = React.useMemo(() => {
+        const pending = draft.trim();
+        return pending ? [...variants, { text: pending }] : variants;
+    }, [variants, draft]);
+    const isValid = React.useMemo(() => Boolean(categoryId && text.trim() && allVariants.length >= MIN_VARIANTS), [categoryId, text, allVariants.length]);
+    const values = React.useMemo(() => ({ categoryId, text: text.trim(), multiSelect, variants: allVariants }), [categoryId, text, multiSelect, allVariants]);
     return {
         categoryId,
         setCategoryId,
@@ -12041,7 +12050,10 @@ const VoteCreateForm = ({ categories, initialValues, isEditing, canDelete, submi
                     }
                 } }), jsxRuntime.jsxs(uilibGl.Flex, { alignItems: "center", justifyContent: "space-between", children: [jsxRuntime.jsx(VoteSectionLabel, { children: t("vote.multiSelect", { ns: VOTE_NS, defaultValue: "Множественный выбор" }) }), jsxRuntime.jsx(uilibGl.Switch, { checked: multiSelect, onChange: () => setMultiSelect(prev => !prev) })] }), jsxRuntime.jsx(uilibGl.RaisedButton, { primary: true, disabled: !isValid || submitting, onClick: () => onSubmit(values), children: isEditing
                     ? t("vote.save", { ns: VOTE_NS, defaultValue: "Сохранить" })
-                    : t("vote.create", { ns: VOTE_NS, defaultValue: "Создать голосование" }) }), isEditing && (jsxRuntime.jsxs(uilibGl.Flex, { alignItems: "center", justifyContent: "space-between", children: [onCancel && (jsxRuntime.jsx(VoteEditLink, { onClick: onCancel, children: t("vote.cancel", { ns: VOTE_NS, defaultValue: "Отмена" }) })), canDelete && onDelete && (jsxRuntime.jsx(uilibGl.RaisedButton, { error: true, disabled: submitting, onClick: onDelete, children: t("vote.delete", { ns: VOTE_NS, defaultValue: "Удалить голосование" }) }))] }))] }));
+                    : t("vote.create", { ns: VOTE_NS, defaultValue: "Создать голосование" }) }), !isValid && (jsxRuntime.jsx(VoteHint, { children: t("vote.formHint", {
+                    ns: VOTE_NS,
+                    defaultValue: "Нужны категория, вопрос и минимум два варианта ответа",
+                }) })), isEditing && (jsxRuntime.jsxs(uilibGl.Flex, { alignItems: "center", justifyContent: "space-between", children: [onCancel && (jsxRuntime.jsx(VoteEditLink, { onClick: onCancel, children: t("vote.cancel", { ns: VOTE_NS, defaultValue: "Отмена" }) })), canDelete && onDelete && (jsxRuntime.jsx(uilibGl.RaisedButton, { error: true, disabled: submitting, onClick: onDelete, children: t("vote.delete", { ns: VOTE_NS, defaultValue: "Удалить голосование" }) }))] }))] }));
 };
 
 /** Блок «Поделиться в соцсетях» — пока только вёрстка, без рабочих ссылок. */
@@ -12065,7 +12077,7 @@ const VoteResults = ({ question, category, results, screen, isOwner, hasAnswers,
     }, [question.multiSelect]);
     const canSubmit = React.useMemo(() => selected.length > 0 && !submitting, [selected.length, submitting]);
     return (jsxRuntime.jsxs(VoteWrapper, { children: [category && jsxRuntime.jsx(VoteCategoryLabel, { children: category.name }), jsxRuntime.jsx(VoteQuestionText, { children: question.text }), jsxRuntime.jsx(VoteVariantList, { column: true, value: selected[0] ?? "", children: results.map(({ id, text, count, percent }) => (jsxRuntime.jsxs(VoteVariantRow, { children: [jsxRuntime.jsxs(VoteVariantHead, { children: [showControls &&
-                                    (question.multiSelect ? (jsxRuntime.jsx(uilibGl.Checkbox, { checked: selected.includes(id), onChange: () => toggle(id) })) : (jsxRuntime.jsx(uilibGl.Radio, { value: id, checked: selected.includes(id), onChange: () => toggle(id) }))), jsxRuntime.jsx(VoteVariantText, { children: text }), jsxRuntime.jsx(VoteVariantCount, { children: count })] }), jsxRuntime.jsx(uilibGl.LinearProgress, { done: percent })] }, id))) }), screen === "unauthenticated" && (jsxRuntime.jsx(VoteAuthHint, { children: t("vote.authHint", { ns: VOTE_NS, defaultValue: "Чтобы проголосовать, пожалуйста, авторизуйтесь" }) })), screen === "voted" && (jsxRuntime.jsxs(VoteAcceptedBadge, { children: [jsxRuntime.jsx(uilibGl.Icon, { kind: "success" }), t("vote.accepted", { ns: VOTE_NS, defaultValue: "Ваш ответ принят" })] })), showControls && (jsxRuntime.jsx(uilibGl.RaisedButton, { primary: true, disabled: !canSubmit, onClick: () => onSubmit(selected), children: t("vote.submit", { ns: VOTE_NS, defaultValue: "Отправить ответ" }) })), canEdit && onEdit && (jsxRuntime.jsx(uilibGl.Flex, { children: jsxRuntime.jsx(VoteEditLink, { onClick: onEdit, children: t("vote.edit", { ns: VOTE_NS, defaultValue: "Редактировать" }) }) })), showShare && jsxRuntime.jsx(VoteShare, {})] }));
+                                    (question.multiSelect ? (jsxRuntime.jsx(uilibGl.Checkbox, { checked: selected.includes(id), onChange: () => toggle(id) })) : (jsxRuntime.jsx(uilibGl.Radio, { value: id, checked: selected.includes(id), onChange: () => toggle(id) }))), jsxRuntime.jsx(VoteVariantText, { children: text }), jsxRuntime.jsx(VoteVariantCount, { children: count })] }), jsxRuntime.jsx(uilibGl.LinearProgress, { done: percent })] }, id))) }), screen === "unauthenticated" && (jsxRuntime.jsx(VoteHint, { children: t("vote.authHint", { ns: VOTE_NS, defaultValue: "Чтобы проголосовать, пожалуйста, авторизуйтесь" }) })), screen === "voted" && (jsxRuntime.jsxs(VoteAcceptedBadge, { children: [jsxRuntime.jsx(uilibGl.Icon, { kind: "success" }), t("vote.accepted", { ns: VOTE_NS, defaultValue: "Ваш ответ принят" })] })), showControls && (jsxRuntime.jsx(uilibGl.RaisedButton, { primary: true, disabled: !canSubmit, onClick: () => onSubmit(selected), children: t("vote.submit", { ns: VOTE_NS, defaultValue: "Отправить ответ" }) })), canEdit && onEdit && (jsxRuntime.jsx(uilibGl.Flex, { children: jsxRuntime.jsx(VoteEditLink, { onClick: onEdit, children: t("vote.edit", { ns: VOTE_NS, defaultValue: "Редактировать" }) }) })), showShare && jsxRuntime.jsx(VoteShare, {})] }));
 };
 
 /**