@evergis/react 3.1.15 → 3.1.17

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

@@ -1,5 +1,7 @@
+import { CSSProperties } from 'react';
 export declare const ChartTooltipTable: import('styled-components').StyledComponent<"table", any, {}, never>;
 export declare const ChartTooltip: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;
+export declare const ChartTooltipLabel: import('styled-components').StyledComponent<"div", any, {}, never>;
 export declare const ChartTooltipColor: import('styled-components').StyledComponent<"div", any, {
     $color: string;
 }, never>;
@@ -13,3 +15,17 @@ export declare const PieChartCenter: import('styled-components').StyledComponent
 export declare const ChartWrapperContainer: import('styled-components').StyledComponent<"div", any, {
     column: boolean;
 }, never>;
+export declare const Tooltip: import('styled-components').StyledComponent<"div", any, {
+    transform?: CSSProperties["transform"];
+}, never>;
+export declare const LineChartStyles: import('styled-components').GlobalStyleComponent<{
+    [x: string]: any;
+    [x: number]: any;
+    [x: symbol]: any;
+} & {
+    theme?: any;
+} & {
+    as?: string | import('react').ComponentType<any>;
+    forwardedAs?: string | import('react').ComponentType<any>;
+}, 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/containers/RoundedBackgroundContainer/styled.d.ts

@@ -1,6 +1,8 @@
+export declare const ContainerIconValue: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;
 export declare const RoundedBackgroundContainerWrapper: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps & {
     $center?: boolean;
     $color?: string;
     $inlineUnits?: boolean;
+    $big?: boolean;
     $bigIcon?: boolean;
 }, 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

@@ -75,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[];
@@ -98,6 +100,7 @@ export interface ConfigOptions {
     wrap?: boolean;
     icon?: string;
     iconUrl?: string;
+    big?: boolean;
     bigIcon?: boolean;
     onlyIcon?: boolean;
     hideEmpty?: boolean;

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

@@ -37,14 +37,18 @@ const ChartTooltipTable = styled.table `
   }
 `;
 const ChartTooltip = styled(uilibGl.Flex) `
-  flex-direction: row;
-  align-items: center;
   flex-wrap: nowrap;
+  background: rgb(48, 69, 79);
+  border-radius: 0.25rem;
+  color: white;
 
   :not(:last-child) {
     margin-bottom: 0.25rem;
   }
 `;
+const ChartTooltipLabel = styled.div `
+  margin-right: 0.25rem;
+`;
 const ChartTooltipColor = styled.div `
   width: 0.625rem;
   height: 0.625rem;
@@ -90,6 +94,115 @@ const ChartWrapperContainer = styled.div `
   position: relative;
   width: 100%;
 `;
+const Tooltip = styled.div `
+  position: relative;
+  border-radius: 0.25rem;
+  background-color: rgba(28, 33, 48);
+  padding: 0.5rem;
+  box-shadow: 0 0.125rem 0.25rem 0 rgba(0, 0, 0, 0.15);
+  font-size: 0.75rem;
+  transform: ${({ transform }) => transform};
+  color: white;
+
+  :before {
+    position: absolute;
+    display: block;
+    content: "";
+    width: 0;
+    height: 0;
+  }
+`;
+const LineChartStyles = styled.createGlobalStyle `
+  .dashboardLineChartTooltip.${charts.lineChartClassNames.lineChartMouseLabel} {
+    .${charts.lineChartClassNames.lineChartLabelFlex} {
+      justify-content: center;
+      align-items: flex-end;
+
+      ${Tooltip} {
+        margin: 0 0 12px 0;
+
+        :before {
+          top: auto;
+          bottom: 0;
+          left: 50%;
+          transform: translate(-50%, 100%);
+          border-left: 4px solid transparent;
+          border-right: 4px solid transparent;
+          border-top: 4px solid rgba(28, 33, 48, 0.9);
+        }
+      }
+    }
+  }
+  
+  .${charts.lineChartClassNames.lineChartYScaleGlobal}, .${charts.lineChartClassNames.lineChartXScaleGlobal} {
+    .domain {
+      visibility: hidden;
+    }
+
+    .tick {
+      text {
+        fill: ${({ theme: { palette } }) => palette.textDisabled};
+      }
+
+      line {
+        visibility: hidden;
+      }
+    }
+  }
+
+  .${charts.lineChartClassNames.lineChartXScaleGlobal} {
+    .tick {
+      :first-of-type {
+        text {
+          text-anchor: start;
+        }
+      }
+
+      :last-of-type {
+        text {
+          text-anchor: end;
+        }
+      }
+    }
+  }
+
+  .${charts.lineChartClassNames.lineChartLine} {
+    stroke-width: 2px;
+  }
+
+  .${charts.lineChartClassNames.lineChartLabel} {
+    color: ${({ theme: { palette } }) => palette.textPrimary};
+  }
+
+  .${charts.lineChartClassNames.lineChartMouseCircle} {
+    stroke: #ffffff;
+    stroke-width: 2px;
+  }
+
+  .${charts.lineChartClassNames.lineChartGridLineX} {
+    stroke: ${({ theme: { palette } }) => palette.element};
+  }
+
+  text {
+    fill: ${({ theme: { palette } }) => palette.textDisabled};
+  }
+`;
+const StyledBarChart = styled(charts.BarChart) `
+  .domain,
+  line {
+    display: none;
+  }
+
+  .tick {
+    text {
+      fill: ${({ theme: { palette } }) => palette.textDisabled};
+    }
+
+    line {
+      visibility: hidden;
+    }
+  }
+`;
 
 function range(start, stop, step) {
   start = +start, stop = +stop, step = (n = arguments.length) < 2 ? (stop = start, start = 0, 1) : n < 3 ? 1 : +step;
@@ -3884,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);
@@ -3955,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`)
@@ -4005,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];
 };
 
