@evergis/react 2.0.191 → 2.0.192

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

@@ -0,0 +1,3 @@
+import { FC } from 'react';
+import { LegendChildrenProps } from '../types';
+export declare const LegendChildren: FC<LegendChildrenProps>;

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

@@ -3,7 +3,7 @@ import { AttributeType, PointLabelSymbolDc, SvgPointSymbolDc, StyleDc, FeatureLa
 import { MaskedImage } from '@evergis/sgis/es/symbols/point/MaskedImage';
 import { H3Symbol } from '@evergis/sgis/es/symbols/H3Symbol';
 import { Coordinates } from '@evergis/sgis/es/baseTypes';
-import { ClassificationParameterExtended, LayerAttribute, LegendValueType, ParameterByAttribute, ParameterValue, StyleSymbolType, SvgPointSymbol } from '../../core';
+import { ClassificationParameterExtended, LayerAttribute, LegendValueType, ParameterByAttribute, ParameterValueWithSymbol, StyleSymbolType, SvgPointSymbol } from '../../core';
 import { SGisBrushFill, SGisImageFill, SGisPolygonSymbol, SGisPolylineSymbol } from '../../symbols';
 export declare type ClassifyParameter = 'fill.color' | 'fill.hatchColor' | 'fillColor' | 'stroke.width' | 'stroke.color' | 'strokeWidth' | 'strokeColor' | 'textBackground.fill.color' | 'background.fillColor' | 'background.strokeColor' | 'background.strokeWidth' | 'figure.fillColor' | 'fontColor' | 'haloColor' | 'size' | 'symbol' | 'angle' | 'maskedColor' | 'endingSize' | 'beginningSize' | 'maxObjectCount' | 'gridSize' | 'selectionObjectsLimit' | 'singleObjectSymbol.figure.fillColor' | 'singleObjectSymbol.background.fillColor';
 export interface ParameterInfo {
@@ -30,13 +30,16 @@ export declare type LegendProps = {
     hiddenLegends?: Record<string, string[]>;
     toggleHiddenLegend?: (layerName: string, hiddenCondition: string) => void;
 };
+export declare type LegendChildrenProps = Pick<LegendProps, 'hiddenLegends' | 'toggleHiddenLegend' | 'formatValue'> & {
+    layerInfo: FeatureLayerServiceInfoDc;
+};
 export declare type LegendSectionProps = Pick<LegendProps, 'hiddenLegends' | 'toggleHiddenLegend' | 'formatValue'> & {
     layerName: string;
     symbol: StyleDc['symbol'];
     parameter: ClassificationParameterExtended;
     parameters: ClassificationParameterExtended[];
-    classified: ParameterByAttribute<ParameterValue>;
-    attribute: LayerAttribute;
+    classified: ParameterByAttribute<ParameterValueWithSymbol>;
+    attribute: LayerAttribute | null;
     index: number;
 };
 export declare type LegendSectionItem = Pick<LegendProps, 'hiddenLegends' | 'toggleHiddenLegend'> & {

package/dist/components/Legend/utils/getConditionAttribute.d.ts

@@ -0,0 +1,2 @@
+import { LayerAttribute } from '../../../core';
+export declare const getConditionAttribute: (attributes: LayerAttribute[], condition?: string | undefined) => LayerAttribute | null;

package/dist/components/Legend/utils/getLegendText.d.ts

@@ -0,0 +1,5 @@
+export declare const getLegendText: ({ title, index, isDate, }: {
+    title?: string | undefined;
+    index: number;
+    isDate: boolean;
+}) => JSX.Element;

package/dist/components/Legend/utils/isHiddenLegend.d.ts

@@ -0,0 +1 @@
+export declare const isHiddenLegend: (hiddenCondition: string, hiddenLegends?: string[] | undefined) => boolean;

package/dist/core/classification/getClassifications.d.ts

@@ -1,4 +1,4 @@
 import { ClassificationExtras, ClassificationParameterExtended, ExtendedClassification } from './types';
-import { ParameterByAttributeValue, ParameterValue, Style, StyleSymbolType } from '../style/types';
-export declare const toClassification: (values: (ParameterByAttributeValue<ParameterValue> | Style)[], parameter: ClassificationParameterExtended, extras?: ClassificationExtras) => ExtendedClassification;
+import { ParameterByAttributeValue, ParameterValueWithSymbol, Style, StyleSymbolType } from '../style';
+export declare const toClassification: (values: (ParameterByAttributeValue<ParameterValueWithSymbol> | Style)[], parameter: ClassificationParameterExtended, extras?: ClassificationExtras) => ExtendedClassification;
 export declare const getClassifications: (symbol: StyleSymbolType, pathContext?: ClassificationParameterExtended[]) => ExtendedClassification[];

package/dist/core/classification/parameterValue.d.ts

@@ -1,8 +1,8 @@
 import { ClassificationParameterExtended, ParameterValueModifier } from './types';
-import { CalculatedAble, CalculatedParameter, ClassifyAble, ParameterByAttribute, ParameterValue, StyleSymbolType, UnidentifiedParameterValue } from '../style';
-export declare const isParameterByAttribute: (value: UnidentifiedParameterValue) => value is ParameterByAttribute<ParameterValue>;
-export declare const isCalculatedParameter: (value: UnidentifiedParameterValue) => value is CalculatedParameter<ParameterValue>;
-export declare const getParameterValue: <Value extends ParameterValue>(value: Value | ParameterByAttribute<Value> | CalculatedParameter<Value>) => Value;
+import { CalculatedAble, CalculatedParameter, ClassifyAble, ParameterByAttribute, ParameterValue, ParameterValueWithSymbol, StyleSymbolType, UnidentifiedParameterValue } from '../style';
+export declare const isParameterByAttribute: (value: UnidentifiedParameterValue) => value is ParameterByAttribute<ParameterValueWithSymbol>;
+export declare const isCalculatedParameter: (value: UnidentifiedParameterValue) => value is CalculatedParameter<ParameterValueWithSymbol>;
+export declare const getParameterValue: <Value extends ParameterValueWithSymbol>(value: Value | ParameterByAttribute<Value> | CalculatedParameter<Value>) => Value;
 export declare const symbolParameterWalker: (valueModifier: ParameterValueModifier) => <S extends StyleSymbolType>(symbol: S, parameter: ClassificationParameterExtended | ClassificationParameterExtended[]) => S;
 export declare const setDefaultParameterValue: <S extends StyleSymbolType>(symbol: S, parameter: ClassificationParameterExtended | ClassificationParameterExtended[]) => S;
 export declare const setParameterValue: <S extends StyleSymbolType>(symbol: S, path: ClassificationParameterExtended, value: ClassifyAble<ParameterValue>) => S;

package/dist/core/classification/types.d.ts

@@ -32,7 +32,7 @@ export declare type RangeClassification = Classification<ClassificationType.Rang
 export declare type UniqueClassification = Classification<ClassificationType.Unique, UniqueClass>;
 export interface ClassificationExtras {
     defaultTitle: string;
-    defaultValue: ParameterValue;
+    defaultValue: ParameterValueWithSymbol;
 }
 export declare type ExtendedClassification<Type extends ClassificationType = ClassificationType, Value extends ClassificationClass = ClassificationClass> = Classification<Type, Value> & ClassificationExtras;
 export declare function isRangeClass(value: ClassificationClass): value is RangeClass;

package/dist/core/style/types/parameterValue.d.ts

@@ -19,8 +19,8 @@ export declare type CalculatedParameter<Value> = {
 export declare type ClassifyAble<Value> = Value | ParameterByAttribute<Value>;
 export declare type CalculatedAble<Value> = Value | CalculatedParameter<Value>;
 export declare type ParameterValue = string | number | number[] | Date;
-export declare type ParameterByAttributeValues = ParameterByAttributeValue<ParameterValue>[];
-export declare type ParameterValueWithSymbol = ParameterValue | StyleSymbolType | Date;
+export declare type ParameterValueWithSymbol = ParameterValue | StyleSymbolType;
+export declare type ParameterByAttributeValues = ParameterByAttributeValue<ParameterValueWithSymbol>[];
 export declare type ClassifiedParameterValue = ClassifyAble<ParameterValueWithSymbol>;
 export declare type UnidentifiedParameterValue = ParameterValueWithSymbol | Partial<ClassifyAble<ParameterValueWithSymbol>> | Partial<CalculatedAble<ParameterValue>>;
 export declare type CalculatedParameterValue = CalculatedAble<ParameterValue>;

package/dist/react.cjs.development.js

@@ -727,6 +727,73 @@ const isParameterValueSymbol = parameterValue => !isParameterValueSimple(paramet
 
 const isStyle = value => 'symbol' in value;
 
+let EvergisStyle = /*#__PURE__*/function () {
+  function EvergisStyle(style) {
+    _classCallCheck(this, EvergisStyle);
+
+    this.style = extractStyle(style);
+    this.classificationManager = new ClassificationManager(this.style);
+  }
+
+  _createClass(EvergisStyle, [{
+    key: "serialize",
+    value: function serialize() {
+      return packStyle(this.style);
+    }
+  }, {
+    key: "hasRasters",
+    value: function hasRasters() {
+      return !!(this.style.raster || (this.style.children || []).some(style => style.raster));
+    }
+  }, {
+    key: "symbol",
+    get: function get() {
+      return this.style.symbol;
+    }
+  }, {
+    key: "raster",
+    get: function get() {
+      return this.style.raster;
+    }
+  }, {
+    key: "label",
+    get: function get() {
+      return this.style.label;
+    }
+  }, {
+    key: "children",
+    get: function get() {
+      return this.style.children;
+    }
+  }, {
+    key: "title",
+    get: function get() {
+      return this.style.title;
+    }
+  }, {
+    key: "condition",
+    get: function get() {
+      return this.style.condition;
+    }
+  }, {
+    key: "ignoreLabel",
+    get: function get() {
+      return this.style.ignoreLabel;
+    }
+  }, {
+    key: "resolution",
+    get: function get() {
+      const {
+        minResolution,
+        maxResolution
+      } = this.style;
+      return minResolution === void 0 || maxResolution === void 0 ? null : [minResolution, maxResolution];
+    }
+  }]);
+
+  return EvergisStyle;
+}();
+
 const toClassificationClass = (parameterValue, title, condition) => _extends({
   parameterValue,
   title
@@ -902,73 +969,6 @@ function getRangeValues(_ref, isDouble, isDate, index) {
   };
 }
 
-let EvergisStyle = /*#__PURE__*/function () {
-  function EvergisStyle(style) {
-    _classCallCheck(this, EvergisStyle);
-
-    this.style = extractStyle(style);
-    this.classificationManager = new ClassificationManager(this.style);
-  }
-
-  _createClass(EvergisStyle, [{
-    key: "serialize",
-    value: function serialize() {
-      return packStyle(this.style);
-    }
-  }, {
-    key: "hasRasters",
-    value: function hasRasters() {
-      return !!(this.style.raster || (this.style.children || []).some(style => style.raster));
-    }
-  }, {
-    key: "symbol",
-    get: function get() {
-      return this.style.symbol;
-    }
-  }, {
-    key: "raster",
-    get: function get() {
-      return this.style.raster;
-    }
-  }, {
-    key: "label",
-    get: function get() {
-      return this.style.label;
-    }
-  }, {
-    key: "children",
-    get: function get() {
-      return this.style.children;
-    }
-  }, {
-    key: "title",
-    get: function get() {
-      return this.style.title;
-    }
-  }, {
-    key: "condition",
-    get: function get() {
-      return this.style.condition;
-    }
-  }, {
-    key: "ignoreLabel",
-    get: function get() {
-      return this.style.ignoreLabel;
-    }
-  }, {
-    key: "resolution",
-    get: function get() {
-      const {
-        minResolution,
-        maxResolution
-      } = this.style;
-      return minResolution === void 0 || maxResolution === void 0 ? null : [minResolution, maxResolution];
-    }
-  }]);
-
-  return EvergisStyle;
-}();
-
 const getHexColor = colorString => colorString ? new color.Color(colorString).toString('hex') : undefined;
 
 // TODO reduce
@@ -2529,7 +2529,7 @@ const getValueFromConditionPart = (condition, partIndex) => {
 
   return (_getExprFromCondition2 = getExprFromCondition(condition, partIndex)) == null ? void 0 : _getExprFromCondition2[2];
 };
-const isRangeCondition = condition => condition.includes('(');
+const isRangeCondition = condition => (condition == null ? void 0 : condition.includes('(')) || false;
 const getSymbolParameterInfo = parameter => {
   return PARAMETER_INFOS[parameter] || DEFAULT_PARAMETER_INFO;
 };
@@ -2585,11 +2585,11 @@ const checkLayerHasLegend = layerInfo => {
 const getTitleFromCondition = condition => {
   var _parts$;
 
-  const parts = condition.split(' == ');
-  return (_parts$ = parts[1]) == null ? void 0 : _parts$.slice(1, -1);
+  const parts = condition == null ? void 0 : condition.split(' == ');
+  return (parts == null ? void 0 : (_parts$ = parts[1]) == null ? void 0 : _parts$.slice(1, -1)) || '';
 };
-
-function createValueTitle$1(paramValue, attribute, formatValue, index) {
+function createValueTitleFromCondition(paramValue, attribute, formatValue, index) {
+  if (!attribute) return '';
   if (paramValue.title) return paramValue.title;
   const value = {
     parameterValue: getParameterValue(paramValue.value),
@@ -2606,7 +2606,6 @@ function createValueTitle$1(paramValue, attribute, formatValue, index) {
 // пункт "Настраиваемые значения параметров символики в системе"
 // Для добавления подготовленных значений размеров символов нужно использовать константу PREPARED_SYMBOL_SIZES
 
-
 const DEFAULT_LEGEND_STYLES = {
   [0
   /* Point */
@@ -2901,7 +2900,7 @@ const getMinimizedLegendValues = (attribute, classified, formatValue, index, oth
       const to = getValueFromConditionPart(paramValue.condition, 2);
       result.from = from ? isNumeric(from) ? +from : formatDate(from) : null;
       result.to = to ? isNumeric(to) ? +to : formatDate(to) : null;
-      result.title = createValueTitle$1(paramValue, attribute, formatValue, index);
+      result.title = createValueTitleFromCondition(paramValue, attribute, formatValue, index);
       return result;
     }
 
@@ -2927,7 +2926,7 @@ const getMaximizedLegendValues = (attribute, param, params, classified, symbol,
     const result = {
       symbol: createLegendSymbol(paramValue.value, param, params, symbol)
     };
-    result.title = isRangeCondition(paramValue.condition) ? createValueTitle$1(paramValue, attribute, formatValue, sectionIndex) : getTitleFromCondition(paramValue.condition);
+    result.title = isRangeCondition(paramValue.condition) ? createValueTitleFromCondition(paramValue, attribute, formatValue, sectionIndex) : getTitleFromCondition(paramValue.condition);
     result.hiddenCondition = createHiddenCondition(attribute.name, attribute.type, getClassificationValue(paramValue.value, result.title, new ClassificationCondition(classified.values[index].condition)));
     return result;
   });
@@ -2939,11 +2938,26 @@ const getMaximizedLegendValues = (attribute, param, params, classified, symbol,
   return [...items, other];
 };
 const getClassified = layerInfo => {
+  var _layerInfo$style2, _layerInfo$style2$chi;
+
+  if ((_layerInfo$style2 = layerInfo.style) != null && (_layerInfo$style2$chi = _layerInfo$style2.children) != null && _layerInfo$style2$chi.length) {
+    var _layerInfo$style3;
+
+    return {
+      symbol: {
+        type: 'byAttribute',
+        defaultValue: layerInfo.style.symbol,
+        title: null,
+        values: (_layerInfo$style3 = layerInfo.style) == null ? void 0 : _layerInfo$style3.children
+      }
+    };
+  }
+
   const classifyParams = SYMBOL_CLASSIFICATION[layerInfo.geometryType];
   return classifyParams == null ? void 0 : classifyParams.reduce((result, classified) => {
-    var _layerInfo$style2;
+    var _layerInfo$style4;
 
-    const param = get((_layerInfo$style2 = layerInfo.style) == null ? void 0 : _layerInfo$style2.symbol, classified);
+    const param = get((_layerInfo$style4 = layerInfo.style) == null ? void 0 : _layerInfo$style4.symbol, classified);
     return (param == null ? void 0 : param.type) === 'byAttribute' ? _extends({}, result, {
       [classified]: param
     }) : result;
@@ -3070,7 +3084,6 @@ function getAttributeType(layer, attributeName) {
   const attribute = attributes[attributeName];
   return attribute ? attribute.type : api.AttributeType.Unknown;
 }
-
 const getClassificationValue = (parameterValue, title, condition) => _extends({
   parameterValue,
   title
@@ -6279,6 +6292,46 @@ const LegendSymbolRenderer = /*#__PURE__*/React.memo(_ref => {
   });
 });
 
+const isHiddenLegend = (hiddenCondition, hiddenLegends) => !!(hiddenLegends != null && hiddenLegends.includes(hiddenCondition));
+
+const renderColumn = (column, index) => {
+  const dateTime = column.split(' ');
+  return React__default.createElement(React.Fragment, {
+    key: index
+  }, React__default.createElement(ItemText, {
+    title: column
+  }, dateTime[0], React__default.createElement(MapLegendDescription, null, dateTime[1])), index === 0 && React__default.createElement(ItemSeparator, null));
+};
+
+const getLegendText = _ref => {
+  let {
+    title,
+    index,
+    isDate
+  } = _ref;
+
+  if (!title) {
+    return React__default.createElement(ItemText, null, "\u0414\u0440\u0443\u0433\u043E\u0435");
+  }
+
+  const columns = title == null ? void 0 : title.split(' - ');
+  const isSingleColumn = (columns == null ? void 0 : columns.length) === 1;
+
+  if (!isDate || index && isSingleColumn) {
+    return React__default.createElement(ItemText, {
+      title: title
+    }, title);
+  }
+
+  if (!index && isSingleColumn) {
+    return React__default.createElement(React__default.Fragment, null, React__default.createElement(ItemText, {
+      title: "\u221E"
+    }, "\u221E"), React__default.createElement(ItemSeparator, null), renderColumn(title));
+  }
+
+  return React__default.createElement(React__default.Fragment, null, columns.map(renderColumn));
+};
+
 const MaximizedLegend = _ref => {
   let {
     innerRef,
@@ -6297,37 +6350,6 @@ const MaximizedLegend = _ref => {
   const isStrokeWidth = isParameterType(['strokeWidth', 'stroke.width'], parameter);
   const isStrokeColor = isParameterType(['strokeColor', 'stroke.color'], parameter);
   const parameterValue = React.useMemo(() => get(sectionSymbol, parameter), [sectionSymbol, parameter]);
-  const renderColumn = React.useCallback((column, index) => {
-    const dateTime = column.split(' ');
-    return React__default.createElement(React.Fragment, {
-      key: index
-    }, React__default.createElement(ItemText, {
-      title: column
-    }, dateTime[0], React__default.createElement(MapLegendDescription, null, dateTime[1])), index === 0 && React__default.createElement(ItemSeparator, null));
-  }, []);
-  const renderItemText = React.useCallback((title, index) => {
-    if (!title) {
-      return React__default.createElement(ItemText, null, "\u0414\u0440\u0443\u0433\u043E\u0435");
-    }
-
-    const columns = title == null ? void 0 : title.split(' - ');
-    const isSingleColumn = (columns == null ? void 0 : columns.length) === 1;
-
-    if (!isDate || index && isSingleColumn) {
-      return React__default.createElement(ItemText, {
-        title: title
-      }, title);
-    }
-
-    if (!index && isSingleColumn) {
-      return React__default.createElement(React__default.Fragment, null, React__default.createElement(ItemText, {
-        title: "\u221E"
-      }, "\u221E"), React__default.createElement(ItemSeparator, null), renderColumn(title));
-    }
-
-    return React__default.createElement(React__default.Fragment, null, columns.map(renderColumn));
-  }, [isDate, renderColumn]);
-  const isHidden = React.useCallback(hiddenCondition => !!(hiddenLegends != null && hiddenLegends.includes(hiddenCondition)), [hiddenLegends]);
   const renderLegend = React.useCallback((_ref2, index) => {
     var _parameterValue$value;
 
@@ -6340,7 +6362,7 @@ const MaximizedLegend = _ref => {
     const isClusterFillColor$1 = isClusterFillColor(symbol, parameter);
     return React__default.createElement(ClassifiedItem, {
       key: sectionIndex + title + index,
-      isHidden: isHidden(hiddenCondition),
+      isHidden: isHiddenLegend(hiddenCondition, hiddenLegends),
       isClusterFillColor: isClusterFillColor$1,
       onClick: () => toggleHiddenLegend == null ? void 0 : toggleHiddenLegend(layerName, hiddenCondition)
     }, isSize || isStrokeWidth || isStrokeColor ? React__default.createElement(MapLegendItems, {
@@ -6356,8 +6378,12 @@ const MaximizedLegend = _ref => {
       parameter: parameter
     })) : React__default.createElement(SymbolContainer, null, React__default.createElement(LegendSymbolRenderer, {
       symbol: isClusterFillColor$1 ? symbol : getExtractedSymbol(symbol, true)
-    })), renderItemText(title, index));
-  }, [parameter, sectionIndex, isHidden, isSize, isStrokeWidth, isStrokeColor, parameterValue, renderItemText, toggleHiddenLegend, layerName]);
+    })), getLegendText({
+      title,
+      index,
+      isDate
+    }));
+  }, [parameter, sectionIndex, hiddenLegends, isSize, isStrokeWidth, isStrokeColor, parameterValue, isDate, toggleHiddenLegend, layerName]);
   return React__default.createElement(MaximizedLegendContainer, {
     ref: innerRef,
     isShown: isShown
@@ -6390,6 +6416,7 @@ const LegendSection = _ref => {
   const [isExpanded, toggleExpanded] = useToggle();
   const [maxRef, maxNode] = useNode();
   const [minRef, minNode] = useNode();
+  if (!attribute) return null;
   return React__default.createElement(MapLegendSectionContainer, null, React__default.createElement(MapLegendHeader, null, attribute.alias || attribute.name), React__default.createElement(LegendParameterDescription, {
     parameter: parameter
   }), React__default.createElement(MapLegendSectionItems, {
@@ -6418,49 +6445,103 @@ const LegendSection = _ref => {
   }, isExpanded ? 'Свернуть' : 'Развернуть'));
 };
 
-const _excluded$3 = ["layerInfo"];
+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(paramValue.condition),
+      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;
+
   let {
-    layerInfo
+    layerInfo,
+    formatValue,
+    hiddenLegends,
+    toggleHiddenLegend
   } = _ref,
       rest = _objectWithoutPropertiesLoose(_ref, _excluded$3);
 
+  if ((_layerInfo$style = layerInfo.style) != null && (_layerInfo$style$chil = _layerInfo$style.children) != null && _layerInfo$style$chil.length) {
+    return React__default.createElement(LegendChildren, {
+      layerInfo: layerInfo,
+      formatValue: formatValue,
+      hiddenLegends: hiddenLegends,
+      toggleHiddenLegend: toggleHiddenLegend
+    });
+  }
+
+  const attributes = getLayerAttributes(layerInfo.layerDefinition);
   const classified = getClassified(layerInfo);
   if (!classified) return null;
   const parameters = Object.keys(classified);
-  const attributes = getLayerAttributes(layerInfo.layerDefinition);
   return React__default.createElement(MapLegendContainer, null, Object.keys(classified).map((param, index) => {
-    var _classified$param$val, _layerInfo$style;
-
-    const attributeName = getAttributeNameFromCondition((_classified$param$val = classified[param].values[0]) == null ? void 0 : _classified$param$val.condition);
-    let attribute = attributes.find(_ref2 => {
-      let {
-        name
-      } = _ref2;
-      return name === attributeName;
-    });
-
-    if (!attribute) {
-      if (attributeName === 'count') {
-        attribute = {
-          name: 'count',
-          alias: 'Количество',
-          type: api.AttributeType.Int32
-        };
-      } else {
-        return null;
-      }
-    }
+    var _layerInfo$style2, _classified$param, _classified$param$val;
 
     return React__default.createElement(LegendSection, Object.assign({
       key: index,
       layerName: layerInfo.name,
-      symbol: (_layerInfo$style = layerInfo.style) == null ? void 0 : _layerInfo$style.symbol,
-      attribute: attribute,
+      symbol: (_layerInfo$style2 = layerInfo.style) == null ? void 0 : _layerInfo$style2.symbol,
+      attribute: getConditionAttribute(attributes, (_classified$param = classified[param]) == null ? void 0 : (_classified$param$val = _classified$param.values[0]) == null ? void 0 : _classified$param$val.condition),
       classified: classified[param],
       parameter: param,
       parameters: parameters,
-      index: index
+      index: index,
+      formatValue: formatValue,
+      hiddenLegends: hiddenLegends,
+      toggleHiddenLegend: toggleHiddenLegend
     }, rest));
   }));
 });
@@ -7021,6 +7102,7 @@ exports.createLegendSymbol = createLegendSymbol;
 exports.createOtherHiddenCondition = createOtherHiddenCondition;
 exports.createSvgGradient = createSvgGradient;
 exports.createValueTitle = createValueTitle;
+exports.createValueTitleFromCondition = createValueTitleFromCondition;
 exports.dateComparisonOperators = dateComparisonOperators;
 exports.defaultOffset = defaultOffset;
 exports.defineStrokeStylePreset = defineStrokeStylePreset;
@@ -7043,6 +7125,7 @@ exports.getAttributeNameFromCondition = getAttributeNameFromCondition;
 exports.getAttributeType = getAttributeType;
 exports.getAttributesConfiguration = getAttributesConfiguration;
 exports.getChildSymbols = getChildSymbols;
+exports.getClassificationValue = getClassificationValue;
 exports.getClassified = getClassified;
 exports.getCrs = getCrs;
 exports.getDashStylePreset = getDashStylePreset;