@rpg-engine/long-bow 0.8.226 → 0.8.227

package/dist/components/Marketplace/characterListingUtils.d.ts

@@ -0,0 +1,3 @@
+import { ICharacter } from '@rpg-engine/shared';
+export declare const isCharacterEligibleForListing: (character: ICharacter) => boolean;
+export declare const getEligibleCharactersForListing: (accountCharacters: ICharacter[], activeCharacterId?: string | undefined) => ICharacter[];

package/dist/components/Spellbook/Spell.d.ts

@@ -7,6 +7,7 @@ export interface ISpellProps {
     charMagicLevel: number;
     charSkillLevels?: Record<string, number>;
     onPointerUp?: (spellKey: string) => void;
+    onClick?: (spellKey: string) => void;
     isSettingShortcut?: boolean;
     spellKey: string;
     spell: ISpell;

package/dist/components/Store/hooks/useStoreCart.d.ts

@@ -9,7 +9,7 @@ interface IUseStoreCart {
     isCartOpen: boolean;
     handleAddToCart: (item: IProductBlueprint, quantity: number, metadata?: Record<string, any>) => void;
     handleRemoveFromCart: (itemKey: string) => void;
-    handlePurchase: (onPurchase: (purchase: IPurchase) => void) => void;
+    handlePurchase: (onPurchase: (purchase: IPurchase) => Promise<boolean>) => Promise<boolean>;
     openCart: () => void;
     closeCart: () => void;
     getTotalItems: () => number;

package/dist/long-bow.cjs.development.js

@@ -13889,6 +13889,29 @@ var EmptyText = /*#__PURE__*/styled__default.span.withConfig({
   componentId: "sc-1aiauep-17"
 })(["font-family:'Press Start 2P',cursive !important;font-size:0.48rem !important;color:#71717a !important;text-transform:uppercase;letter-spacing:1px;"]);
 
+var toTimestamp = function toTimestamp(value) {
+  if (!value) return 0;
+  var timestamp = new Date(value).getTime();
+  return Number.isFinite(timestamp) ? timestamp : 0;
+};
+var isCharacterEligibleForListing = function isCharacterEligibleForListing(character) {
+  return !character.isListedForSale;
+};
+var getEligibleCharactersForListing = function getEligibleCharactersForListing(accountCharacters, activeCharacterId) {
+  return accountCharacters.filter(isCharacterEligibleForListing).sort(function (left, right) {
+    var leftIsActive = !!activeCharacterId && left._id === activeCharacterId;
+    var rightIsActive = !!activeCharacterId && right._id === activeCharacterId;
+    if (leftIsActive !== rightIsActive) {
+      return leftIsActive ? 1 : -1;
+    }
+    var tradedAtDiff = toTimestamp(right.tradedAt) - toTimestamp(left.tradedAt);
+    if (tradedAtDiff !== 0) {
+      return tradedAtDiff;
+    }
+    return 0;
+  });
+};
+
 var CharacterListingModal = function CharacterListingModal(_ref) {
   var isOpen = _ref.isOpen,
     onClose = _ref.onClose,
@@ -13913,10 +13936,10 @@ var CharacterListingModal = function CharacterListingModal(_ref) {
   var stopPropagation = React.useCallback(function (e) {
     e.stopPropagation();
   }, []);
+  var eligibleCharacters = React.useMemo(function () {
+    return getEligibleCharactersForListing(accountCharacters, activeCharacterId);
+  }, [accountCharacters, activeCharacterId]);
   if (!isOpen) return null;
-  var eligibleCharacters = accountCharacters.filter(function (c) {
-    return !c.isListedForSale;
-  });
   var isActiveCharacter = function isActiveCharacter(c) {
     return !!activeCharacterId && c._id === activeCharacterId;
   };
@@ -14176,9 +14199,7 @@ var MyCharacterListingsPanel = function MyCharacterListingsPanel(_ref) {
       enableHotkeys == null ? void 0 : enableHotkeys();
     }
   };
-  var eligibleCount = accountCharacters.filter(function (c) {
-    return !c.isListedForSale && !c.tradedAt;
-  }).length;
+  var eligibleCount = getEligibleCharactersForListing(accountCharacters).length;
   return React__default.createElement(React__default.Fragment, null, delistingId && React__default.createElement(ConfirmModal, {
     onClose: function onClose() {
       setDelistingId(null);
@@ -14795,9 +14816,7 @@ var CharacterListingForm = function CharacterListingForm(_ref) {
   var _useState = React.useState(false),
     isModalOpen = _useState[0],
     setIsModalOpen = _useState[1];
-  var eligibleCount = accountCharacters.filter(function (c) {
-    return !c.isListedForSale && !c.tradedAt;
-  }).length;
+  var eligibleCount = getEligibleCharactersForListing(accountCharacters).length;
   return React__default.createElement(Wrapper$2, null, React__default.createElement(CharacterListingModal, {
     isOpen: isModalOpen,
     onClose: function onClose() {
@@ -16865,6 +16884,7 @@ var Spell = function Spell(_ref) {
     charMagicLevel = _ref.charMagicLevel,
     charSkillLevels = _ref.charSkillLevels,
     onPointerUp = _ref.onPointerUp,
+    onClick = _ref.onClick,
     isSettingShortcut = _ref.isSettingShortcut,
     spell = _ref.spell,
     activeCooldown = _ref.activeCooldown;
@@ -16893,10 +16913,11 @@ var Spell = function Spell(_ref) {
     height: '32px'
   };
   var IMAGE_SCALE = 2;
+  var handleClick = onClick != null ? onClick : onPointerUp;
   return React__default.createElement(SpellInfoWrapper, {
     spell: spell
   }, React__default.createElement(Container$J, {
-    onPointerUp: onPointerUp == null ? void 0 : onPointerUp.bind(null, spellKey),
+    onClick: handleClick == null ? void 0 : handleClick.bind(null, spellKey),
     isSettingShortcut: isSettingShortcut && !disabled,
     className: "spell"
   }, disabled && React__default.createElement(Overlay$a, null, characterSkillLevel < requiredLevel ? "Low " + getSkillName(attribute || 'magic level') + " level" : manaCost > charMana && 'No mana'), React__default.createElement(SpellImage, null, activeCooldown && activeCooldown > 0 ? React__default.createElement("span", {
@@ -38159,30 +38180,48 @@ var useStoreCart = function useStoreCart() {
       });
     });
   };
-  var handlePurchase = function handlePurchase(onPurchase) {
-    var purchaseUnits = cartItems.map(function (cartItem) {
-      return {
-        purchaseKey: cartItem.item.key,
-        qty: cartItem.quantity,
-        type: getPurchaseType(cartItem.item),
-        name: cartItem.item.name,
-        metadata: cartItem.metadata || cartItem.item.metadataConfig
-      };
-    });
-    var purchase = {
-      _id: uuidv4(),
-      userId: '1',
-      status: 'pending',
-      createdAt: new Date().toISOString(),
-      updatedAt: new Date().toISOString(),
-      purchases: purchaseUnits
+  var handlePurchase = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(onPurchase) {
+      var purchaseUnits, purchase, success;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            purchaseUnits = cartItems.map(function (cartItem) {
+              return {
+                purchaseKey: cartItem.item.key,
+                qty: cartItem.quantity,
+                type: getPurchaseType(cartItem.item),
+                name: cartItem.item.name,
+                metadata: cartItem.metadata || cartItem.item.metadataConfig
+              };
+            });
+            purchase = {
+              _id: uuidv4(),
+              userId: '1',
+              status: 'pending',
+              createdAt: new Date().toISOString(),
+              updatedAt: new Date().toISOString(),
+              purchases: purchaseUnits
+            };
+            _context2.next = 4;
+            return onPurchase(purchase);
+          case 4:
+            success = _context2.sent;
+            if (success && isMounted.current) {
+              setCartItems([]);
+              setIsCartOpen(false);
+            }
+            return _context2.abrupt("return", success);
+          case 7:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handlePurchase(_x4) {
+      return _ref2.apply(this, arguments);
     };
-    onPurchase(purchase);
-    if (isMounted.current) {
-      setCartItems([]);
-      setIsCartOpen(false);
-    }
-  };
+  }();
   var openCart = function openCart() {
     return setIsCartOpen(true);
   };
@@ -40108,24 +40147,9 @@ var Store = function Store(_ref) {
     cartItems: cartItems,
     onRemoveFromCart: handleRemoveFromCartTracked,
     onClose: closeCart,
-    onPurchase: function () {
-      var _onPurchase2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              handleCartPurchase(_onPurchase);
-              return _context.abrupt("return", true);
-            case 2:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function onPurchase() {
-        return _onPurchase2.apply(this, arguments);
-      }
-      return onPurchase;
-    }(),
+    onPurchase: function onPurchase() {
+      return handleCartPurchase(_onPurchase);
+    },
     atlasJSON: atlasJSON,
     atlasIMG: atlasIMG,
     onCheckoutStart: onCheckoutStart,