@evergis/react 3.1.16 → 3.1.18

package/dist/components/Dashboard/components/Chart/styled.d.ts

@@ -18,7 +18,7 @@ export declare const ChartWrapperContainer: import('styled-components').StyledCo
 export declare const Tooltip: import('styled-components').StyledComponent<"div", any, {
     transform?: CSSProperties["transform"];
 }, never>;
-export declare const LineChartTooltipStyles: import('styled-components').GlobalStyleComponent<{
+export declare const LineChartStyles: import('styled-components').GlobalStyleComponent<{
     [x: string]: any;
     [x: number]: any;
     [x: symbol]: any;
@@ -28,4 +28,4 @@ export declare const LineChartTooltipStyles: import('styled-components').GlobalS
     as?: string | import('react').ComponentType<any>;
     forwardedAs?: string | import('react').ComponentType<any>;
 }, import('styled-components').DefaultTheme>;
-export declare const BarChartStyles: import('styled-components').GlobalStyleComponent<{}, import('styled-components').DefaultTheme>;
+export declare const StyledBarChart: import('styled-components').StyledComponent<import('react').FC<import('@evergis/charts').BarChartProps>, any, {}, never>;

package/dist/components/Dashboard/hooks/useChartChange.d.ts

@@ -1,6 +1,6 @@
 import { LineChartProps } from '@evergis/charts';
 import { ConfigDataSource, ConfigRelatedDataSource } from '../types';
-export declare const useChartChange: ({ dataSources, chartId, width, height, relatedAttributes, defaultColor, fontColor, }: {
+export declare const useChartChange: ({ dataSources, chartId, width, height, relatedAttributes, defaultColor, fontColor, showMarkers, }: {
     dataSources: ConfigDataSource[];
     chartId: string;
     width: string | number;
@@ -8,4 +8,5 @@ export declare const useChartChange: ({ dataSources, chartId, width, height, rel
     relatedAttributes: ConfigRelatedDataSource[];
     defaultColor: string;
     fontColor: string;
+    showMarkers: number;
 }) => [LineChartProps["customize"], (range: [number, number]) => void];

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

@@ -43,7 +43,6 @@ export interface ConfigOptions {
     srid?: string;
     title?: string;
     label?: string;
-    showMarkers?: boolean;
     withPadding?: boolean;
     withDivider?: boolean;
     tagView?: boolean;
@@ -76,7 +75,9 @@ export interface ConfigOptions {
     height?: number;
     barWidth?: number;
     barHeight?: number;
-    markers?: BarChartMarker[];
+    showLabels?: boolean;
+    showMarkers?: number;
+    markers?: BarChartMarker[] | string;
     drawMinMax?: boolean;
     attributes?: string[];
     colors?: string[];

package/dist/components/Dashboard/utils/getChartMarkers.d.ts

@@ -1,3 +1,3 @@
 import { BarChartMarker } from '@evergis/charts';
-import { FilterItem } from '../types';
-export declare const getChartMarkers: (items: FilterItem[], markers: BarChartMarker[]) => BarChartMarker[];
+import { FetchedDataSource, FilterItem } from '../types';
+export declare const getChartMarkers: (items: FilterItem[], markers: BarChartMarker[] | string, dataSources: FetchedDataSource[]) => BarChartMarker[];

package/dist/index.js

@@ -112,7 +112,7 @@ const Tooltip = styled.div `
     height: 0;
   }
 `;
-const LineChartTooltipStyles = styled.createGlobalStyle `
+const LineChartStyles = styled.createGlobalStyle `
   .dashboardLineChartTooltip.${charts.lineChartClassNames.lineChartMouseLabel} {
     .${charts.lineChartClassNames.lineChartLabelFlex} {
       justify-content: center;
@@ -187,11 +187,19 @@ const LineChartTooltipStyles = styled.createGlobalStyle `
     fill: ${({ theme: { palette } }) => palette.textDisabled};
   }
 `;
-const BarChartStyles = styled.createGlobalStyle `
-  .dashboardBarChart {
-    .domain,
+const StyledBarChart = styled(charts.BarChart) `
+  .domain,
+  line {
+    display: none;
+  }
+
+  .tick {
+    text {
+      fill: ${({ theme: { palette } }) => palette.textDisabled};
+    }
+
     line {
-      display: none;
+      visibility: hidden;
     }
   }
 `;
@@ -3989,41 +3997,7 @@ function wrap() {
         textLength = self.node().getComputedTextLength();
     }
 }
-// https://jr.everpoint.ru/browse/PUB-5221
-/* function wrap2(text, width, content) {
-  text.each(() => {
-    const textElem = d3.select(this);
-    const words = content.split(/\s+/).reverse();
-    let word;
-    let line = [];
-    let lineNumber = 0;
-    const lineHeight = 1.1; // ems
-    const x = 0; // textElem.attr("x");
-    const y = 0; // textElem.attr("y");
-    const dy = 0; // parseFloat(text.attr("dy")),
-    // eslint-disable-next-line newline-per-chained-call
-    let tspan = textElem.text(null).append("tspan").attr("x", x).attr("y", y).attr("dy", `${dy}em`);
-
-    // eslint-disable-next-line no-cond-assign
-    while ((word = words.pop())) {
-      line.push(word);
-      tspan.text(line.join(" "));
-      if (tspan.node().getComputedTextLength() > width) {
-        line.pop();
-        tspan.text(line.join(" "));
-        line = [word];
-        tspan = textElem
-          .append("tspan")
-          .attr("x", x)
-          .attr("y", y)
-          // eslint-disable-next-line no-plusplus
-          .attr("dy", `${++lineNumber * lineHeight + dy}em`)
-          .text(word);
-      }
-    }
-  });
-}*/
-const useChartChange = ({ dataSources, chartId, width, height, relatedAttributes, defaultColor, fontColor, }) => {
+const useChartChange = ({ dataSources, chartId, width, height, relatedAttributes, defaultColor, fontColor, showMarkers, }) => {
     const { t } = useGlobalContext();
     const { layerInfos } = useWidgetContext();
     const strokeColors = relatedAttributes.filter(({ chartAxis }) => chartAxis === "y").map(({ axisColor }) => axisColor);
@@ -4060,11 +4034,17 @@ const useChartChange = ({ dataSources, chartId, width, height, relatedAttributes
             if (index === nodes.length - 1) {
                 nodes[index].style.textAnchor = "end";
             }
-            if (index && index < nodes.length - 1) {
-                nodes[index].remove();
+            if (showMarkers) {
+                if (index % (showMarkers || 1) !== 0) {
+                    nodes[index].remove();
+                }
+            }
+            else {
+                if (index && index < nodes.length - 1) {
+                    nodes[index].remove();
+                }
             }
         });
-        // svg.selectAll(`.${lineChartClassNames.lineChartXScaleGlobal} .tick text`).call(wrap2, 5, "!!!");
         svg.selectAll(`.${charts.lineChartClassNames.lineChartXScaleGlobal} .tick text`).attr("y", 16);
         svg
             .selectAll(`.${charts.lineChartClassNames.lineChartYScaleGlobal} .tick text`)
@@ -4110,7 +4090,7 @@ const useChartChange = ({ dataSources, chartId, width, height, relatedAttributes
             onChange();
         });
         svg.append("defs").html(() => defs.join(""));
-    }, [fontColor, dataSources, layerInfos, relatedAttributes, chartId, strokeColors, defaultColor, width, onChange]);
+    }, [fontColor, dataSources, layerInfos, relatedAttributes, chartId, strokeColors, defaultColor, width, onChange, showMarkers]);
     return [customize, onChange];
 };
 
@@ -5399,7 +5379,11 @@ const getChartFilterName = (relatedDataSources) => {
     return axes?.[0]?.filterName;
 };
 
-const getChartMarkers = (items, markers) => {
+const getChartMarkers = (items, markers, dataSources) => {
+    if (typeof markers === "string") {
+        const dataSource = getDataSource(markers, dataSources);
+        return dataSource?.features?.map(({ attributes }) => attributes) || [];
+    }
     return (markers?.map(marker => ({
         ...marker,
         value: items?.findIndex(({ name }) => name.toString() === marker.value?.toString()),
@@ -8151,7 +8135,7 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
         bars.attr("rx", radius).attr("ry", radius);
     }, [radius]);
     const tooltipY = React.useMemo(() => (barHeight ? height - barHeight - DEFAULT_BAR_CHART_MARGINS.bottom : undefined), [barHeight, height]);
-    const markers = React.useMemo(() => getChartMarkers(filterItems, configMarkers), [configMarkers, filterItems]);
+    const markers = React.useMemo(() => getChartMarkers(filterItems, configMarkers, dataSources), [configMarkers, dataSources, filterItems]);
     const hasDefinedColors = React.useMemo(() => configColors?.length || colorAttribute, [configColors, colorAttribute]);
     const marshalledMap = React.useCallback(items => {
         if (hasDefinedColors)
@@ -8483,7 +8467,7 @@ const getRenderElement = ({ t, config, elementConfig, attributes = [], layerInfo
     return formatElementValue({ t, value, elementConfig: element, attributes, wrap });
 };
 
-const getResourceUrl = (url) => url ? (url.startsWith("http") ? url : `/sp/resources/${url}/download`) : "";
+const getResourceUrl = (url) => url ? (url.startsWith("http") ? url : `/sp/resources/file/${url}`) : "";
 
 const getSlideshowImages = ({ element, attribute, }) => {
     const { defaultValue, options } = element;
@@ -9129,10 +9113,11 @@ const StackBar = ({ data, filterName, type, alias, options, renderElement, rende
 const Chart = React.memo(({ config, element, elementConfig, type, renderElement }) => {
     const theme = styled.useTheme();
     const { palette } = theme;
+    const primaryColor = palette.primary;
     const { t } = useGlobalContext();
-    const { expandedContainers, layerInfos, attributes } = useWidgetContext(type);
+    const { expandedContainers, layerInfos, attributes, dataSources } = useWidgetContext(type);
     const { id, options, children } = element || {};
-    const { column, markers: configMarkers, showTotal, expandable, expanded, chartType, relatedDataSources, defaultColor } = options || {};
+    const { column, markers: configMarkers, showLabels, showMarkers, showTotal, totalWord: configTotalWord, totalAttribute, expandable, expanded, chartType, relatedDataSources, defaultColor } = options || {};
     const isLineChart = chartType === "line";
     const isPieChart = chartType === "pie";
     const isStackBar = chartType === "stack";
@@ -9144,7 +9129,6 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
     const angle = options?.angle || DEFAULT_CHART_ANGLE;
     const barWidth = options?.barWidth || DEFAULT_BAR_WIDTH;
     const cornerRadius = options?.cornerRadius || 0;
-    const primaryColor = theme.palette.primary;
     const relatedAttributes = React.useMemo(() => relatedDataSources || [], [relatedDataSources]);
     const axes = React.useMemo(() => relatedAttributes.filter(({ chartAxis }) => chartAxis === "y"), [relatedAttributes]);
     const filterName = getChartFilterName(relatedDataSources);
@@ -9164,16 +9148,17 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
         height,
         fontColor,
         relatedAttributes,
-        defaultColor: primaryColor
+        defaultColor: primaryColor,
+        showMarkers,
     });
     const { formatFilterColor, onFilter } = useFeatureFilters(type, filterName, data?.[0]?.items);
     const formattedAttributes = React.useMemo(() => getFormattedAttributes(t, (data[0]?.items || []), attributes, element), [attributes, data, element, t]);
     const totalSum = React.useMemo(() => isRelated
         ? getTotalFromRelatedFeatures((data[0]?.items || []))
         : getTotalFromAttributes(children, formattedAttributes), [data, children, formattedAttributes, isRelated]);
-    const totalWord = React.useMemo(() => options?.totalAttribute
-        ? attributes?.find(({ name }) => name === options.totalAttribute)?.value
-        : options?.totalWord, [attributes, options.totalAttribute, options?.totalWord]);
+    const totalWord = React.useMemo(() => totalAttribute
+        ? attributes?.find(({ name }) => name === totalAttribute)?.value
+        : configTotalWord, [attributes, totalAttribute, configTotalWord]);
     const renderPieChartTooltip = React.useCallback(item => isRelated
         ? pieChartTooltipFromRelatedFeatures(t, item, relatedAttributes, data[0]?.layerInfo)
         : pieChartTooltipFromAttributes(t, item, formattedAttributes), [data, formattedAttributes, isRelated, relatedAttributes]);
@@ -9192,11 +9177,17 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
                     return (jsxRuntime.jsxs(ChartTooltipRow, { children: [jsxRuntime.jsx(ChartLegendColor$1, { "$color": stroke }), jsxRuntime.jsx(ChartLegendValue, { children: attribute ? formatAttributeValue({ t, type: attribute.type, value, stringFormat: attribute.stringFormat }) : value })] }, index));
                 })] }));
     }, [labels, layerInfos]);
-    const markers = React.useMemo(() => getChartMarkers(data[0]?.items, configMarkers), [data, configMarkers]);
+    const markers = React.useMemo(() => getChartMarkers(data[0]?.items, configMarkers, dataSources), [data, dataSources, configMarkers]);
     const formatTooltipName = React.useCallback((name) => (isRelated ? name : tooltipNameFromAttributes(name, formattedAttributes)), [formattedAttributes, isRelated]);
     const formatTooltipValue = React.useCallback((value, name) => isRelated
         ? tooltipValueFromRelatedFeatures(t, value, relatedAttributes, data[0]?.layerInfo)
         : tooltipValueFromAttributes(t, value, name, formattedAttributes), [data, formattedAttributes, isRelated, relatedAttributes]);
+    const customXAxisBottom = React.useCallback((xAxisBottom, data) => {
+        xAxisBottom.tickFormat((index) => (showMarkers
+            ? index % (showMarkers || 1) === 0
+            : index === 0 || index === data.length - 1)
+            ? data[index]?.groupName || "" : "");
+    }, [showMarkers]);
     const renderChart = React.useMemo(() => {
         if (!element)
             return null;
@@ -9214,7 +9205,7 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
                 .flat()
                 .map(({ values }) => values)
                 .flat();
-            return (jsxRuntime.jsxs(AnyChartWrapper, { height: height, children: [jsxRuntime.jsx(LineChartTooltipStyles, {}), jsxRuntime.jsx(charts.LineChart, { data: lineChartData, labels: labels, width: +width, height: height, xAxisPadding: 15, yAxisPadding: 0, min: Math.min(...chartValues), customYAxisSelection: yAxis => {
+            return (jsxRuntime.jsxs(AnyChartWrapper, { height: height, children: [jsxRuntime.jsx(LineChartStyles, {}), jsxRuntime.jsx(charts.LineChart, { data: lineChartData, labels: labels, width: +width, height: height, xAxisPadding: 15, yAxisPadding: 0, min: Math.min(...chartValues), customYAxisSelection: yAxis => {
                             if (isHidedY) {
                                 yAxis.remove();
                             }
@@ -9236,18 +9227,20 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
                         color: formatFilterColor(item.name, item.color, defaultColor)
                     })) || []), width: +width, height: +width, padAngle: angle, outerRadius: radius, cornerRadius: cornerRadius, renderTooltip: renderPieChartTooltip, withTooltip: true, onClick: filterName ? item => onFilter(item.name) : undefined, children: showTotal && jsxRuntime.jsx(PieChartCenter, { children: totalWord || roundTotalSum(+totalSum) }) }) }));
         }
-        const markersMargin = options?.showMarkers ? 10 : 0;
+        const barChartData = getDataFromFilterItems(data[0]?.items);
+        const markersMargin = showMarkers ? 10 : 0;
         const margin = {
             top: markersMargin,
             right: markersMargin,
             bottom: markers?.length ? 20 : markersMargin,
             left: markersMargin
         };
-        return (jsxRuntime.jsx(BarChartWrapper, { height: height + margin.bottom, children: jsxRuntime.jsxs(BarChartContainer, { children: [jsxRuntime.jsx(BarChartStyles, {}), jsxRuntime.jsx(charts.BarChart, { data: getDataFromFilterItems(data[0]?.items), colors: getColorsFromFilterItems(data[0]?.items, defaultColor, formatFilterColor), minValue: getMinValueFromFilterItems(data[0]?.items), markers: markers, width: +width, height: height, barWidth: barWidth, barPadding: padding, className: "dashboardBarChart", customXAxis: axis => axis.remove(), customYAxis: axis => !options?.showMarkers && axis.remove(), customBars: ({ bars }) => {
-                            bars.attr("rx", radius);
-                            bars.attr("ry", radius);
-                        }, margin: margin, xAxisPadding: 0, yAxisPadding: 0, formatTooltipValue: formatTooltipValue, formatTooltipName: formatTooltipName, hideTooltipGroupName: true, dynamicTooltipEnable: true, isBarTooltip: true, onBarClick: filterName ? item => onFilter(item.name) : undefined })] }) }));
+        return (jsxRuntime.jsx(BarChartWrapper, { height: height + margin.bottom, children: jsxRuntime.jsx(BarChartContainer, { children: jsxRuntime.jsx(StyledBarChart, { data: barChartData, colors: getColorsFromFilterItems(data[0]?.items, defaultColor, formatFilterColor), minValue: getMinValueFromFilterItems(data[0]?.items), markers: markers, width: +width, height: height, barWidth: barWidth, barPadding: padding, className: "dashboardBarChart", customXAxisBottom: xAxisBottom => customXAxisBottom(xAxisBottom, barChartData), customYAxis: axis => !showLabels && axis.remove(), customBars: ({ bars }) => {
+                        bars.attr("rx", radius);
+                        bars.attr("ry", radius);
+                    }, margin: margin, xAxisPadding: 0, yAxisPadding: 0, formatTooltipValue: formatTooltipValue, formatTooltipName: formatTooltipName, hideTooltipGroupName: true, dynamicTooltipEnable: true, isBarTooltip: true, onBarClick: filterName ? item => onFilter(item.name) : undefined }) }) }));
     }, [
+        customXAxisBottom,
         element,
         isLineChart,
         isStackBar,
@@ -9259,6 +9252,8 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
         formatFilterColor,
         width,
         barWidth,
+        showLabels,
+        showMarkers,
         padding,
         formatTooltipValue,
         formatTooltipName,
@@ -9553,7 +9548,10 @@ const SvgImage = React.memo(({ url, width, height, fontColor }) => {
     React.useEffect(() => () => {
         setSvg(null);
     }, []);
-    if (!svg?.endsWith("</svg>"))
+    // Todo remove the test info
+    console.info("svg", svg);
+    const regexp = /<\/svg>\s*$/im;
+    if (!regexp.test(svg))
         return null;
     return (jsxRuntime.jsx(StyledSvg, { "$width": width, "$height": height, "$fontColor": fontColor, dangerouslySetInnerHTML: { __html: svg } }));
 });