@rpg-engine/long-bow 0.7.67 → 0.7.68

package/dist/components/Item/Inventory/ItemSlotTooltips.d.ts

@@ -16,9 +16,6 @@ interface IProps {
     atlasIMG: any;
     atlasJSON: any;
     equipmentSet?: IEquipmentSet | null;
-    isDragging: boolean;
-    isSelectingShortcut: boolean;
-    showTooltipDelayed: boolean;
 }
-export declare const ItemSlotToolTips: ({ tooltipState, setTooltipState, contextMenuState, setContextMenuState, isFocused, isContextMenuDisabled, item, contextActions, dragScale, onSelected, atlasIMG, atlasJSON, equipmentSet, isDragging, isSelectingShortcut, showTooltipDelayed, }: IProps) => JSX.Element;
+export declare const ItemSlotToolTips: ({ tooltipState, setTooltipState, contextMenuState, setContextMenuState, isFocused, isContextMenuDisabled, item, contextActions, dragScale, onSelected, atlasIMG, atlasJSON, equipmentSet, }: IProps) => JSX.Element;
 export {};

package/dist/components/Item/Inventory/context/DraggingContext.d.ts

@@ -1,11 +1,26 @@
 import { IItem } from '@rpg-engine/shared';
 import React from 'react';
-export declare const useDragging: () => {
+export interface DragState {
+    isFocused: boolean;
+    wasDragged: boolean;
+    position: {
+        x: number;
+        y: number;
+    };
+    dropPosition: {
+        x: number;
+        y: number;
+    } | null;
+}
+interface DraggingContextType {
     item: IItem | null;
     setDraggingItem: React.Dispatch<React.SetStateAction<IItem | null>>;
-};
+    dragState: DragState;
+    setDragState: React.Dispatch<React.SetStateAction<DragState>>;
+}
 interface IProps {
     children: React.ReactNode;
 }
 export declare const DraggingProvider: ({ children }: IProps) => JSX.Element;
+export declare const useDragging: () => DraggingContextType;
 export {};

package/dist/components/Item/Inventory/hooks/useItemSlotDragAndDrop.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { IItem, ItemContainerType, ItemType } from '@rpg-engine/shared';
 import { DraggableEventHandler } from 'react-draggable';
