@difizen/libro-core 0.3.3 → 1.0.0

package/src/cell/libro-executable-cell-view.ts

@@ -1,7 +1,7 @@
 import type { ICodeCell } from '@difizen/libro-common';
-import { watch } from '@difizen/mana-app';
-import { ViewOption } from '@difizen/mana-app';
-import { inject } from '@difizen/mana-app';
+import { watch } from '@difizen/libro-common/app';
+import { ViewOption } from '@difizen/libro-common/app';
+import { inject } from '@difizen/libro-common/app';
 
 import type { CellModel } from '../libro-protocol.js';
 import type { CellViewOptions } from '../libro-protocol.js';

package/src/collapse-service.ts

@@ -1,4 +1,4 @@
-import { inject, prop, transient } from '@difizen/mana-app';
+import { inject, prop, transient } from '@difizen/libro-common/app';
 
 import type { CellView } from './libro-protocol.js';
 import type { LibroView } from './libro-view.js';

package/src/command/document-commands.ts

@@ -1,5 +1,5 @@
 import { SaveOutlined, SettingOutlined } from '@ant-design/icons';
-import type { Command } from '@difizen/mana-app';
+import type { Command } from '@difizen/libro-common/app';
 
 import { FormatCellIcon } from '../material-from-designer.js';
 

package/src/command/kernel-command.ts

@@ -1,5 +1,5 @@
-import type { Command } from '@difizen/mana-app';
-import { l10n } from '@difizen/mana-l10n';
+import type { Command } from '@difizen/libro-common/app';
+import { l10n } from '@difizen/libro-common/l10n';
 
 export const KernelCommands: Record<string, Command & { keybind?: string }> = {
   //#region libro command

package/src/command/libro-command-contribution.ts

@@ -1,12 +1,12 @@
 import { MIME } from '@difizen/libro-common';
-import type { CommandRegistry } from '@difizen/mana-app';
+import type { CommandRegistry } from '@difizen/libro-common/app';
 import {
   inject,
   ModalService,
   singleton,
   CommandContribution,
-} from '@difizen/mana-app';
-import { equals } from '@difizen/mana-app';
+} from '@difizen/libro-common/app';
+import { equals } from '@difizen/libro-common/app';
 import { v4 } from 'uuid';
 
 import { LibroCellView, ExecutableCellModel, EditorCellView } from '../cell/index.js';

package/src/command/libro-command-register.ts

@@ -4,8 +4,8 @@ import type {
   CommandHandlerWithContext,
   CommandRegistry,
   KeybindingRegistry,
-} from '@difizen/mana-app';
-import { inject, singleton } from '@difizen/mana-app';
+} from '@difizen/libro-common/app';
+import { inject, singleton } from '@difizen/libro-common/app';
 
 import type { CellView, NotebookView } from '../libro-protocol.js';
 import { LibroContextKeys } from '../libro-protocol.js';

package/src/command/module.ts

@@ -1,4 +1,4 @@
-import { ManaModule } from '@difizen/mana-app';
+import { ManaModule } from '@difizen/libro-common/app';
 
 import { LibroCommandContribution } from './libro-command-contribution.js';
 import { LibroCommandRegister } from './libro-command-register.js';

package/src/command/notebook-commands.ts

@@ -9,8 +9,8 @@ import {
   // ReloadOutlined,
   PoweroffOutlined,
 } from '@ant-design/icons';
-import type { Command } from '@difizen/mana-app';
-import { l10n } from '@difizen/mana-l10n';
+import type { Command } from '@difizen/libro-common/app';
+import { l10n } from '@difizen/libro-common/l10n';
 
 import {
   Undo,

package/src/components/dnd-cell-item-render.tsx

@@ -8,8 +8,8 @@ import {
   useObserve,
   ViewInstance,
   ViewRender,
-} from '@difizen/mana-app';
-import { l10n } from '@difizen/mana-l10n';
+} from '@difizen/libro-common/app';
+import { l10n } from '@difizen/libro-common/l10n';
 import { Tooltip } from 'antd';
 import classnames from 'classnames';
 import type { FC } from 'react';

package/src/components/dnd-component/default-dnd-content.tsx

