@orderly.network/hooks 3.0.0-beta.2 → 3.0.0-beta.4

package/dist/index.d.mts

@@ -170,7 +170,7 @@ declare global {
         };
     }
 }
-declare const _default: "3.0.0-beta.2";
+declare const _default: "3.0.0-beta.4";
 
 declare const fetcher: (url: string, init: RequestInit | undefined, queryOptions: useQueryOptions<any>) => Promise<any>;
 type useQueryOptions<T> = SWRConfiguration & {
@@ -3139,6 +3139,12 @@ type TpslPriceParams = {
     slPrice?: string;
     liqPrice: number | null;
     side?: OrderSide;
+    /**
+     * Mark price for the symbol. When set with `side`, liq values that `useGetEstLiqPrice` would
+     * hide (invalid vs mark — e.g. long est. liq above mark) are ignored here too so SL checks do
+     * not run against a number the UI does not show as “Est. liq. price”.
+     */
+    markPrice?: number | null;
     /** Current position qty (signed: positive=Long, negative=Short). If missing, treated as is_reducing=true, skip liq check. */
     currentPosition?: number;
     /** Order quantity (non-negative, sign derived from side). If missing or 0, treated as is_reducing=true, skip liq check. */

package/dist/index.d.ts

@@ -170,7 +170,7 @@ declare global {
         };
     }
 }
