fix: fix after review

gravity-ui · Jan 23, 2023 · b0c5227 · b0c5227
1 parent 27ddb48
commit b0c5227
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/src/components/ChartKit.tsx b/src/components/ChartKit.tsx
@@ -17,7 +17,17 @@ type ChartKitComponentProps<T extends ChartKitType> = Omit<ChartKitProps<T>, 'on
 
 const ChartKitComponent = <T extends ChartKitType>(props: ChartKitComponentProps<T>) => {
     const widgetRef = React.useRef<ChartKitWidgetRef>();
-    const {instanceRef, id: propsId, type, data, onLoad, isMobile, ...restProps} = props;
+    const {
+        instanceRef,
+        id: propsId,
+        type,
+        data,
+        onLoad,
+        onRender,
+        onChartLoad,
+        isMobile,
+        ...restProps
+    } = props;
 
     const ckId = React.useMemo(() => getRandomCKId(), []);
     const id = propsId || ckId;
@@ -56,6 +66,8 @@ const ChartKitComponent = <T extends ChartKitType>(props: ChartKitComponentProps
                     lang={lang}
                     data={data}
                     onLoad={onLoad}
+                    onRender={onRender}
+                    onChartLoad={onChartLoad}
                     {...restProps}
                 />
             </div>

diff --git a/src/plugins/highcharts/renderer/components/HighchartsComponent.tsx b/src/plugins/highcharts/renderer/components/HighchartsComponent.tsx
@@ -101,23 +101,24 @@ export class HighchartsComponent extends React.PureComponent<Props, State> {
     }>();
 
     componentDidMount() {
-        if (this.props.onChartLoad) {
-            if (!this.state.isError && !this.props.splitTooltip) {
-                const widget = this.chartComponent.current
-                    ? this.chartComponent.current.chart
-                    : null;
+        if (!this.props.onChartLoad) {
+            this.onLoad();
+            return;
+        }
 
-                if (this.state.callback && widget) {
-                    this.state.callback(widget);
-                }
+        const needCallbacks = !this.state.isError && !this.props.splitTooltip;
+        if (!needCallbacks) {
+            return;
+        }
+        const widget = this.chartComponent.current ? this.chartComponent.current.chart : null;
 
-                this.props.onChartLoad?.({
-                    widget,
-                });
-            }
-        } else {
-            this.onLoad();
+        if (this.state.callback && widget) {
+            this.state.callback(widget);
         }
+
+        this.props.onChartLoad?.({
+            widget,
+        });
     }
 
     componentDidUpdate() {
@@ -127,9 +128,9 @@ export class HighchartsComponent extends React.PureComponent<Props, State> {
                     renderTime: getChartPerformanceDuration(this.getId()),
                 });
             }
-        } else {
-            this.onLoad();
+            return;
         }
+        this.onLoad();
     }
 
     render() {
@@ -188,10 +189,6 @@ export class HighchartsComponent extends React.PureComponent<Props, State> {
         return `${this.props.id}_${this.id}`;
     }
 
-    /**
-     * @depricated: please use onRender & onChartLoad instead
-     * @private
-     */
     private onLoad() {
         if (!this.state.isError && !this.props.splitTooltip) {
             const data = {

diff --git a/src/plugins/indicator/renderer/IndicatorWidget.tsx b/src/plugins/indicator/renderer/IndicatorWidget.tsx
@@ -18,21 +18,16 @@ const IndicatorWidget = React.forwardRef<ChartKitWidgetRef | undefined, ChartKit
         const {
             onLoad,
             onRender,
-            onChartLoad,
             formatNumber,
             data: {data = [], defaultColor},
         } = props;
 
         React.useLayoutEffect(() => {
             // TODO: swap to onRender after https://github.com/gravity-ui/chartkit/issues/33
             onLoad?.();
-            onRender?.(); // TODO renderTime ?
+            onRender?.(); // TODO renderTime
         });
 
-        React.useLayoutEffect(() => {
-            onChartLoad?.({widget: null});
-        }, []);
-
         if (isEmpty(data)) {
             throw new ChartKitError({
                 code: CHARTKIT_ERROR_CODE.NO_DATA,

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -40,7 +40,7 @@ export type ChartKitProps<T extends ChartKitType> = {
     isMobile?: boolean;
     /**
      * @depricated: please use onRender & onChartLoad instead
-     * @private
+     * @param data
      */
     onLoad?: (data?: ChartKitOnLoadData<T>) => void;
     /**
@@ -49,7 +49,7 @@ export type ChartKitProps<T extends ChartKitType> = {
      */
     onRender?: (data?: ChartKitOnRenderData) => void;
     /**
-     * called on mount
+     * called on chart mount
      * @param data
      */
     onChartLoad?: (data?: ChartKitOnChartLoad) => void;