@@ -1,31 +1,27 @@
 /* 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 type { Identifier } from 'dnd-core';
 import React, {
   useCallback,
-  useEffect,
   useLayoutEffect,
   useMemo,
   useRef,
   useState,
   forwardRef,
+  useContext,
 } from 'react';
-import { useDrag, useDragDropManager, useDrop } from 'react-dnd';
-import { getEmptyImage } from 'react-dnd-html5-backend';
 import 'resize-observer-polyfill';
 
-import type { CellService } from '../../cell/index.js';
-import { LibroCellService } from '../../cell/index.js';
 import { CellCollapsible } from '../../collapse-service.js';
-import { DragAreaKey, isCellView } from '../../libro-protocol.js';
 import type { CellView, DndContentProps } from '../../libro-protocol.js';
 import { MultiSelectionWhenShiftClick } from '../../libro-setting.js';
 import type { LibroView } from '../../libro-view.js';
 import { HolderOutlined, PlusOutlined } from '../../material-from-designer.js';
 import { BetweenCellProvider } from '../cell-protocol.js';
 
+import { DragContext } from './dnd-list.js';
+
 export interface Dragparams {
   cell: CellView;
   index: number;
@@ -42,11 +38,21 @@ export const DndCellContainer: React.FC<DndContentProps> = ({
     MultiSelectionWhenShiftClick,
   );
   const BetweenCellContent = useInject<BetweenCellProvider>(BetweenCellProvider);
-  const cellService = useInject<CellService>(LibroCellService);
-  const dragDropManager = useDragDropManager();
-  const dragDropMonitor = dragDropManager.getMonitor();
+  const [isMouseOverDragArea, setIsMouseOverDragArea] = useState(false);
+  const [isDragDown, setIsDragDown] = useState(false);
   const ItemRender = getOrigin(instance.dndItemRender);
 
+  const {
+    dragOverIndex,
+    isDraging,
+    sourceIndex,
+    onDragStart,
+    onDragOver,
+    onDrop,
+    onDragEnd,
+    fragFromRef,
+  } = useContext(DragContext);
+
   useLayoutEffect(() => {
     if (typeof ref !== 'object') {
       return () => {
@@ -119,174 +125,102 @@ export const DndCellContainer: React.FC<DndContentProps> = ({
       return;
     }
     instance.model.selectCell(cell);
-    instance.model.selections = [];
+    if (instance.model.selections.length !== 0) {
+      instance.model.selections = [];
+    }
   }, [instance, cell]);
 
-  const scrollTimer = useRef<null | NodeJS.Timeout>(null);
-  const unsubscribe = useRef<null | any>(null);
+  const isMultiSelected =
+    instance.model.selections.length !== 0 && instance.isSelected(cell);
+
+  const isDragOver = useMemo(() => {
+    return index === dragOverIndex;
+  }, [index, dragOverIndex]);
 
-  const [{ isDrag }, drag, preview] = useDrag(
-    {
-      type: DragAreaKey,
-      item: { cell, index },
-      collect: (monitor) => ({
-        isDrag: monitor.isDragging(),
-      }),
-      end() {
-        instance.isDragging = false;
-        if (scrollTimer.current) {
-          clearInterval(scrollTimer.current);
-        }
-      },
+  const handleDragStart = useCallback(
+    (e: React.DragEvent) => {
+      if (!instance.model.cellsEditable) {
+        e.preventDefault();
+        return;
+      }
+      onDragStart?.(e, index);
     },
-    [cell, index],
+    [index, instance.model.cellsEditable, onDragStart],
   );
 
-  const libroViewContent = instance.container?.current?.getElementsByClassName(
-    'libro-view-content',
-  )[0] as HTMLElement;
+  const handleDragOver = useCallback(
+    (e: React.DragEvent) => {
+      //判断拖拽来源是否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],
+  );
 
-  useEffect(() => {
-    unsubscribe.current = dragDropMonitor.subscribeToStateChange(() => {
-      instance.isDragging = dragDropMonitor.isDragging();
-      scrollTimer.current = setInterval(() => {
-        const currentOffset = dragDropMonitor.getClientOffset();
-        if (libroViewContent && instance.isDragging && currentOffset) {
-          const libroViewClientRect = libroViewContent.getBoundingClientRect();
-          const { top, bottom } = libroViewClientRect;
-          const { y } = currentOffset;
-          const topLimit = top + 30;
-          const bottomLimit = bottom - 50;
-          if (y < topLimit) {
-            libroViewContent.scrollTop -= 0.5;
-          } else if (y > bottomLimit) {
-            libroViewContent.scrollTop += 0.5;
-          }
-        }
-      }, 10);
-      return () => {
-        if (scrollTimer.current) {
-          clearInterval(scrollTimer.current);
-        }
-        if (unsubscribe.current) {
-          unsubscribe.current();
-        }
-      };
-    });
-  }, [dragDropMonitor]);
+  const handleDrop = useCallback(
+    (e: React.DragEvent) => {
+      e.preventDefault();
+      if (fragFromRef.current !== 'cell') {
+        return;
+      }
+      onDrop(e, index);
+    },
+    [fragFromRef, index, onDrop],
+  );
 
-  useEffect(() => {
-    // This gets called after every render, by default
-    // (the first one, and every one after that)
+  const handleDragEnd = useCallback(
+    (e: React.DragEvent) => {
+      if (fragFromRef.current !== 'cell') {
+        return;
+      }
+      onDragEnd(e, index);
+    },
+    [fragFromRef, index, onDragEnd],
+  );
 
-    // 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]);
+  const opacity = useMemo(() => {
+    return {
+      opacity: isDraging && sourceIndex === index ? 0.4 : 1,
+    };
+  }, [index, isDraging, sourceIndex]);
 
-  const [{ handlerId, isDragOver }, drop] = useDrop<
-    Dragparams,
-    void,
-    {
-      handlerId: Identifier | null;
-      isDragOver: boolean;
-    }
-  >({
-    accept: DragAreaKey,
-    drop(item, monitor) {
-      cellService
-        .getOrCreateView(
-          {
-            ...item.cell.model.options,
-            modelId: item.cell.model.id,
-            singleSelectionDragPreview: true,
-          },
-          item.cell.parent.id,
-        )
-        .then((view) => {
-          view.dispose();
-          return;
-        })
-        .catch((e) => {
-          //
-        });
-      if (isCellView(item.cell)) {
-        const didDrop = monitor.didDrop();
-        if (didDrop) {
-          return;
-        }
-        const dragIndex = instance.findCellIndex(item.cell);
-        const dropIndex = instance.findCellIndex(cell);
-        if (instance.model.selections.length > 0) {
-          const isDragInSelections =
-            instance.model.selections.findIndex(
-              (selection) => selection.id === item.cell.id,
-            ) > -1
-              ? true
-              : false;
-          const isDropInSelections =
-            instance.model.selections.findIndex(
-              (selection) => selection.id === cell.id,
-            ) > -1
-              ? true
-              : false;
-          if (isDragInSelections && isDropInSelections) {
-            return;
-          }
-          if (isDragInSelections) {
-            instance.model.exchangeCells(instance.model.selections, dropIndex);
-            instance.model.scrollToView(cell);
+  const onMouseOver = useCallback(() => {
+    setIsMouseOverDragArea(true);
+  }, []);
 
-            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(monitor) {
-      return {
-        isDragOver: monitor.isOver(),
-        canDrop: monitor.canDrop(),
-        handlerId: monitor.getHandlerId(),
-      };
-    },
-  });
-  const opacity = isDrag ? 0.4 : 1;
-  if (instance.model.cellsEditable) {
-    drop(ref);
-  }
-  if (isDrag) {
-    instance.model.mouseMode = 'drag';
-  }
+  const onMouseLeave = useCallback(() => {
+    setIsMouseOverDragArea(false);
+  }, []);
 
-  const isMultiSelected =
-    instance.model.selections.length !== 0 && instance.isSelected(cell);
   // let isMouseOver = false;
-  const [isMouseOverDragArea, setIsMouseOverDragArea] = useState(false);
   const hasCellHidden = useMemo(() => {
     return cell.hasCellHidden();
   }, [cell]);
   const isCollapsible = CellCollapsible.is(cell);
 
+  const wrapperclassName = useMemo(() => {
+    return `libro-dnd-cell-container ${isMultiSelected ? 'multi-selected' : ''} ${
+      hasCellHidden ? 'hidden' : ''
+    }`;
+  }, [isMultiSelected]);
+
   return (
     <div
-      className={`libro-dnd-cell-container ${isMultiSelected ? 'multi-selected' : ''} ${
-        hasCellHidden ? 'hidden' : ''
-      }`}
-      data-handler-id={handlerId}
-      style={{ opacity }}
+      className={wrapperclassName}
+      onDragOver={handleDragOver}
+      onDrop={handleDrop}
+      onDragEnd={handleDragEnd}
+      style={opacity}
       ref={ref}
       id={cell.id}
     >
@@ -294,15 +228,16 @@ export const DndCellContainer: React.FC<DndContentProps> = ({
         index={position || index}
         addCell={cell.parent.addCellAbove}
       />
-      {isDragOver && <div className="libro-drag-hoverline" />}
+      {!isDragDown && isDragOver && <div className="libro-drag-hoverline" />}
       {isMouseOverDragArea && <HolderOutlined className="libro-handle-style" />}
       <div
         className="libro-drag-area"
-        ref={drag}
+        onDragStart={handleDragStart}
+        draggable={instance.model.cellsEditable}
         onMouseDown={handleMouseDown}
         onMouseUp={handleMouseUp}
-        onMouseOver={() => setIsMouseOverDragArea(true)}
-        onMouseLeave={() => setIsMouseOverDragArea(false)}
+        onMouseOver={onMouseOver}
+        onMouseLeave={onMouseLeave}
       />
       <div
         tabIndex={-1}
@@ -312,7 +247,7 @@ export const DndCellContainer: React.FC<DndContentProps> = ({
       >
         <ItemRender
           isDragOver={!!isDragOver}
-          isDrag={!!isDrag}
+          isDrag={!!isDraging}
           cell={cell}
           isMouseOverDragArea={isMouseOverDragArea}
         />
@@ -329,6 +264,7 @@ export const DndCellContainer: React.FC<DndContentProps> = ({
           </Button>
         </div>
       )}
+      {isDragDown && isDragOver && <div className="libro-drag-hoverline-last-one" />}
     </div>
   );
 };