@evergis/react 2.0.194 → 2.0.195

package/dist/components/Legend/components/ClusterSymbolPreview.d.ts

@@ -2,6 +2,7 @@ import { FC } from 'react';
 import { ClusterSymbolDc } from '@evergis/api';
 export declare const ClusterSymbolPreview: FC<{
     symbol: ClusterSymbolDc;
+    index?: number;
     size?: number;
     fontSize?: string;
 }>;

package/dist/components/Legend/components/LegendSymbolRenderer.d.ts

@@ -2,4 +2,5 @@ import { FC } from 'react';
 import { StyleSymbolType } from '../../../core';
 export declare const LegendSymbolRenderer: FC<{
     symbol: StyleSymbolType;
+    index?: number;
 }>;

package/dist/components/Legend/components/index.d.ts

@@ -1,6 +1,8 @@
+export * from './ClusterSymbolPreview';
+export * from './LegendChildren';
+export * from './LegendParameterDescription';
 export * from './LegendSection';
 export * from './LegendSymbolRenderer';
-export * from './LegendParameterDescription';
 export * from './MaximizedLegend';
 export * from './MinimizedLegend';
 export * from './SvgSymbol';

package/dist/components/Legend/hooks/useSvgSymbol.d.ts

@@ -1,15 +1,16 @@
 /// <reference types="react" />
 import { Color } from '@evergis/color/es/Color';
-import { SvgEditorField, SvgSymbolBg } from '../types';
 import { SvgPointSymbol } from '../../../core';
