@gravity-ui/chartkit 4.19.0 → 4.19.1

package/build/plugins/yagr/renderer/utils.d.ts

@@ -1,4 +1,4 @@
-import type { Yagr, YagrWidgetData, YagrTheme, MinimalValidConfig } from '../types';
+import type { Yagr, YagrWidgetData, YagrTheme, YagrChartOptions, MinimalValidConfig } from '../types';
 type ShapeYagrConfigArgs = {
     data: YagrWidgetData['data'];
     libraryConfig: YagrWidgetData['libraryConfig'];
@@ -18,5 +18,12 @@ export declare const detectClickOutside: (args: {
     };
     yagr?: Yagr<MinimalValidConfig> | undefined;
 }) => (event: MouseEvent) => void;
+/**
+ * This function needs to align timezone that uplot is processing.
+ * Uplot uses simple new Date() when [processing ticks](https://github.com/leeoniya/uPlot/blob/master/src/opts.js#L177) on axis.
+ * It leads that timestamp will be converted to user browser timezone.
+ * In this function we artificially add shift diff between browser timezone and user timeozne to reset new Date() affects.
+ */
+export declare const getUplotTimezoneAligner: (chart?: YagrChartOptions, timeZone?: string) => (ts: number) => Date;
 export declare const shapeYagrConfig: (args: ShapeYagrConfigArgs) => MinimalValidConfig;
 export {};

package/build/plugins/yagr/renderer/utils.js

@@ -82,6 +82,20 @@ const getXAxisFormatter = (msm = 1, timeZone) => (_, ticks) => {
         return d.format(range < 300 ? 'HH:mm:ss' : 'HH:mm');
     });
 };
+/**
+ * This function needs to align timezone that uplot is processing.
+ * Uplot uses simple new Date() when [processing ticks](https://github.com/leeoniya/uPlot/blob/master/src/opts.js#L177) on axis.
+ * It leads that timestamp will be converted to user browser timezone.
+ * In this function we artificially add shift diff between browser timezone and user timeozne to reset new Date() affects.
+ */
+export const getUplotTimezoneAligner = (chart, timeZone) => (ts) => {
+    const dt = ts / ((chart === null || chart === void 0 ? void 0 : chart.timeMultiplier) || 1);
+    const browserDate = dateTime({ input: dt });
+    const browserTimezone = browserDate.utcOffset();
+    const timestampRealTimezone = dateTime({ input: dt, timeZone }).utcOffset();
+    const uPlotOffset = (browserTimezone - timestampRealTimezone) * 60 * 1000;
+    return new Date(browserDate.valueOf() + uPlotOffset);
+};
 export const shapeYagrConfig = (args) => {
     var _a, _b;
     const { data, libraryConfig, theme } = args;
@@ -114,6 +128,7 @@ export const shapeYagrConfig = (args) => {
     }
     config.axes = config.axes || {};
     const xAxis = config.axes[defaults.DEFAULT_X_SCALE];
+    config.editUplotOptions = (opts) => (Object.assign(Object.assign({}, opts), { tzDate: timeZone ? getUplotTimezoneAligner(config.chart, timeZone) : undefined }));
     if (xAxis && !xAxis.values) {
         xAxis.values = getXAxisFormatter(config.chart.timeMultiplier, timeZone);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/chartkit",
-  "version": "4.19.0",
+  "version": "4.19.1",
   "description": "React component used to render charts based on any sources you need",
   "license": "MIT",
   "repository": "git@github.com:gravity-ui/ChartKit.git",
@@ -47,7 +47,7 @@
   ],
   "dependencies": {
     "@bem-react/classname": "^1.6.0",
-    "@gravity-ui/date-utils": "^1.4.1",
+    "@gravity-ui/date-utils": "^1.4.2",
     "@gravity-ui/yagr": "^4.2.3",
     "afterframe": "^1.0.2",
     "d3": "^7.8.5",