@forgecharts/sdk 1.5.22 → 1.5.24

package/dist/react/internal.js

@@ -7711,6 +7711,9 @@ function orderRoleLabel(role) {
 function isDraggableRole(role) {
   return role === "stop_loss" || role === "take_profit" || role === "limit" || role === "stop";
 }
+function isTerminal(status) {
+  return status === "cancelled" || status === "rejected" || status === "expired" || status === "filled";
+}
 var LINE_H = 15;
 var LABEL_GAP = 6;
 var LABEL_PAD = 6;
@@ -7975,33 +7978,37 @@ var PixiTradingRenderer = class {
         labelIdx = this._drawLabel(String(pos.entryPrice), plotWidth + 4, y, labelIdx, labelStyle);
         this._positionHitZones.push({ id: pos.id, x: pillX, y: boxY, w: pillW, h: LINE_H });
         const linked = pos.linkedOrderIds ?? [];
-        const hasTp = linked.some((id) => id.endsWith("-tp"));
-        const hasSl = linked.some((id) => id.endsWith("-sl"));
+        const hasTp = linked.some((id) => id.endsWith("-tp")) || orders.some((o) => (o.role === "take_profit" || o.role === "limit") && !isTerminal(o.status));
+        const hasSl = linked.some((id) => id.endsWith("-sl")) || orders.some((o) => (o.role === "stop_loss" || o.role === "stop") && !isTerminal(o.status));
         const entrySide = pos.side === "long" ? "buy" : "sell";
-        if (!hasTp) {
-          const tpY = y - PILL_H / 2;
-          this._boxGfx.roundRect(PILL_TP_X, tpY, PILL_W, PILL_H, PILL_R).fill({ color: TP_PILL_COLOR, alpha: 0.85 });
-          labelIdx = this._drawLabel("TP", PILL_TP_X + PILL_W / 2, y, labelIdx, pillLabelStyle, true);
+        let pillCursor = pillX - 4;
+        if (!hasSl) {
+          const slX = pillCursor - PILL_W;
+          const slY = y - PILL_H / 2;
+          this._boxGfx.roundRect(slX, slY, PILL_W, PILL_H, PILL_R).fill({ color: SL_PILL_COLOR, alpha: 0.85 });
+          labelIdx = this._drawLabel("SL", slX + PILL_W / 2, y, labelIdx, pillLabelStyle, true);
           this._pillHitZones.push({
-            kind: "tp",
+            kind: "sl",
             entryOrderId: pos.id,
             entrySide,
-            x: PILL_TP_X,
-            y: tpY,
+            x: slX,
+            y: slY,
             w: PILL_W,
             h: PILL_H
           });
+          pillCursor = slX - 4;
         }
-        if (!hasSl) {
-          const slY = y - PILL_H / 2;
-          this._boxGfx.roundRect(PILL_SL_X, slY, PILL_W, PILL_H, PILL_R).fill({ color: SL_PILL_COLOR, alpha: 0.85 });
-          labelIdx = this._drawLabel("SL", PILL_SL_X + PILL_W / 2, y, labelIdx, pillLabelStyle, true);
+        if (!hasTp) {
+          const tpX = pillCursor - PILL_W;
+          const tpY = y - PILL_H / 2;
+          this._boxGfx.roundRect(tpX, tpY, PILL_W, PILL_H, PILL_R).fill({ color: TP_PILL_COLOR, alpha: 0.85 });
+          labelIdx = this._drawLabel("TP", tpX + PILL_W / 2, y, labelIdx, pillLabelStyle, true);
           this._pillHitZones.push({
-            kind: "sl",
+            kind: "tp",
             entryOrderId: pos.id,
             entrySide,
-            x: PILL_SL_X,
-            y: slY,
+            x: tpX,
+            y: tpY,
             w: PILL_W,
             h: PILL_H
           });
@@ -9294,30 +9301,40 @@ var PixiChart = class {
   setTradingOrders(orders) {
     this._tradingOrders = orders;
     this._layers.dirty.mark(4 /* TradingOverlay */);
-    const hasDraggable = orders.some(
-      (o) => (o.role === "stop_loss" || o.role === "take_profit") && o.status !== "cancelled" && o.status !== "filled"
-    );
-    if (hasDraggable) {
-      this._interaction.setOrderLineHitTest(
-        (x, y) => this._tradingRenderer.hitTestDraggableOrder(x, y)
-      );
-    } else {
-      this._interaction.setOrderLineHitTest(null);
-    }
-    const hasEntryWithoutBracket = orders.some(
-      (o) => o.role === "entry" && !o.groupId && o.status !== "cancelled" && o.status !== "filled" && o.status !== "rejected"
-    );
-    if (hasEntryWithoutBracket) {
-      this._interaction.setPillHitTest(
-        (x, y) => this._tradingRenderer.hitTestPill(x, y)
-      );
-    } else {
-      this._interaction.setPillHitTest(null);
-    }
+    this._refreshTradingHitTests();
   }
   setTradingPositions(positions) {
     this._tradingPositions = positions;
     this._layers.dirty.mark(4 /* TradingOverlay */);
+    this._refreshTradingHitTests();
+  }
+  /**
+   * (Re)register the trading hit tests against current orders AND positions.
+   *
+   * Was inline in setTradingOrders and keyed on hardcoded roles, which left
+   * both interactions half-wired:
+   *
+   *   - the drag hit test required a 'stop_loss'/'take_profit' order, so
+   *     working limit and stop lines rendered a drag handle they could not
+   *     actually be grabbed by
+   *   - the pill hit test required an ORDER with role 'entry' and no groupId,
+   *     but the pills are drawn on POSITIONS, so they were never grabbable
+   *
+   * Both now derive from the same predicates the renderer draws with.
+   */
+  _refreshTradingHitTests() {
+    const hasDraggable = this._tradingOrders.some(
+      (o) => isDraggableRole(o.role) && o.status !== "cancelled" && o.status !== "filled"
+    );
+    this._interaction.setOrderLineHitTest(
+      hasDraggable ? (x, y) => this._tradingRenderer.hitTestDraggableOrder(x, y) : null
+    );
+    const hasPillSource = this._tradingPositions.some((p) => p.status === "open") || this._tradingOrders.some(
+      (o) => o.role === "entry" && !o.groupId && o.status !== "cancelled" && o.status !== "filled" && o.status !== "rejected"
+    );
+    this._interaction.setPillHitTest(
+      hasPillSource ? (x, y) => this._tradingRenderer.hitTestPill(x, y) : null
+    );
   }
   setContractSwitches(switches) {
     this._timeScale.contractSwitches = switches;