@@ -5294,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()),
@@ -5716,7 +5805,6 @@ const AnyChartWrapper = styled.div `
 `;
 const BarChartWrapper = styled(AnyChartWrapper) `
   width: 100%;
-  max-width: ${MAX_CHART_WIDTH}px;
   margin: 0 auto ${BAR_CHART_FOOTER_MARGIN}px;
 
   :hover {
@@ -5846,7 +5934,7 @@ const PagesContainer = React.memo(({ type }) => {
     const { pageIndex, currentPage } = useWidgetPage(type);
     const { selectedTabId, setSelectedTabId, expandedContainers, attributes } = useWidgetContext(type);
     const { options } = config || {};
-    const { column } = options || {};
+    const { column, width } = options || {};
     const isColumn = column === undefined || column;
     const filteredChildren = React.useMemo(() => !selectedTabId
         ? currentPage.children
@@ -5871,7 +5959,7 @@ const PagesContainer = React.memo(({ type }) => {
         setSelectedTabId,
         type,
     ]);
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ExpandableTitle, { elementConfig: config, type: type, renderElement: renderElement }), jsxRuntime.jsx(Container, { isColumn: isColumn, isMain: true, children: jsxRuntime.jsx(ContainerChildren, { items: filteredChildren, isMain: true, renderElement: renderElement }) })] }));
+    return (jsxRuntime.jsxs("div", { style: { width }, children: [jsxRuntime.jsx(ExpandableTitle, { elementConfig: config, type: type, renderElement: renderElement }), jsxRuntime.jsx(Container, { isColumn: isColumn, isMain: true, children: jsxRuntime.jsx(ContainerChildren, { items: filteredChildren, isMain: true, renderElement: renderElement }) })] }));
 });
 
 const TwoColumnsInnerContainer = React.memo(({ renderElement }) => {
@@ -6270,6 +6358,7 @@ const TabsContainer = React.memo(({ elementConfig, type }) => {
     return (jsxRuntime.jsx(SwiperContainer, { style: style, children: jsxRuntime.jsx(react.Swiper, { spaceBetween: 0, slidesPerView: shownItems || 2, children: tabs.map(({ id, value, options: tabOptions }) => (jsxRuntime.jsxs(react.SwiperSlide, { children: [jsxRuntime.jsxs(TabContainer, { href: `#${id}`, active: selectedTabId === id, column: column, bgColor: bgColor, noBg: noBg, radius: radius, onlyIcon: onlyIcon, hasIcon: !!tabOptions?.icon, onClick: () => onClick(id), children: [renderIcon(tabOptions?.icon, selectedTabId === id), !onlyIcon && (jsxRuntime.jsx(TabValue, { children: jsxRuntime.jsx(TextTrim, { maxLength: maxLength, children: value }) }))] }), jsxRuntime.jsx(TabAnchor, { id: id })] }, id))) }) }));
 });
 
