@orderly.network/hooks 2.1.1 → 2.1.2

package/dist/index.d.mts

@@ -8,7 +8,8 @@ import * as _orderly_network_core from '@orderly.network/core';
 import { AccountState, Account, EventEmitter, ConfigStore, ConfigKey, SimpleDI, OrderlyKeyStore, WalletAdapter, IContract, DefaultConfigStore } from '@orderly.network/core';
 export { WalletAdapter } from '@orderly.network/core';
 import * as _orderly_network_types from '@orderly.network/types';
-import { NetworkId, TrackerListenerKeyMap, API, Chain as Chain$1, ChainNamespace, WSMessage, OrderStatus, OrderSide, AlgoOrderRootType, OrderEntity, OrderType, OrderlyOrder, AlgoOrderEntity, AlgoOrderType, RequireKeys } from '@orderly.network/types';
+import { NetworkId, TrackerEventName, API, Chain as Chain$1, ChainNamespace, WSMessage, OrderStatus, OrderSide, AlgoOrderRootType, OrderEntity, OrderType, OrderlyOrder, AlgoOrderEntity, AlgoOrderType, RequireKeys } from '@orderly.network/types';
+import * as lodash from 'lodash';
 export { default as useConstant } from 'use-constant';
 import { WS } from '@orderly.network/net';
 import * as react from 'react';
