Merge branch 'develop' of https://github.com/CrocSwap/ambient-ts-app …

…into add-theme-switching
CrocSwap · Sep 30, 2024 · a1ddbfe · a1ddbfe
2 parents c3dd01b + 2729fce
commit a1ddbfe
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 15 deletions.
diff --git a/src/pages/Chart/ChartSettings/ChartSettings.tsx b/src/pages/Chart/ChartSettings/ChartSettings.tsx
@@ -702,7 +702,7 @@ export default function ChartSettings(props: ContextMenuIF) {
                                 ? 'var(--accent1)'
                                 : 'var(--text1)'
                         }
-                        width={'98px'}
+                        width={'auto'}
                         onClick={() =>
                             handleApplyDefaults(defaultChartSettings)
                         }

diff --git a/src/pages/Chart/ChartSettings/ChartSettingsCss.ts b/src/pages/Chart/ChartSettings/ChartSettingsCss.ts
@@ -175,6 +175,7 @@ const FooterButtons = styled.div<{
     gap: 10px;
     border-radius: ${({ isFuta }) => (isFuta ? '0px' : '50px')};
 
+    max-width: 110px;
     width: ${({ width }) => width};
     height: 27px;
 
@@ -201,12 +202,11 @@ const FooterButtons = styled.div<{
 `;
 
 const FooterContextText = styled.div`
-    font-family: Lexend Deca;
-    font-size: 12px;
-    font-weight: 300;
+    font-size: var(--body-size);
     line-height: 15px;
     letter-spacing: -0.02em;
     text-align: center;
+    text-wrap: nowrap;
 `;
 
 const Icon = styled.svg`

diff --git a/src/pages/platformAmbient/Chart/Chart.tsx b/src/pages/platformAmbient/Chart/Chart.tsx
@@ -5520,15 +5520,39 @@ export default function Chart(props: propsIF) {
         renderSubchartCrCanvas();
     }, [crosshairActive]);
 
-    const setCrossHairDataFunc = (nearestTime: number, offsetY: number) => {
-        setCrosshairActive('chart');
+    const setCrossHairDataFunc = (
+        nearestTime: number,
+        offsetX: number,
+        offsetY: number,
+    ) => {
+        if (scaleData) {
+            const snapDiff =
+                scaleData?.xScale.invert(offsetX) % (period * 1000);
+
+            const snappedTime =
+                scaleData?.xScale.invert(offsetX) -
+                (snapDiff > period * 1000 - snapDiff
+                    ? -1 * (period * 1000 - snapDiff)
+                    : snapDiff);
+
+            const crTime =
+                snappedTime <= lastCandleData.time * 1000 &&
+                snappedTime >= firstCandleData.time * 1000 &&
+                nearestTime
+                    ? nearestTime * 1000
+                    : snappedTime;
+
+            setCrosshairActive('chart');
+
+            setCrosshairData([
+                {
+                    x: crTime,
+                    y: scaleData?.yScale.invert(offsetY),
+                },
+            ]);
 
-        setCrosshairData([
-            {
-                x: nearestTime,
-                y: scaleData?.yScale.invert(offsetY),
-            },
-        ]);
+            return crTime;
+        }
     };
 
     const mousemove = (event: MouseEvent<HTMLDivElement>) => {
@@ -5543,7 +5567,7 @@ export default function Chart(props: propsIF) {
                 const { isHoverCandleOrVolumeData, nearest } =
                     candleOrVolumeDataHoverStatus(offsetX, offsetY);
 
-                setCrossHairDataFunc(nearest?.time * 1000, offsetY);
+                    setCrossHairDataFunc(nearest?.time, offsetX, offsetY);
 
                 let isOrderHistorySelected = undefined;
                 if (

diff --git a/src/pages/platformAmbient/Chart/Draw/DrawCanvas/DragCanvas.tsx b/src/pages/platformAmbient/Chart/Draw/DrawCanvas/DragCanvas.tsx
@@ -582,7 +582,7 @@ export default function DragCanvas(props: DragCanvasProps) {
                                 ? valueX > scaleData.xScale.invert(offsetX)
                                 : valueX < scaleData.xScale.invert(offsetX);
 
-                        setCrossHairDataFunc(valueX, offsetY);
+                        setCrossHairDataFunc(valueX,offsetX,offsetY);
 
                         if (
                             hoveredDrawnShape &&

diff --git a/src/pages/platformAmbient/Chart/Draw/DrawCanvas/DrawCanvas.tsx b/src/pages/platformAmbient/Chart/Draw/DrawCanvas/DrawCanvas.tsx
@@ -507,7 +507,7 @@ function DrawCanvas(props: DrawCanvasProps) {
                     offsetY,
                 );
 
-                setCrossHairDataFunc(valueX, offsetY);
+                setCrossHairDataFunc(valueX / 1000, offsetX, offsetY);
 
                 if (!isDrawing || activeDrawingType === 'Ray') return;