@rpg-engine/long-bow 0.3.87 → 0.3.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.3.87",
+  "version": "0.3.89",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -83,7 +83,7 @@
   },
   "dependencies": {
     "@rollup/plugin-image": "^2.1.1",
-    "@rpg-engine/shared": "^0.7.38",
+    "@rpg-engine/shared": "^0.7.40",
     "dayjs": "^1.11.2",
     "font-awesome": "^4.7.0",
     "fs-extra": "^10.1.0",

package/src/components/CircularController/CircularController.tsx

@@ -97,6 +97,7 @@ export const CircularController: React.FC<CircularControllerProps> = ({
                   key: payload.texturePath,
                   texturePath: payload.texturePath,
                   stackQty: payload.stackQty || 1,
+                  isStackable: payload.isStackable,
                 },
                 atlasJSON
               )}

package/src/components/Item/Inventory/ItemContainer.tsx

@@ -88,6 +88,12 @@ export const ItemContainer: React.FC<IItemContainerProps> = ({
   });
   const [settingShortcutIndex, setSettingShortcutIndex] = useState(-1);
 
+  const handleSetShortcut = (item: IItem, index: number) => {
+    if (item.type === ItemType.Consumable || item.type === ItemType.Tool) {
+      setItemShortcut?.(item.key, index);
+    }
+  };
+
   const onRenderSlots = () => {
     const slots = [];
 
@@ -106,12 +112,7 @@ export const ItemContainer: React.FC<IItemContainerProps> = ({
             if (settingShortcutIndex !== -1) {
               setSettingShortcutIndex(-1);
 
-              if (
-                itemType === ItemType.Consumable ||
-                itemType === ItemType.Tool
-              ) {
-                setItemShortcut?.(item.key, settingShortcutIndex);
-              }
+              handleSetShortcut(item, settingShortcutIndex);
             } else if (onItemClick) onItemClick(item, itemType, containerType);
           }}
           onSelected={(optionId: string, item: IItem) => {
@@ -145,6 +146,9 @@ export const ItemContainer: React.FC<IItemContainerProps> = ({
           atlasJSON={atlasJSON}
           isSelectingShortcut={settingShortcutIndex !== -1}
           equipmentSet={equipmentSet}
+          setItemShortcut={
+            type === ItemContainerType.Inventory ? handleSetShortcut : undefined
+          }
           isDepotSystem={isDepotSystem}
         />
       );

package/src/components/Item/Inventory/ItemSlot.tsx

@@ -78,6 +78,7 @@ interface IProps {
   isContextMenuDisabled?: boolean;
   isSelectingShortcut?: boolean;
   equipmentSet?: IEquipmentSet | null;
+  setItemShortcut?: (item: IItem, shortcutIndex: number) => void;
   isDepotSystem?: boolean;
 }
 
@@ -104,6 +105,7 @@ export const ItemSlot: React.FC<IProps> = observer(
     dragScale,
     isSelectingShortcut,
     equipmentSet,
+    setItemShortcut,
     isDepotSystem,
   }) => {
     const [isTooltipVisible, setTooltipVisible] = useState(false);
@@ -310,6 +312,18 @@ export const ItemSlot: React.FC<IProps> = observer(
           defaultClassName={item ? 'draggable' : 'empty-slot'}
           scale={dragScale}
           onStop={(e, data) => {
+            const target = e.target as HTMLElement;
+            if (
+              target?.id.includes('shortcutSetter') &&
+              setItemShortcut &&
+              item
+            ) {
+              const index = parseInt(target.id.split('_')[1]);
+              if (!isNaN(index)) {
+                setItemShortcut(item, index);
+              }
+            }
+
             if (wasDragged && item && !isSelectingShortcut) {
               //@ts-ignore
               const classes: string[] = Array.from(e.target?.classList);

package/src/components/Shortcuts/Shortcuts.tsx

@@ -95,6 +95,7 @@ export const Shortcuts: React.FC<ShortcutsProps> = ({
                       key: payload.texturePath,
                       texturePath: payload.texturePath,
                       stackQty: payload.stackQty || 1,
+                      isStackable: payload.isStackable,
                     },
                     atlasJSON
                   )}

package/src/components/Shortcuts/ShortcutsSetter.tsx

@@ -42,6 +42,7 @@ export const ShortcutsSetter: React.FC<ShortcutsSetterProps> = ({
               key: payload.texturePath,
               texturePath: payload.texturePath,
               stackQty: payload.stackQty || 1,
+              isStackable: payload.isStackable,
             },
             atlasJSON
           )}
@@ -66,12 +67,18 @@ export const ShortcutsSetter: React.FC<ShortcutsSetterProps> = ({
           <Shortcut
             key={i}
             onPointerDown={() => {
+              if (settingShortcutIndex !== -1) setSettingShortcutIndex(-1);
+
               removeShortcut(i);
-              if (!shortcuts[i] || shortcuts[i].type === ShortcutType.None)
+              if (
+                settingShortcutIndex === -1 &&
+                (!shortcuts[i] || shortcuts[i].type === ShortcutType.None)
+              )
                 setSettingShortcutIndex(i);
             }}
             disabled={settingShortcutIndex !== -1 && settingShortcutIndex !== i}
             isBeingSet={settingShortcutIndex === i}
+            id={`shortcutSetter_${i}`}
           >
             {getContent(i)}
           </Shortcut>

package/src/components/TradingMenu/TradingItemRow.tsx

@@ -66,6 +66,7 @@ export const TradingItemRow: React.FC<ITradeComponentProps> = ({
                   key: traderItem.key,
                   stackQty: traderItem.stackQty || 1,
                   texturePath: traderItem.texturePath,
+                  isStackable: traderItem.isStackable,
                 },
                 atlasJSON
               )}