@gravity-ui/chartkit 3.0.0-beta.zefirka.11 → 3.0.0-beta.zefirka.12

package/build/components/ChartKit.d.ts

@@ -8,7 +8,6 @@ declare const ChartKitComponent: <T extends keyof import("../types").ChartKitWid
 export declare const ChartKit: <T extends keyof import("../types").ChartKitWidget>(props: {
     type: T;
     data: import("../types").ChartKitWidget[T]["data"];
-    pluginRef?: import("../types").ChartKitWidget[T]["pluginRef"] | undefined;
     id?: string | undefined;
     isMobile?: boolean | undefined;
     onLoad?: ((data?: import("../types").ChartKitOnLoadData<T> | undefined) => void) | undefined;
@@ -17,7 +16,7 @@ export declare const ChartKit: <T extends keyof import("../types").ChartKitWidge
     onError?: import("../types").ChartKitOnError | undefined;
     renderError?: import("../types").RenderError | undefined;
     renderPluginLoader?: (() => React.ReactNode) | undefined;
-} & (Omit<import("../types").ChartKitWidget[T], "data" | "widget" | "pluginRef"> extends infer T_1 ? { [key in keyof T_1]: import("../types").ChartKitWidget[T][key]; } : never) & {
+} & (Omit<import("../types").ChartKitWidget[T], "data" | "widget"> extends infer T_1 ? { [key in keyof T_1]: import("../types").ChartKitWidget[T][key]; } : never) & {
     ref?: React.ForwardedRef<ChartKitRef | undefined> | undefined;
 }) => ReturnType<typeof ChartKitComponent>;
 export {};

package/build/plugins/highcharts/renderer/HighchartsWidget.d.ts

