acttrader-charts 1.3.0-beta.22 → 1.3.0-beta.24

package/README.md

@@ -1171,9 +1171,11 @@ Sub-pane heights are user-resizable by dragging the separator between panes.
 
 ### SL/TP bracket labels — price or amount
 
-By default an SL/TP pill reads `SL 4159.00`. With `bracketLabelMode: 'amount'`
-it reads `SL -$290.80` — the money the position gains or loses if that bracket
-is hit, currency symbol in front.
+By default an SL/TP pill reads `SL @4159.00` — the currency sign is never shown on
+a price. With `bracketLabelMode: 'amount'` it reads `SL -$290.80` — the money the
+position gains or loses if that bracket is hit, currency symbol in front and a
+minus only on a loss. `'priceAndAmount'` shows `SL @4159.00` at rest and
+`SL @4159.00 -$290.80` while the bracket is dragged.
 
 The chart has no access to contract specs or the account currency, so each level
 supplies what the maths needs:
@@ -1188,7 +1190,7 @@ chart.setLevels([{
   valuePerPoint: 1,      // account-currency value of one price unit
   currencySymbol: '$',   // optional per-level override
 }], 'label', 'price', 'position');
-// pills render: SL -$290.80   TP +$189.20
+// pills render: SL -$290.80   TP $189.20
 ```
 
 ```

package/dist/{MACD-B6SoR6iH.d.cts → MACD-BD55Bgdu.d.cts}

