@difizen/libro-core 0.3.3 → 1.0.0

package/es/components/dnd-component/default-dnd-content.js

@@ -1,8 +1,3 @@
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -11,23 +6,19 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /* eslint-disable react-hooks/exhaustive-deps */
-import { getOrigin, useInject, ViewInstance } from '@difizen/mana-app';
-import { useConfigurationValue } from '@difizen/mana-app';
+import { getOrigin, useInject, ViewInstance } from '@difizen/libro-common/app';
+import { useConfigurationValue } from '@difizen/libro-common/app';
 import { Button } from 'antd';
-import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, forwardRef } from 'react';
-import { useDrag, useDragDropManager, useDrop } from 'react-dnd';
-import { getEmptyImage } from 'react-dnd-html5-backend';
+import React, { useCallback, useLayoutEffect, useMemo, useRef, useState, forwardRef, useContext } from 'react';
 import 'resize-observer-polyfill';
-import { LibroCellService } from "../../cell/index.js";
 import { CellCollapsible } from "../../collapse-service.js";
-import { DragAreaKey, isCellView } from "../../libro-protocol.js";
 import { MultiSelectionWhenShiftClick } from "../../libro-setting.js";
 import { HolderOutlined, PlusOutlined } from "../../material-from-designer.js";
 import { BetweenCellProvider } from "../cell-protocol.js";
+import { DragContext } from "./dnd-list.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var DndCellContainer = function DndCellContainer(_ref) {
-  var _instance$container;
   var cell = _ref.cell,
     index = _ref.index,
     position = _ref.position;
