diff --git a/packages/web/components/common/DndDrag/index.tsx b/packages/web/components/common/DndDrag/index.tsx index 82fd0f440..888bc2ace 100644 --- a/packages/web/components/common/DndDrag/index.tsx +++ b/packages/web/components/common/DndDrag/index.tsx @@ -16,17 +16,16 @@ type Props = { renderClone?: DraggableChildrenFn; children: ({ provided, - snapshot, - draggingItemHeight + snapshot }: { provided: DroppableProvided; snapshot: DroppableStateSnapshot; - draggingItemHeight: number; }) => ReactElement; dataList: T[]; + zoom?: number; }; -function DndDrag({ children, renderClone, onDragEndCb, dataList }: Props) { +function DndDrag({ children, renderClone, onDragEndCb, dataList, zoom = 1 }: Props) { const [draggingItemHeight, setDraggingItemHeight] = useState(0); const onDragStart = (start: DragStart) => { @@ -53,7 +52,12 @@ function DndDrag({ children, renderClone, onDragEndCb, dataList }: Props) return ( - {(provided, snapshot) => children({ provided, snapshot, draggingItemHeight })} + {(provided, snapshot) => ( + <> + {children({ provided, snapshot })} + {snapshot.isDraggingOver && } + + )} ); diff --git a/projects/app/src/components/core/app/VariableEdit.tsx b/projects/app/src/components/core/app/VariableEdit.tsx index 967f1f498..5a916bfaf 100644 --- a/projects/app/src/components/core/app/VariableEdit.tsx +++ b/projects/app/src/components/core/app/VariableEdit.tsx @@ -223,8 +223,9 @@ const VariableEdit = ({ variables={variables} /> )} + zoom={zoom} > - {({ provided, snapshot, draggingItemHeight }) => ( + {({ provided }) => ( {formatVariables.map((item, index) => ( @@ -241,7 +242,6 @@ const VariableEdit = ({ )} ))} - {snapshot.isDraggingOver && } )} diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeFormInput/index.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeFormInput/index.tsx index b7382e687..5457a93d3 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeFormInput/index.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeFormInput/index.tsx @@ -209,8 +209,9 @@ const NodeFormInput = ({ data, selected }: NodeProps) => { /> ); }} + zoom={zoom} > - {({ provided, snapshot, draggingItemHeight }) => ( + {({ provided }) => ( {inputs.map((item, index) => { const icon = FlowNodeInputMap[item.type as FlowNodeInputTypeEnum]?.icon; @@ -230,7 +231,6 @@ const NodeFormInput = ({ data, selected }: NodeProps) => { ); })} - {snapshot.isDraggingOver && } )} diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeIfElse/index.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeIfElse/index.tsx index 97983ba03..67b49d4ec 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeIfElse/index.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeIfElse/index.tsx @@ -65,7 +65,7 @@ const NodeIfElse = ({ data, selected }: NodeProps) => { /> )} > - {({ provided, snapshot, draggingItemHeight }) => ( + {({ provided }) => ( {ifElseList.map((conditionItem, conditionIndex) => ( ) => { )} ))} - {snapshot.isDraggingOver && } )} diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/InputTypeConfig.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/InputTypeConfig.tsx index 5ed17ea78..4d05214f6 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/InputTypeConfig.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/InputTypeConfig.tsx @@ -417,7 +417,7 @@ const InputTypeConfig = ({ ); }} > - {({ provided, snapshot, draggingItemHeight }) => ( + {({ provided }) => ( ))} - {snapshot.isDraggingOver && } )} diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeUserSelect.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeUserSelect.tsx index 858a2bada..019557cff 100644 --- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeUserSelect.tsx +++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodeUserSelect.tsx @@ -62,8 +62,9 @@ const NodeUserSelect = ({ data, selected }: NodeProps) => { index={rubric.source.index} /> )} + zoom={zoom} > - {({ provided, snapshot, draggingItemHeight }) => ( + {({ provided }) => ( {options.map((item, i) => ( @@ -80,7 +81,6 @@ const NodeUserSelect = ({ data, selected }: NodeProps) => { )} ))} - {snapshot.isDraggingOver && } )}