-export declare const useSvgSymbol: (symbol: SvgPointSymbol, skipOffset?: boolean | undefined) => {
+import { SvgEditorField, SvgSymbolBg } from '../types';
+export declare const useSvgSymbol: (symbol: SvgPointSymbol, skipOffset?: boolean | undefined, isClassifiedValue?: boolean | undefined) => {
     svgRef: import("react").MutableRefObject<HTMLElement | null>;
     initSvg: () => void;
     getSvgData: () => string;
-    manipulateSvg: ({ svg, bg, newSymbol, }: {
+    manipulateSvg: ({ svg, bg, newSymbol, isClassifiedValue, }: {
         svg: string;
         bg?: SvgSymbolBg | undefined;
         newSymbol?: import("../../../core").ClientSymbol<"svgPointSymbol", import("@evergis/api").SvgPointSymbolDc, never> | undefined;
+        isClassifiedValue?: boolean | undefined;
     }) => void;
     getUpdatedSvgSymbol: (field: keyof SvgEditorField, value: Color | number | string) => any;
 };

package/dist/components/Legend/types.d.ts

@@ -69,6 +69,7 @@ export declare type SvgSymbolProps = {
     text?: string;
     bg?: SvgSymbolBg;
     skipOffset?: boolean;
+    isClassifiedValue?: boolean;
     fontSettings?: PointLabelSymbolDc;
     onClick?: (svg: string, symbol: SvgPointSymbol) => void;
 };

package/dist/react.cjs.development.js

@@ -3231,9 +3231,16 @@ const createSvgGradient = (svg, values) => svg.gradient('linear', add => {
   });
 }).from(0, 0).to(1, 1); // eslint-disable-next-line max-lines-per-function
 
-const manipulateSvgSymbol = (SVGContainer, symbol, svg, bg) => {
+const manipulateSvgSymbol = _ref2 => {
   var _$exec2;
 
+  let {
+    SVGContainer,
+    symbol,
+    svg,
+    bg,
+    isClassifiedValue
+  } = _ref2;
   if (!symbol) return SVGContainer;
   const symbolData = getParameterValue(svg || symbol.data);
   if (!symbolData) return SVGContainer;
@@ -3280,18 +3287,24 @@ const manipulateSvgSymbol = (SVGContainer, symbol, svg, bg) => {
         SVGContainer.svg(currentBg === exports.SvgSymbolBg.Circle ? "<circle\n                id=\"symbol-bg\"\n                cx=\"" + DEFAULT_SYMBOL_WITH_BG_SIZE / 2 + "\"\n                cy=\"" + DEFAULT_SYMBOL_WITH_BG_SIZE / 2 + "\"\n                r=\"" + DEFAULT_SYMBOL_WITH_BG_SIZE / 2 + "\"\n                fill=\"" + (fillColor || DEFAULT_SYMBOL_FILL_COLOR) + "\"\n                stroke=\"" + (strokeColor || DEFAULT_SYMBOL_STROKE_COLOR) + "\"\n                stroke-width=\"" + strokeWidth + "\"\n              />" : "<rect\n                id=\"symbol-bg\"\n                width=\"" + DEFAULT_SYMBOL_WITH_BG_SIZE + "\"\n                height=\"" + DEFAULT_SYMBOL_WITH_BG_SIZE + "\"\n                rx=\"4\"\n                fill=\"" + (fillColor || DEFAULT_SYMBOL_FILL_COLOR) + "\"\n                stroke=\"" + (strokeColor || DEFAULT_SYMBOL_STROKE_COLOR) + "\"\n                stroke-width=\"" + strokeWidth + "\"\n              />");
         SVGContainer.svg(innerSvg);
         SVGContainer.find('#symbol-bg:not(:first-child)').each(item => item.remove());
-        SVGContainer.find(':not(#symbol-bg)').each(item => item.center(DEFAULT_SYMBOL_WITH_BG_SIZE / 2, DEFAULT_SYMBOL_WITH_BG_SIZE / 2).fill('white')); // eslint-disable-next-line max-depth
+        SVGContainer.find(':not(#symbol-bg)').each(item => item.center(DEFAULT_SYMBOL_WITH_BG_SIZE / 2, DEFAULT_SYMBOL_WITH_BG_SIZE / 2).fill('white'));
+        const symbolBg = SVGContainer.find('#symbol-bg')[0];
+
+        if (isClassifiedValue) {
+          symbolBg == null ? void 0 : symbolBg.stroke({
+            opacity: 0.28
+          });
+        } // eslint-disable-next-line max-depth
+
 
         if (isParameterByAttribute(background == null ? void 0 : background.fillColor)) {
-          var _background$fillColor, _SVGContainer$find$;
+          var _background$fillColor;
 
           const gradient = createSvgGradient(SVGContainer, background == null ? void 0 : (_background$fillColor = background.fillColor) == null ? void 0 : _background$fillColor.values);
-          (_SVGContainer$find$ = SVGContainer.find('#symbol-bg')[0]) == null ? void 0 : _SVGContainer$find$.fill(gradient);
+          symbolBg == null ? void 0 : symbolBg.fill(gradient);
 
           if (isParameterByAttribute(background == null ? void 0 : background.strokeColor)) {
-            var _SVGContainer$find$2;
-
-            (_SVGContainer$find$2 = SVGContainer.find('#symbol-bg')[0]) == null ? void 0 : _SVGContainer$find$2.stroke({
+            symbolBg == null ? void 0 : symbolBg.stroke({
               color: gradient,
               opacity: 0.28
             });
@@ -6002,89 +6015,7 @@ const MapLegendValuesOther = /*#__PURE__*/styled__default(MapLegendOther)(_templ
 const MapLegendExpandButton = /*#__PURE__*/styled__default.div(_templateObject36 || (_templateObject36 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  cursor: pointer;\n  margin-top: 0.1rem;\n  font-size: 0.625rem;\n  color: #1fb3aa;\n"])));
 const ClusterLegendContainer = /*#__PURE__*/styled__default.div(_templateObject37 || (_templateObject37 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin: -0.9rem;\n  transform: scale(0.5);\n"])));
 
-const getValueFromLegendTitle = (title, minOrMax) => {
-  if (title.includes(" - ")) {
-    const result = title == null ? void 0 : title.split(" - ");
-    return minOrMax === "min" ? result == null ? void 0 : result[0] : result == null ? void 0 : result[1];
-  }
-
-  if (title.includes(",")) {
-    const result = title == null ? void 0 : title.split(",");
-    return result.join(", ");
-  }
-
-  return title.split(" ").find(isNumeric) || title || "";
-};
-
-const MinimizedLegend = _ref => {
-  var _currentValues$, _currentValues, _currentValues$2, _currentValues2;
-
-  let {
-    innerRef,
-    isShown,
-    values,
-    title,
-    parameter,
-    hiddenLegends
-  } = _ref;
-  const currentValues = [...values];
-  const other = currentValues.pop();
-  const isSize = isParameterType("size", parameter);
-  const isStrokeWidth = isParameterType(["strokeWidth", "stroke.width"], parameter);
-  const titleMax = getValueFromLegendTitle((_currentValues$ = currentValues[0]) == null ? void 0 : _currentValues$.title, "max");
-  const titleMin = getValueFromLegendTitle((_currentValues = currentValues[currentValues.length - 1]) == null ? void 0 : _currentValues.title, "min");
-  const checkIsHidden = React.useCallback(hiddenCondition => hiddenCondition ? hiddenLegends == null ? void 0 : hiddenLegends.some(condition => hiddenCondition.includes(condition)) : false, [hiddenLegends]);
-  return React__default.createElement(MinimizedLegendContainer, {
-    ref: innerRef,
-    isShown: isShown
-  }, !!title && React__default.createElement(MapLegendValueDescr, null, title), isSize ? React__default.createElement(React__default.Fragment, null, React__default.createElement(SizeMinimizedLegend, null, React__default.createElement(SizeMinimizedLegendSymbol, null, React__default.createElement(MapLegendItems, {
-    parameter: parameter,
-    isSize: true
-  }, currentValues.map((value, index) => React__default.createElement(MapLegendItem, {
-    key: "" + value.title + index,
-    title: value.title,
-    value: value.parameterValue,
-    parameter: parameter,
-    isHidden: checkIsHidden(value.hiddenCondition)
-  })))), React__default.createElement(SizeMinimizedLegendLabel, null, React__default.createElement(SizeMinimizedLegendDown, null, (_currentValues$2 = currentValues[0]) == null ? void 0 : _currentValues$2.title), React__default.createElement(SizeMinimizedLegendUp, null, (_currentValues2 = currentValues[currentValues.length - 1]) == null ? void 0 : _currentValues2.title))), React__default.createElement(SizeMinimizedLegend, null, React__default.createElement(SizeMinimizedLegendSymbol, null, React__default.createElement(MapLegendItems, {
-    parameter: parameter,
-    isSize: true
-  }, React__default.createElement(MapLegendOther, {
-    title: "\u0414\u0440\u0443\u0433\u043E\u0435",
-    value: other == null ? void 0 : other.parameterValue,
-    parameter: parameter,
-    isHidden: checkIsHidden(other == null ? void 0 : other.hiddenCondition)
-  }))), React__default.createElement(SizeMinimizedLegendLabel, null, React__default.createElement(SizeMinimizedLegendUp, null, "\u0414\u0440\u0443\u0433\u043E\u0435")))) : isStrokeWidth ? React__default.createElement(MapLegendItems, {
-    parameter: parameter,
-    isStrokeWidth: true
-  }, currentValues.map((value, index) => React__default.createElement(MapLegendItem, {
-    key: "" + value.title + index,
-    title: value.title,
-    value: value.parameterValue,
-    parameter: parameter,
-    isHidden: checkIsHidden(value.hiddenCondition)
-  }, (!index || index === currentValues.length - 1) && value.title)), React__default.createElement(MapLegendOther, {
-    title: "\u0414\u0440\u0443\u0433\u043E\u0435",
-    value: other == null ? void 0 : other.parameterValue,
-    parameter: parameter,
-    isHidden: checkIsHidden(other == null ? void 0 : other.hiddenCondition)
-  }, "\u0414\u0440\u0443\u0433\u043E\u0435")) : React__default.createElement(MapLegendItems, {
-    parameter: parameter
-  }, React__default.createElement(MapLegendItemsContainer, null, currentValues.map((value, index) => React__default.createElement(MapLegendItem, {
-    key: "" + value.title + index,
-    title: value.title,
-    value: value.parameterValue,
-    parameter: parameter,
-    isHidden: checkIsHidden(value.hiddenCondition)
-  }))), React__default.createElement(MapLegendOther, {
-    title: "\u0414\u0440\u0443\u0433\u043E\u0435",
-    value: other == null ? void 0 : other.parameterValue,
-    parameter: parameter,
-    isHidden: checkIsHidden(other == null ? void 0 : other.hiddenCondition)
-  })), typeof (other == null ? void 0 : other.parameterValue) === "string" && (titleMax || titleMin) && React__default.createElement(MapLegendValues, null, React__default.createElement(MapLegendValuesRange, null, React__default.createElement("div", null, titleMax), React__default.createElement("div", null, titleMin)), React__default.createElement(MapLegendValuesOther, null, "-")));
-};
-
-const useSvgSymbol = (symbol, skipOffset) => {
+const useSvgSymbol = (symbol, skipOffset, isClassifiedValue) => {
   const SVGWrapperRefElement = React.useRef(null);
   const SVGContainer = React.useMemo(() => svg_js.SVG(), []);
   const initSvg = React.useCallback(() => {
@@ -6095,9 +6026,16 @@ const useSvgSymbol = (symbol, skipOffset) => {
     let {
       svg,
       bg,
-      newSymbol
+      newSymbol,
+      isClassifiedValue
     } = _ref;
-    manipulateSvgSymbol(SVGContainer, newSymbol || symbol, svg, bg);
+    manipulateSvgSymbol({
+      SVGContainer,
+      symbol: newSymbol || symbol,
+      svg,
+      bg,
+      isClassifiedValue
+    });
   }, [SVGContainer, symbol]);
   const getUpdatedSvgSymbol = React.useCallback((field, value) => {
     var _newSymbol$background;
@@ -6136,7 +6074,8 @@ const useSvgSymbol = (symbol, skipOffset) => {
     manipulateSvg({
       svg: getParameterValue(data),
       newSymbol,
-      bg: (_newSymbol$background = newSymbol.background) == null ? void 0 : _newSymbol$background.type
+      bg: (_newSymbol$background = newSymbol.background) == null ? void 0 : _newSymbol$background.type,
+      isClassifiedValue
     });
     return _extends({}, newSymbol, {
       data: SVGContainer.svg()
@@ -6190,9 +6129,10 @@ const SvgSymbol = /*#__PURE__*/React.memo(_ref7 => {
     bg,
     symbol,
     title,
-    skipOffset,
     text,
     fontSettings,
+    skipOffset,
+    isClassifiedValue,
     onClick
   } = _ref7;
   const {
@@ -6200,7 +6140,7 @@ const SvgSymbol = /*#__PURE__*/React.memo(_ref7 => {
     initSvg,
     getSvgData,
     manipulateSvg
-  } = useSvgSymbol(symbol, skipOffset);
+  } = useSvgSymbol(symbol, skipOffset, isClassifiedValue);
   const onSelectSymbol = React.useCallback(() => {
     onClick == null ? void 0 : onClick(getSvgData(), _extends({}, symbol, bg ? {
       background: _extends({}, symbol.background, {
@@ -6220,9 +6160,10 @@ const SvgSymbol = /*#__PURE__*/React.memo(_ref7 => {
     manipulateSvg({
       svg,
       bg,
-      newSymbol: symbol
+      newSymbol: symbol,
+      isClassifiedValue
     });
-  }, [svg, symbol, bg, manipulateSvg]);
+  }, [svg, symbol, bg, manipulateSvg, isClassifiedValue]);
   return text ? React__default.createElement(SvgSymbolContainer, null, renderSymbol, React__default.createElement(SvgSymbolLabel, {
     fontSettings: fontSettings
   }, text), !!(fontSettings != null && fontSettings.haloColor) && !!(fontSettings != null && fontSettings.haloWidth) && React__default.createElement(SvgSymbolLabel, {
@@ -6233,41 +6174,19 @@ const SvgSymbol = /*#__PURE__*/React.memo(_ref7 => {
   }, text)) : renderSymbol;
 });
 
-const SymbolByType = _ref => {
-  let {
-    type,
-    symbol,
-    size,
-    svg,
-    skipOffset
-  } = _ref;
-  const defaultSymbol = React.useMemo(() => React__default.createElement(Symbol, {
-    symbol: symbol,
-    size: size
-  }), [symbol, size]);
-
-  switch (type) {
-    case "svgPointSymbol":
-      return svg ? React__default.createElement(SvgSymbol, {
-        svg: svg,
-        size: size,
-        skipOffset: skipOffset,
-        symbol: serializeSvgPointSymbol(symbol)
-      }) : defaultSymbol;
-
-    default:
-      return defaultSymbol;
-  }
-};
-
 const ClusterSymbolPreview = _ref => {
-  var _symbol$labelSymbol;
+  var _symbol$fillColor$val, _symbol$labelSymbol;
 
   let {
     symbol,
+    index,
     size = 56,
     fontSize = '1.25rem'
   } = _ref;
+  const isClassified = isParameterByAttribute(symbol.fillColor);
+  const isClassifiedValue = isClassified && index !== undefined;
+  const fillColor = isClassifiedValue ? ((_symbol$fillColor$val = symbol.fillColor.values[index]) == null ? void 0 : _symbol$fillColor$val.value) || symbol.fillColor.defaultValue : symbol.fillColor;
+  const strokeColor = isClassified ? fillColor : symbol.strokeColor;
   const svgSymbol = {
     type: 'svgPointSymbol',
     size,
@@ -6275,8 +6194,8 @@ const ClusterSymbolPreview = _ref => {
     angle: 0,
     background: {
       id: 'symbol-bg',
-      fillColor: getParameterValue(symbol.fillColor),
-      strokeColor: symbol.strokeColor,
+      fillColor,
+      strokeColor,
       strokeWidth: 6,
       type: 'circle'
     }
@@ -6284,6 +6203,7 @@ const ClusterSymbolPreview = _ref => {
   return React__default.createElement(SvgSymbol, {
     svg: DEFAULT_CLUSTER_SVG,
     symbol: svgSymbol,
+    isClassifiedValue: isClassifiedValue,
     text: '99',
     fontSettings: _extends({}, symbol.labelSymbol, {
       fontSize: fontSize || ((_symbol$labelSymbol = symbol.labelSymbol) == null ? void 0 : _symbol$labelSymbol.fontSize)
@@ -6291,14 +6211,43 @@ const ClusterSymbolPreview = _ref => {
   });
 };
 
+const SymbolByType = _ref => {
+  let {
+    type,
+    symbol,
+    size,
+    svg,
+    skipOffset
+  } = _ref;
+  const defaultSymbol = React.useMemo(() => React__default.createElement(Symbol, {
+    symbol: symbol,
+    size: size
+  }), [symbol, size]);
+
+  switch (type) {
+    case "svgPointSymbol":
+      return svg ? React__default.createElement(SvgSymbol, {
+        svg: svg,
+        size: size,
+        skipOffset: skipOffset,
+        symbol: serializeSvgPointSymbol(symbol)
+      }) : defaultSymbol;
+
+    default:
+      return defaultSymbol;
+  }
+};
+
 const LegendSymbolRenderer = /*#__PURE__*/React.memo(_ref => {
   let {
-    symbol
+    symbol,
+    index
   } = _ref;
 
   if (isClusterSymbol(symbol)) {
     return React__default.createElement(ClusterLegendContainer, null, React__default.createElement(ClusterSymbolPreview, {
-      symbol: symbol
+      symbol: symbol,
+      index: index
     }));
   }
 
@@ -6311,6 +6260,31 @@ const LegendSymbolRenderer = /*#__PURE__*/React.memo(_ref => {
   });
 });
 
+const getConditionAttribute = (attributes, condition) => {
+  if (!condition) return null;
+  const attributeName = getAttributeNameFromCondition(condition);
+  let attribute = attributes.find(_ref => {
+    let {
+      name
+    } = _ref;
+    return name === attributeName;
+  });
+
+  if (!attribute) {
+    if (attributeName === 'count') {
+      attribute = {
+        name: 'count',
+        alias: 'Количество',
+        type: api.AttributeType.Int32
+      };
+    } else {
+      return null;
+    }
+  }
+
+  return attribute;
+};
+
 const isHiddenLegend = (hiddenCondition, hiddenLegends) => !!(hiddenLegends != null && hiddenLegends.includes(hiddenCondition));
 
 const renderColumn = (column, index) => {
@@ -6351,6 +6325,134 @@ const getLegendText = _ref => {
   return React__default.createElement(React__default.Fragment, null, columns.map(renderColumn));
 };
 
+const LegendChildren = _ref => {
+  var _layerInfo$style, _layerInfo$style$chil;
+
+  let {
+    layerInfo,
+    hiddenLegends,
+    toggleHiddenLegend,
+    formatValue
+  } = _ref;
+  if (!((_layerInfo$style = layerInfo.style) != null && (_layerInfo$style$chil = _layerInfo$style.children) != null && _layerInfo$style$chil.length)) return null;
+  const attributes = getLayerAttributes(layerInfo.layerDefinition);
+  return React__default.createElement(MapLegendContainer, null, layerInfo.style.children.map((paramValue, index) => {
+    var _getConditionAttribut;
+
+    const attribute = getConditionAttribute(attributes, paramValue.condition);
+    if (!attribute) return null;
+    const hiddenCondition = createHiddenCondition(attribute.name, attribute.type, getClassificationValue(paramValue.symbol, paramValue.title, new ClassificationCondition(paramValue.condition)));
+    const legendText = getLegendText({
+      title: isRangeCondition(paramValue.condition) ? createValueTitleFromCondition(paramValue, attribute, formatValue, index) : getTitleFromCondition({
+        condition: paramValue.condition,
+        attribute,
+        formatValue
+      }),
+      index,
+      isDate: ((_getConditionAttribut = getConditionAttribute(attributes, paramValue.condition)) == null ? void 0 : _getConditionAttribut.type) === 'DateTime'
+    });
+    return React__default.createElement(ClassifiedItem, {
+      key: index,
+      isHidden: isHiddenLegend(hiddenCondition, hiddenLegends == null ? void 0 : hiddenLegends[layerInfo.name]),
+      onClick: () => toggleHiddenLegend == null ? void 0 : toggleHiddenLegend(layerInfo.name, hiddenCondition)
+    }, React__default.createElement(SymbolContainer, null, React__default.createElement(LegendSymbolRenderer, {
+      symbol: paramValue.symbol
+    })), legendText);
+  }));
+};
+
+const LegendParameterDescription = _ref => {
+  let {
+    parameter
+  } = _ref;
+  const isSize = isParameterType("size", parameter);
+  const isStrokeWidth = isParameterType(["strokeWidth", "stroke.width"], parameter);
+  const isStrokeColor = isParameterType(["strokeColor", "stroke.color"], parameter);
+  return React__default.createElement(MapLegendDescriptionContainer, null, isStrokeWidth || isStrokeColor ? isStrokeWidth ? "Толщина обводки" : "Цвет обводки" : isSize ? "Размер знака" : "Цвет символа");
+};
+
+const getValueFromLegendTitle = (title, minOrMax) => {
+  if (title.includes(" - ")) {
+    const result = title == null ? void 0 : title.split(" - ");
+    return minOrMax === "min" ? result == null ? void 0 : result[0] : result == null ? void 0 : result[1];
+  }
+
+  if (title.includes(",")) {
+    const result = title == null ? void 0 : title.split(",");
+    return result.join(", ");
+  }
+
+  return title.split(" ").find(isNumeric) || title || "";
+};
+
+const MinimizedLegend = _ref => {
+  var _currentValues$, _currentValues, _currentValues$2, _currentValues2;
+
+  let {
+    innerRef,
+    isShown,
+    values,
+    title,
+    parameter,
+    hiddenLegends
+  } = _ref;
+  const currentValues = [...values];
+  const other = currentValues.pop();
+  const isSize = isParameterType("size", parameter);
+  const isStrokeWidth = isParameterType(["strokeWidth", "stroke.width"], parameter);
+  const titleMax = getValueFromLegendTitle((_currentValues$ = currentValues[0]) == null ? void 0 : _currentValues$.title, "max");
+  const titleMin = getValueFromLegendTitle((_currentValues = currentValues[currentValues.length - 1]) == null ? void 0 : _currentValues.title, "min");
+  const checkIsHidden = React.useCallback(hiddenCondition => hiddenCondition ? hiddenLegends == null ? void 0 : hiddenLegends.some(condition => hiddenCondition.includes(condition)) : false, [hiddenLegends]);
+  return React__default.createElement(MinimizedLegendContainer, {
+    ref: innerRef,
+    isShown: isShown
+  }, !!title && React__default.createElement(MapLegendValueDescr, null, title), isSize ? React__default.createElement(React__default.Fragment, null, React__default.createElement(SizeMinimizedLegend, null, React__default.createElement(SizeMinimizedLegendSymbol, null, React__default.createElement(MapLegendItems, {
+    parameter: parameter,
+    isSize: true
+  }, currentValues.map((value, index) => React__default.createElement(MapLegendItem, {
+    key: "" + value.title + index,
+    title: value.title,
+    value: value.parameterValue,
+    parameter: parameter,
+    isHidden: checkIsHidden(value.hiddenCondition)
+  })))), React__default.createElement(SizeMinimizedLegendLabel, null, React__default.createElement(SizeMinimizedLegendDown, null, (_currentValues$2 = currentValues[0]) == null ? void 0 : _currentValues$2.title), React__default.createElement(SizeMinimizedLegendUp, null, (_currentValues2 = currentValues[currentValues.length - 1]) == null ? void 0 : _currentValues2.title))), React__default.createElement(SizeMinimizedLegend, null, React__default.createElement(SizeMinimizedLegendSymbol, null, React__default.createElement(MapLegendItems, {
+    parameter: parameter,
+    isSize: true
+  }, React__default.createElement(MapLegendOther, {
+    title: "\u0414\u0440\u0443\u0433\u043E\u0435",
+    value: other == null ? void 0 : other.parameterValue,
+    parameter: parameter,
+    isHidden: checkIsHidden(other == null ? void 0 : other.hiddenCondition)
+  }))), React__default.createElement(SizeMinimizedLegendLabel, null, React__default.createElement(SizeMinimizedLegendUp, null, "\u0414\u0440\u0443\u0433\u043E\u0435")))) : isStrokeWidth ? React__default.createElement(MapLegendItems, {
+    parameter: parameter,
+    isStrokeWidth: true
+  }, currentValues.map((value, index) => React__default.createElement(MapLegendItem, {
+    key: "" + value.title + index,
+    title: value.title,
+    value: value.parameterValue,
+    parameter: parameter,
+    isHidden: checkIsHidden(value.hiddenCondition)
+  }, (!index || index === currentValues.length - 1) && value.title)), React__default.createElement(MapLegendOther, {
+    title: "\u0414\u0440\u0443\u0433\u043E\u0435",
+    value: other == null ? void 0 : other.parameterValue,
+    parameter: parameter,
+    isHidden: checkIsHidden(other == null ? void 0 : other.hiddenCondition)
+  }, "\u0414\u0440\u0443\u0433\u043E\u0435")) : React__default.createElement(MapLegendItems, {
+    parameter: parameter
+  }, React__default.createElement(MapLegendItemsContainer, null, currentValues.map((value, index) => React__default.createElement(MapLegendItem, {
+    key: "" + value.title + index,
+    title: value.title,
+    value: value.parameterValue,
+    parameter: parameter,
+    isHidden: checkIsHidden(value.hiddenCondition)
+  }))), React__default.createElement(MapLegendOther, {
+    title: "\u0414\u0440\u0443\u0433\u043E\u0435",
+    value: other == null ? void 0 : other.parameterValue,
+    parameter: parameter,
+    isHidden: checkIsHidden(other == null ? void 0 : other.hiddenCondition)
+  })), typeof (other == null ? void 0 : other.parameterValue) === "string" && (titleMax || titleMin) && React__default.createElement(MapLegendValues, null, React__default.createElement(MapLegendValuesRange, null, React__default.createElement("div", null, titleMax), React__default.createElement("div", null, titleMin)), React__default.createElement(MapLegendValuesOther, null, "-")));
+};
+
 const MaximizedLegend = _ref => {
   let {
     innerRef,
@@ -6396,29 +6498,20 @@ const MaximizedLegend = _ref => {
       value: (parameterValue == null ? void 0 : (_parameterValue$value = parameterValue.values[(parameterValue == null ? void 0 : parameterValue.values.length) - index - 1]) == null ? void 0 : _parameterValue$value.value) || (parameterValue == null ? void 0 : parameterValue.defaultValue),
       parameter: parameter
     })) : React__default.createElement(SymbolContainer, null, React__default.createElement(LegendSymbolRenderer, {
-      symbol: isClusterFillColor$1 ? symbol : getExtractedSymbol(symbol, true)
+      index: index,
+      symbol: isClusterFillColor$1 ? sectionSymbol : getExtractedSymbol(symbol, true)
     })), getLegendText({
       title,
       index,
       isDate
     }));
-  }, [parameter, sectionIndex, hiddenLegends, isSize, isStrokeWidth, isStrokeColor, parameterValue, isDate, toggleHiddenLegend, layerName]);
+  }, [parameter, sectionIndex, hiddenLegends, isSize, isStrokeWidth, isStrokeColor, parameterValue, sectionSymbol, isDate, toggleHiddenLegend, layerName]);
   return React__default.createElement(MaximizedLegendContainer, {
     ref: innerRef,
     isShown: isShown
   }, values.map(renderLegend));
 };
 
-const LegendParameterDescription = _ref => {
-  let {
-    parameter
-  } = _ref;
-  const isSize = isParameterType("size", parameter);
-  const isStrokeWidth = isParameterType(["strokeWidth", "stroke.width"], parameter);
-  const isStrokeColor = isParameterType(["strokeColor", "stroke.color"], parameter);
-  return React__default.createElement(MapLegendDescriptionContainer, null, isStrokeWidth || isStrokeColor ? isStrokeWidth ? "Толщина обводки" : "Цвет обводки" : isSize ? "Размер знака" : "Цвет символа");
-};
-
 const LegendSection = _ref => {
   let {
     layerName,
@@ -6464,67 +6557,6 @@ const LegendSection = _ref => {
   }, isExpanded ? 'Свернуть' : 'Развернуть'));
 };
 
-const getConditionAttribute = (attributes, condition) => {
-  if (!condition) return null;
-  const attributeName = getAttributeNameFromCondition(condition);
-  let attribute = attributes.find(_ref => {
-    let {
-      name
-    } = _ref;
-    return name === attributeName;
-  });
-
-  if (!attribute) {
-    if (attributeName === 'count') {
-      attribute = {
-        name: 'count',
-        alias: 'Количество',
-        type: api.AttributeType.Int32
-      };
-    } else {
-      return null;
-    }
-  }
-
-  return attribute;
-};
-
-const LegendChildren = _ref => {
-  var _layerInfo$style, _layerInfo$style$chil;
-
-  let {
-    layerInfo,
-    hiddenLegends,
-    toggleHiddenLegend,
-    formatValue
-  } = _ref;
-  if (!((_layerInfo$style = layerInfo.style) != null && (_layerInfo$style$chil = _layerInfo$style.children) != null && _layerInfo$style$chil.length)) return null;
-  const attributes = getLayerAttributes(layerInfo.layerDefinition);
-  return React__default.createElement(MapLegendContainer, null, layerInfo.style.children.map((paramValue, index) => {
-    var _getConditionAttribut;
-
-    const attribute = getConditionAttribute(attributes, paramValue.condition);
-    if (!attribute) return null;
-    const hiddenCondition = createHiddenCondition(attribute.name, attribute.type, getClassificationValue(paramValue.symbol, paramValue.title, new ClassificationCondition(paramValue.condition)));
-    const legendText = getLegendText({
-      title: isRangeCondition(paramValue.condition) ? createValueTitleFromCondition(paramValue, attribute, formatValue, index) : getTitleFromCondition({
-        condition: paramValue.condition,
-        attribute,
-        formatValue
-      }),
-      index,
-      isDate: ((_getConditionAttribut = getConditionAttribute(attributes, paramValue.condition)) == null ? void 0 : _getConditionAttribut.type) === 'DateTime'
-    });
-    return React__default.createElement(ClassifiedItem, {
-      key: index,
-      isHidden: isHiddenLegend(hiddenCondition, hiddenLegends == null ? void 0 : hiddenLegends[layerInfo.name]),
-      onClick: () => toggleHiddenLegend == null ? void 0 : toggleHiddenLegend(layerInfo.name, hiddenCondition)
-    }, React__default.createElement(SymbolContainer, null, React__default.createElement(LegendSymbolRenderer, {
-      symbol: paramValue.symbol
-    })), legendText);
-  }));
-};
-
 const _excluded$3 = ["layerInfo", "formatValue", "hiddenLegends", "toggleHiddenLegend"];
 const Legend = /*#__PURE__*/React.memo(_ref => {
   var _layerInfo$style, _layerInfo$style$chil;
@@ -6987,6 +7019,7 @@ exports.ClassifiedItem = ClassifiedItem;
 exports.ClusterLayer = ClusterLayer;
 exports.ClusterLegendContainer = ClusterLegendContainer;
 exports.ClusterSymbol = ClusterSymbol;
+exports.ClusterSymbolPreview = ClusterSymbolPreview;
 exports.CompoundIcon = CompoundIcon;
 exports.DEFAULT_CLUSTER_SVG = DEFAULT_CLUSTER_SVG;
 exports.DEFAULT_CRS = DEFAULT_CRS;
@@ -7037,6 +7070,7 @@ exports.ItemSeparator = ItemSeparator;
 exports.ItemText = ItemText;
 exports.LabelSymbol = LabelSymbol;
 exports.Legend = Legend;
+exports.LegendChildren = LegendChildren;
 exports.LegendParameterDescription = LegendParameterDescription;
 exports.LegendProvider = LegendProvider;
 exports.LegendSection = LegendSection;