-import { ContextMenuState, DragState, TooltipState } from '../ItemSlot';
+import { ContextMenuState, TooltipState } from '../ItemSlot';
 interface IUseItemSlotDragAndDrop {
     isDepotSystem: boolean;
     item: IItem;
@@ -26,7 +26,7 @@ interface IUseItemSlotDragAndDrop {
 }
 export declare const useItemSlotDragAndDrop: ({ isDepotSystem, item, onDrop, onDragEnd, checkIfItemCanBeMoved, checkIfItemShouldDragEnd, setItemShortcut, isSelectingShortcut, onDragStart, onPointerDown, containerType, slotIndex, openQuantitySelector, isContextMenuDisabled, setTooltipState, setContextMenuState, }: IUseItemSlotDragAndDrop) => {
     dragContainer: import("react").RefObject<HTMLDivElement>;
-    dragState: DragState;
+    dragState: import("../context/DraggingContext").DragState;
     draggingItem: IItem | null;
     setDraggingItem: import("react").Dispatch<import("react").SetStateAction<IItem | null>>;
     getContainerBounds: () => {

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

@@ -27668,17 +27668,13 @@ var ItemSlotToolTips = function ItemSlotToolTips(_ref) {
     _onSelected = _ref.onSelected,
     atlasIMG = _ref.atlasIMG,
     atlasJSON = _ref.atlasJSON,
-    equipmentSet = _ref.equipmentSet,
-    isDragging = _ref.isDragging,
-    isSelectingShortcut = _ref.isSelectingShortcut,
-    showTooltipDelayed = _ref.showTooltipDelayed;
-  var canShow = !isDragging || !isSelectingShortcut || showTooltipDelayed;
-  return React__default.createElement(React__default.Fragment, null, tooltipState.visible && item && !isFocused && canShow && React__default.createElement(ItemTooltip, {
+    equipmentSet = _ref.equipmentSet;
+  return React__default.createElement(React__default.Fragment, null, tooltipState.visible && item && !isFocused && React__default.createElement(ItemTooltip, {
     item: item,
     atlasIMG: atlasIMG,
     atlasJSON: atlasJSON,
     equipmentSet: equipmentSet
-  }), tooltipState.mobileVisible && item && canShow && React__default.createElement(MobileItemTooltip, {
+  }), tooltipState.mobileVisible && item && React__default.createElement(MobileItemTooltip, {
     item: item,
     atlasIMG: atlasIMG,
     atlasJSON: atlasJSON,
@@ -27702,7 +27698,7 @@ var ItemSlotToolTips = function ItemSlotToolTips(_ref) {
         _onSelected == null ? void 0 : _onSelected(optionId, item);
       }
     }
-  }), !isContextMenuDisabled && contextMenuState.visible && contextActions && canShow && React__default.createElement(RelativeListMenu, {
+  }), !isContextMenuDisabled && contextMenuState.visible && contextActions && React__default.createElement(RelativeListMenu, {
     options: contextActions,
     onSelected: function onSelected(optionId) {
       setContextMenuState(function (prev) {
@@ -27727,23 +27723,46 @@ var ItemSlotToolTips = function ItemSlotToolTips(_ref) {
 
 var DraggingContext = /*#__PURE__*/React.createContext({
   item: null,
-  setDraggingItem: function setDraggingItem() {}
+  setDraggingItem: function setDraggingItem() {},
+  dragState: {
+    isFocused: false,
+    wasDragged: false,
+    position: {
+      x: 0,
+      y: 0
+    },
+    dropPosition: null
+  },
+  setDragState: function setDragState() {}
 });
-var useDragging = function useDragging() {
-  return React.useContext(DraggingContext);
-};
 var DraggingProvider = function DraggingProvider(_ref) {
   var children = _ref.children;
   var _useState = React.useState(null),
     item = _useState[0],
     setDraggingItem = _useState[1];
+  var _useState2 = React.useState({
+      isFocused: false,
+      wasDragged: false,
+      position: {
+        x: 0,
+        y: 0
+      },
+      dropPosition: null
+    }),
+    dragState = _useState2[0],
+    setDragState = _useState2[1];
   return React__default.createElement(DraggingContext.Provider, {
     value: {
       item: item,
-      setDraggingItem: setDraggingItem
+      setDraggingItem: setDraggingItem,
+      dragState: dragState,
+      setDragState: setDragState
     }
   }, children);
 };
+var useDragging = function useDragging() {
+  return React.useContext(DraggingContext);
+};
 
 var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
   var isDepotSystem = _ref.isDepotSystem,
@@ -27765,18 +27784,9 @@ var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
   var dragContainer = React.useRef(null);
   var _useDragging = useDragging(),
     draggingItem = _useDragging.item,
-    setDraggingItem = _useDragging.setDraggingItem;
-  var _useState = React.useState({
-      isFocused: false,
-      wasDragged: false,
-      position: {
-        x: 0,
-        y: 0
-      },
-      dropPosition: null
-    }),
-    dragState = _useState[0],
-    setDragState = _useState[1];
+    setDraggingItem = _useDragging.setDraggingItem,
+    dragState = _useDragging.dragState,
+    setDragState = _useDragging.setDragState;
   React.useEffect(function () {
     setDragState(function (prev) {
       return _extends({}, prev, {
@@ -27787,7 +27797,7 @@ var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
         isFocused: false
       });
     });
-  }, [item, isDepotSystem]);
+  }, [item, isDepotSystem, setDragState]);
   React.useEffect(function () {
     if (onDrop && item && dragState.dropPosition) {
       onDrop(item, dragState.dropPosition);
@@ -27815,11 +27825,6 @@ var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
     };
   }, []);
   var resetDragState = React.useCallback(function () {
-    setTooltipState(function (prev) {
-      return _extends({}, prev, {
-        visible: false
-      });
-    });
     setDragState(function (prev) {
       return _extends({}, prev, {
         wasDragged: false,
@@ -27830,7 +27835,7 @@ var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
         }
       });
     });
-  }, [setTooltipState]);
+  }, [setTooltipState, setDragState]);
   var handleSuccessfulDrag = React.useCallback(function (quantity) {
     resetDragState();
     if (quantity !== -1 && item) {
@@ -27858,7 +27863,7 @@ var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
     if (!draggingItem) {
       setDraggingItem(item);
     }
-  }, [dragState.position, draggingItem, item, setDraggingItem]);
+  }, [dragState.position, draggingItem, item, setDraggingItem, setDragState]);
   var onDraggableStop = React.useCallback(function (e, data) {
     setTimeout(function () {
       setDraggingItem(null);
@@ -28118,12 +28123,6 @@ var ItemSlot = /*#__PURE__*/React__default.memo( /*#__PURE__*/mobxReactLite.obse
   var _useState3 = React.useState([]),
     contextActions = _useState3[0],
     setContextActions = _useState3[1];
-  var isDraggingDisabled = React.useMemo(function () {
-    return contextMenuState.visible || onDragStart === undefined || onDragEnd === undefined;
-  }, [contextMenuState.visible, onDragStart, onDragEnd]);
-  React.useEffect(function () {
-    console.log('isDraggingDisabled', isDraggingDisabled);
-  }, [isDraggingDisabled]);
   var _useItemSlotDragAndDr = useItemSlotDragAndDrop({
       isDepotSystem: !!isDepotSystem,
       item: item,
@@ -28197,22 +28196,6 @@ var ItemSlot = /*#__PURE__*/React__default.memo( /*#__PURE__*/mobxReactLite.obse
       (_document$elementFrom = document.elementFromPoint(clientX, clientY)) == null ? void 0 : _document$elementFrom.dispatchEvent(simulatedEvent);
     }
   }, [onMouseOut]);
-  var _useState4 = React.useState(false),
-    showTooltipDelayed = _useState4[0],
-    setShowTooltipDelayed = _useState4[1];
-  //@ts-ignore
-  React.useEffect(function () {
-    if (tooltipState.visible && !isDraggingDisabled) {
-      var timer = setTimeout(function () {
-        return setShowTooltipDelayed(true);
-      }, 50);
-      return function () {
-        return clearTimeout(timer);
-      };
-    } else {
-      setShowTooltipDelayed(false);
-    }
-  }, [tooltipState.visible, isDraggingDisabled]);
   return React__default.createElement(Container$b, {
     isDraggingItem: !!draggingItem,
     item: item,
@@ -28229,7 +28212,6 @@ var ItemSlot = /*#__PURE__*/React__default.memo( /*#__PURE__*/mobxReactLite.obse
     },
     onTouchEnd: function onTouchEnd(e) {
       var _document$elementFrom2;
-      handleInteractionEnd(e);
       var _e$changedTouches$ = e.changedTouches[0],
         clientX = _e$changedTouches$.clientX,
         clientY = _e$changedTouches$.clientY;
@@ -28248,7 +28230,7 @@ var ItemSlot = /*#__PURE__*/React__default.memo( /*#__PURE__*/mobxReactLite.obse
     axis: isSelectingShortcut ? 'none' : 'both',
     defaultClassName: item ? 'draggable' : 'empty-slot',
     scale: dragScale,
-    disabled: isDraggingDisabled,
+    disabled: onDragStart === undefined || onDragEnd === undefined,
     onStop: onDraggableStop,
     onStart: onDraggableStart,
     onDrag: onDraggableProgress,
@@ -28269,15 +28251,12 @@ var ItemSlot = /*#__PURE__*/React__default.memo( /*#__PURE__*/mobxReactLite.obse
         });
       });
     },
-    onMouseLeave: function onMouseLeave(e) {
-      var _dragContainer$curren;
-      if (!e.relatedTarget || !((_dragContainer$curren = dragContainer.current) != null && _dragContainer$curren.contains(e.relatedTarget))) {
-        setTooltipState(function (prev) {
-          return _extends({}, prev, {
-            visible: false
-          });
+    onMouseLeave: function onMouseLeave() {
+      setTooltipState(function (prev) {
+        return _extends({}, prev, {
+          visible: false
         });
-      }
+      });
     }
   }, React__default.createElement(ItemSlotRenderer, {
     item: item,
@@ -28305,10 +28284,7 @@ var ItemSlot = /*#__PURE__*/React__default.memo( /*#__PURE__*/mobxReactLite.obse
     },
     atlasIMG: atlasIMG,
     atlasJSON: atlasJSON,
-    equipmentSet: equipmentSet,
-    isDragging: !!draggingItem,
-    isSelectingShortcut: !!isSelectingShortcut,
-    showTooltipDelayed: showTooltipDelayed
+    equipmentSet: equipmentSet
   }));
 }));
 var Container$b = /*#__PURE__*/styled__default.div.withConfig({