@evergis/react 2.0.195 → 2.0.197

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

@@ -5,7 +5,7 @@ import { H3Symbol } from '@evergis/sgis/es/symbols/H3Symbol';
 import { Coordinates } from '@evergis/sgis/es/baseTypes';
 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 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' | 'figure.strokeColor' | 'figure.strokeWidth' | 'fontColor' | 'haloColor' | 'size' | 'symbol' | 'angle' | 'maskedColor' | 'endingSize' | 'beginningSize' | 'maxObjectCount' | 'gridSize' | 'selectionObjectsLimit' | 'singleObjectSymbol.figure.fillColor' | 'singleObjectSymbol.background.fillColor';
 export interface ParameterInfo {
     min: number;
     max: number;
@@ -82,6 +82,8 @@ export declare type SvgEditorField = Pick<SvgPointSymbol, 'size' | 'offset' | 'a
     'background.fillColor': string;
     'background.strokeColor': string;
     'background.strokeWidth': string;
+    'figure.strokeColor': string;
+    'figure.strokeWidth': string;
     'figure.fillColor': string;
 };
 export declare type MinimizedLegendProps = {

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

@@ -1,6 +1,6 @@
 import { ClassifyAble, ParameterValue, ParameterValueWithSymbol } from '../style';
 import { ClassificationAttribute } from '../attributes';
-export declare type NestedClassificationParameters = 'fill.color' | 'fill.hatchColor' | 'stroke.width' | 'stroke.color' | 'background.fillColor' | 'background.strokeColor' | 'background.strokeWidth' | 'figure.fillColor';
+export declare type NestedClassificationParameters = 'fill.color' | 'fill.hatchColor' | 'stroke.width' | 'stroke.color' | 'background.fillColor' | 'background.strokeColor' | 'background.strokeWidth' | 'figure.fillColor' | 'figure.strokeColor' | 'figure.strokeWidth';
 export declare type SimpleClassificationParameters = 'fillColor' | 'strokeColor' | 'strokeWidth' | 'size' | 'symbol' | 'angle' | 'maskedColor';
 export declare type ClassificationParameter = NestedClassificationParameters | SimpleClassificationParameters;
 export declare type ClassificationParameterExtended = ClassificationParameter | 'width' | 'height';

package/dist/react.cjs.development.js

@@ -3012,7 +3012,7 @@ const getLegendSymbolSize = symbol => {
   return Math.max(DEFAULT_LEGEND_SYMBOL_SIZE, size);
 };
 const serializeSvgPointSymbol = symbol => {
-  var _symbol$figure, _symbol$background2, _symbol$background3, _symbol$background4, _symbol$background5;
+  var _symbol$figure, _symbol$background2, _symbol$background3, _symbol$background4, _symbol$background5, _symbol$figure2, _symbol$figure3;
 
   if (!symbol) return null;
   const figureFillColor = ((_symbol$figure = symbol.figure) == null ? void 0 : _symbol$figure.fillColor) || null;
@@ -3033,7 +3033,9 @@ const serializeSvgPointSymbol = symbol => {
   } : {}, figureFillColor ? {
     figure: {
       id: 'symbol-figure',
-      fillColor: figureFillColor
+      fillColor: figureFillColor,
+      strokeColor: ((_symbol$figure2 = symbol.figure) == null ? void 0 : _symbol$figure2.strokeColor) || null,
+      strokeWidth: ((_symbol$figure3 = symbol.figure) == null ? void 0 : _symbol$figure3.strokeWidth) || null
     }
   } : {});
 };
@@ -3145,7 +3147,7 @@ const DEFAULT_CLUSTER_SVG = "\n<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox
 const SYMBOL_CLASSIFICATION = {
   [api.GeometryType.Polygon]: ['fill.color', 'stroke.color', 'stroke.width'],
   [api.GeometryType.Polyline]: ['stroke.color', 'stroke.width'],
-  [api.GeometryType.Point]: ['angle', 'size', 'fill.color', 'fillColor', 'background.fillColor', 'background.strokeColor', 'background.strokeWidth', 'figure.fillColor', 'singleObjectSymbol.figure.fillColor', 'singleObjectSymbol.background.fillColor']
+  [api.GeometryType.Point]: ['angle', 'size', 'fill.color', 'fillColor', 'background.fillColor', 'background.strokeColor', 'background.strokeWidth', 'figure.fillColor', 'figure.strokeColor', 'figure.strokeWidth', 'singleObjectSymbol.figure.fillColor', 'singleObjectSymbol.background.fillColor']
 };
 const SYMBOL_LIMITS = {
   SIZE_MIN: 1,
@@ -3314,11 +3316,16 @@ const manipulateSvgSymbol = _ref2 => {
         SVGContainer.svg(innerSvg);
       }
     } else {
+      const strokeColor = getParameterValue(figure == null ? void 0 : figure.strokeColor);
+      const strokeWidth = getParameterValue(figure == null ? void 0 : figure.strokeWidth) || (typeof (figure == null ? void 0 : figure.strokeColor) === 'object' ? 1 : 0);
       const fillColor = getParameterValue(figure == null ? void 0 : figure.fillColor);
       SVGContainer.size(currentSize + "px", currentSize + "px").viewbox(viewBox.join(' '));
       SVGContainer.svg(innerSvg);
       SVGContainer.find('#symbol-figure').each(item => {
-        item.center(DEFAULT_SYMBOL_SIZE / 2, DEFAULT_SYMBOL_SIZE / 2).fill(fillColor || DEFAULT_SYMBOL_FILL_COLOR);
+        item.center(DEFAULT_SYMBOL_SIZE / 2, DEFAULT_SYMBOL_SIZE / 2).fill(fillColor || DEFAULT_SYMBOL_FILL_COLOR).stroke({
+          color: strokeColor,
+          width: strokeWidth
+        });
       });
     }
   }