@rpg-engine/long-bow 0.1.794 → 0.2.2

package/src/components/Equipment/EquipmentSet.tsx

@@ -1,180 +1,138 @@
-import {
-  IEquipementSet,
-  IItem,
-  IItemContainer,
-  ItemSlotType,
-  ItemSocketEvents,
-} from '@rpg-engine/shared';
-import { observer } from 'mobx-react';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-import { IPosition } from '../../types/eventTypes';
-import { DraggableContainer } from '../DraggableContainer';
-import { ItemCard } from '../Item/Cards/ItemCard';
-import { ItemSlot, SlotContainerType } from '../Item/Inventory/ItemSlot';
-import { ListMenu } from '../ListMenu';
-import { RPGUIContainerTypes } from '../RPGUIContainer';
-import { uiStore } from '../store/UI.store';
-
-export interface IEquipmentSetProps {
-  equipmentSet: IEquipementSet;
-  onClose?: () => void;
-  onMouseOver?: (e: any, slotIndex: number, item: IItem | null) => void;
-  onActionSelected?: (payload: any) => void;
-  initialPosition?: { x: number; y: number };
-}
-
-export const EquipmentSet: React.FC<IEquipmentSetProps> = observer(
-  ({
-    equipmentSet,
-    onClose,
-    onMouseOver,
-    onActionSelected,
-    initialPosition = { x: 0, y: 0 },
-  }) => {
-    const {
-      neck,
-      leftHand,
-      ring,
-      head,
-      armor,
-      legs,
-      boot,
-      inventory,
-      rightHand,
-      accessory,
-    } = equipmentSet;
-
-    const equipmentData = [
-      neck,
-      leftHand,
-      ring,
-      head,
-      armor,
-      legs,
-      boot,
-      inventory,
-      rightHand,
-      accessory,
-    ];
-
-    const equipmentMaskSlots = [
-      ItemSlotType.Neck,
-      ItemSlotType.LeftHand,
-      ItemSlotType.Ring,
-      ItemSlotType.Head,
-      ItemSlotType.Torso,
-      ItemSlotType.Legs,
-      ItemSlotType.Feet,
-      ItemSlotType.Inventory,
-      ItemSlotType.RightHand,
-      ItemSlotType.Accessory,
-    ];
-    // we use this draggable position to offset the menu position, after the container is dragged (otherwise, it bugs!)
-    // uiStore.setDraggablePosition(initialPosition)
-    const [draggablePosition, setDraggablePosition] = useState<IPosition>(
-      initialPosition
-    );
-
-    const handleOnMouseHover = (
-      event: any,
-      slotIndex: number,
-      item: IItem | null,
-      x: number,
-      y: number
-    ) => {
-      uiStore.handleOnMouseHover(event, slotIndex, item, x, y, onMouseOver);
-    };
-
-    const onSelected = (selectedActionId: ItemSocketEvents | string): void => {
-      uiStore.onSelected(selectedActionId, onActionSelected);
-    };
-
-    const onRenderEquipmentSlotRange = (start: number, end: number) => {
-      const equipmentRange = equipmentData.slice(start, end);
-      const slotMaksRange = equipmentMaskSlots.slice(start, end);
-
-      return equipmentRange.map((data, i) => {
-        const item = data as IItem;
-        const itemContainer =
-          (item && (item.itemContainer as IItemContainer)) ?? null;
-        return (
-          <ItemSlot
-            key={i}
-            slotIndex={i}
-            item={item}
-            itemContainer={itemContainer}
-            slotContainerType={SlotContainerType.EQUIPMENT_SET}
-            slotSpriteMask={slotMaksRange[i]}
-            onMouseOver={handleOnMouseHover}
-            onMouseOut={() => {
-              uiStore.clearItemHoverDetail();
-            }}
-            onClick={uiStore.handleOnItemClick}
-            onCancelContextMenu={() => {
-              uiStore.clearContextMenu();
-            }}
-          />
-        );
-      });
-    };
-
-    return (
-      <DraggableContainer
-        title={'Equipments'}
-        type={RPGUIContainerTypes.Framed}
-        onCloseButton={() => {
-          if (onClose) onClose();
-        }}
-        width="330px"
-        cancelDrag=".equipment-container-body"
-        onPositionChange={({ x, y }) => {
-          setDraggablePosition({ x, y });
-          console.log(draggablePosition)
-        }}
-        onOutsideClick={() => {
-          uiStore.clearContextMenu();
-          uiStore.clearItemHoverDetail();
-        }}
-      >
-        <EquipmentSetContainer className="equipment-container-body">
-          <EquipmentColumn>{onRenderEquipmentSlotRange(0, 3)}</EquipmentColumn>
-          <EquipmentColumn>{onRenderEquipmentSlotRange(3, 7)}</EquipmentColumn>
-          <EquipmentColumn>{onRenderEquipmentSlotRange(7, 10)}</EquipmentColumn>
-        </EquipmentSetContainer>
-
-        {uiStore.contextMenu?.visible ? (
-          <ListMenu
-            x={uiStore.contextMenu.posX - uiStore.draggablePosition.x}
-            y={uiStore.contextMenu.posY - uiStore.draggablePosition.y}
-            options={uiStore.contextMenu.contextActions}
-            onSelected={onSelected}
-          />
-        ) : null}
-
-        {uiStore.onHoverDetail?.visible ? (
-          <ItemCard
-            item={uiStore.onHoverDetail.item}
-            x={uiStore.onHoverDetail.posX}
-            y={uiStore.onHoverDetail.posY}
-          />
-        ) : null}
-      </DraggableContainer>
-    );
-  }
-);
-
-const EquipmentSetContainer = styled.div`
-  width: inherit;
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-  flex-direction: row;
-`;
-
-const EquipmentColumn = styled.div`
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-  flex-direction: column;
-`;
+import {
+  IEquipmentSet,
+  IItem,
+  IItemContainer,
+  ItemContainerType,
+  ItemSlotType,
+  ItemType,
+} from '@rpg-engine/shared';
+import React from 'react';
+import styled from 'styled-components';
+import { DraggableContainer } from '../DraggableContainer';
+import { ItemSlot } from '../Item/Inventory/ItemSlot';
+import { RPGUIContainerTypes } from '../RPGUIContainer';
+
+export interface IEquipmentSetProps {
+  equipmentSet: IEquipmentSet;
+  onClose?: () => void;
+  onItemClick?: (
+    ItemType: ItemType,
+    item: IItem,
+    itemContainerType: ItemContainerType | null
+  ) => void;
+  onMouseOver?: (e: any, slotIndex: number, item: IItem | null) => void;
+  onSelected?: (optionId: string) => void;
+  initialPosition?: { x: number; y: number };
+  type: ItemContainerType | null;
+}
+
+export const EquipmentSet: React.FC<IEquipmentSetProps> = ({
+  equipmentSet,
+  onClose,
+  onMouseOver,
+  onSelected,
+  onItemClick,
+}) => {
+  const {
+    neck,
+    leftHand,
+    ring,
+    head,
+    armor,
+    legs,
+    boot,
+    inventory,
+    rightHand,
+    accessory,
+  } = equipmentSet;
+
+  const equipmentData = [
+    neck,
+    leftHand,
+    ring,
+    head,
+    armor,
+    legs,
+    boot,
+    inventory,
+    rightHand,
+    accessory,
+  ];
+
+  const equipmentMaskSlots = [
+    ItemSlotType.Neck,
+    ItemSlotType.LeftHand,
+    ItemSlotType.Ring,
+    ItemSlotType.Head,
+    ItemSlotType.Torso,
+    ItemSlotType.Legs,
+    ItemSlotType.Feet,
+    ItemSlotType.Inventory,
+    ItemSlotType.RightHand,
+    ItemSlotType.Accessory,
+  ];
+
+  const onRenderEquipmentSlotRange = (start: number, end: number) => {
+    const equipmentRange = equipmentData.slice(start, end);
+    const slotMaksRange = equipmentMaskSlots.slice(start, end);
+
+    return equipmentRange.map((data, i) => {
+      const item = data as IItem;
+      const itemContainer =
+        (item && (item.itemContainer as IItemContainer)) ?? null;
+
+      return (
+        <ItemSlot
+          key={i}
+          slotIndex={i}
+          item={item}
+          itemContainer={itemContainer}
+          itemContainerType={ItemContainerType.Equipment}
+          slotSpriteMask={slotMaksRange[i]}
+          onMouseOver={(event, slotIndex, item) => {
+            if (onMouseOver) onMouseOver(event, slotIndex, item);
+          }}
+          onClick={(itemType, ContainerType) => {
+            if (onItemClick) onItemClick(itemType, item, ContainerType);
+          }}
+          onSelected={(optionId: string) => {
+            if (onSelected) onSelected(optionId);
+          }}
+        />
+      );
+    });
+  };
+
+  return (
+    <DraggableContainer
+      title={'Equipments'}
+      type={RPGUIContainerTypes.Framed}
+      onCloseButton={() => {
+        if (onClose) onClose();
+      }}
+      width="330px"
+      cancelDrag=".equipment-container-body"
+    >
+      <EquipmentSetContainer className="equipment-container-body">
+        <EquipmentColumn>{onRenderEquipmentSlotRange(0, 3)}</EquipmentColumn>
+        <EquipmentColumn>{onRenderEquipmentSlotRange(3, 7)}</EquipmentColumn>
+        <EquipmentColumn>{onRenderEquipmentSlotRange(7, 10)}</EquipmentColumn>
+      </EquipmentSetContainer>
+    </DraggableContainer>
+  );
+};
+
+const EquipmentSetContainer = styled.div`
+  width: inherit;
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  flex-direction: row;
+`;
+
+const EquipmentColumn = styled.div`
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  flex-direction: column;
+`;

