rebase main into this branch

Author: Basttyy

src/Chart.ts

@@ -108,7 +108,6 @@ export default class Chart implements ProChart
     return this._chart.resize();
   }
 
-
   /**
    * Store Proxy Methods
    */

src/extension/brush.ts

@@ -0,0 +1,38 @@
+import { Coordinate, LineAttrs, LineStyle, OverlayTemplate, SmoothLineStyle } from "klinecharts";
+import _ from "lodash";
+
+const brush = (): OverlayTemplate => {
+  return {
+    name: "brush",
+    totalStep: 3,
+    needDefaultPointFigure: false,
+    needDefaultXAxisFigure: false,
+    needDefaultYAxisFigure: false,
+    styles: {},
+    createPointFigures: ({ coordinates }) => {
+      const lines: LineAttrs[] = []
+      if (coordinates.length > 1) {
+        const filteredCoords = coordinates.filter((_, i) => i !== 1)
+
+        lines.push({ coordinates: filteredCoords })
+        console.info("brush - createPointFigures - lines", filteredCoords, 'and coordinates', coordinates);
+      }
+
+      return [
+        {
+          type: 'line',
+          attrs: lines,
+          styles: { style: 'solid', smooth: true } as SmoothLineStyle
+        },
+      ];
+    },
+    performEventMoveForDrawing: ({ currentStep, points, performPoint }) => {
+      if (currentStep >= 2) {
+        console.info("brush - performEventMoveForDrawing before", { currentStep, points, performPoint: { ...performPoint } });
+        points.push(performPoint);
+      }
+    }
+  }
+};
+
+export default brush;

src/extension/index.ts

@@ -18,9 +18,10 @@ import abcd from './abcd'
 import xabcd from './xabcd'
 
 import positionLine from './position/orderLine'
+import brush from './brush'
 
 const overlays = [
-  arrow(),
+  arrow(), brush(),
   circle(), rect(), triangle(), parallelogram(),
   fibonacciCircle(), fibonacciSegment(), fibonacciSpiral(),
   fibonacciSpeedResistanceFan(), fibonacciExtension(), gannBox(),

src/extension/parallelogram.ts

@@ -68,16 +68,13 @@ const parallelogram = (): ProOverlayTemplate => {
     },
     performEventPressedMove: ({ points, performPointIndex, performPoint }) => {
       if (performPointIndex < 2) {
-        // @ts-expect-error
-        points[0].price = performPoint.price
-        // @ts-expect-error
-        points[1].price = performPoint.price
+        points[0].value = performPoint.value
+        points[1].value = performPoint.value
       }
     },
     performEventMoveForDrawing: ({ currentStep, points, performPoint }) => {
       if (currentStep === 2) {
-        // @ts-expect-error
-        points[0].price = performPoint.price
+        points[0].value = performPoint.value
       }
     },
     setProperties: (_properties: DeepPartial<OverlayProperties>) => {

src/widget/drawing-bar/icons/brush.tsx

@@ -0,0 +1,19 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default () => (
+  <svg class="icon-overlay" viewBox="0 0 22 22">
+    <path d="M17.0643,7.033864912109375L18,3.585784912109375L14.5078,4.509695912109375L15.3537,5.344934912109375L6.02026,14.560584912109375C5.87635,14.517484912109374,5.72366,14.494284912109375,5.5655,14.494284912109375C4.7009,14.494284912109375,4,15.186384912109375,4,16.040084912109375C4,16.893784912109375,4.7009,17.585784912109375,5.5655,17.585784912109375C6.43011,17.585784912109375,7.13101,16.893784912109375,7.13101,16.040084912109375C7.13101,15.722284912109375,7.03392,15.426984912109376,6.86744,15.181384912109374L16.0917,6.073604912109375L17.0643,7.033864912109375Z" stroke-opacity="0" stroke="none"/>
+  </svg>
+)

src/widget/drawing-bar/icons/index.ts

@@ -59,6 +59,7 @@ import remove from './remove'
 import type { SelectDataSourceItem } from '../../../component'
 
 import i18n from '../../../i18n'
+import brush from './brush'
 
 export const mapping = {
   horizontalStraightLine,
@@ -97,7 +98,8 @@ export const mapping = {
   unlock,
   visible,
   invisible,
-  remove
+  remove,
+  brush
 }
 
 export function createSingleLineOptions (locale: string): SelectDataSourceItem[] {
@@ -112,6 +114,7 @@ export function createSingleLineOptions (locale: string): SelectDataSourceItem[]
     { key: 'rayLine', text: i18n('ray_line', locale) },
     { key: 'segment', text: i18n('segment', locale) },
     { key: 'arrow', text: i18n('arrow', locale) },
+    { key: 'brush', text: i18n('brush', locale) },
     { key: 'priceLine', text: i18n('price_line', locale) }
   ]
 }