@@ -28,7 +29,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.1.1";
+declare const _default: "2.1.2";
 
 type useQueryOptions<T> = SWRConfiguration & {
     formatter?: (data: any) => T;
@@ -113,8 +114,10 @@ type CurrentChain = {
 declare const useNetworkInfo: (networkId: NetworkId) => (chainId: number) => CurrentChain;
 
 declare const useTrack: () => {
-    track: (eventName: keyof typeof TrackerListenerKeyMap, params: any) => void;
+    track: lodash.DebouncedFunc<(eventName: TrackerEventName, params: any) => void>;
+    tracking: (eventName: TrackerEventName, params: any) => void;
     setTrackUserId: (userId: string) => void;
+    setIdentify: (params: any) => void;
 };
 
 declare enum ENVType$1 {
@@ -132,7 +135,7 @@ declare class AmplitudeTracker {
     setUserId(userId: string): void;
     setSdkInfo(sdkInfo: any): void;
     identify(properties: any): void;
-    track(eventName: keyof typeof TrackerListenerKeyMap, properties?: any): void;
+    track(eventName: TrackerEventName, properties?: any): void;
     private _bindEvents;
 }
 
@@ -1640,7 +1643,7 @@ declare const useOrderEntryNextInternal: (symbol: string, options?: {
     }) => Promise<{
         [x: string]: OrderValidationItem | undefined;
     }>;
-    readonly onMarkPriceChange: (markPrice: number, baseOn?: "total" | "order_quantity") => void;
+    readonly onMarkPriceChange: (markPrice: number, baseOn?: string[]) => void;
 };
 
 type OrderEntryParameters = Parameters<typeof useOrderEntryNextInternal>;

package/dist/index.d.ts

@@ -8,7 +8,8 @@ import * as _orderly_network_core from '@orderly.network/core';
 import { AccountState, Account, EventEmitter, ConfigStore, ConfigKey, SimpleDI, OrderlyKeyStore, WalletAdapter, IContract, DefaultConfigStore } from '@orderly.network/core';
 export { WalletAdapter } from '@orderly.network/core';
 import * as _orderly_network_types from '@orderly.network/types';
-import { NetworkId, TrackerListenerKeyMap, API, Chain as Chain$1, ChainNamespace, WSMessage, OrderStatus, OrderSide, AlgoOrderRootType, OrderEntity, OrderType, OrderlyOrder, AlgoOrderEntity, AlgoOrderType, RequireKeys } from '@orderly.network/types';
+import { NetworkId, TrackerEventName, API, Chain as Chain$1, ChainNamespace, WSMessage, OrderStatus, OrderSide, AlgoOrderRootType, OrderEntity, OrderType, OrderlyOrder, AlgoOrderEntity, AlgoOrderType, RequireKeys } from '@orderly.network/types';
+import * as lodash from 'lodash';
 export { default as useConstant } from 'use-constant';
 import { WS } from '@orderly.network/net';
 import * as react from 'react';
@@ -28,7 +29,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.1.1";
+declare const _default: "2.1.2";
 
 type useQueryOptions<T> = SWRConfiguration & {
     formatter?: (data: any) => T;
@@ -113,8 +114,10 @@ type CurrentChain = {
 declare const useNetworkInfo: (networkId: NetworkId) => (chainId: number) => CurrentChain;
 
 declare const useTrack: () => {
-    track: (eventName: keyof typeof TrackerListenerKeyMap, params: any) => void;
+    track: lodash.DebouncedFunc<(eventName: TrackerEventName, params: any) => void>;
+    tracking: (eventName: TrackerEventName, params: any) => void;
     setTrackUserId: (userId: string) => void;
+    setIdentify: (params: any) => void;
 };
 
 declare enum ENVType$1 {
@@ -132,7 +135,7 @@ declare class AmplitudeTracker {
     setUserId(userId: string): void;
     setSdkInfo(sdkInfo: any): void;
     identify(properties: any): void;
-    track(eventName: keyof typeof TrackerListenerKeyMap, properties?: any): void;
+    track(eventName: TrackerEventName, properties?: any): void;
     private _bindEvents;
 }
 
@@ -1640,7 +1643,7 @@ declare const useOrderEntryNextInternal: (symbol: string, options?: {
     }) => Promise<{
         [x: string]: OrderValidationItem | undefined;
     }>;
-    readonly onMarkPriceChange: (markPrice: number, baseOn?: "total" | "order_quantity") => void;
+    readonly onMarkPriceChange: (markPrice: number, baseOn?: string[]) => void;
 };
 
 type OrderEntryParameters = Parameters<typeof useOrderEntryNextInternal>;

package/dist/index.js

@@ -61,9 +61,9 @@ var __export = (target, all) => {
 // src/version.ts
 if (typeof window !== "undefined") {
   window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.1.1";
+  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.1.2";
 }
-var version_default = "2.1.1";
+var version_default = "2.1.2";
 var fetcher = (url, init2 = {}, queryOptions) => net.get(url, init2, queryOptions?.formatter);
 var OrderlyContext = React.createContext({
   // configStore: new MemoryConfigStore(),
@@ -258,8 +258,8 @@ var useWalletConnector = () => {
 var useTrack = () => {
   const ee = useEventEmitter();
   const { wallet } = useWalletConnector();
-  const debouncedTrackFn = React.useCallback(
-    lodash.debounce((eventName, params) => {
+  const tracking = React.useCallback(
+    (eventName, params) => {
       utils.windowGuard(() => {
         const location = window.location;
         const origin = location.origin;
@@ -272,23 +272,29 @@ var useTrack = () => {
           page_domain: origin,
           user_agent: userAgent
         });
-        if (eventName === types.EnumTrackerKeys.placeorderSuccess) {
+        if (eventName === types.TrackerEventName.placeOrderSuccess) {
           Object.assign(params, {
             wallet: wallet?.label || "QR code"
           });
         }
         ee.emit(eventName, params);
       });
-    }, 500),
-    []
+    },
+    [wallet]
   );
-  const track2 = React.useCallback((eventName, params) => {
-    debouncedTrackFn(eventName, params);
-  }, [debouncedTrackFn]);
+  const track2 = React.useCallback(lodash.debounce(tracking, 500), [tracking]);
   const setTrackUserId = React.useCallback((userId) => {
-    ee.emit(types.EnumTrackerKeys.trackIdentifyUserId, userId);
+    ee.emit(types.TrackerEventName.trackIdentifyUserId, userId);
   }, []);
-  return { track: track2, setTrackUserId };
+  const setIdentify = React.useCallback((params) => {
+    ee.emit(types.TrackerEventName.trackIdentify, params);
+  }, []);
+  return {
+    track: track2,
+    tracking,
+    setTrackUserId,
+    setIdentify
+  };
 };
 
 // src/useAccount.ts
@@ -323,7 +329,7 @@ var useAccount = () => {
   }, []);
   const createOrderlyKey = React.useCallback(
     async (remember) => {
-      track2(types.EnumTrackerKeys.signinSuccess, {
+      track2(types.TrackerEventName.signinSuccess, {
         network: account5.chainId,
         wallet: state.connectWallet?.name
       });
@@ -599,14 +605,22 @@ var AmplitudeTracker = class {
     amplitude__namespace.identify(identify2);
   }
   track(eventName, properties) {
-    amplitude__namespace.track(types.TrackerListenerKeyMap[eventName], properties);
+    amplitude__namespace.track(eventName, properties);
   }
   _bindEvents() {
-    const listenKeys = Object.keys(types.TrackerListenerKeyMap);
+    const listenKeys = Object.values(types.TrackerEventName);
     listenKeys.forEach((key) => {
       this._ee.addListener(key, (params = {}) => {
-        if (key === types.EnumTrackerKeys.trackIdentifyUserId) {
+        if (key === types.TrackerEventName.trackIdentifyUserId) {
           this.setUserId(params);
+        } else if (key === types.TrackerEventName.trackIdentify) {
+          this.identify(params);
+        } else if (key === types.TrackerEventName.trackCustomEvent) {
+          const { eventName, ...rest } = params;
+          if (!eventName) {
+            return;
+          }
+          this.track(eventName, rest);
         } else {
           this.track(key, params);
         }
@@ -4191,6 +4205,8 @@ var useHoldingStream = () => {
     isLoading
   };
 };
+
+// src/orderly/useWithdraw.ts
 var useWithdraw = (options) => {
   const { account: account5, state } = useAccount();
   const [isLoading, setIsLoading] = React.useState(false);
@@ -4240,7 +4256,7 @@ var useWithdraw = (options) => {
     (inputs) => {
       return account5.assetsManager.withdraw(inputs).then((res) => {
         if (res.success) {
-          track2(types.EnumTrackerKeys.withdrawSuccess, {
+          track2(types.TrackerEventName.withdrawSuccess, {
             wallet: state?.connectWallet?.name,
             network: targetChain?.network_infos.name,
             quantity: inputs.amount
@@ -4248,7 +4264,7 @@ var useWithdraw = (options) => {
         }
         return res;
       }).catch((err) => {
-        track2(types.EnumTrackerKeys.withdrawFailed, {
+        track2(types.TrackerEventName.withdrawFailed, {
           wallet: state?.connectWallet?.name,
           network: targetChain?.network_infos.name,
           msg: JSON.stringify(err)
@@ -4470,7 +4486,7 @@ var useDeposit = (options) => {
       throw new types.SDKError("Insufficient allowance");
     }
     return account5.assetsManager.deposit(quantity, depositFee).then((res) => {
-      track2(types.EnumTrackerKeys.depositSuccess, {
+      track2(types.TrackerEventName.depositSuccess, {
         wallet: state?.connectWallet?.name,
         network: targetChain?.network_infos.name,
         quantity
@@ -4479,7 +4495,7 @@ var useDeposit = (options) => {
       setBalance((value) => new utils.Decimal(value).sub(quantity).toString());
       return res;
     }).catch((e) => {
-      track2(types.EnumTrackerKeys.depositFailed, {
+      track2(types.TrackerEventName.depositFailed, {
         wallet: state?.connectWallet?.name,
         network: targetChain?.network_infos?.name,
         msg: JSON.stringify(e)
@@ -13919,6 +13935,10 @@ var calcEstLeverage = (order, askAndBid, inputs) => {
     }
   });
 };
+function isBBOOrder(options) {
+  const { order_type, order_type_ext } = options;
+  return order_type === types.OrderType.LIMIT && [types.OrderType.ASK, types.OrderType.BID].includes(order_type_ext);
+}
 var initialOrderState = {
   order_price: "",
   order_quantity: "",
@@ -14004,7 +14024,7 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
   const calculate = React.useCallback(
     (values2, fieldName, value, markPrice, config) => {
       const fieldHandler = getCalculateHandler(fieldName);
-      let newValues = ramda.compose(
+      const newValues = ramda.compose(
         ramda.head,
         // orderEntityFormatHandle(baseDP, quoteDP),
         fieldHandler,
@@ -14124,11 +14144,11 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
     return newValues;
   };
   const onMarkPriceUpdated = React.useCallback(
-    (markPrice, baseOn) => {
+    (markPrice, baseOn = []) => {
       if (!options.symbolInfo)
         return;
-      let newValues;
-      if (typeof baseOn === "undefined") {
+      let newValues = { ...orderEntity };
+      if (baseOn.length === 0) {
         newValues = calculate(
           { ...orderEntity },
           "order_price",
@@ -14137,13 +14157,15 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
           options.symbolInfo
         );
       } else {
-        newValues = calculate(
-          { ...orderEntity },
-          baseOn,
-          orderEntity[baseOn],
-          markPrice,
-          options.symbolInfo
-        );
+        baseOn.forEach((key) => {
+          newValues = calculate(
+            { ...newValues },
+            key,
+            orderEntity[key],
+            markPrice,
+            options.symbolInfo
+          );
+        });
       }
       if (hasTPSL(newValues)) {
         if (newValues.tp_pnl && newValues.order_quantity) {
@@ -14196,6 +14218,8 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
     onMarkPriceChange: onMarkPriceUpdated
   };
 };
+
+// src/next/useOrderEntry/useOrderEntry.ts
 var useOrderEntry2 = (symbol, options = {}) => {
   if (!symbol) {
     throw new types.SDKError("Symbol is required");
@@ -14212,6 +14236,10 @@ var useOrderEntry2 = (symbol, options = {}) => {
   const lastChangedField = React.useRef();
   const lastOrderTypeExt = React.useRef();
   const lastLevel = React.useRef();
+  const calculateTPSL_baseOn = React.useRef({
+    tp: "",
+    sl: ""
+  });
   const actions = useMarkPriceActions();
   const symbolConfig = useSymbolsInfo();
   const accountInfo = useAccountInfo();
@@ -14240,24 +14268,26 @@ var useOrderEntry2 = (symbol, options = {}) => {
     formattedOrder.reduce_only
   );
   const updateOrderPrice = () => {
+    const order_type = formattedOrder.order_type;
     const order_type_ext = formattedOrder.order_type_ext ?? lastOrderTypeExt.current;
     const level = formattedOrder.level ?? lastLevel.current;
-    if (![types.OrderType.ASK, types.OrderType.BID].includes(order_type_ext) || level === void 0) {
+    const isBBO = isBBOOrder({ order_type, order_type_ext });
+    if (!isBBO || level === void 0) {
       return;
     }
     lastOrderTypeExt.current = order_type_ext;
     lastLevel.current = level;
     const index = order_type_ext === types.OrderType.ASK ? 0 : 1;
     const price = askAndBid.current?.[level]?.[index];
-    if (price && !isNaN(price)) {
+    if (price) {
       setValue("order_price", price, {
         shouldUpdateLastChangedField: false
       });
     }
   };
   const updateOrderPriceByOrderBook = () => {
-    const { order_type, order_type_ext, order_quantity } = formattedOrder;
-    const isBBO = order_type === types.OrderType.LIMIT && [types.OrderType.ASK, types.OrderType.BID].includes(order_type_ext);
+    const { order_type, order_type_ext } = formattedOrder;
+    const isBBO = isBBOOrder({ order_type, order_type_ext });
     if (lastChangedField.current !== "total" && isBBO) {
       updateOrderPrice();
     }
@@ -14277,10 +14307,17 @@ var useOrderEntry2 = (symbol, options = {}) => {
   }, []);
   React.useEffect(() => {
     if ((formattedOrder.order_type === types.OrderType.MARKET || formattedOrder.order_type === types.OrderType.STOP_MARKET) && markPrice) {
-      orderEntryActions.onMarkPriceChange(
-        markPrice,
-        lastChangedField.current
-      );
+      const baseOn = /* @__PURE__ */ new Set();
+      if (lastChangedField.current) {
+        baseOn.add(lastChangedField.current);
+      }
+      if (calculateTPSL_baseOn.current.tp) {
+        baseOn.add(calculateTPSL_baseOn.current.tp);
+      }
+      if (calculateTPSL_baseOn.current.sl) {
+        baseOn.add(calculateTPSL_baseOn.current.sl);
+      }
+      orderEntryActions.onMarkPriceChange(markPrice, Array.from(baseOn));
     }
   }, [markPrice, formattedOrder.order_type]);
   const prepareData = React.useCallback(() => {
@@ -14330,6 +14367,11 @@ var useOrderEntry2 = (symbol, options = {}) => {
       interactiveValidate(values2);
     }
     if (shouldUpdateLastChangedField) {
+      if (key.startsWith("tp_")) {
+        calculateTPSL_baseOn.current.tp = key;
+      } else if (key.startsWith("sl_")) {
+        calculateTPSL_baseOn.current.sl = key;
+      }
       lastChangedField.current = key;
     }
   };
@@ -14448,7 +14490,7 @@ var useOrderEntry2 = (symbol, options = {}) => {
     const order = generateOrder(creator, prepareData());
     const result = await doCreateOrder(order);
     if (result.success) {
-      track2(types.EnumTrackerKeys.placeorderSuccess, {
+      track2(types.TrackerEventName.placeOrderSuccess, {
         side: order.side,
         order_type: order.order_type,
         tp_sl: hasTPSL(formattedOrder),