acttrader-charts 1.3.0-beta.1 → 1.3.0-beta.2

package/dist/index.cjs

@@ -1890,6 +1890,8 @@ var FONT_BRACKET = "12px 'Inter', system-ui, sans-serif";
 var BRACKET_BASE_RATIO = 0.68;
 var BRACKET_COL_OFFSETS = [0, -0.08, 0.08];
 var ADD_BRACKET_BTN_OFFSET_PX = 30;
+var __bracketDraws = [];
+var __lastDupeSignature = "";
 function hasPnl(level) {
   return level.type === "position" && !!level.pnlText;
 }
@@ -1934,8 +1936,9 @@ function getLevelDisplayText(level, price, precision, omitLots = false) {
 }
 function computeBracketLineX(levels, scale, priceRange, priceH, chartW, draggingLabel, dragNewPrice, hoveredLabel, selectedLabel, bracketBoxH = BRACKET_BOX_H) {
   const items = [];
+  const lineXOwner = hoveredLabel ?? selectedLabel;
   for (const level of levels) {
-    if (level.label !== hoveredLabel && level.label !== selectedLabel) continue;
+    if (level.label !== lineXOwner) continue;
     const bh = level;
     if (bh.stopLossPrice !== void 0) {
       const key = `${level.label}:stopLoss`;
@@ -2031,6 +2034,9 @@ function isDraggable(level) {
     return !!level.entryPriceEditable;
   return false;
 }
+function passiveBracketsVisible(alwaysShowBrackets, activeLabel) {
+  return alwaysShowBrackets && activeLabel === null;
+}
 function renderTradeLevels(ctx, levels, scale, priceRange, theme, chartW, priceH, precision, hoveredLabel = null, draggingLabel = null, dragNewPrice = null, selectedLabel = null, pendingLabels = /* @__PURE__ */ new Set(), positionStyle = "line", hideConfirmCancel = false, draftOrderLabel = null, draftBracketPnl = {}, expandedClusters = /* @__PURE__ */ new Set(), clusterThresholdPx = 0, showQuantityField = false, dragNewSLPrice = null, dragNewTPPrice = null, buttonScale = 1, alwaysShowBrackets = false, anchorXResolver = null, timeDragEnabled = false) {
   if (levels.length === 0)
     return {
@@ -2044,6 +2050,7 @@ function renderTradeLevels(ctx, levels, scale, priceRange, theme, chartW, priceH
       clusters: []
     };
   const colors = theme.tradeLevels;
+  __bracketDraws = [];
   const s = Math.min(Math.max(buttonScale, 1), 3);
   const closeR = CLOSE_R * s;
   const editR = EDIT_R * s;
@@ -2144,8 +2151,9 @@ function renderTradeLevels(ctx, levels, scale, priceRange, theme, chartW, priceH
   );
   const bracketItems = [];
   const fallbackX = chartW * BRACKET_BASE_RATIO;
+  const cascadeOwner = hoveredLabel ?? selectedLabel;
   for (const level of levels) {
-    if (level.label !== hoveredLabel && level.label !== selectedLabel) continue;
+    if (level.label !== cascadeOwner) continue;
     const bh = level;
     const mainDrag = draggingLabel === level.label;
     if (bh.stopLossPrice !== void 0) {
@@ -2192,6 +2200,10 @@ function renderTradeLevels(ctx, levels, scale, priceRange, theme, chartW, priceH
   }
   const activeLabel = hoveredLabel ?? selectedLabel;
   const bracketPnlHostLabel = draftOrderLabel ?? selectedLabel;
+  const effectiveAlwaysShowBrackets = passiveBracketsVisible(
+    alwaysShowBrackets,
+    activeLabel
+  );
   const visibleMeasured = measured.filter((m) => !collapsedLabels.has(m.level.label));
   const drawOrder = [
     ...visibleMeasured.filter((m) => m.level.label !== activeLabel),
@@ -2243,9 +2255,10 @@ function renderTradeLevels(ctx, levels, scale, priceRange, theme, chartW, priceH
       dragNewTPPrice,
       buttonScale,
       bracketBoxYMap,
-      alwaysShowBrackets,
+      effectiveAlwaysShowBrackets,
       timeDragEnabled && anchorXResolver ? anchorXResolver(level) : null,
-      timeDragEnabled
+      timeDragEnabled,
+      level.label === activeLabel
     );
     const ec = labelToExpandedCluster.get(level.label);
     if (ec && layout.boxY !== layout.y - boxH / 2) {
@@ -2327,6 +2340,50 @@ function renderTradeLevels(ctx, levels, scale, priceRange, theme, chartW, priceH
       }
     }
   }
+  {
+    globalThis.__bracketDrawsLast = __bracketDraws.slice();
+    const counts = /* @__PURE__ */ new Map();
+    for (const d of __bracketDraws) {
+      const k = `${d.bracketType}@${d.price}`;
+      counts.set(k, (counts.get(k) ?? 0) + 1);
+    }
+    const dupeKeys = [...counts.entries()].filter(([, n]) => n > 1).map(([k]) => k);
+    if (dupeKeys.length > 0) {
+      const signature = dupeKeys.join(",") + "|" + __bracketDraws.map((d) => `${d.label}/${d.levelType}/${d.bW}`).join(",");
+      if (signature !== __lastDupeSignature) {
+        __lastDupeSignature = signature;
+        const frame = {
+          hoveredLabel,
+          selectedLabel,
+          draftOrderLabel,
+          draftBracketPnl,
+          levels: levels.map((l) => ({
+            label: l.label,
+            type: l.type,
+            price: l.price,
+            sl: l.stopLossPrice,
+            tp: l.takeProfitPrice,
+            isDraft: !!l.data?._isDraft
+          }))
+        };
+        console.warn(
+          `[ActCharts] DUPLICATE BRACKET BOX \u2192 ${dupeKeys.join(", ")}
+  hovered=${hoveredLabel ?? "null"}  selected=${selectedLabel ?? "null"}  draft=${draftOrderLabel ?? "null"}
+` + __bracketDraws.map(
+            (d, i) => `  box#${i + 1} label=${d.label} type=${d.levelType} draft=${d.isDraft} ${d.bracketType}@${d.price} bX=${d.bX} bW=${d.bW} right=${d.rightEdge} boxY=${d.boxY} pnl=${d.pnlText === null ? "none" : JSON.stringify(d.pnlText)} hideCC=${d.hideConfirmCancel}`
+          ).join("\n") + `
+  levels this frame: ` + frame.levels.map((l) => `${l.label}/${l.type}${l.isDraft ? "/DRAFT" : ""} price=${l.price} sl=${l.sl} tp=${l.tp}`).join(" | ")
+        );
+        if (typeof window !== "undefined") {
+          window.__bracketDupe = {
+            dupeKeys,
+            frame,
+            draws: __bracketDraws.slice()
+          };
+        }
+      }
+    }
+  }
   ctx.restore();
   return {
     hitAreas,
@@ -2482,7 +2539,7 @@ function drawDotHoverBox(ctx, level, y, dotX, dotR, theme, precision) {
   });
   ctx.restore();
 }
-function drawLevel(ctx, level, layout, chartW, colors, theme, precision, hovered, selected, scale, priceRange, priceH, draggingLabel, dragNewPrice, bracketLineXMap, hasPendingChanges, positionStyle, hitAreas, editAreas, hoverAreas, dragAreas, confirmAreas, addBracketAreas, hideConfirmCancel = false, draftBracketPnl, showQuantityField = false, draftQtyPillAreas, dragNewSLPrice = null, dragNewTPPrice = null, buttonScale = 1, bracketBoxYMap, alwaysShowBrackets = false, anchorX = null, timeDragEnabled = false) {
+function drawLevel(ctx, level, layout, chartW, colors, theme, precision, hovered, selected, scale, priceRange, priceH, draggingLabel, dragNewPrice, bracketLineXMap, hasPendingChanges, positionStyle, hitAreas, editAreas, hoverAreas, dragAreas, confirmAreas, addBracketAreas, hideConfirmCancel = false, draftBracketPnl, showQuantityField = false, draftQtyPillAreas, dragNewSLPrice = null, dragNewTPPrice = null, buttonScale = 1, bracketBoxYMap, alwaysShowBrackets = false, anchorX = null, timeDragEnabled = false, isBracketOwner) {
   const { y, boxY, boxW, boxH } = layout;
   const color = levelColor(level, colors, theme);
   const active = hovered || selected;
@@ -2532,7 +2589,8 @@ function drawLevel(ctx, level, layout, chartW, colors, theme, precision, hovered
   const boxX = draggable ? groupX + GRIP_W + 2 : groupX;
   const badgeTimeDrag = timeDragEnabled && level.timeDraggable === true;
   const bracketHost = level;
-  if (active || isMarketDraft || passiveBracketShow) {
+  const bracketOwner = isBracketOwner ?? active;
+  if (bracketOwner || isMarketDraft || passiveBracketShow) {
     const slDragKey = `${level.label}:stopLoss`;
     const tpDragKey = `${level.label}:takeProfit`;
     const mainDragActive = draggingLabel === level.label;
@@ -2994,6 +3052,19 @@ function drawBracketLine(ctx, level, bracketType, bracketPrice, scale, priceRang
   const bY = boxYOverride ?? naturalBoxY;
   const boxCenterY = bY + bH / 2;
   const displaced = Math.abs(bY - naturalBoxY) >= 2;
+  __bracketDraws.push({
+    label: level.label,
+    levelType: level.type,
+    isDraft: !!level.data?._isDraft,
+    bracketType,
+    price,
+    bX: Math.round(bX),
+    bW: Math.round(bW),
+    rightEdge: Math.round(bX + bW),
+    boxY: Math.round(bY),
+    pnlText: pnlText ?? null,
+    hideConfirmCancel
+  });
   if (displaced) {
     drawBracketLeader(ctx, bX + bW / 2, boxCenterY, y, theme);
   }