@rpg-engine/long-bow 0.7.67 → 0.7.68

package/dist/long-bow.esm.js

@@ -27662,17 +27662,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.createElement(React.Fragment, null, tooltipState.visible && item && !isFocused && canShow && React.createElement(ItemTooltip, {
+    equipmentSet = _ref.equipmentSet;
+  return React.createElement(React.Fragment, null, tooltipState.visible && item && !isFocused && React.createElement(ItemTooltip, {
     item: item,
     atlasIMG: atlasIMG,
     atlasJSON: atlasJSON,
     equipmentSet: equipmentSet
-  }), tooltipState.mobileVisible && item && canShow && React.createElement(MobileItemTooltip, {
+  }), tooltipState.mobileVisible && item && React.createElement(MobileItemTooltip, {
     item: item,
     atlasIMG: atlasIMG,
     atlasJSON: atlasJSON,
@@ -27696,7 +27692,7 @@ var ItemSlotToolTips = function ItemSlotToolTips(_ref) {
         _onSelected == null ? void 0 : _onSelected(optionId, item);
       }
     }
-  }), !isContextMenuDisabled && contextMenuState.visible && contextActions && canShow && React.createElement(RelativeListMenu, {
+  }), !isContextMenuDisabled && contextMenuState.visible && contextActions && React.createElement(RelativeListMenu, {
     options: contextActions,
     onSelected: function onSelected(optionId) {
       setContextMenuState(function (prev) {
@@ -27721,23 +27717,46 @@ var ItemSlotToolTips = function ItemSlotToolTips(_ref) {
 
 var DraggingContext = /*#__PURE__*/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 useContext(DraggingContext);
-};
 var DraggingProvider = function DraggingProvider(_ref) {
   var children = _ref.children;
   var _useState = useState(null),
     item = _useState[0],
     setDraggingItem = _useState[1];
+  var _useState2 = useState({
+      isFocused: false,
+      wasDragged: false,
+      position: {
+        x: 0,
+        y: 0
+      },
+      dropPosition: null
+    }),
+    dragState = _useState2[0],
+    setDragState = _useState2[1];
   return React.createElement(DraggingContext.Provider, {
     value: {
       item: item,
-      setDraggingItem: setDraggingItem
+      setDraggingItem: setDraggingItem,
+      dragState: dragState,
+      setDragState: setDragState
     }
   }, children);
 };
+var useDragging = function useDragging() {
+  return useContext(DraggingContext);
+};
 
 var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
   var isDepotSystem = _ref.isDepotSystem,
@@ -27759,18 +27778,9 @@ var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
   var dragContainer = useRef(null);
   var _useDragging = useDragging(),
     draggingItem = _useDragging.item,
-    setDraggingItem = _useDragging.setDraggingItem;
-  var _useState = 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;
   useEffect(function () {
     setDragState(function (prev) {
       return _extends({}, prev, {
@@ -27781,7 +27791,7 @@ var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
         isFocused: false
       });
     });
-  }, [item, isDepotSystem]);
+  }, [item, isDepotSystem, setDragState]);
   useEffect(function () {
     if (onDrop && item && dragState.dropPosition) {
       onDrop(item, dragState.dropPosition);
@@ -27809,11 +27819,6 @@ var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
     };
   }, []);
   var resetDragState = useCallback(function () {
-    setTooltipState(function (prev) {
-      return _extends({}, prev, {
-        visible: false
-      });
-    });
     setDragState(function (prev) {
       return _extends({}, prev, {
         wasDragged: false,
@@ -27824,7 +27829,7 @@ var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
         }
       });
     });
-  }, [setTooltipState]);
+  }, [setTooltipState, setDragState]);
   var handleSuccessfulDrag = useCallback(function (quantity) {
     resetDragState();
     if (quantity !== -1 && item) {
@@ -27852,7 +27857,7 @@ var useItemSlotDragAndDrop = function useItemSlotDragAndDrop(_ref) {
     if (!draggingItem) {
       setDraggingItem(item);
     }
-  }, [dragState.position, draggingItem, item, setDraggingItem]);
+  }, [dragState.position, draggingItem, item, setDraggingItem, setDragState]);
   var onDraggableStop = useCallback(function (e, data) {
     setTimeout(function () {
       setDraggingItem(null);
@@ -28112,12 +28117,6 @@ var ItemSlot = /*#__PURE__*/React.memo( /*#__PURE__*/observer(function (_ref) {
   var _useState3 = useState([]),
     contextActions = _useState3[0],
     setContextActions = _useState3[1];
-  var isDraggingDisabled = useMemo(function () {
-    return contextMenuState.visible || onDragStart === undefined || onDragEnd === undefined;
-  }, [contextMenuState.visible, onDragStart, onDragEnd]);
-  useEffect(function () {
-    console.log('isDraggingDisabled', isDraggingDisabled);
-  }, [isDraggingDisabled]);
   var _useItemSlotDragAndDr = useItemSlotDragAndDrop({
       isDepotSystem: !!isDepotSystem,
       item: item,
@@ -28191,22 +28190,6 @@ var ItemSlot = /*#__PURE__*/React.memo( /*#__PURE__*/observer(function (_ref) {
       (_document$elementFrom = document.elementFromPoint(clientX, clientY)) == null ? void 0 : _document$elementFrom.dispatchEvent(simulatedEvent);
     }
   }, [onMouseOut]);
-  var _useState4 = useState(false),
-    showTooltipDelayed = _useState4[0],
-    setShowTooltipDelayed = _useState4[1];
-  //@ts-ignore
-  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.createElement(Container$b, {
     isDraggingItem: !!draggingItem,
     item: item,
@@ -28223,7 +28206,6 @@ var ItemSlot = /*#__PURE__*/React.memo( /*#__PURE__*/observer(function (_ref) {
     },
     onTouchEnd: function onTouchEnd(e) {
       var _document$elementFrom2;
-      handleInteractionEnd(e);
       var _e$changedTouches$ = e.changedTouches[0],
         clientX = _e$changedTouches$.clientX,
         clientY = _e$changedTouches$.clientY;
@@ -28242,7 +28224,7 @@ var ItemSlot = /*#__PURE__*/React.memo( /*#__PURE__*/observer(function (_ref) {
     axis: isSelectingShortcut ? 'none' : 'both',
     defaultClassName: item ? 'draggable' : 'empty-slot',
     scale: dragScale,
-    disabled: isDraggingDisabled,
+    disabled: onDragStart === undefined || onDragEnd === undefined,
     onStop: onDraggableStop,
     onStart: onDraggableStart,
     onDrag: onDraggableProgress,
@@ -28263,15 +28245,12 @@ var ItemSlot = /*#__PURE__*/React.memo( /*#__PURE__*/observer(function (_ref) {
         });
       });
     },
-    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.createElement(ItemSlotRenderer, {
     item: item,
@@ -28299,10 +28278,7 @@ var ItemSlot = /*#__PURE__*/React.memo( /*#__PURE__*/observer(function (_ref) {
     },
     atlasIMG: atlasIMG,
     atlasJSON: atlasJSON,
-    equipmentSet: equipmentSet,
-    isDragging: !!draggingItem,
-    isSelectingShortcut: !!isSelectingShortcut,
-    showTooltipDelayed: showTooltipDelayed
+    equipmentSet: equipmentSet
   }));
 }));
 var Container$b = /*#__PURE__*/styled.div.withConfig({