package/src/components/Input.tsx

@@ -1,11 +1,11 @@
-import React from 'react';
-
-export interface IInputProps
-  extends React.DetailedHTMLProps<
-    React.InputHTMLAttributes<HTMLInputElement>,
-    HTMLInputElement
-  > {}
-
-export const Input: React.FC<IInputProps> = ({ ...props }) => {
-  return <input {...props} />;
-};
+import React from 'react';
+
+export interface IInputProps
+  extends React.DetailedHTMLProps<
+    React.InputHTMLAttributes<HTMLInputElement>,
+    HTMLInputElement
+  > {}
+
+export const Input: React.FC<IInputProps> = ({ ...props }) => {
+  return <input {...props} />;
+};

package/src/components/Item/Cards/ItemTooltip.tsx

@@ -0,0 +1,32 @@
+import React from 'react';
+import styled from 'styled-components';
+
+interface IProps {
+  label: string;
+}
+
+export const ItemTooltip: React.FC<IProps> = ({ label }) => {
+  return (
+    <Container>
+      <div>{label}</div>
+    </Container>
+  );
+};
+
+const Container = styled.div`
+  z-index: 2;
+  position: absolute;
+  top: 1rem;
+  left: 4rem;
+
+  font-size: 0.5rem;
+  color: white;
+  background-color: black;
+  border-radius: 5px;
+  padding: 0.5rem;
+  min-width: 20px;
+  width: 100%;
+  text-align: center;
+
+  opacity: 0.75;
+`;

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