@@ -3,7 +3,6 @@ import type { ChartKitWidgetRef } from '../../../types';
 declare const HighchartsWidget: React.ForwardRefExoticComponent<{
     type: "highcharts";
     data: import("../types").HighchartsWidgetData;
-    pluginRef?: undefined;
     id?: string | undefined;
     isMobile?: boolean | undefined;
     onLoad?: ((data?: import("../../../types").ChartKitOnLoadData<"highcharts"> | undefined) => void) | undefined;

package/build/plugins/indicator/renderer/IndicatorWidget.d.ts

@@ -4,7 +4,6 @@ import './IndicatorWidget.css';
 declare const IndicatorWidget: React.ForwardRefExoticComponent<{
     type: "indicator";
     data: import("../types").IndicatorWidgetData;
-    pluginRef?: undefined;
     id?: string | undefined;
     isMobile?: boolean | undefined;
     onLoad?: ((data?: import("../../../types").ChartKitOnLoadData<"indicator"> | undefined) => void) | undefined;

package/build/plugins/yagr/__stories__/Yagr.stories.js

@@ -13,14 +13,12 @@ export default {
 const LineTemplate = () => {
     const [shown, setShown] = React.useState(false);
     const chartkitRef = React.useRef();
-    // Example of usage pluginRef property
-    const yagrPluginRef = React.useRef(null);
     if (!shown) {
         settings.set({ plugins: [YagrPlugin] });
         return React.createElement(Button, { onClick: () => setShown(true) }, "Show chart");
     }
     return (React.createElement("div", { style: { height: 300, width: '100%' } },
-        React.createElement(ChartKit, { ref: chartkitRef, id: "1", type: "yagr", data: line10, pluginRef: yagrPluginRef })));
+        React.createElement(ChartKit, { ref: chartkitRef, id: "1", type: "yagr", data: line10 })));
 };
 const UpdatesTemplate = () => {
     const [shown, setShown] = React.useState(false);
@@ -83,7 +81,7 @@ const CustomTooltipImpl = () => {
         return React.createElement(Button, { onClick: () => setShown(true) }, "Show chart");
     }
     return (React.createElement("div", { style: { height: 300, width: '100%' } },
-        React.createElement(ChartKit, { ref: chartkitRef, id: "1", type: "yagr", data: state, CustomTooltip: Tooltip }),
+        React.createElement(ChartKit, { ref: chartkitRef, id: "1", type: "yagr", data: state, tooltip: (props) => React.createElement(Tooltip, Object.assign({}, props)) }),
         React.createElement(Button, { onClick: () => setState(getNewConfig()) }, "Change data")));
 };
 export const Line = LineTemplate.bind({});

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

@@ -1,14 +1,11 @@
 import React from 'react';
-import { YagrReactRef } from '@gravity-ui/yagr/dist/react';
 import type { ChartKitWidgetRef } from '../../../types';
-import { Yagr } from '../types';
 import './polyfills';
 import '@gravity-ui/yagr/dist/index.css';
 import './YagrWidget.css';
 declare const YagrWidget: React.ForwardRefExoticComponent<{
     type: "yagr";
     data: import("../types").YagrWidgetData;
-    pluginRef?: React.MutableRefObject<YagrReactRef | null> | undefined;
     id?: string | undefined;
     isMobile?: boolean | undefined;
     onLoad?: ((data?: import("../../../types").ChartKitOnLoadData<"yagr"> | undefined) => void) | undefined;
@@ -18,9 +15,8 @@ declare const YagrWidget: React.ForwardRefExoticComponent<{
     renderError?: import("../../../types").RenderError | undefined;
     renderPluginLoader?: (() => React.ReactNode) | undefined;
 } & {
-    CustomTooltip?: React.ComponentType<import("../types").CustomTooltipProps<Yagr<import("@gravity-ui/yagr/dist/YagrCore/types").MinimalValidConfig>>> | undefined;
+    tooltip?: (<T extends import("../types").CustomTooltipProps = import("../types").CustomTooltipProps>(props: T) => React.ReactNode) | undefined;
 } & {
     id: string;
-    CustomTooltip?: React.ComponentType<import("../types").CustomTooltipProps<Yagr<import("@gravity-ui/yagr/dist/YagrCore/types").MinimalValidConfig>>> | undefined;
 } & React.RefAttributes<ChartKitWidgetRef | undefined>>;
 export default YagrWidget;

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

@@ -9,7 +9,7 @@ import './polyfills';
 import '@gravity-ui/yagr/dist/index.css';
 import './YagrWidget.css';
 const YagrWidget = React.forwardRef((props, forwardedRef) => {
-    const { id, data: { data }, onLoad, onRender, onChartLoad, CustomTooltip, } = props;
+    const { id, data: { data }, onLoad, onRender, onChartLoad, tooltip, } = props;
     const yagrRef = React.useRef(null);
     const [yagr, setYagr] = React.useState();
     if (!data || isEmpty(data)) {
@@ -67,7 +67,11 @@ const YagrWidget = React.forwardRef((props, forwardedRef) => {
         onChartLoad === null || onChartLoad === void 0 ? void 0 : onChartLoad({ widget: yagr });
     }, [yagr, onChartLoad]);
     return (React.createElement(React.Fragment, null,
-        CustomTooltip && yagr && React.createElement(CustomTooltip, { yagr: yagr }),
+        tooltip &&
+            yagr &&
+            tooltip({
+                yagr,
+            }),
         React.createElement(YagrComponent, { ref: yagrRef, id: id, config: config, debug: debug, onChartLoad: handleChartLoading })));
 });
 export default YagrWidget;

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

@@ -8,8 +8,8 @@ export const useWidgetData = (props, id) => {
         data,
         libraryConfig,
         theme,
-        customTooltip: Boolean(props.CustomTooltip),
-    }), [data, libraryConfig, theme, props.CustomTooltip]);
+        customTooltip: Boolean(props.tooltip),
+    }), [data, libraryConfig, theme, props.tooltip]);
     const debug = React.useMemo(() => {
         const filename = sources
             ? Object.values(sources)

package/build/plugins/yagr/types.d.ts

@@ -1,17 +1,14 @@
-/// <reference types="react" />
-import type { MinimalValidConfig, RawSerieData, TooltipOptions, YagrConfig } from '@gravity-ui/yagr';
+import type { MinimalValidConfig, RawSerieData, YagrConfig } from '@gravity-ui/yagr';
 import type Yagr from '@gravity-ui/yagr';
 import { ChartKitProps } from 'src/types';
 export type { default as Yagr } from '@gravity-ui/yagr';
 export type { YagrReactRef } from '@gravity-ui/yagr/dist/react';
 export * from '@gravity-ui/yagr/dist/types';
-export interface CustomTooltipProps<T extends Yagr<MinimalValidConfig> = Yagr<MinimalValidConfig>> {
-    config?: TooltipOptions;
-    yagr: T | undefined;
+export interface CustomTooltipProps {
+    yagr: Yagr<MinimalValidConfig> | undefined;
 }
 export type YagrWidgetProps = ChartKitProps<'yagr'> & {
     id: string;
-    CustomTooltip?: React.ComponentType<CustomTooltipProps>;
 };
 export type YagrWidgetData = {
     data: {

package/build/types/index.d.ts

@@ -26,8 +26,6 @@ export type ChartKitOnError = (data: {
 export type ChartKitProps<T extends ChartKitType> = {
     type: T;
     data: ChartKitWidget[T]['data'];
-    /** Plugin component's react ref */
-    pluginRef?: ChartKitWidget[T]['pluginRef'];
     id?: string;
     isMobile?: boolean;
     onLoad?: (data?: ChartKitOnLoadData<T>) => void;
@@ -42,7 +40,7 @@ export type ChartKitProps<T extends ChartKitType> = {
     /** Used to render user's plugin loader component */
     renderPluginLoader?: () => React.ReactNode;
 } & {
-    [key in keyof Omit<ChartKitWidget[T], 'data' | 'widget' | 'pluginRef'>]: ChartKitWidget[T][key];
+    [key in keyof Omit<ChartKitWidget[T], 'data' | 'widget'>]: ChartKitWidget[T][key];
 };
 export type ChartKitPlugin = {
     type: ChartKitType;

package/build/types/widget.d.ts

@@ -1,24 +1,21 @@
 /// <reference types="react" />
-import type { CustomTooltipProps, Yagr, YagrReactRef, YagrWidgetData } from '../plugins/yagr/types';
+import type { CustomTooltipProps, Yagr, YagrWidgetData } from '../plugins/yagr/types';
 import type { IndicatorWidgetData } from '../plugins/indicator/types';
 import type { Highcharts, HighchartsWidgetData, StringParams } from '../plugins/highcharts/types';
 export interface ChartKitWidget {
     yagr: {
         data: YagrWidgetData;
         widget: Yagr;
-        pluginRef: React.MutableRefObject<YagrReactRef | null>;
-        CustomTooltip?: React.ComponentType<CustomTooltipProps>;
+        tooltip?: <T extends CustomTooltipProps = CustomTooltipProps>(props: T) => React.ReactNode;
     };
     indicator: {
         data: IndicatorWidgetData;
         widget: never;
-        pluginRef: never;
         formatNumber?: <T = any>(value: number, options?: T) => string;
     };
     highcharts: {
         data: HighchartsWidgetData;
         widget: Highcharts.Chart | null;
-        pluginRef: never;
         hoistConfigError?: boolean;
         nonBodyScroll?: boolean;
         splitTooltip?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/chartkit",
-  "version": "3.0.0-beta.zefirka.11",
+  "version": "3.0.0-beta.zefirka.12",
   "description": "React component used to render charts based on any sources you need",
   "license": "MIT",
   "repository": "git@github.com:gravity-ui/ChartKit.git",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@gravity-ui/date-utils": "^1.4.1",
-    "@gravity-ui/yagr": "^3.6.1",
+    "@gravity-ui/yagr": "^3.7.0",
     "bem-cn-lite": "^4.1.0",
     "highcharts": "^8.2.2",
     "highcharts-react-official": "^3.0.0",