From 0e432df77cbf236933d5a60556eafb6f65a0aaaf Mon Sep 17 00:00:00 2001
From: ts_salikhov <ts.salikhov@digitaldrilling.ru>
Date: Fri, 19 Aug 2022 12:19:42 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B2=D1=8B=D1=81=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D0=BA=D0=B8=20=D0=BA?=
 =?UTF-8?q?=D1=83=D1=80=D1=81=D0=BE=D1=80=D0=B0=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=BC=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=D0=B0=20=D0=B8?=
 =?UTF-8?q?=20=D0=B0=D1=80=D1=85=D0=B8=D0=B2=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/d3/monitoring/D3HorizontalCursor.tsx | 5 ++---
 src/pages/Telemetry/TelemetryView/cursorRender.jsx  | 2 +-
 src/styles/d3.less                                  | 7 -------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/components/d3/monitoring/D3HorizontalCursor.tsx b/src/components/d3/monitoring/D3HorizontalCursor.tsx
index 335475d..4466254 100644
--- a/src/components/d3/monitoring/D3HorizontalCursor.tsx
+++ b/src/components/d3/monitoring/D3HorizontalCursor.tsx
@@ -1,4 +1,4 @@
-import { CSSProperties, ReactNode, SVGProps, useEffect, useMemo, useRef, useState, isValidElement, cloneElement } from 'react'
+import { CSSProperties, ReactNode, SVGProps, useEffect, useMemo, useRef, useState } from 'react'
 import * as d3 from 'd3'
 
 import { wrapPlugin } from '@components/d3/plugins/base'
@@ -166,7 +166,6 @@ const _D3HorizontalCursor = <DataType,>({
         })
 
         const bodies = groups.map((group) => render(group, chartData))
-            .map(body => isValidElement(body) ? cloneElement(body, {className: 'tooltip-body' }) : body)
 
         setTooltipBodies(bodies)
     }, [groups, data, yAxis, lineY, fixed, mouseState.visible])
@@ -180,7 +179,7 @@ const _D3HorizontalCursor = <DataType,>({
                 <foreignObject
                     key={`${i}`}
                     width={width}
-                    height={'100%'}
+                    height={height}
                     x={sizes.groupLeft(i) + (sizes.groupWidth - width) / 2}
                     y={tooltipY}
                     opacity={fixed || mouseState.visible ? 1 : 0}
diff --git a/src/pages/Telemetry/TelemetryView/cursorRender.jsx b/src/pages/Telemetry/TelemetryView/cursorRender.jsx
index 7f7245b..ad96f61 100644
--- a/src/pages/Telemetry/TelemetryView/cursorRender.jsx
+++ b/src/pages/Telemetry/TelemetryView/cursorRender.jsx
@@ -28,7 +28,7 @@ export const cursorRender = (group, data) => {
                     <Fragment key={chart.key}>
                         <GridItem row={i+2} col={1} style={{ padding: '4px 0' }}>{getChartIcon(chart)}</GridItem>
                         <GridItem row={i+2} col={2}>{chart.shortLabel || chart.label}</GridItem>
-                        <GridItem row={i+2} col={3} style={{ paddingRight: 0 }}>{xFormat(chart)}</GridItem>
+                        <GridItem row={i+2} col={3} style={{ paddingRight: 0, textAlign: 'end' }}>{xFormat(chart)}</GridItem>
                     </Fragment>
                 )
             })}
diff --git a/src/styles/d3.less b/src/styles/d3.less
index daadea4..6ec1bb0 100644
--- a/src/styles/d3.less
+++ b/src/styles/d3.less
@@ -99,13 +99,6 @@
                     }
                 }
             }
-
-            & .tooltip-body {
-
-                & > div:nth-child(n+3):nth-child(3n+1) {
-                    text-align: end;
-                }
-            }
         }
     }