@@ -1177,14 +1177,15 @@ interface ChartConfig {
     /**
      * What the SL/TP bracket pills show.
      *
-     * `'price'` (default) renders the bracket price — `SL 4159.00`.
+     * `'price'` (default) renders the bracket price — `SL @4159.00`. The currency
+     * sign is never shown on a price, only on money values.
      * `'amount'` renders the money the position gains or loses if that bracket
-     * is hit — `SL -$290.80` — computed from the level's `lots`, `contractSize`
-     * and `valuePerPoint`. Falls back to the price for any level lacking the
-     * data needed to compute it, so a partial rollout degrades gracefully.
-     * `'priceAndAmount'` keeps the price but puts the currency symbol in front
-     * of it — `SL $1.27859` — and appends the P/L while the bracket is being
-     * dragged: `SL $1.27859  -$29.08`.
+     * is hit — `SL -$290.80` (a minus only on a loss, no plus on a gain) —
+     * computed from the level's `lots`, `contractSize` and `valuePerPoint`.
+     * Falls back to the price for any level lacking the data needed to compute
+     * it, so a partial rollout degrades gracefully.
+     * `'priceAndAmount'` shows the price at rest — `SL @1.27859` — and appends
+     * the P/L while the bracket is being dragged: `SL @1.27859 -$29.08`.
      */
     bracketLabelMode?: 'price' | 'amount' | 'priceAndAmount';
     /**

package/dist/{MACD-B6SoR6iH.d.ts → MACD-BD55Bgdu.d.ts}

@@ -1177,14 +1177,15 @@ interface ChartConfig {
     /**
      * What the SL/TP bracket pills show.
      *
-     * `'price'` (default) renders the bracket price — `SL 4159.00`.
+     * `'price'` (default) renders the bracket price — `SL @4159.00`. The currency
+     * sign is never shown on a price, only on money values.
      * `'amount'` renders the money the position gains or loses if that bracket
-     * is hit — `SL -$290.80` — computed from the level's `lots`, `contractSize`
-     * and `valuePerPoint`. Falls back to the price for any level lacking the
-     * data needed to compute it, so a partial rollout degrades gracefully.
-     * `'priceAndAmount'` keeps the price but puts the currency symbol in front
-     * of it — `SL $1.27859` — and appends the P/L while the bracket is being
-     * dragged: `SL $1.27859  -$29.08`.
+     * is hit — `SL -$290.80` (a minus only on a loss, no plus on a gain) —
+     * computed from the level's `lots`, `contractSize` and `valuePerPoint`.
+     * Falls back to the price for any level lacking the data needed to compute
+     * it, so a partial rollout degrades gracefully.
+     * `'priceAndAmount'` shows the price at rest — `SL @1.27859` — and appends
+     * the P/L while the bracket is being dragged: `SL @1.27859 -$29.08`.
      */
     bracketLabelMode?: 'price' | 'amount' | 'priceAndAmount';
     /**

package/dist/index.cjs

@@ -1935,8 +1935,7 @@ function bracketPnl(input) {
 function formatMoney(amount, symbol = "$", decimals = 2) {
   const rounded = Number(amount.toFixed(decimals));
   const magnitude = Math.abs(rounded).toFixed(decimals);
-  if (rounded === 0) return `${symbol}${magnitude}`;
-  return `${rounded > 0 ? "+" : "-"}${symbol}${magnitude}`;
+  return `${rounded < 0 ? "-" : ""}${symbol}${magnitude}`;
 }
 function positionQty(input) {
   const { entryPrice, stopPrice, accountSize, riskPercent } = input;
@@ -2080,13 +2079,12 @@ function bracketBoxLabel(bracketType, price, precision, level, opts = DEFAULT_BR
     const pnl = amount();
     if (pnl !== null) return `${typeLabel} ${formatMoney(pnl, symbol)}`;
   }
-  if (opts.mode === "priceAndAmount") {
-    const priced = `${typeLabel} ${symbol}${price.toFixed(precision)}`;
-    if (!active) return priced;
+  const priced = `${typeLabel} @${price.toFixed(precision)}`;
+  if (opts.mode === "priceAndAmount" && active) {
     const pnl = amount();
-    return pnl === null ? priced : `${priced}  ${formatMoney(pnl, symbol)}`;
+    if (pnl !== null) return `${priced} ${formatMoney(pnl, symbol)}`;
   }
-  return `${typeLabel} ${price.toFixed(precision)}`;
+  return priced;
 }
 var BRACKET_BASE_RATIO = 0.68;
 var BRACKET_COL_OFFSETS = [0, -0.08, 0.08];
@@ -21333,13 +21331,15 @@ var OrderLineTimeDragHandler = class _OrderLineTimeDragHandler {
 // src/core/priceReveal.ts
 var MIN_FACTOR = 0.1;
 var MAX_FACTOR = 10;
-function revealPriceRange(displayed, prices, plotHeightPx, padPx = 24) {
-  const pts = prices.filter((p) => Number.isFinite(p));
+function revealPriceRange(displayed, prices, plotHeightPx, padPx = 24, maxSpan) {
+  const pts = prices.filter((p) => Number.isFinite(p) && p > 0);
   const span = displayed.max - displayed.min;
   if (pts.length === 0 || !(span > 0) || !(plotHeightPx > 0)) return null;
   const lo = Math.min(...pts);
   const hi = Math.max(...pts);
-  if (lo >= displayed.min && hi <= displayed.max) return null;
+  const needLo = lo < displayed.min;
+  const needHi = hi > displayed.max;
+  if (!needLo && !needHi) return null;
   let min = displayed.min;
   let max = displayed.max;
   for (let pass = 0; pass < 2; pass++) {
@@ -21347,6 +21347,20 @@ function revealPriceRange(displayed, prices, plotHeightPx, padPx = 24) {
     min = Math.min(displayed.min, lo - pad);
     max = Math.max(displayed.max, hi + pad);
   }
+  if (maxSpan !== void 0 && max - min > maxSpan) {
+    if (!(maxSpan > span)) return null;
+    if (needLo && !needHi) {
+      max = displayed.max;
+      min = max - maxSpan;
+    } else if (needHi && !needLo) {
+      min = displayed.min;
+      max = min + maxSpan;
+    } else {
+      const mid = (displayed.min + displayed.max) / 2;
+      min = mid - maxSpan / 2;
+      max = mid + maxSpan / 2;
+    }
+  }
   return { min, max };
 }
 function scaleAndPanFor(base, target) {
@@ -32321,7 +32335,8 @@ var _ChartEngine = class _ChartEngine {
     if (this.dataStore.length === 0 || this._lastInCompareMode) return;
     const { priceH } = this.getChartLayout();
     const displayed = this._displayedPriceRange ?? this.getScaledPriceRange(this.viewport);
-    const target = revealPriceRange(displayed, prices, priceH);
+    const base = this._lockedAutoFitBase ?? displayed;
+    const target = revealPriceRange(displayed, prices, priceH, 24, (base.max - base.min) * MAX_FACTOR);
     if (!target) return;
     if (this.scrollAnimId !== null) {
       cancelAnimationFrame(this.scrollAnimId);