@qfo/qfchart 0.8.1 → 0.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@qfo/qfchart",
-    "version": "0.8.1",
+    "version": "0.8.4",
     "description": "Professional financial charting library built on Apache ECharts with candlestick charts, technical indicators, and interactive drawing tools",
     "keywords": [
         "chart",

package/src/QFChart.ts

@@ -984,6 +984,9 @@ export class QFChart implements ChartContext {
             return candle;
         });
 
+        // Build drawing range hints for Y-axis scaling
+        const updateDrawingRangeHints = this._buildDrawingRangeHints(layout, paddingPoints);
+
         // Update only the data arrays in the option, not the full config
         const updateOption: any = {
             xAxis: currentOption.xAxis.map((axis: any, index: number) => ({
@@ -995,6 +998,7 @@ export class QFChart implements ChartContext {
                     markLine: candlestickSeries.markLine, // Ensure markLine is updated
                 },
                 ...indicatorSeries,
+                ...updateDrawingRangeHints,
             ],
         };
 
@@ -1232,6 +1236,132 @@ export class QFChart implements ChartContext {
         this._renderTableOverlays();
     }
 
+    /**
+     * Build invisible "scatter" series that carry the min/max Y values of Pine
+     * Script drawing objects (lines, boxes, labels, polylines).  ECharts includes
+     * these points in its automatic Y-axis range calculation so drawings below
+     * or above the candlestick range are no longer clipped.
+     *
+     * Returns one hidden series per pane that has drawing objects with Y-values
+     * outside the default data range.
+     */
+    private _buildDrawingRangeHints(layout: any, paddingPoints: number): any[] {
+        const hintSeries: any[] = [];
+
+        // Collect Y-value bounds per pane from all indicator drawing objects
+        const boundsPerPane = new Map<number, { yMin: number; yMax: number }>();
+
+        for (const indicator of this.indicators) {
+            if (!indicator.plots) continue;
+            const paneIndex = indicator.paneIndex ?? 0;
+            if (!boundsPerPane.has(paneIndex)) {
+                boundsPerPane.set(paneIndex, { yMin: Infinity, yMax: -Infinity });
+            }
+            const bounds = boundsPerPane.get(paneIndex)!;
+
+            for (const [plotName, plot] of Object.entries(indicator.plots as Record<string, any>)) {
+                if (!plot || !plot.options) continue;
+                const style = plot.options?.style;
+
+                // Lines: y1, y2
+                if (style === 'drawing_line' && plot.data) {
+                    for (const entry of plot.data) {
+                        const items = entry?.value ? (Array.isArray(entry.value) ? entry.value : [entry.value]) : [];
+                        for (const ln of items) {
+                            if (!ln || ln._deleted) continue;
+                            if (typeof ln.y1 === 'number' && isFinite(ln.y1)) {
+                                bounds.yMin = Math.min(bounds.yMin, ln.y1);
+                                bounds.yMax = Math.max(bounds.yMax, ln.y1);
+                            }
+                            if (typeof ln.y2 === 'number' && isFinite(ln.y2)) {
+                                bounds.yMin = Math.min(bounds.yMin, ln.y2);
+                                bounds.yMax = Math.max(bounds.yMax, ln.y2);
+                            }
+                        }
+                    }
+                }
+
+                // Boxes: top, bottom
+                if (style === 'drawing_box' && plot.data) {
+                    for (const entry of plot.data) {
+                        const items = entry?.value ? (Array.isArray(entry.value) ? entry.value : [entry.value]) : [];
+                        for (const bx of items) {
+                            if (!bx || bx._deleted) continue;
+                            if (typeof bx.top === 'number' && isFinite(bx.top)) {
+                                bounds.yMin = Math.min(bounds.yMin, bx.top);
+                                bounds.yMax = Math.max(bounds.yMax, bx.top);
+                            }
+                            if (typeof bx.bottom === 'number' && isFinite(bx.bottom)) {
+                                bounds.yMin = Math.min(bounds.yMin, bx.bottom);
+                                bounds.yMax = Math.max(bounds.yMax, bx.bottom);
+                            }
+                        }
+                    }
+                }
+
+                // Labels: y
+                if (style === 'label' && plot.data) {
+                    for (const entry of plot.data) {
+                        const items = entry?.value ? (Array.isArray(entry.value) ? entry.value : [entry.value]) : [];
+                        for (const lbl of items) {
+                            if (!lbl || lbl._deleted) continue;
+                            if (typeof lbl.y === 'number' && isFinite(lbl.y)) {
+                                bounds.yMin = Math.min(bounds.yMin, lbl.y);
+                                bounds.yMax = Math.max(bounds.yMax, lbl.y);
+                            }
+                        }
+                    }
+                }
+
+                // Polylines: points[].price
+                if (style === 'drawing_polyline' && plot.data) {
+                    for (const entry of plot.data) {
+                        const items = entry?.value ? (Array.isArray(entry.value) ? entry.value : [entry.value]) : [];
+                        for (const pl of items) {
+                            if (!pl || pl._deleted || !pl._points) continue;
+                            for (const pt of pl._points) {
+                                if (typeof pt?.price === 'number' && isFinite(pt.price)) {
+                                    bounds.yMin = Math.min(bounds.yMin, pt.price);
+                                    bounds.yMax = Math.max(bounds.yMax, pt.price);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // Create a hidden scatter series per pane with min/max Y values
+        const midIndex = paddingPoints + Math.floor((this.marketData?.length || 0) / 2);
+        boundsPerPane.forEach((bounds, paneIndex) => {
+            if (!isFinite(bounds.yMin) || !isFinite(bounds.yMax)) return;
+
+            // Determine Y-axis index for this pane
+            const yAxisIndex = paneIndex === 0
+                ? 0
+                : (layout.separatePaneYAxisOffset || 1) + (paneIndex - 1);
+
+            hintSeries.push({
+                name: `_drawingRange_pane${paneIndex}`,
+                type: 'scatter',
+                xAxisIndex: paneIndex,
+                yAxisIndex,
+                symbol: 'none',
+                symbolSize: 0,
+                silent: true,
+                animation: false,
+                // Two invisible points at min and max Y — ECharts includes them in axis scaling
+                data: [
+                    [midIndex, bounds.yMin],
+                    [midIndex, bounds.yMax],
+                ],
+                tooltip: { show: false },
+            });
+        });
+
+        return hintSeries;
+    }
+
     /**
      * Build table canvas graphic elements from the current _lastTables.
      * Must be called AFTER setOption so grid rects are available from ECharts.
@@ -1397,22 +1527,22 @@ export class QFChart implements ChartContext {
         });
         drawingsByPane.forEach((paneDrawings) => {
             drawingSeriesUpdates.push({
-                data: paneDrawings.map((d) => [
-                    d.points[0].timeIndex + this.dataIndexOffset,
-                    d.points[0].value,
-                    d.points[1].timeIndex + this.dataIndexOffset,
-                    d.points[1].value,
-                ]),
+                data: paneDrawings.map((d) => {
+                    const row: number[] = [];
+                    d.points.forEach((p) => {
+                        row.push(p.timeIndex + this.dataIndexOffset, p.value);
+                    });
+                    return row;
+                }),
             });
         });
 
         // 6. Merge update — preserves drag/interaction state
         const updateOption: any = {
             xAxis: currentOption.xAxis.map(() => ({ data: categoryData })),
-            dataZoom: [
-                { start: newStart, end: newEnd },
-                { start: newStart, end: newEnd },
-            ],
+            dataZoom: (currentOption.dataZoom || []).map(() => ({
+                start: newStart, end: newEnd,
+            })),
             series: [
                 { data: coloredCandlestickData, markLine: candlestickSeries.markLine },
                 ...indicatorSeries.map((s) => {
@@ -1602,6 +1732,10 @@ export class QFChart implements ChartContext {
             layout.separatePaneYAxisOffset, // Pass Y-axis offset for separate panes
         );
 
+        // Create hidden range-hint series so Pine Script drawing objects
+        // (lines, boxes, labels, polylines) contribute to Y-axis auto-scaling.
+        const drawingRangeHints = this._buildDrawingRangeHints(layout, paddingPoints);
+
         // Apply barColors (TradingView: barcolor() only changes body fill, borders/wicks stay default)
         candlestickSeries.data = candlestickSeries.data.map((candle: any, i: number) => {
             if (barColors[i]) {
@@ -1668,6 +1802,7 @@ export class QFChart implements ChartContext {
                         pixelPoints,
                         isSelected: drawing.id === this.selectedDrawingId,
                         api,
+                        coordSys: params.coordSys,
                     });
                 },
                 data: drawings.map((d) => {
@@ -1769,7 +1904,7 @@ export class QFChart implements ChartContext {
             xAxis: layout.xAxis,
             yAxis: layout.yAxis,
             dataZoom: layout.dataZoom,
-            series: [candlestickSeries, ...indicatorSeries, ...drawingSeriesList],
+            series: [candlestickSeries, ...indicatorSeries, ...drawingRangeHints, ...drawingSeriesList],
         };
 
         this.chart.setOption(option, true); // true = not merge, replace.

package/src/components/LayoutManager.ts

@@ -268,6 +268,18 @@ export class LayoutManager {
 
         let mainHeightVal = 75; // Default if no separate pane
 
+        // Parse layout.mainPaneHeight option (e.g. '40%' or 40)
+        let configuredMainHeight: number | undefined;
+        if (options.layout?.mainPaneHeight !== undefined) {
+            const raw = options.layout.mainPaneHeight;
+            if (typeof raw === 'string') {
+                const parsed = parseFloat(raw);
+                if (!isNaN(parsed)) configuredMainHeight = parsed;
+            } else if (typeof raw === 'number') {
+                configuredMainHeight = raw as unknown as number;
+            }
+        }
+
         // Prepare separate panes configuration
         let paneConfigs: PaneConfiguration[] = [];
 
@@ -286,33 +298,54 @@ export class LayoutManager {
                 };
             });
 
-            // 2. Assign actual heights
-            // If collapsed, use small fixed height (e.g. 3%)
-            const resolvedPanes = panes.map((p) => ({
+            // 2. Assign raw heights (collapsed = 3%, otherwise use requested or default 15)
+            const rawPanes = panes.map((p) => ({
                 ...p,
-                height: p.isCollapsed ? 3 : p.requestedHeight !== undefined ? p.requestedHeight : 15,
+                rawHeight: p.isCollapsed ? 3 : p.requestedHeight !== undefined ? p.requestedHeight : 15,
             }));
 
-            // 3. Calculate total space needed for indicators
-            const totalIndicatorHeight = resolvedPanes.reduce((sum, p) => sum + p.height, 0);
-            const totalGaps = resolvedPanes.length * gapPercent;
-            const totalBottomSpace = totalIndicatorHeight + totalGaps;
-
-            // 4. Calculate Main Chart Height
-            // Available space = chartAreaBottom - mainPaneTop;
             const totalAvailable = chartAreaBottom - mainPaneTop;
-            mainHeightVal = totalAvailable - totalBottomSpace;
+            const totalGaps = rawPanes.length * gapPercent;
 
-            // Apply user-dragged main height override
+            // 4. Determine main chart height
             if (mainHeightOverride !== undefined && mainHeightOverride > 0 && !isMainCollapsed) {
+                // Drag-resize takes absolute priority
                 mainHeightVal = mainHeightOverride;
             } else if (isMainCollapsed) {
                 mainHeightVal = 3;
+            } else if (configuredMainHeight !== undefined && configuredMainHeight > 0) {
+                // User set mainPaneHeight — indicators fill remaining space proportionally
+                mainHeightVal = configuredMainHeight;
             } else {
-                // Safety check: ensure main chart has at least some space (e.g. 20%)
-                if (mainHeightVal < 20) {
-                    mainHeightVal = Math.max(mainHeightVal, 10);
-                }
+                // Auto: subtract indicator heights from available space
+                const totalIndicatorHeight = rawPanes.reduce((sum, p) => sum + p.rawHeight, 0);
+                mainHeightVal = totalAvailable - totalIndicatorHeight - totalGaps;
+                if (mainHeightVal < 20) mainHeightVal = Math.max(mainHeightVal, 10);
+            }
+
+            // 3. Resolve indicator heights
+            // When mainPaneHeight is configured (or drag override active), distribute remaining space
+            // proportionally among non-collapsed panes using their rawHeight as weights.
+            const isMainHeightFixed = (mainHeightOverride !== undefined && mainHeightOverride > 0 && !isMainCollapsed)
+                || (configuredMainHeight !== undefined && configuredMainHeight > 0 && !isMainCollapsed);
+
+            type ResolvedPane = (typeof rawPanes)[number] & { height: number };
+            let resolvedPanes: ResolvedPane[];
+            if (isMainHeightFixed) {
+                const remainingForIndicators = totalAvailable - mainHeightVal - totalGaps;
+                const totalWeights = rawPanes
+                    .filter((p) => !p.isCollapsed)
+                    .reduce((sum, p) => sum + p.rawHeight, 0);
+                resolvedPanes = rawPanes.map((p) => ({
+                    ...p,
+                    height: p.isCollapsed
+                        ? 3
+                        : totalWeights > 0
+                            ? Math.max(5, (p.rawHeight / totalWeights) * remainingForIndicators)
+                            : remainingForIndicators / rawPanes.filter((x) => !x.isCollapsed).length,
+                }));
+            } else {
+                resolvedPanes = rawPanes.map((p) => ({ ...p, height: p.rawHeight }));
             }
 
             // 5. Calculate positions
@@ -332,6 +365,7 @@ export class LayoutManager {
                 return config;
             });
         } else {
+            // No secondary panes — mainPaneHeight is ignored, fill all available space
             mainHeightVal = chartAreaBottom - mainPaneTop;
             if (isMainCollapsed) {
                 mainHeightVal = 3;
@@ -384,7 +418,10 @@ export class LayoutManager {
         const xAxis: any[] = [];
 
         // Main X-Axis
+        // Hide date labels on the main chart when indicator panes exist below —
+        // the bottom-most pane's x-axis will show them instead.
         const isMainBottom = paneConfigs.length === 0;
+        const showMainXLabels = !isMainCollapsed && isMainBottom;
         xAxis.push({
             type: 'category',
             data: [], // Will be filled by SeriesBuilder or QFChart
@@ -401,7 +438,7 @@ export class LayoutManager {
                 lineStyle: { color: gridLineColor, opacity: gridLineOpacity },
             },
             axisLabel: {
-                show: !isMainCollapsed,
+                show: showMainXLabels,
                 color: '#94a3b8',
                 fontFamily: options.fontFamily || 'sans-serif',
                 formatter: (value: number) => {
@@ -413,7 +450,7 @@ export class LayoutManager {
                     return AxisUtils.formatValue(value, decimals);
                 },
             },
-            axisTick: { show: !isMainCollapsed },
+            axisTick: { show: showMainXLabels },
             axisPointer: {
                 label: {
                     show: isMainBottom,
@@ -424,15 +461,21 @@ export class LayoutManager {
         });
 
         // Separate Panes X-Axes
+        // Show date labels only on the bottom-most pane
         paneConfigs.forEach((pane, i) => {
             const isBottom = i === paneConfigs.length - 1;
+            const showLabels = isBottom && !pane.isCollapsed;
             xAxis.push({
                 type: 'category',
                 gridIndex: i + 1, // 0 is main
                 data: [], // Shared data
-                axisLabel: { show: false }, // Hide labels on indicator panes
+                axisLabel: {
+                    show: showLabels,
+                    color: '#94a3b8',
+                    fontFamily: options.fontFamily || 'sans-serif',
+                },
                 axisLine: { show: !pane.isCollapsed && gridBorderShow, lineStyle: { color: gridBorderColor } },
-                axisTick: { show: false },
+                axisTick: { show: showLabels },
                 splitLine: { show: false },
                 axisPointer: {
                     label: {
@@ -515,16 +558,21 @@ export class LayoutManager {
                         const plotKey = `${id}::${plotName}`;
 
                         // Skip visual-only plot types that should never affect Y-axis scaling
-                        // EXCEPTION: shapes with abovebar/belowbar must stay on main Y-axis
-                        const visualOnlyStyles = ['background', 'barcolor', 'char'];
+                        // EXCEPTION: shapes/chars with price-relative locations must stay on main Y-axis
+                        const visualOnlyStyles = ['background', 'barcolor'];
 
-                        // Check if this is a shape with price-relative positioning
+                        // Check if this is a shape/char with price-relative positioning
+                        // Includes abovebar/belowbar (relative to candle) and absolute (exact Y value)
                         const isShapeWithPriceLocation =
-                            plot.options.style === 'shape' &&
+                            (plot.options.style === 'shape' || plot.options.style === 'char') &&
                             (plot.options.location === 'abovebar' ||
                                 plot.options.location === 'AboveBar' ||
+                                plot.options.location === 'ab' ||
                                 plot.options.location === 'belowbar' ||
-                                plot.options.location === 'BelowBar');
+                                plot.options.location === 'BelowBar' ||
+                                plot.options.location === 'bl' ||
+                                plot.options.location === 'absolute' ||
+                                plot.options.location === 'Absolute');
 
                         if (visualOnlyStyles.includes(plot.options.style)) {
                             // Assign these to a separate Y-axis so they don't affect price scale
@@ -535,8 +583,8 @@ export class LayoutManager {
                             return; // Skip further processing for this plot
                         }
 
-                        // If it's a shape but NOT with price-relative positioning, treat as visual-only
-                        if (plot.options.style === 'shape' && !isShapeWithPriceLocation) {
+                        // If it's a shape/char but NOT with price-relative positioning, treat as visual-only
+                        if ((plot.options.style === 'shape' || plot.options.style === 'char') && !isShapeWithPriceLocation) {
                             if (!overlayYAxisMap.has(plotKey)) {
                                 overlayYAxisMap.set(plotKey, nextYAxisIndex);
                                 nextYAxisIndex++;