@rpg-engine/long-bow 0.2.36 → 0.2.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/TradingMenu/TradingItemRow.tsx

@@ -2,7 +2,6 @@ import { ITradeResponseItem } from '@rpg-engine/shared';
 import capitalize from 'lodash/capitalize';
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import { v4 as uuidv4 } from 'uuid';
 import { colors } from '../../constants/uiColors';
 import SelectArrow from '../Arrow/SelectArrow';
 import { Ellipsis } from '../shared/Ellipsis';
@@ -28,7 +27,6 @@ export const TradingItemRow: React.FC<ITradeComponentProps> = ({
       setItemQuantity(newQuantity);
       updateChartTotals({
         key: traderItem.key,
-        itemId: traderItem.itemId ? traderItem.itemId : uuidv4(),
         qty: newQuantity,
         price: traderItem.price,
         texturePath: traderItem.texturePath,
@@ -42,7 +40,6 @@ export const TradingItemRow: React.FC<ITradeComponentProps> = ({
       setItemQuantity(newQuantity);
       updateChartTotals({
         key: traderItem.key,
-        itemId: traderItem.itemId ? traderItem.itemId : uuidv4(),
         qty: newQuantity,
         price: traderItem.price,
         texturePath: traderItem.texturePath,

package/src/components/TradingMenu/TradingMenu.tsx

@@ -8,6 +8,7 @@ import { TradingItemRow } from './TradingItemRow';
 export interface ITrandingMenu {
   traderItems: ITradeResponseItem[];
   onClose: () => void;
+  onConfirm: () => void;
   type: TradeTransactionType;
   atlasJSON: any;
   atlasIMG: any;
@@ -23,12 +24,13 @@ export const TradingMenu: React.FC<ITrandingMenu> = ({
   atlasIMG,
   characterAvailableGold,
   onChangeTraderItems,
+  onConfirm,
 }) => {
   const [sum, setSum] = useState(0);
   let newSumArray = 0;
   const updateChartTotals = (item: ITradeResponseItem) => {
     const itemIndex = traderItems.findIndex(
-      itemArray => itemArray.itemId === item.itemId
+      itemArray => itemArray.key === item.key
     );
     traderItems[itemIndex] = item;
 
@@ -96,10 +98,16 @@ export const TradingMenu: React.FC<ITrandingMenu> = ({
           <Button
             buttonType={ButtonTypes.RPGUIButton}
             disabled={sum > characterAvailableGold}
+            onClick={() => onConfirm()}
           >
             Confirm
           </Button>
-          <Button buttonType={ButtonTypes.RPGUIButton}>Cancel</Button>
+          <Button
+            buttonType={ButtonTypes.RPGUIButton}
+            onClick={() => onClose()}
+          >
+            Cancel
+          </Button>
         </ButtonWrapper>
       </>
     </DraggableContainer>

package/src/components/TradingMenu/items.mock.ts

@@ -1,84 +1,36 @@
 import { ITradeResponseItem } from '@rpg-engine/shared';
+
+export enum SwordsBlueprint {
+  ShortSword = "short-sword",
+  BasiliskSword = "basilisk-sword",
+  DragonsSword = "dragon's-sword",
+  DoubleEdgedSword = "double-edged-sword",
+  BroadSword = "broad-sword",
+  ElvenSword = "elven-sword",
+  FireSword = "fire-sword",
+  Katana = "katana",
+  KnightsSword = "knights-sword",
+  IceSword = "ice-sword",
+}
+
 export const itemMock: ITradeResponseItem[] = [
   {
     texturePath: 'swords/broad-sword.png',
     name: 'Silver Short Sword Premium',
     price: 100,
-    key: 'Short sword',
+    key: SwordsBlueprint.IceSword,
   },
   {
     texturePath: "swords/corruption-sword.png",
     name: 'Short sword Best',
     price: 100,
-    key: 'Short sword',
+    key: SwordsBlueprint.DragonsSword,
   },
   {
     texturePath: 'swords/broad-sword.png',
     name: 'Short sword Trade',
     price: 100,
-    key: 'Short sword',
-  },
-  {
-    texturePath: 'swords/broad-sword.png',
-    name: 'Short sword',
-    price: 100,
-    key: 'Short sword',
-  },
-  {
-    texturePath: 'swords/broad-sword.png',
-    itemId: 'itemId01',
-    name: 'Short sword',
-    price: 100,
-    key: 'Short sword',
+    key: SwordsBlueprint.FireSword,
   },
-  {
-    texturePath: 'swords/broad-sword.png',
-    itemId: 'itemId02',
-    name: 'Short sword',
-    price: 100,
-    key: 'Short sword',
-  },
-  {
-    texturePath: 'swords/broad-sword.png',
-    itemId: 'itemId03',
-    name: 'Short sword',
-    price: 100,
-    key: 'Short sword',
-  },
-  {
-    texturePath: 'swords/broad-sword.png',
-    itemId: 'itemId01',
-    name: 'Short sword',
-    price: 100,
-    key: 'Short sword',
-  },
-  {
-    texturePath: 'swords/broad-sword.png',
-    itemId: 'itemId02',
-    name: 'Short sword',
-    price: 100,
-    key: 'Short sword',
-  },
-  {
-    texturePath: 'swords/broad-sword.png',
-    itemId: 'itemId03',
-    name: 'Short sword',
-    price: 100,
-    key: 'Short sword',
-  },
-  {
-    texturePath: 'swords/broad-sword.png',
-    itemId: 'itemId01',
-    name: 'Short sword',
-    price: 100,
-    key: 'Short sword',
-  },
-  {
-    texturePath: 'swords/broad-sword.png',
-    itemId: 'itemId02',
-    name: 'Short sword',
-    price: 100,
-    key: 'Short sword',
-  },
-
+  
 ];