-declare const _default: "3.0.0-beta.2";
+declare const _default: "3.0.0-beta.4";
 
 declare const fetcher: (url: string, init: RequestInit | undefined, queryOptions: useQueryOptions<any>) => Promise<any>;
 type useQueryOptions<T> = SWRConfiguration & {
@@ -3139,6 +3139,12 @@ type TpslPriceParams = {
     slPrice?: string;
     liqPrice: number | null;
     side?: OrderSide;
+    /**
+     * Mark price for the symbol. When set with `side`, liq values that `useGetEstLiqPrice` would
+     * hide (invalid vs mark — e.g. long est. liq above mark) are ignored here too so SL checks do
+     * not run against a number the UI does not show as “Est. liq. price”.
+     */
+    markPrice?: number | null;
     /** Current position qty (signed: positive=Long, negative=Short). If missing, treated as is_reducing=true, skip liq check. */
     currentPosition?: number;
     /** Order quantity (non-negative, sign derived from side). If missing or 0, treated as is_reducing=true, skip liq check. */

package/dist/index.js

@@ -76,9 +76,9 @@ function useMarketCategoriesConfig() {
 // src/version.ts
 if (typeof window !== "undefined") {
   window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "3.0.0-beta.2";
+  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "3.0.0-beta.4";
 }
-var version_default = "3.0.0-beta.2";
+var version_default = "3.0.0-beta.4";
 var fetcher = (url, init2 = {}, queryOptions) => net.get(url, init2, queryOptions?.formatter);
 var noCacheConfig = {
   dedupingInterval: 0,
@@ -607,6 +607,20 @@ var useAudioPlayer = (src, options = {}) => {
     const el = getOrderFilledAudio();
     el.volume = Math.max(0, Math.min(1, volume));
   }, [volume]);
+  React.useEffect(() => {
+    const handleVisibilityChange = () => {
+      if (document.visibilityState === "visible") {
+        const el = getOrderFilledAudio();
+        el.pause();
+        el.removeAttribute("src");
+        el.load();
+      }
+    };
+    document.addEventListener("visibilitychange", handleVisibilityChange);
+    return () => {
+      document.removeEventListener("visibilitychange", handleVisibilityChange);
+    };
+  }, []);
   const play = React.useCallback(() => {
     const currentSrc = srcRef.current;
     const currentEnabled = enabledRef.current;
@@ -1316,7 +1330,7 @@ function checkTPSLOrderTypeIsMarket(key, values) {
 }
 function tpslCalculateHelper(key, inputs, options = {}) {
   const { symbol } = options;
-  if (key !== "quantity" && key !== "tp_trigger_price" && key !== "sl_trigger_price" && key !== "tp_pnl" && key !== "sl_pnl" && key !== "tp_offset" && key !== "sl_offset" && key !== "tp_offset_percentage" && key !== "sl_offset_percentage" && key !== "tp_order_price" && key !== "sl_order_price" && key !== "tp_order_type" && key !== "sl_order_type") {
+  if (key !== "quantity" && key !== "tp_trigger_price" && key !== "sl_trigger_price" && key !== "tp_pnl" && key !== "sl_pnl" && key !== "tp_offset" && key !== "sl_offset" && key !== "tp_offset_percentage" && key !== "sl_offset_percentage" && key !== "tp_offset_from_mark" && key !== "sl_offset_from_mark" && key !== "tp_offset_percentage_from_mark" && key !== "sl_offset_percentage_from_mark" && key !== "tp_order_price" && key !== "sl_order_price" && key !== "tp_order_type" && key !== "sl_order_type") {
     return {
       [key]: inputs.value
     };
@@ -1324,6 +1338,7 @@ function tpslCalculateHelper(key, inputs, options = {}) {
   const orderType = key.startsWith("tp_") ? types.AlgoOrderType.TAKE_PROFIT : types.AlgoOrderType.STOP_LOSS;
   const keyPrefix = key.slice(0, 3);
   const qty = Number(key === "quantity" ? inputs.value : inputs.qty);
+  const markPrice = inputs.markPrice ?? inputs.entryPrice;
   if (qty === 0 && (key === "tp_pnl" || key === "sl_pnl" || key === "tp_trigger_price" || key === "sl_trigger_price")) {
     return {
       // [`${keyPrefix}trigger_price`]: "",
@@ -1334,7 +1349,7 @@ function tpslCalculateHelper(key, inputs, options = {}) {
       [key]: inputs.value
     };
   }
-  let trigger_price, offset, offset_percentage, pnl, order_price, tpsl_order_type = inputs.values[`${keyPrefix}order_type`] ?? types.OrderType.MARKET;
+  let trigger_price, offset, offset_percentage, offset_from_mark, offset_percentage_from_mark, pnl, order_price, tpsl_order_type = inputs.values[`${keyPrefix}order_type`] ?? types.OrderType.MARKET;
   const entryPrice = new utils.Decimal(inputs.entryPrice).todp(options.symbol?.quote_dp ?? 2, utils.Decimal.ROUND_UP).toNumber();
   switch (key) {
     case "tp_trigger_price":
@@ -1346,6 +1361,8 @@ function tpslCalculateHelper(key, inputs, options = {}) {
             [`${keyPrefix}trigger_price`]: trigger_price,
             [`${keyPrefix}offset`]: "",
             [`${keyPrefix}offset_percentage`]: "",
+            [`${keyPrefix}offset_from_mark`]: "",
+            [`${keyPrefix}offset_percentage_from_mark`]: "",
             [`${keyPrefix}pnl`]: "",
             [`${keyPrefix}ROI`]: ""
           };
@@ -1355,31 +1372,6 @@ function tpslCalculateHelper(key, inputs, options = {}) {
       }
       break;
     }
-    // case "tp_enable":
-    // case "sl_enable": {
-    //   return {
-    //     [`${keyPrefix}enable`]: inputs.value,
-    //     [`${keyPrefix}order_type`]: OrderType.MARKET,
-    //     [`${keyPrefix}trigger_price`]: "",
-    //     [`${keyPrefix}order_price`]: "",
-    //     [`${keyPrefix}offset`]: "",
-    //     [`${keyPrefix}offset_percentage`]: "",
-    //     [`${keyPrefix}pnl`]: "",
-    //     [`${keyPrefix}ROI`]: "",
-    //   };
-    // }
-    // case 'tp_pnl':{
-    //   if (inputs.values.tp_order_type !== OrderType.MARKET) {
-    //     pnl = inputs.value;
-    //     trigger_price = pnlToPrice({
-    //     qty,
-    //     pnl: Number(inputs.value),
-    //     entryPrice,
-    //     orderSide: inputs.orderSide,
-    //     orderType,
-    //     })
-    //   }
-    // }
     case "tp_pnl":
     case "sl_pnl": {
       pnl = inputs.value;
@@ -1426,6 +1418,30 @@ function tpslCalculateHelper(key, inputs, options = {}) {
       }
       break;
     }
+    case "tp_offset_from_mark":
+    case "sl_offset_from_mark": {
+      offset_from_mark = inputs.value;
+      if (!checkTPSLOrderTypeIsMarket(key, inputs.values)) {
+        order_price = offsetToPrice({
+          qty,
+          offset: Number(inputs.value),
+          entryPrice: markPrice,
+          orderSide: inputs.orderSide,
+          orderType: key === "tp_offset_from_mark" ? types.AlgoOrderType.TAKE_PROFIT : types.AlgoOrderType.STOP_LOSS
+        });
+        trigger_price = inputs.values[`${keyPrefix}trigger_price`] ?? order_price;
+      } else {
+        trigger_price = offsetToPrice({
+          qty,
+          offset: Number(inputs.value),
+          // entryPrice,
+          entryPrice: markPrice,
+          orderSide: inputs.orderSide,
+          orderType: key === "tp_offset_from_mark" ? types.AlgoOrderType.TAKE_PROFIT : types.AlgoOrderType.STOP_LOSS
+        });
+      }
+      break;
+    }
     case "tp_order_price":
     case "sl_order_price": {
       order_price = inputs.value;
@@ -1466,12 +1482,38 @@ function tpslCalculateHelper(key, inputs, options = {}) {
       }
       break;
     }
+    case "tp_offset_percentage_from_mark":
+    case "sl_offset_percentage_from_mark": {
+      offset_percentage_from_mark = inputs.value;
+      const markBase = Number(markPrice);
+      if (!checkTPSLOrderTypeIsMarket(key, inputs.values)) {
+        order_price = offsetPercentageToPrice({
+          qty,
+          percentage: Number(`${inputs.value}`.replace(/\.0{0,2}$/, "")),
+          entryPrice: markBase,
+          orderSide: inputs.orderSide,
+          orderType
+        });
+        trigger_price = inputs.values[`${keyPrefix}trigger_price`] ?? order_price;
+      } else {
+        trigger_price = offsetPercentageToPrice({
+          qty,
+          percentage: Number(`${inputs.value}`.replace(/\.0{0,2}$/, "")),
+          entryPrice: markBase,
+          orderSide: inputs.orderSide,
+          orderType
+        });
+      }
+      break;
+    }
   }
   if (!trigger_price && checkTPSLOrderTypeIsMarket(key, inputs.values)) {
     return {
       [`${keyPrefix}trigger_price`]: "",
       [`${keyPrefix}offset`]: "",
       [`${keyPrefix}offset_percentage`]: "",
+      [`${keyPrefix}offset_from_mark`]: "",
+      [`${keyPrefix}offset_percentage_from_mark`]: "",
       [`${keyPrefix}pnl`]: "",
       [`${keyPrefix}ROI`]: "",
       [key]: inputs.value
@@ -1516,6 +1558,8 @@ function tpslCalculateHelper(key, inputs, options = {}) {
     [`${keyPrefix}order_price`]: order_price ? utils.todpIfNeed(order_price, symbol?.quote_dp ?? 2) : "",
     [`${keyPrefix}offset`]: offset ?? "",
     [`${keyPrefix}offset_percentage`]: offset_percentage ?? "",
+    [`${keyPrefix}offset_from_mark`]: offset_from_mark ?? inputs.values[`${keyPrefix}offset_from_mark`] ?? "",
+    [`${keyPrefix}offset_percentage_from_mark`]: offset_percentage_from_mark ?? inputs.values[`${keyPrefix}offset_percentage_from_mark`] ?? "",
     [`${keyPrefix}pnl`]: pnl ?? ""
     // [`${keyPrefix}ROI`]: calcROI({
     //   pnl: Number(pnl ?? 0),
@@ -1703,6 +1747,7 @@ function tpslInputHandle(inputs) {
       // order price or mark price
       qty: values.side === types.OrderSide.BUY ? Number(values.order_quantity) : Number(values.order_quantity) * -1,
       orderSide: values.side,
+      markPrice,
       // values: newValues,
       values
     },
@@ -1738,6 +1783,10 @@ var getCalculateHandler = (fieldName) => {
     case "sl_offset":
     case "tp_offset_percentage":
     case "sl_offset_percentage":
+    case "tp_offset_from_mark":
+    case "sl_offset_from_mark":
+    case "tp_offset_percentage_from_mark":
+    case "sl_offset_percentage_from_mark":
     case "tp_order_price":
     case "tp_order_type":
     case "sl_order_type":
@@ -3162,7 +3211,9 @@ var DEFAULT_SYMBOL_DEPTHS = {
 };
 var DEFAULT_SYMBOL_DISPLAY_NAMES = {
   PERP_XAU_USDC: "XAU (Gold) ",
-  PERP_XAG_USDC: "XAG (Silver)"
+  PERP_XAG_USDC: "XAG (Silver)",
+  PERP_CL_USDC: "CL (WTI Crude Oil)",
+  PERP_BZ_USDC: "BZ (Brent Crude Oil)"
 };
 var ProxyConfigStore = class {
   constructor(_originConfigStore) {
@@ -5150,6 +5201,11 @@ var MarkPriceCalculator = class extends BaseCalculator {
 
 // src/orderly/calculator/calculatorContext.ts
 var CalculatorContext = class _CalculatorContext {
+  // holding: API.Holding[];
+  // portfolio — dynamic getter to always read the latest output from PortfolioCalculator
+  get portfolio() {
+    return this.output["portfolio"] || useAppStore.getState().portfolio;
+  }
   static get instance() {
     return this._instance;
   }
@@ -5168,7 +5224,6 @@ var CalculatorContext = class _CalculatorContext {
   update(scope, data) {
     this.setCtxData();
     this.markPrices = scope === "markPrice" /* MARK_PRICE */ ? data : this.output[MarketCalculatorName];
-    this.portfolio = this.output["portfolio"] || useAppStore.getState().portfolio;
     return this;
   }
   setCtxData() {
@@ -5186,7 +5241,6 @@ var CalculatorContext = class _CalculatorContext {
   clearCache() {
     this.output = {};
     this.accountInfo = void 0;
-    this.portfolio = void 0;
   }
   deleteByName(name) {
     delete this.output[name];
@@ -11052,7 +11106,11 @@ var tpslFields = [
   "tp_offset",
   "sl_offset",
   "tp_offset_percentage",
-  "sl_offset_percentage"
+  "sl_offset_percentage",
+  "tp_offset_from_mark",
+  "sl_offset_from_mark",
+  "tp_offset_percentage_from_mark",
+  "sl_offset_percentage_from_mark"
 ];
 var isBracketOrder = (order) => {
   return !!order.tp_trigger_price || !!order.sl_trigger_price;
@@ -11268,6 +11326,8 @@ var useTaskProfitAndStopLossInternal = (position, options) => {
           entryPrice: position.average_open_price,
           qty: side === types.OrderSide.BUY ? Number(prev.quantity) : -Number(prev.quantity),
           orderSide: side,
+          markPrice: markPrice ?? position.average_open_price,
+          // use mark price as the default value
           values: prev
         },
         {
@@ -18648,10 +18708,14 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
           tp_pnl: "",
           tp_offset: "",
           tp_offset_percentage: "",
+          tp_offset_from_mark: "",
+          tp_offset_percentage_from_mark: "",
           sl_trigger_price: "",
           sl_pnl: "",
           sl_offset: "",
-          sl_offset_percentage: ""
+          sl_offset_percentage: "",
+          sl_offset_from_mark: "",
+          sl_offset_percentage_from_mark: ""
         }));
       },
       hasTP_SL: () => {
@@ -18742,6 +18806,42 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
           symbolInfo2
         );
       }
+      if (newValues.tp_offset_from_mark !== void 0 && newValues.tp_offset_from_mark !== "") {
+        newValues = calculate2(
+          newValues,
+          "tp_offset_from_mark",
+          newValues.tp_offset_from_mark,
+          markPrice,
+          symbolInfo2
+        );
+      }
+      if (newValues.tp_offset_percentage_from_mark !== void 0 && newValues.tp_offset_percentage_from_mark !== "") {
+        newValues = calculate2(
+          newValues,
+          "tp_offset_percentage_from_mark",
+          newValues.tp_offset_percentage_from_mark,
+          markPrice,
+          symbolInfo2
+        );
+      }
+      if (newValues.sl_offset_from_mark !== void 0 && newValues.sl_offset_from_mark !== "") {
+        newValues = calculate2(
+          newValues,
+          "sl_offset_from_mark",
+          newValues.sl_offset_from_mark,
+          markPrice,
+          symbolInfo2
+        );
+      }
+      if (newValues.sl_offset_percentage_from_mark !== void 0 && newValues.sl_offset_percentage_from_mark !== "") {
+        newValues = calculate2(
+          newValues,
+          "sl_offset_percentage_from_mark",
+          newValues.sl_offset_percentage_from_mark,
+          markPrice,
+          symbolInfo2
+        );
+      }
     } else {
       if (typeof newValues.tp_trigger_price !== "undefined") {
         newValues = calculate2(
@@ -18761,6 +18861,42 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
           symbolInfo2
         );
       }
+      if (newValues.tp_offset_from_mark !== void 0 && newValues.tp_offset_from_mark !== "") {
+        newValues = calculate2(
+          newValues,
+          "tp_offset_from_mark",
+          newValues.tp_offset_from_mark,
+          markPrice,
+          symbolInfo2
+        );
+      }
+      if (newValues.tp_offset_percentage_from_mark !== void 0 && newValues.tp_offset_percentage_from_mark !== "") {
+        newValues = calculate2(
+          newValues,
+          "tp_offset_percentage_from_mark",
+          newValues.tp_offset_percentage_from_mark,
+          markPrice,
+          symbolInfo2
+        );
+      }
+      if (newValues.sl_offset_from_mark !== void 0 && newValues.sl_offset_from_mark !== "") {
+        newValues = calculate2(
+          newValues,
+          "sl_offset_from_mark",
+          newValues.sl_offset_from_mark,
+          markPrice,
+          symbolInfo2
+        );
+      }
+      if (newValues.sl_offset_percentage_from_mark !== void 0 && newValues.sl_offset_percentage_from_mark !== "") {
+        newValues = calculate2(
+          newValues,
+          "sl_offset_percentage_from_mark",
+          newValues.sl_offset_percentage_from_mark,
+          markPrice,
+          symbolInfo2
+        );
+      }
     }
     return newValues;
   };
@@ -19740,6 +19876,7 @@ var useTpslPriceChecker = (params) => {
     slPrice,
     liqPrice,
     side,
+    markPrice,
     currentPosition,
     orderQuantity
   } = params;
@@ -19795,6 +19932,17 @@ var useTpslPriceChecker = (params) => {
     if (slPrice === void 0 || liqPrice === void 0 || side === void 0 || liqPrice === null) {
       return null;
     }
+    if (markPrice != null && Number.isFinite(markPrice) && markPrice > 0) {
+      if (side === types.OrderSide.BUY && liqPrice > markPrice) {
+        return null;
+      }
+      if (side === types.OrderSide.SELL && liqPrice < markPrice) {
+        return null;
+      }
+    }
+    if (typeof liqPrice === "number" && (!Number.isFinite(liqPrice) || liqPrice <= 0)) {
+      return null;
+    }
     let slPriceDecimal;
     let liqPriceDecimal;
     try {
@@ -19821,6 +19969,7 @@ var useTpslPriceChecker = (params) => {
     slPrice,
     liqPrice,
     side,
+    markPrice,
     warning_threshold,
     currentPosition,
     orderQuantity