@oanda/labs-crowd-view-widget 1.0.54 → 1.0.55

package/src/CrowdViewWidget/components/Chart/ChartWithData.tsx

@@ -5,7 +5,8 @@ import {
   SpinnerSize,
   useLayoutProvider,
 } from '@oanda/labs-widget-common';
-import React from 'react';
+import React, { useEffect, useState } from 'react';
+import { useDebounceCallback } from 'usehooks-ts';
 
 import { Chart } from './Chart';
 import type { ChartWithDataProps } from './types';
@@ -18,14 +19,30 @@ const ChartWithData = ({
   granularity,
 }: ChartWithDataProps) => {
   const { size } = useLayoutProvider();
+  const [debouncedLoading, setDebouncedLoading] = useState(true);
   const isDesktop = size === Size.DESKTOP;
 
-  const { mainData, additionalData, loading, error } = useCrowdViewData({
-    instrument,
-    bookType,
-    division,
-    granularity,
-  });
+  const { mainData, additionalData, loading, priceCandlesLoading, error } =
+    useCrowdViewData({
+      instrument,
+      bookType,
+      division,
+      granularity,
+    });
+
+  const hideLoading = useDebounceCallback(
+    () => setDebouncedLoading(false),
+    500
+  );
+
+  useEffect(() => {
+    if (loading === false) {
+      hideLoading();
+    }
+    if (loading === true) {
+      setDebouncedLoading(true);
+    }
+  }, [loading, hideLoading]);
 
   return (
     <>
@@ -35,20 +52,21 @@ const ChartWithData = ({
             <ChartError />
           </div>
         )}
-        {loading && (
-          <div className="lw-absolute lw-left-0 lw-top-0 lw-flex lw-h-full lw-w-full lw-items-center lw-justify-center lw-border lw-border-solid lw-border-border-primary">
-            <Spinner size={SpinnerSize.lg} />
-          </div>
-        )}
-        {!loading && !error && !!mainData && !!additionalData && (
+        {!priceCandlesLoading && !error && !!mainData && !!additionalData && (
           <div className="lw-absolute lw-left-0 lw-top-0 lw-flex lw-h-full lw-w-full">
             <Chart
               additionalData={additionalData}
               isDesktop={isDesktop}
+              isLoading={debouncedLoading}
               mainData={mainData}
             />
           </div>
         )}
+        {loading && (
+          <div className="lw-absolute lw-left-0 lw-top-0 lw-flex lw-h-full lw-w-full lw-items-center lw-justify-center lw-border lw-border-solid lw-border-border-primary lw-bg-bg-transparent-50">
+            <Spinner size={SpinnerSize.lg} />
+          </div>
+        )}
       </div>
     </>
   );

package/src/CrowdViewWidget/components/Chart/chartOptions/getDataZoomConfig.ts

@@ -2,12 +2,21 @@ import type { DataZoomComponentOption } from 'echarts';
 
 import { CHART_CONFIG } from '../../../constants';
 
-export const getDataZoomConfig = (): DataZoomComponentOption => ({
+interface GetDataZoomConfigParams {
+  isDesktop: boolean;
+}
+
+export const getDataZoomConfig = ({
+  isDesktop,
+}: GetDataZoomConfigParams): DataZoomComponentOption => ({
   type: 'inside',
   id: 'main',
   xAxisIndex: [0, 1],
-  start: CHART_CONFIG.INITIAL_START_ZOOM,
+  start: isDesktop
+    ? CHART_CONFIG.INITIAL_START_ZOOM_DESKTOP
+    : CHART_CONFIG.INITIAL_START_ZOOM_MOBILE,
   end: CHART_CONFIG.INITIAL_END_ZOOM,
   filterMode: 'filter',
   minSpan: 10,
+  preventDefaultMouseMove: true,
 });

package/src/CrowdViewWidget/components/Chart/chartOptions/getGridConfig.ts

@@ -12,18 +12,18 @@ export const getGridConfig = ({
   {
     id: 'main-grid',
     name: 'main-grid',
-    left: `${CHART_CONFIG.Y_SENTIMENT_LABEL_SIZE}px`,
+    left: `${isDesktop ? CHART_CONFIG.Y_SENTIMENT_LABEL_DESKTOP_SIZE : CHART_CONFIG.Y_SENTIMENT_LABEL_MOBILE_SIZE}px`,
     right: `${isDesktop ? CHART_CONFIG.Y_LABEL_SIZE_DESKTOP : CHART_CONFIG.Y_LABEL_SIZE_MOBILE}px`,
-    top: '0px',
+    top: `${isDesktop ? CHART_CONFIG.TOP_MARGIN_DESKTOP : CHART_CONFIG.TOP_MARGIN_MOBILE}px`,
     bottom: `${CHART_CONFIG.X_LABEL_SIZE}px`,
-    height: `${CHART_CONFIG.MAIN_HEIGHT}px`,
+    height: `${isDesktop ? CHART_CONFIG.MAIN_HEIGHT - CHART_CONFIG.TOP_MARGIN_DESKTOP : CHART_CONFIG.MAIN_HEIGHT - CHART_CONFIG.TOP_MARGIN_MOBILE}px`,
   },
   {
     id: 'sentiment-grid',
     name: 'sentiment-grid',
-    left: `${CHART_CONFIG.Y_SENTIMENT_LABEL_SIZE}px`,
+    left: `${isDesktop ? CHART_CONFIG.Y_SENTIMENT_LABEL_DESKTOP_SIZE : CHART_CONFIG.Y_SENTIMENT_LABEL_MOBILE_SIZE}px`,
     right: `${isDesktop ? CHART_CONFIG.Y_LABEL_SIZE_DESKTOP : CHART_CONFIG.Y_LABEL_SIZE_MOBILE}px`,
-    top: `0px`,
-    height: `${CHART_CONFIG.MAIN_HEIGHT}px`,
+    top: `${isDesktop ? CHART_CONFIG.TOP_MARGIN_DESKTOP : CHART_CONFIG.TOP_MARGIN_MOBILE}px`,
+    height: `${isDesktop ? CHART_CONFIG.MAIN_HEIGHT - CHART_CONFIG.TOP_MARGIN_DESKTOP : CHART_CONFIG.MAIN_HEIGHT - CHART_CONFIG.TOP_MARGIN_MOBILE}px`,
   },
 ];

package/src/CrowdViewWidget/components/Chart/chartOptions/getGridLines.ts

@@ -5,13 +5,24 @@ import { CHART_CONFIG } from '../../../constants';
 
 interface GetGridLinesParams {
   isDark: boolean;
+  isDesktop: boolean;
 }
 
 export const getGridLines = ({
   isDark,
+  isDesktop,
 }: GetGridLinesParams): GraphicComponentOption[] => {
-  const { WIDTH, MAIN_HEIGHT, X_LABEL_SIZE, Y_SENTIMENT_LABEL_SIZE } =
-    CHART_CONFIG;
+  const { WIDTH, MAIN_HEIGHT, X_LABEL_SIZE } = CHART_CONFIG;
+  const ySentimentLabelSize = isDesktop
+    ? CHART_CONFIG.Y_SENTIMENT_LABEL_DESKTOP_SIZE
+    : CHART_CONFIG.Y_SENTIMENT_LABEL_MOBILE_SIZE;
+
+  const yLabelSize = isDesktop
+    ? CHART_CONFIG.Y_LABEL_SIZE_DESKTOP
+    : CHART_CONFIG.Y_LABEL_SIZE_MOBILE;
+
+  const topMargin = isDesktop ? 0 : CHART_CONFIG.TOP_MARGIN_MOBILE;
+
   return [
     // Top
     {
@@ -23,6 +34,7 @@ export const getGridLines = ({
         x2: WIDTH,
         y2: 0,
       },
+      z: 30,
     },
     // Right
     {
@@ -34,6 +46,7 @@ export const getGridLines = ({
         x2: 0,
         y2: MAIN_HEIGHT + X_LABEL_SIZE + 2,
       },
+      z: 30,
     },
     // Bottom
     {
@@ -45,6 +58,7 @@ export const getGridLines = ({
         x2: WIDTH,
         y2: 0,
       },
+      z: 30,
     },
     // Left
     {
@@ -56,29 +70,57 @@ export const getGridLines = ({
         x2: 0,
         y2: MAIN_HEIGHT + X_LABEL_SIZE + 2,
       },
+      z: 30,
+    },
+    // Y Label
+    {
+      ...getLineCommons(isDark),
+      right: yLabelSize - 3,
+      top: topMargin - 2,
+      shape: {
+        x1: 0,
+        y1: 0,
+        x2: 0,
+        y2: MAIN_HEIGHT - topMargin,
+      },
+      z: 30,
     },
     // Y Sentiment Label
     {
       ...getLineCommons(isDark),
-      left: Y_SENTIMENT_LABEL_SIZE - 2,
-      top: -2,
+      left: ySentimentLabelSize - 2,
+      top: topMargin - 2,
       shape: {
         x1: 0,
         y1: 0,
         x2: 0,
-        y2: MAIN_HEIGHT,
+        y2: MAIN_HEIGHT - topMargin,
       },
+      z: 30,
     },
     // X Label
     {
       ...getLineCommons(isDark),
-      top: MAIN_HEIGHT - 2,
+      bottom: X_LABEL_SIZE - 3,
+      shape: {
+        x1: 0,
+        y1: 0,
+        x2: WIDTH,
+        y2: 0,
+      },
+      z: 30,
+    },
+    // X Mobile Label
+    {
+      ...getLineCommons(isDark),
+      top: topMargin - 3,
       shape: {
         x1: 0,
         y1: 0,
         x2: WIDTH,
         y2: 0,
       },
+      z: 30,
     },
   ];
 };

package/src/CrowdViewWidget/components/Chart/chartOptions/getLabelsConfig.ts

@@ -0,0 +1,191 @@
+import { colorPalette } from '@oanda/labs-widget-common';
+import chroma from 'chroma-js';
+import type { GraphicComponentOption } from 'echarts';
+
+import { CHART_CONFIG } from '../../../constants';
+
+interface getLabelsConfigParams {
+  isDark: boolean;
+  isDesktop: boolean;
+  labelCallback: (key: string, params?: Record<string, unknown>) => string;
+}
+
+export const getLabelsConfig = ({
+  isDark,
+  isDesktop,
+  labelCallback,
+}: getLabelsConfigParams): GraphicComponentOption[] => {
+  const ySentimentLabelSize = isDesktop
+    ? CHART_CONFIG.Y_SENTIMENT_LABEL_DESKTOP_SIZE
+    : CHART_CONFIG.Y_SENTIMENT_LABEL_MOBILE_SIZE;
+
+  const yMainLabelSize = isDesktop
+    ? CHART_CONFIG.Y_LABEL_SIZE_DESKTOP
+    : CHART_CONFIG.Y_LABEL_SIZE_MOBILE;
+
+  const textColor = isDark ? colorPalette.white : colorPalette.black;
+  const labelBackgroundColor = isDark
+    ? colorPalette.darkGray
+    : colorPalette.white;
+  const backgroundColor = isDark ? colorPalette.black : colorPalette.white;
+  const shadowColor = chroma(colorPalette.black).alpha(0.1).hex();
+
+  // Estimate text width for centering rotated text
+  // Approximate: fontSize * characterCount * 0.65 (typical character width ratio)
+  const sentimentText = labelCallback('sentiment').toUpperCase();
+  const priceText = labelCallback('price').toUpperCase();
+  const sentimentEstimatedWidth = 10 * sentimentText.length * 0.65;
+  const priceEstimatedWidth = 10 * priceText.length * 0.65;
+  const sentimentVerticalOffset = sentimentEstimatedWidth / 2;
+  const priceVerticalOffset = priceEstimatedWidth / 2;
+
+  const topMargin = isDesktop
+    ? CHART_CONFIG.TOP_MARGIN_DESKTOP
+    : CHART_CONFIG.TOP_MARGIN_MOBILE;
+
+  return [
+    {
+      type: 'group',
+      left: `${ySentimentLabelSize + 5}px'`,
+      top: `${topMargin + 5}px`,
+      silent: true,
+      children: [
+        {
+          type: 'rect',
+          z: 100,
+          right: 'center',
+          top: 'middle',
+          shape: {
+            width: 50,
+            height: 24,
+          },
+          style: {
+            fill: labelBackgroundColor,
+            shadowBlur: 8,
+            shadowOffsetX: 0,
+            shadowOffsetY: 1,
+            shadowColor: shadowColor,
+          },
+        },
+        {
+          type: 'text',
+          z: 100,
+          right: 'center',
+          top: 'middle',
+          style: {
+            fontSize: 11,
+            fontFamily: 'Sofia W03',
+            fontWeight: 500,
+            fill: textColor,
+            width: 70,
+            height: 30,
+            text: labelCallback('short'),
+          },
+        },
+      ],
+    },
+    {
+      type: 'group',
+      left: `${ySentimentLabelSize + 5}px'`,
+      top: `${CHART_CONFIG.MAIN_HEIGHT - 24 - 5}px`,
+      silent: true,
+      children: [
+        {
+          type: 'rect',
+          z: 100,
+          right: 'center',
+          top: 'middle',
+          shape: {
+            width: 50,
+            height: 24,
+          },
+          style: {
+            fill: labelBackgroundColor,
+            shadowBlur: 8,
+            shadowOffsetX: 0,
+            shadowOffsetY: 1,
+            shadowColor: shadowColor,
+          },
+        },
+        {
+          type: 'text',
+          z: 100,
+          right: 'center',
+          top: 'middle',
+          style: {
+            fontSize: 11,
+            fontFamily: 'Sofia W03',
+            fontWeight: 500,
+            fill: textColor,
+            width: 70,
+            height: 30,
+            text: labelCallback('long'),
+          },
+        },
+      ],
+    },
+
+    {
+      type: 'text',
+      z: 30,
+      rotation: isDesktop ? Math.PI / 2 : 0,
+      left: `5px`,
+      top: isDesktop
+        ? `${topMargin + CHART_CONFIG.MAIN_HEIGHT / 2 - sentimentVerticalOffset}px`
+        : `${topMargin - 18}px`,
+      silent: true,
+      style: {
+        fontSize: 10,
+        fontFamily: 'Sofia W03',
+        fontWeight: 300,
+        fill: textColor,
+        text: sentimentText,
+      },
+    },
+    {
+      type: 'text',
+      z: 30,
+      rotation: isDesktop ? -Math.PI / 2 : 0,
+      right: `5px`,
+      top: isDesktop
+        ? `${topMargin + CHART_CONFIG.MAIN_HEIGHT / 2 - priceVerticalOffset}px`
+        : `${topMargin - 18}px`,
+      silent: true,
+      style: {
+        fontSize: 10,
+        fontFamily: 'Sofia W03',
+        fontWeight: 300,
+        fill: textColor,
+        text: priceText,
+      },
+    },
+    {
+      type: 'rect',
+      z: 20,
+      right: '0px',
+      top: '0px',
+      shape: {
+        width: yMainLabelSize,
+        height: CHART_CONFIG.MAIN_HEIGHT,
+      },
+      silent: true,
+      style: {
+        fill: backgroundColor,
+      },
+    },
+    {
+      type: 'rect',
+      z: 20,
+      left: '0px',
+      top: '0px',
+      shape: {
+        width: ySentimentLabelSize,
+        height: CHART_CONFIG.MAIN_HEIGHT,
+      },
+      silent: true,
+      style: {
+        fill: backgroundColor,
+      },
+    },
+  ];
+};

package/src/CrowdViewWidget/components/Chart/chartOptions/getSeriesCandlestickConfig.ts

@@ -1,31 +1,28 @@
 import chroma from 'chroma-js';
 import type { CandlestickSeriesOption } from 'echarts';
 
-import { getLabelData } from '../chartUtils';
 import type { ChartStyles } from '../chartUtils/getChartStyles';
 
 interface GetSeriesCandlestickConfigParams {
-  dates: string[];
-  isGreaterThanTwoWeeks: boolean;
   styles: ChartStyles;
+  isLoading: boolean;
 }
 
 export const getSeriesCandlestickConfig = ({
-  dates,
-  isGreaterThanTwoWeeks,
   styles,
+  isLoading,
 }: GetSeriesCandlestickConfigParams): CandlestickSeriesOption => {
   const { candleLongColor, candleShortColor } = styles;
-  const labelsData = getLabelData({
-    dates,
-    isGreaterThanTwoWeeks,
-  });
 
   return {
+    animation: isLoading,
     type: 'candlestick',
     id: 'candlestick',
     xAxisIndex: 0,
     yAxisIndex: 0,
+    silent: true,
+    clip: true,
+    large: true,
     encode: {
       x: 'dates',
       y: ['open', 'close', 'low', 'high'],
@@ -42,11 +39,6 @@ export const getSeriesCandlestickConfig = ({
         color0: candleShortColor,
       },
     },
-    markPoint: {
-      data: labelsData,
-      symbol: 'circle',
-      symbolSize: 0,
-    },
-    z: 2,
+    z: 3,
   };
 };

package/src/CrowdViewWidget/components/Chart/chartOptions/getSeriesHeatmapConfig.ts

@@ -13,6 +13,7 @@ interface GetSeriesHeatmapConfigParams {
   isDark: boolean;
   sentimentThresholdMax: number;
   sentimentThresholdMin: number;
+  isLoading: boolean;
 }
 
 export const getSeriesHeatmapConfig = ({
@@ -21,8 +22,10 @@ export const getSeriesHeatmapConfig = ({
   isDark,
   sentimentThresholdMax,
   sentimentThresholdMin,
+  isLoading,
 }: GetSeriesHeatmapConfigParams): CustomSeriesOption => {
   return {
+    animation: isLoading,
     type: 'custom',
     id: 'heatmap',
     name: 'heatmap',
@@ -35,9 +38,11 @@ export const getSeriesHeatmapConfig = ({
     dimensions: ['dates', 'bookPrices', 'bookIndexes'],
     clip: true,
     renderItem: (
-      _params: CustomSeriesRenderItemParams,
+      params: CustomSeriesRenderItemParams,
       api: CustomSeriesRenderItemAPI
     ) => {
+      const animationDelay =
+        (350 * params.dataIndexInside) / params.dataInsideLength;
       const xVal = api.value(0);
       const bucketIndex = api.value(2) as number;
 
@@ -47,12 +52,17 @@ export const getSeriesHeatmapConfig = ({
 
       const metaValues = buckets[bucketIndex];
 
+      if (!metaValues) {
+        return null;
+      }
+
       const [rectWidth, rectHeight] = api.size!([0, bucketWidth]) as number[];
 
       const items = metaValues.map(({ price, sentiment }: Bucket) => {
         const start = api.coord([xVal, price]);
 
         return {
+          silent: true,
           shape: {
             height: rectHeight,
             width: rectWidth + 1,
@@ -67,6 +77,16 @@ export const getSeriesHeatmapConfig = ({
               sentimentThresholdMax
             ),
           },
+          enterFrom: {
+            shape: {},
+            style: {
+              opacity: 0,
+            },
+          },
+          enterAnimation: {
+            duration: 150,
+            delay: animationDelay,
+          },
           type: 'rect' as const,
         };
       });
@@ -74,6 +94,7 @@ export const getSeriesHeatmapConfig = ({
       return {
         children: items,
         emphasisDisabled: true,
+        silent: true,
         type: 'group' as const,
       };
     },

package/src/CrowdViewWidget/components/Chart/chartOptions/getSeriesSentimentConfig.ts

@@ -5,12 +5,16 @@ import type { ChartStyles } from '../chartUtils';
 
 interface GetSeriesSentimentConfigParams {
   styles: ChartStyles;
+  isLoading: boolean;
 }
 
 export const getSeriesSentimentConfig = ({
   styles,
+  isLoading,
 }: GetSeriesSentimentConfigParams): LineSeriesOption => {
   return {
+    animation: isLoading,
+    animationDelay: 350,
     type: 'line',
     id: 'sentiment',
     name: 'sentiment',
@@ -18,9 +22,9 @@ export const getSeriesSentimentConfig = ({
     yAxisIndex: 1,
     encode: {
       x: 'dates',
-      y: 'sentimentShorts',
+      y: 'sentimentLongs',
     },
-    dimensions: ['dates', 'sentimentShorts', 'sentimentLongs'],
+    dimensions: ['dates', 'sentimentLongs', 'sentimentShorts'],
     lineStyle: {
       width: styles.sentimentOutlineWidth,
       opacity: 1,
@@ -30,7 +34,11 @@ export const getSeriesSentimentConfig = ({
     emphasis: {
       disabled: true,
     },
+    tooltip: {
+      show: false,
+    },
     markLine: {
+      animation: isLoading,
       silent: true,
       symbol: ['none', 'none'],
       label: {
@@ -55,9 +63,10 @@ export const getSeriesSentimentConfig = ({
         },
       ],
     },
-    stack: 'sentiment',
     showSymbol: false,
     symbol: 'none',
-    z: 3,
+    z: 2,
+    connectNulls: true,
+    silent: true,
   };
 };

package/src/CrowdViewWidget/components/Chart/chartOptions/getTooltipConfig.ts

@@ -1,6 +1,7 @@
 import type { TooltipComponentOption } from 'echarts';
 
 import type { BookType } from '../../../../gql/types/graphql';
+import { CHART_CONFIG } from '../../../constants';
 import { getTooltipFormatter } from '../chartUtils';
 import type { Bucket, TooltipParam } from '../types';
 
@@ -12,6 +13,8 @@ interface GetTooltipConfigParams {
   labelCallback: (key: string, params?: Record<string, unknown>) => string;
   selectedPriceRef: { current: number };
   tooltipLinesColor: string;
+  sentimentLongs: (number | null)[];
+  sentimentShorts: (number | null)[];
 }
 
 export const getTooltipConfig = ({
@@ -22,6 +25,8 @@ export const getTooltipConfig = ({
   labelCallback,
   selectedPriceRef,
   tooltipLinesColor,
+  sentimentLongs,
+  sentimentShorts,
 }: GetTooltipConfigParams): TooltipComponentOption => ({
   trigger: 'axis' as const,
   formatter: (params) =>
@@ -32,8 +37,10 @@ export const getTooltipConfig = ({
       labelCallback,
       params: params as unknown as TooltipParam[],
       selectedPrice: selectedPriceRef.current,
+      sentimentLongs,
+      sentimentShorts,
     }),
-
+  hideDelay: 0,
   axisPointer: {
     type: 'cross' as const,
     axis: 'x' as const,
@@ -60,4 +67,8 @@ export const getTooltipConfig = ({
     },
   },
   confine: true,
+  position: (point) => [
+    point[0] + CHART_CONFIG.TOOLTIP_OFFSET,
+    point[1] + CHART_CONFIG.TOOLTIP_OFFSET,
+  ],
 });