+const ContainerIconValue = styled(uilibGl.Flex) ``;
 const RoundedBackgroundContainerWrapper = styled(uilibGl.Flex) `
   position: relative;
   flex-direction: ${({ $bigIcon }) => ($bigIcon ? "row" : "column")};
@@ -6287,13 +6376,10 @@ const RoundedBackgroundContainerWrapper = styled(uilibGl.Flex) `
     styled.css `
       align-items: center;
 
-      * {
+      > * {
         display: flex;
         justify-content: center;
         text-align: center;
-      }
-
-      > * {
         width: 100%;
       }
     `};
@@ -6326,8 +6412,32 @@ const RoundedBackgroundContainerWrapper = styled(uilibGl.Flex) `
       }
     `};
 
+  ${ContainerIconValue} {
+    align-items: center;
+    flex-direction: column;
+
+    ${({ $big }) => $big &&
+    styled.css `
+        flex-direction: row;
+        margin-bottom: 0.5rem;
+
+        > * {
+          text-align: left;
+        }
+
+        span[kind] {
+          margin-right: 0.5rem;
+        }
+        
+        ${ContainerValue} {
+          width: auto;
+        }
+      `};
+  }
+
   ${ContainerValue} {
     flex-direction: ${({ $inlineUnits }) => ($inlineUnits ? "row" : "column")};
+    justify-content: ${({ $big }) => ($big ? "flex-start" : "flex-end")};
     align-items: ${({ $inlineUnits }) => ($inlineUnits ? "center" : "flex-start")};
     line-height: 1;
   }