@@ -37,10 +28,24 @@ export var DndCellContainer = function DndCellContainer(_ref) {
     _useConfigurationValu2 = _slicedToArray(_useConfigurationValu, 1),
     multiSelectionWhenShiftClick = _useConfigurationValu2[0];
   var BetweenCellContent = useInject(BetweenCellProvider);
-  var cellService = useInject(LibroCellService);
-  var dragDropManager = useDragDropManager();
-  var dragDropMonitor = dragDropManager.getMonitor();
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isMouseOverDragArea = _useState2[0],
+    setIsMouseOverDragArea = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isDragDown = _useState4[0],
+    setIsDragDown = _useState4[1];
   var ItemRender = getOrigin(instance.dndItemRender);
+  var _useContext = useContext(DragContext),
+    dragOverIndex = _useContext.dragOverIndex,
+    isDraging = _useContext.isDraging,
+    sourceIndex = _useContext.sourceIndex,
+    onDragStart = _useContext.onDragStart,
+    onDragOver = _useContext.onDragOver,
+    onDrop = _useContext.onDrop,
+    onDragEnd = _useContext.onDragEnd,
+    fragFromRef = _useContext.fragFromRef;
   useLayoutEffect(function () {
     if (_typeof(ref) !== 'object') {
       return function () {
@@ -93,176 +98,92 @@ export var DndCellContainer = function DndCellContainer(_ref) {
       return;
     }
     instance.model.selectCell(cell);
-    instance.model.selections = [];
+    if (instance.model.selections.length !== 0) {
+      instance.model.selections = [];
+    }
   }, [instance, cell]);
-  var scrollTimer = useRef(null);
-  var unsubscribe = useRef(null);
-  var _useDrag = useDrag({
-      type: DragAreaKey,
-      item: {
-        cell: cell,
-        index: index
-      },
-      collect: function collect(monitor) {
-        return {
-          isDrag: monitor.isDragging()
-        };
-      },
-      end: function end() {
-        instance.isDragging = false;
-        if (scrollTimer.current) {
-          clearInterval(scrollTimer.current);
-        }
-      }
-    }, [cell, index]),
-    _useDrag2 = _slicedToArray(_useDrag, 3),
-    isDrag = _useDrag2[0].isDrag,
-    drag = _useDrag2[1],
-    preview = _useDrag2[2];
-  var libroViewContent = (_instance$container = instance.container) === null || _instance$container === void 0 || (_instance$container = _instance$container.current) === null || _instance$container === void 0 ? void 0 : _instance$container.getElementsByClassName('libro-view-content')[0];
-  useEffect(function () {
-    unsubscribe.current = dragDropMonitor.subscribeToStateChange(function () {
-      instance.isDragging = dragDropMonitor.isDragging();
-      scrollTimer.current = setInterval(function () {
-        var currentOffset = dragDropMonitor.getClientOffset();
-        if (libroViewContent && instance.isDragging && currentOffset) {
-          var libroViewClientRect = libroViewContent.getBoundingClientRect();
-          var top = libroViewClientRect.top,
-            bottom = libroViewClientRect.bottom;
-          var y = currentOffset.y;
-          var topLimit = top + 30;
-          var bottomLimit = bottom - 50;
-          if (y < topLimit) {
-            libroViewContent.scrollTop -= 0.5;
-          } else if (y > bottomLimit) {
-            libroViewContent.scrollTop += 0.5;
-          }
-        }
-      }, 10);
-      return function () {
-        if (scrollTimer.current) {
-          clearInterval(scrollTimer.current);
-        }
-        if (unsubscribe.current) {
-          unsubscribe.current();
-        }
-      };
-    });
-  }, [dragDropMonitor]);
-  useEffect(function () {
-    // This gets called after every render, by default
-    // (the first one, and every one after that)
-
-    // Use empty image as a drag preview so browsers don't draw it
-    // and we can draw whatever we want on the custom drag layer instead.
-    preview(getEmptyImage(), {
-      // IE fallback: specify that we'd rather screenshot the node
-      // when it already knows it's being dragged so we can hide it with CSS.
-      captureDraggingState: true
-    });
-  }, [preview]);
-  var _useDrop = useDrop({
-      accept: DragAreaKey,
-      drop: function drop(item, monitor) {
-        cellService.getOrCreateView(_objectSpread(_objectSpread({}, item.cell.model.options), {}, {
-          modelId: item.cell.model.id,
-          singleSelectionDragPreview: true
-        }), item.cell.parent.id).then(function (view) {
-          view.dispose();
-          return;
-        }).catch(function (e) {
-          //
-        });
-        if (isCellView(item.cell)) {
-          var didDrop = monitor.didDrop();
-          if (didDrop) {
-            return;
-          }
-          var dragIndex = instance.findCellIndex(item.cell);
-          var dropIndex = instance.findCellIndex(cell);
-          if (instance.model.selections.length > 0) {
-            var isDragInSelections = instance.model.selections.findIndex(function (selection) {
-              return selection.id === item.cell.id;
-            }) > -1 ? true : false;
-            var isDropInSelections = instance.model.selections.findIndex(function (selection) {
-              return selection.id === cell.id;
-            }) > -1 ? true : false;
-            if (isDragInSelections && isDropInSelections) {
-              return;
-            }
-            if (isDragInSelections) {
-              instance.model.exchangeCells(instance.model.selections, dropIndex);
-              instance.model.scrollToView(cell);
-              return;
-            }
-          }
-          if (dragIndex < dropIndex) {
-            instance.model.exchangeCell(dragIndex, dropIndex - 1);
-            instance.model.scrollToView(cell);
-          }
-          if (dragIndex > dropIndex) {
-            instance.model.exchangeCell(dragIndex, dropIndex);
-            instance.model.scrollToView(cell);
-          }
-        }
-        return;
-      },
-      collect: function collect(monitor) {
-        return {
-          isDragOver: monitor.isOver(),
-          canDrop: monitor.canDrop(),
-          handlerId: monitor.getHandlerId()
-        };
-      }
-    }),
-    _useDrop2 = _slicedToArray(_useDrop, 2),
-    _useDrop2$ = _useDrop2[0],
-    handlerId = _useDrop2$.handlerId,
-    isDragOver = _useDrop2$.isDragOver,
-    drop = _useDrop2[1];
-  var opacity = isDrag ? 0.4 : 1;
-  if (instance.model.cellsEditable) {
-    drop(ref);
-  }
-  if (isDrag) {
-    instance.model.mouseMode = 'drag';
-  }
   var isMultiSelected = instance.model.selections.length !== 0 && instance.isSelected(cell);
+  var isDragOver = useMemo(function () {
+    return index === dragOverIndex;
+  }, [index, dragOverIndex]);
+  var handleDragStart = useCallback(function (e) {
+    if (!instance.model.cellsEditable) {
+      e.preventDefault();
+      return;
+    }
+    onDragStart === null || onDragStart === void 0 || onDragStart(e, index);
+  }, [index, instance.model.cellsEditable, onDragStart]);
+  var handleDragOver = useCallback(function (e) {
+    //判断拖拽来源是否cell
+    if (fragFromRef.current !== 'cell') {
+      return;
+    }
+    e.preventDefault();
+    instance.model.mouseMode = 'drag';
+    //判断是向下拖拽还是向上拖拽
+    if (sourceIndex < index) {
+      setIsDragDown(true);
+    } else {
+      setIsDragDown(false);
+    }
+    onDragOver(e, index);
+  }, [fragFromRef, index, instance.model, onDragOver, sourceIndex]);
+  var handleDrop = useCallback(function (e) {
+    e.preventDefault();
+    if (fragFromRef.current !== 'cell') {
+      return;
+    }
+    onDrop(e, index);
+  }, [fragFromRef, index, onDrop]);
+  var handleDragEnd = useCallback(function (e) {
+    if (fragFromRef.current !== 'cell') {
+      return;
+    }
+    onDragEnd(e, index);
+  }, [fragFromRef, index, onDragEnd]);
+  var opacity = useMemo(function () {
+    return {
+      opacity: isDraging && sourceIndex === index ? 0.4 : 1
+    };
+  }, [index, isDraging, sourceIndex]);
+  var onMouseOver = useCallback(function () {
+    setIsMouseOverDragArea(true);
+  }, []);
+  var onMouseLeave = useCallback(function () {
+    setIsMouseOverDragArea(false);
+  }, []);
+
   // let isMouseOver = false;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isMouseOverDragArea = _useState2[0],
-    setIsMouseOverDragArea = _useState2[1];
   var hasCellHidden = useMemo(function () {
     return cell.hasCellHidden();
   }, [cell]);
   var isCollapsible = CellCollapsible.is(cell);
+  var wrapperclassName = useMemo(function () {
+    return "libro-dnd-cell-container ".concat(isMultiSelected ? 'multi-selected' : '', " ").concat(hasCellHidden ? 'hidden' : '');
+  }, [isMultiSelected]);
   return /*#__PURE__*/_jsxs("div", {
-    className: "libro-dnd-cell-container ".concat(isMultiSelected ? 'multi-selected' : '', " ").concat(hasCellHidden ? 'hidden' : ''),
-    "data-handler-id": handlerId,
-    style: {
-      opacity: opacity
-    },
+    className: wrapperclassName,
+    onDragOver: handleDragOver,
+    onDrop: handleDrop,
+    onDragEnd: handleDragEnd,
+    style: opacity,
     ref: ref,
     id: cell.id,
     children: [/*#__PURE__*/_jsx(BetweenCellContent, {
       index: position || index,
       addCell: cell.parent.addCellAbove
-    }), isDragOver && /*#__PURE__*/_jsx("div", {
+    }), !isDragDown && isDragOver && /*#__PURE__*/_jsx("div", {
       className: "libro-drag-hoverline"
     }), isMouseOverDragArea && /*#__PURE__*/_jsx(HolderOutlined, {
       className: "libro-handle-style"
     }), /*#__PURE__*/_jsx("div", {
       className: "libro-drag-area",
-      ref: drag,
+      onDragStart: handleDragStart,
+      draggable: instance.model.cellsEditable,
       onMouseDown: handleMouseDown,
       onMouseUp: handleMouseUp,
-      onMouseOver: function onMouseOver() {
-        return setIsMouseOverDragArea(true);
-      },
-      onMouseLeave: function onMouseLeave() {
-        return setIsMouseOverDragArea(false);
-      }
+      onMouseOver: onMouseOver,
+      onMouseLeave: onMouseLeave
     }), /*#__PURE__*/_jsx("div", {
       tabIndex: -1,
       onFocus: handleFocus
@@ -271,7 +192,7 @@ export var DndCellContainer = function DndCellContainer(_ref) {
       className: "libro-dnd-cell-content",
       children: /*#__PURE__*/_jsx(ItemRender, {
         isDragOver: !!isDragOver,
-        isDrag: !!isDrag,
+        isDrag: !!isDraging,
         cell: cell,
         isMouseOverDragArea: isMouseOverDragArea
       })
@@ -288,6 +209,8 @@ export var DndCellContainer = function DndCellContainer(_ref) {
         type: "default",
         children: [cell.collapsibleChildNumber, " cell hidden"]
       })
+    }), isDragDown && isDragOver && /*#__PURE__*/_jsx("div", {
+      className: "libro-drag-hoverline-last-one"
     })]
   });
 };

package/es/components/dnd-component/dnd-list.d.ts

@@ -2,6 +2,17 @@ import type { FC, ReactNode } from 'react';
 import type { DndContentProps } from '../../libro-protocol.js';
 import type { LibroView } from '../../libro-view.js';
 import './index.less';
+interface IDragContextType {
+    dragOverIndex?: number;
+    isDraging: boolean;
+    sourceIndex?: number;
+    onDragStart: (e: React.DragEvent, index: number) => void;
+    onDragOver: (e: React.DragEvent, index: number) => void;
+    onDrop: (e: React.DragEvent, index: number) => void;
+    onDragEnd: (e?: React.DragEvent, index?: number) => void;
+    fragFromRef: any;
+}
+export declare const DragContext: import("react").Context<IDragContextType>;
 export declare const DndCellRender: FC<DndContentProps>;
 export declare const DndCellsRender: import("react").ForwardRefExoticComponent<{
     libroView: LibroView;
@@ -11,4 +22,5 @@ export declare const DndList: import("react").ForwardRefExoticComponent<{
     libroView: LibroView;
     children: ReactNode;
 } & import("react").RefAttributes<HTMLDivElement>>;
+export {};
 //# sourceMappingURL=dnd-list.d.ts.map

package/es/components/dnd-component/dnd-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dnd-list.d.ts","sourceRoot":"","sources":["../../../src/components/dnd-component/dnd-list.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAO3C,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAKrD,OAAO,cAAc,CAAC;AAEtB,eAAO,MAAM,aAAa,EAAE,EAAE,CAAC,eAAe,CAY5C,CAAC;AA2BH,eAAO,MAAM,cAAc;eAEZ,SAAS;oBAAkB,SAAS;kDAsFjD,CAAC;AAEH,eAAO,MAAM,OAAO;eAEL,SAAS;cAAY,SAAS;kDA2E3C,CAAC"}
+{"version":3,"file":"dnd-list.d.ts","sourceRoot":"","sources":["../../../src/components/dnd-component/dnd-list.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAgB3C,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIrD,OAAO,cAAc,CAAC;AAEtB,UAAU,gBAAgB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,UAAU,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,WAAW,EAAE,GAAG,CAAC;CAClB;AAED,eAAO,MAAM,WAAW,2CAiBtB,CAAC;AA6CH,eAAO,MAAM,aAAa,EAAE,EAAE,CAAC,eAAe,CAY5C,CAAC;AA2BH,eAAO,MAAM,cAAc;eAEZ,SAAS;oBAAkB,SAAS;kDAsFjD,CAAC;AAEH,eAAO,MAAM,OAAO;eAEL,SAAS;cAAY,SAAS;kDAsQ3C,CAAC"}