Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions frontend/src/core/components/pageEditor/DragDropGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ interface DragDropGridProps<T extends DragDropItem> {
justMoved: boolean,
dragHandleProps?: any,
zoomLevel?: number,
isOverTarget?: boolean
) => React.ReactNode;
getThumbnailData?: (
itemId: string,
Expand Down Expand Up @@ -234,9 +235,11 @@ interface DraggableItemProps<T extends DragDropItem> {
justMoved: boolean,
dragHandleProps?: any,
zoomLevel?: number,
isOverTarget?: boolean
) => React.ReactNode;
zoomLevel: number;
selectedPageIds?: string[];
isOverTarget: boolean;
}

const DraggableItemInner = <T extends DragDropItem>({
Expand All @@ -251,6 +254,7 @@ const DraggableItemInner = <T extends DragDropItem>({
renderItem,
onUpdateDropTarget,
zoomLevel,
isOverTarget,
}: DraggableItemProps<T>) => {
const isPlaceholder = Boolean(item.isPlaceholder);
const pageNumber = (item as any).pageNumber ?? index + 1;
Expand Down Expand Up @@ -321,6 +325,7 @@ const DraggableItemInner = <T extends DragDropItem>({
justMoved,
{ ref: setNodeRef, ...attributes, ...listeners },
zoomLevel,
isOverTarget
)}
</>
);
Expand Down Expand Up @@ -361,6 +366,7 @@ const DraggableItem = React.memo(DraggableItemInner, (prevProps, nextProps) => {
prevProps.index === nextProps.index &&
prevProps.justMoved === nextProps.justMoved &&
prevProps.zoomLevel === nextProps.zoomLevel &&
prevProps.isOverTarget === nextProps.isOverTarget &&
prevProps.activeDragIds.length === nextProps.activeDragIds.length &&
prevProps.boxSelectedPageIds.length === nextProps.boxSelectedPageIds.length
);
Expand Down Expand Up @@ -961,6 +967,7 @@ const DragDropGrid = <T extends DragDropItem>({
renderItem={renderItem}
zoomLevel={zoomLevel}
selectedPageIds={selectedPageIds}
isOverTarget={hoveredItemId === item.id}
/>
);
})}
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/core/components/pageEditor/PageEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ const PageEditor = ({ onFunctionsReady }: PageEditorProps) => {
justMoved: boolean,
dragHandleProps?: any,
zoomLevelParam?: number,
isOverTarget?: boolean
) => {
gridItemRefsRef.current = refs;
const fileColorIndex = page.originalFileId
Expand All @@ -621,6 +622,7 @@ const PageEditor = ({ onFunctionsReady }: PageEditorProps) => {
justMoved={justMoved}
pageRefs={refs}
dragHandleProps={dragHandleProps}
isOverTarget={isOverTarget}
onReorderPages={handleReorderPages}
onTogglePage={togglePage}
onAnimateReorder={animateReorder}
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/core/components/pageEditor/PageThumbnail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ interface PageThumbnailProps {
selectionMode: boolean;
movingPage: number | null;
isAnimating: boolean;
isOverTarget?: boolean;
isBoxSelected?: boolean;
clearBoxSelection?: () => void;
activeDragIds: string[];
Expand Down Expand Up @@ -79,6 +80,7 @@ const PageThumbnail: React.FC<PageThumbnailProps> = ({
selectionMode,
movingPage,
isAnimating,
isOverTarget = false,
isBoxSelected = false,
clearBoxSelection,
activeDragIds,
Expand Down Expand Up @@ -554,8 +556,8 @@ const PageThumbnail: React.FC<PageThumbnailProps> = ({
background: "rgba(162, 201, 255, 0.8)",
padding: "6px 8px",
borderRadius: 8,
zIndex: 2,
opacity: 0,
zIndex: 20,
opacity: isHovered || (isOverTarget && !isDragging) ? 0.6 : 0,
transition: "opacity 0.2s ease-in-out",
}}
>
Expand Down
Loading