@@ -6351,15 +6461,17 @@ const RoundedBackgroundContainer = React.memo(({ type, elementConfig, feature, r
         feature
     });
     const { options, style, children } = elementConfig || {};
-    const { maxLength, center, fontColor, innerTemplateStyle, inlineUnits, bigIcon, hideEmpty, colorAttribute } = options || {};
+    const { maxLength, center, fontColor, innerTemplateStyle, inlineUnits, big, bigIcon, hideEmpty, colorAttribute } = options || {};
     const aliasElement = children?.find(({ id }) => id === "alias");
     const unitsElement = children?.find(({ id }) => id === "units");
     const valueElement = children?.find(({ id }) => id === "value");
     const value = renderElement({ id: "value" });
     const color = React.useMemo(() => attributes?.find(({ name }) => name === colorAttribute)?.value || fontColor, [attributes, colorAttribute, fontColor]);
+    const renderAlias = React.useMemo(() => (jsxRuntime.jsx(ContainerAlias, { style: aliasElement?.style, children: jsxRuntime.jsx(TextTrim, { maxLength: maxLength || ALIAS_DEFAULT_MAX_LENGTH, children: renderElement({ id: "alias", wrap: false }) }) })), [aliasElement?.style, maxLength, renderElement]);
+    const renderValue = React.useMemo(() => (jsxRuntime.jsxs(ContainerValue, { style: valueElement?.style, big: true, children: [value, !!unitsElement && (jsxRuntime.jsx(ContainerUnits, { style: unitsElement?.style, children: renderElement({ id: "units" }) }))] })), [valueElement?.style, value, unitsElement, renderElement]);
     if (!value && hideEmpty)
         return null;
-    return (jsxRuntime.jsxs(RoundedBackgroundContainerWrapper, { style: innerTemplateStyle || style, "$center": center, "$color": color, "$inlineUnits": inlineUnits, "$bigIcon": bigIcon, children: [renderElement({ id: "icon", wrap: false }), jsxRuntime.jsxs(ContainerValue, { style: valueElement?.style, big: true, children: [value, !!unitsElement && (jsxRuntime.jsx(ContainerUnits, { style: unitsElement?.style, children: renderElement({ id: "units" }) }))] }), jsxRuntime.jsx(ContainerAlias, { style: aliasElement?.style, children: jsxRuntime.jsx(TextTrim, { maxLength: maxLength || ALIAS_DEFAULT_MAX_LENGTH, children: renderElement({ id: "alias", wrap: false }) }) })] }));
+    return (jsxRuntime.jsxs(RoundedBackgroundContainerWrapper, { style: innerTemplateStyle || style, "$center": center, "$color": color, "$inlineUnits": inlineUnits, "$big": big, "$bigIcon": bigIcon, children: [jsxRuntime.jsxs(ContainerIconValue, { children: [renderElement({ id: "icon", wrap: false }), big ? renderAlias : renderValue] }), big ? renderValue : renderAlias] }));
 });
 
 const AddFeatureContainer = React.memo(({ elementConfig }) => {
@@ -8023,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)
@@ -8355,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;
@@ -8408,7 +8520,7 @@ const pieChartTooltipFromAttributes = (t, data, attributes) => {
 const pieChartTooltipFromRelatedFeatures = (t, data, relatedAttributes, layerInfo) => {
     if (!data?.length)
         return "";
-    return (jsxRuntime.jsx(uilibGl.ThemeProvider, { children: jsxRuntime.jsxs(ChartTooltip, { children: [jsxRuntime.jsx(ChartTooltipColor, { "$color": data[0].color }), jsxRuntime.jsxs("div", { children: [data[0].name, " \u00A0 ", formatChartRelatedValue(t, data[0].value, layerInfo, relatedAttributes)] })] }) }));
+    return (jsxRuntime.jsx(uilibGl.ThemeProvider, { children: jsxRuntime.jsxs(ChartTooltip, { alignItems: "center", children: [jsxRuntime.jsx(ChartTooltipColor, { "$color": data[0].color }), jsxRuntime.jsxs("div", { children: [data[0].name, " \u00A0 ", formatChartRelatedValue(t, data[0].value, layerInfo, relatedAttributes)] })] }) }));
 };
 
 const removeDataSource = (dashboardConfiguration, name, pageIndex) => {
@@ -8990,7 +9102,7 @@ const StackBar = ({ data, filterName, type, alias, options, renderElement, rende
     const units = attribute?.stringFormat?.unitsLabel;
     const total = React.useMemo(() => items?.reduce((result, { value }) => result + Number(value), 0) || 0, [items]);
     const getWidth = React.useCallback(value => ((Number(value) / total) * 100).toFixed(2), [total]);
-    const renderGroupTooltip = React.useMemo(() => (jsxRuntime.jsx(uilibGl.ThemeProvider, { children: jsxRuntime.jsx(ChartTooltipTable, { cellPadding: 0, cellSpacing: 0, children: items?.map(({ name, value, color }, index) => (jsxRuntime.jsxs("tr", { children: [jsxRuntime.jsx("td", { children: jsxRuntime.jsxs(ChartTooltip, { children: [jsxRuntime.jsx(ChartTooltipColor, { "$color": color }), jsxRuntime.jsx(ChartTooltipName, { children: name })] }) }), jsxRuntime.jsx("td", { children: value })] }, index))) }) })), [items]);
+    const renderGroupTooltip = React.useMemo(() => (jsxRuntime.jsx(uilibGl.ThemeProvider, { children: jsxRuntime.jsx(ChartTooltipTable, { cellPadding: 0, cellSpacing: 0, children: items?.map(({ name, value, color }, index) => (jsxRuntime.jsxs("tr", { children: [jsxRuntime.jsx("td", { children: jsxRuntime.jsxs(ChartTooltip, { alignItems: "center", children: [jsxRuntime.jsx(ChartTooltipColor, { "$color": color }), jsxRuntime.jsx(ChartTooltipName, { children: name })] }) }), jsxRuntime.jsx("td", { children: value })] }, index))) }) })), [items]);
     const renderItem = React.useCallback(({ name, value, color }, ref) => (jsxRuntime.jsx(StackBarSection, { ref: ref, "$width": getWidth(value), "$height": height, "$color": color, cornerRadius: cornerRadius, hasAnyFilter: hasAnyFilter, isFiltered: isFiltered(name), onClick: filterName ? () => onFilter(name) : undefined })), [cornerRadius, filterName, getWidth, hasAnyFilter, height, isFiltered, onFilter]);
     const renderItems = React.useMemo(() => (jsxRuntime.jsx(jsxRuntime.Fragment, { children: items?.map((item, index) => (jsxRuntime.jsx(React.Fragment, { children: groupTooltip ? (renderItem(item)) : (jsxRuntime.jsx(uilibGl.ThemeProvider, { children: jsxRuntime.jsx(uilibGl.Tooltip, { placement: "top", arrow: true, content: renderTooltip([item]), children: ref => renderItem(item, ref) }) })) }, index))) })), [groupTooltip, items, renderItem, renderTooltip]);
     if (!total || !attribute)
@@ -9001,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";
@@ -9016,23 +9129,17 @@ 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);
     const isRelated = !!relatedAttributes?.length;
     const { data, loading } = useChartData({ element, type });
     const totalWidthFromBarWidth = (data[0]?.items?.length || 0) * (barWidth + padding);
-    const width = options?.width
-        ? options.width > MAX_CHART_WIDTH
-            ? MAX_CHART_WIDTH
-            : options.width
-        : isStackBar
+    const width = options?.width ? options.width :
+        isStackBar
             ? "100%"
             : isBarChart
-                ? totalWidthFromBarWidth < MAX_CHART_WIDTH
-                    ? MAX_CHART_WIDTH
-                    : totalWidthFromBarWidth
+                ? totalWidthFromBarWidth || MAX_CHART_WIDTH
                 : DEFAULT_CHART_WIDTH;
     const [customize] = useChartChange({
         dataSources: config.dataSources,
@@ -9041,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]);
@@ -9061,19 +9169,25 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
         return result?.filter((name, index) => result.indexOf(name) === index);
     }, [data, isLineChart]);
     const renderLineChartTooltip = React.useCallback((items, { indexX }) => {
-        return (jsxRuntime.jsx(uilibGl.ThemeProvider, { children: jsxRuntime.jsxs(ChartTooltip, { children: [jsxRuntime.jsx("div", { children: labels[indexX] }), items
-                        .filter(({ value }) => !isEmptyValue(value))
-                        ?.map(({ layerName, attributeName, value, stroke }, index) => {
-                        const layerInfo = layerInfos?.find(({ name }) => name === layerName);
-                        const attribute = layerInfo?.layerDefinition.attributes[attributeName];
-                        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));
-                    })] }) }));
+        return (jsxRuntime.jsxs(Tooltip, { children: [jsxRuntime.jsx(ChartTooltipLabel, { children: labels[indexX] }), items
+                    .filter(({ value }) => !isEmptyValue(value))
+                    ?.map(({ layerName, attributeName, value, stroke }, index) => {
+                    const layerInfo = layerInfos?.find(({ name }) => name === layerName);
+                    const attribute = layerInfo?.layerDefinition.attributes[attributeName];
+                    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;
@@ -9091,16 +9205,16 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
                 .flat()
                 .map(({ values }) => values)
                 .flat();
-            return (jsxRuntime.jsx(AnyChartWrapper, { height: height, children: 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();
-                        }
-                    }, customYAxis: yAxis => yAxis.ticks(4), renderTooltip: renderLineChartTooltip, customize: customize, dynamicTooltipEnable: true, stackedTooltip: true, drawGridX: !isHidedY, margin: {
-                        top: 0,
-                        right: 0,
-                        bottom: 0,
-                        left: 0
-                    } }) }));
+            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();
+                            }
+                        }, customYAxis: yAxis => yAxis.ticks(4), renderTooltip: renderLineChartTooltip, customize: customize, dynamicTooltipEnable: true, stackedTooltip: true, tooltipClassName: "dashboardLineChartTooltip", drawGridX: !isHidedY, margin: {
+                            top: 0,
+                            right: 0,
+                            bottom: 0,
+                            left: 0
+                        } })] }));
         }
         if (isStackBar) {
             return (jsxRuntime.jsx(AnyChartWrapper, { height: height, children: jsxRuntime.jsx(StackBar, { data: data, filterName: filterName, type: type, alias: elementConfig?.children?.find(child => child.id === "alias"), options: options, renderTooltip: renderPieChartTooltip, renderElement: renderElement }) }));
@@ -9113,17 +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 barChartData = getDataFromFilterItems(data[0]?.items);
+        const markersMargin = showMarkers ? 10 : 0;
         const margin = {
-            top: 0,
-            right: 0,
-            bottom: markers?.length ? 20 : 0,
-            left: 0
+            top: markersMargin,
+            right: markersMargin,
+            bottom: markers?.length ? 20 : markersMargin,
+            left: markersMargin
         };
-        return (jsxRuntime.jsx(BarChartWrapper, { height: height + margin.bottom, children: jsxRuntime.jsx(BarChartContainer, { children: 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, customXAxis: axis => axis.remove(), customYAxis: axis => axis.remove(), customBars: ({ bars }) => {
+        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, onBarClick: filterName ? item => onFilter(item.name) : undefined, hideTooltipGroupName: true, dynamicTooltipEnable: true, isBarTooltip: true }) }) }));
+                    }, 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,
@@ -9135,6 +9252,8 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
         formatFilterColor,
         width,
         barWidth,