@@ -1,113 +1,68 @@
-import { IItem, IItemContainer, ItemSocketEvents } from '@rpg-engine/shared';
-import { observer } from 'mobx-react';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-import { IPosition } from '../../../types/eventTypes';
-import { SlotsContainer } from '../../Abstractions/SlotsContainer';
-import { ListMenu } from '../../ListMenu';
-import { uiStore } from '../../store/UI.store';
-import { ItemCard } from '../Cards/ItemCard';
-import { ItemSlot, SlotContainerType } from './ItemSlot';
-
-export interface IItemContainerProps {
-  itemContainer: IItemContainer;
-  onClose?: () => void;
-  onMouseOver?: (e: any, slotIndex: number, item: IItem | null) => void;
-  onActionSelected?: (payload: any) => void;
-  initialPosition?: { x: number; y: number };
-}
-
-export const ItemContainer: React.FC<IItemContainerProps> = observer(
-  ({
-    itemContainer,
-    onClose,
-    onMouseOver,
-    onActionSelected,
-    initialPosition = { x: 0, y: 0 },
-  }) => {
-    // we use this draggable position to offset the menu position, after the container is dragged (otherwise, it bugs!)
-    const [draggablePosition, setDraggablePosition] = useState<IPosition>(
-      initialPosition
-    );
-
-    const handleOnMouseHover = (
-      event: any,
-      slotIndex: number,
-      item: IItem | null,
-      x: number,
-      y: number
-    ) => {
-      uiStore.handleOnMouseHover(event, slotIndex, item, x, y, onMouseOver);
-    };
-
-    const onSelected = (selectedActionId: ItemSocketEvents | string): void => {
-      uiStore.onSelected(selectedActionId, onActionSelected);
-    };
-
-    const onRenderSlots = () => {
-      const slots = [];
-
-      for (let i = 0; i < itemContainer.slotQty; i++) {
-        slots.push(
-          <ItemSlot
-            key={i}
-            slotIndex={i}
-            item={itemContainer.slots?.[i] || null}
-            slotContainerType={SlotContainerType.INVENTORY}
-            onMouseOver={handleOnMouseHover}
-            onClick={uiStore.handleOnItemClick}
-            onMouseOut={() => {
-              uiStore.clearItemHoverDetail();
-            }}
-            onCancelContextMenu={() => {
-              uiStore.clearContextMenu();
-            }}
-          />
-        );
-      }
-      return slots;
-    };
-
-    return (
-      <SlotsContainer
-        title={itemContainer.name || 'Container'}
-        onPositionChange={({ x, y }) => {
-          setDraggablePosition({ x, y });
-        }}
-        onOutsideClick={() => {
-          uiStore.clearContextMenu();
-          uiStore.clearItemHoverDetail();
-        }}
-        onClose={onClose}
-      >
-        <ItemsContainer className="item-container-body">
-          {onRenderSlots()}
-        </ItemsContainer>
-
-        {uiStore.contextMenu?.visible ? (
-          <ListMenu
-            x={uiStore.contextMenu.posX - draggablePosition.x}
-            y={uiStore.contextMenu.posY - draggablePosition.y}
-            options={uiStore.contextMenu.contextActions}
-            onSelected={onSelected}
-          />
-        ) : null}
-
-        {uiStore.onHoverDetail?.visible ? (
-          <ItemCard
-            item={uiStore.onHoverDetail.item}
-            x={uiStore.onHoverDetail.posX - draggablePosition.x}
-            y={uiStore.onHoverDetail.posY - draggablePosition.y}
-          />
-        ) : null}
-      </SlotsContainer>
-    );
-  }
-);
-
-const ItemsContainer = styled.div`
-  max-width: 280px;
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-`;
+import { IItem, IItemContainer, ItemContainerType } from '@rpg-engine/shared';
+import React from 'react';
+import styled from 'styled-components';
+import { SlotsContainer } from '../../Abstractions/SlotsContainer';
+
+import { ItemSlot } from './ItemSlot';
+
+export interface IItemContainerProps {
+  itemContainer: IItemContainer;
+  onClose?: () => void;
+  onItemClick?: (
+    item: IItem,
+    ItemType: IItem['type'],
+    itemContainerType: ItemContainerType | null
+  ) => void;
+  onMouseOver?: (e: any, slotIndex: number, item: IItem | null) => void;
+  onSelected?: (optionId: string, item: IItem) => void;
+  type: ItemContainerType;
+}
+
+export const ItemContainer: React.FC<IItemContainerProps> = ({
+  itemContainer,
+  onClose,
+  onMouseOver,
+  onSelected,
+  onItemClick,
+  type,
+}) => {
+  const onRenderSlots = () => {
+    const slots = [];
+
+    for (let i = 0; i < itemContainer.slotQty; i++) {
+      slots.push(
+        <ItemSlot
+          key={i}
+          slotIndex={i}
+          item={itemContainer.slots?.[i] || null}
+          itemContainerType={type}
+          onMouseOver={(event, slotIndex, item) => {
+            if (onMouseOver) onMouseOver(event, slotIndex, item);
+          }}
+          onClick={(ItemType, ContainerType, item) => {
+            if (onItemClick) onItemClick(item, ItemType, ContainerType);
+          }}
+          onSelected={(optionId: string, item: IItem) => {
+            if (onSelected) onSelected(optionId, item);
+          }}
+        />
+      );
+    }
+    return slots;
+  };
+
+  return (
+    <SlotsContainer title={itemContainer.name || 'Container'} onClose={onClose}>
+      <ItemsContainer className="item-container-body">
+        {onRenderSlots()}
+      </ItemsContainer>
+    </SlotsContainer>
+  );
+};
+
+const ItemsContainer = styled.div`
+  max-width: 280px;
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+`;

package/src/components/Item/Inventory/ItemContainerTypes.ts

@@ -0,0 +1,6 @@
+export enum SlotContainerType {
+  INVENTORY = 'Inventory',
+  EQUIPMENT_SET = 'EquipmentSet',
+  LOOT = 'Loot',
+  MAP_CONTAINER = 'Map-Container',
+}