+        showLabels,
+        showMarkers,
         padding,
         formatTooltipValue,
         formatTooltipName,
@@ -9171,7 +9290,7 @@ const ChartLegend = ({ data, chartElement, type, twoColumns, loading }) => {
     const showMoreBtn = !!shownItems && data.length > shownItems;
     if (!loading && !data?.length && !!hideEmpty)
         return null;
-    return (jsxRuntime.jsxs(uilibGl.Flex, { opacity: loading ? FILTERED_VALUE_OPACITY / 100 : 1, children: [jsxRuntime.jsx(ChartLegendContainer, { twoColumns: twoColumns, children: sliceItems(data)?.map(({ name, color }, index) => (jsxRuntime.jsxs(ChartLegendItem, { hasAnyFilter: hasAnyFilter, isFiltered: isFiltered(name), onClick: axes?.[0]?.filterName ? () => onFilter(name) : undefined, children: [jsxRuntime.jsx(ChartLegendColor, { color: color }), jsxRuntime.jsx(ChartLegendName, { "$fontColor": fontColor, children: name })] }, index))) }), showMoreBtn && (jsxRuntime.jsx(uilibGl.LegendToggler, { onClick: onShowMore, toggled: showMore, children: t("other", { ns: "dashboard" }) }))] }));
+    return (jsxRuntime.jsxs(uilibGl.Flex, { flexDirection: "column", opacity: loading ? FILTERED_VALUE_OPACITY / 100 : 1, children: [jsxRuntime.jsx(ChartLegendContainer, { twoColumns: twoColumns, children: sliceItems(data)?.map(({ name, color }, index) => (jsxRuntime.jsxs(ChartLegendItem, { hasAnyFilter: hasAnyFilter, isFiltered: isFiltered(name), onClick: axes?.[0]?.filterName ? () => onFilter(name) : undefined, children: [jsxRuntime.jsx(ChartLegendColor, { color: color }), jsxRuntime.jsx(ChartLegendName, { "$fontColor": fontColor, children: name })] }, index))) }), showMoreBtn && (jsxRuntime.jsx(uilibGl.LegendToggler, { onClick: onShowMore, toggled: showMore, children: t("other", { ns: "dashboard" }) }))] }));
 };
 
 const ContainerChildren = React.memo(({ items, isColumn, isMain, renderElement }) => {