From e0935eb15cca73294704d9c1b94ca32b39982e4e Mon Sep 17 00:00:00 2001
From: Tiago Santos Da Silva <tiago.toya@hotmail.com>
Date: Tue, 5 Oct 2021 19:55:55 -0300
Subject: [PATCH] Typing adjustment - 1353 (#1415)

* refactor: adjusting typing

* fix: improving typing

* refactor: simplifying typing using Generics
---
 webapp/src/hooks/sortable.tsx | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/webapp/src/hooks/sortable.tsx b/webapp/src/hooks/sortable.tsx
index 582bd912f..8e3de405a 100644
--- a/webapp/src/hooks/sortable.tsx
+++ b/webapp/src/hooks/sortable.tsx
@@ -3,7 +3,14 @@
 import React, {useRef} from 'react'
 import {useDrag, useDrop, DragElementWrapper, DragSourceOptions, DragPreviewOptions} from 'react-dnd'
 
-function useSortableBase(itemType: string, item: any, enabled: boolean, handler: (src: any, st: any) => void): [boolean, boolean, DragElementWrapper<DragSourceOptions>, DragElementWrapper<any>, DragElementWrapper<DragPreviewOptions>] {
+import {IContentBlockWithCords} from '../blocks/contentBlock'
+import {Block} from '../blocks/block'
+interface ISortableWithGripItem {
+    block: Block | Block[],
+    cords: {x: number, y?: number, z?: number}
+}
+
+function useSortableBase<T>(itemType: string, item: T, enabled: boolean, handler: (src: T, st: T) => void): [boolean, boolean, DragElementWrapper<DragSourceOptions>, DragElementWrapper<DragSourceOptions>, DragElementWrapper<DragPreviewOptions>] {
     const [{isDragging}, drag, preview] = useDrag(() => ({
         type: itemType,
         item,
@@ -17,7 +24,7 @@ function useSortableBase(itemType: string, item: any, enabled: boolean, handler:
         collect: (monitor) => ({
             isOver: monitor.isOver(),
         }),
-        drop: (dragItem: any) => {
+        drop: (dragItem: T) => {
             handler(dragItem, item)
         },
         canDrop: () => enabled,
@@ -26,17 +33,17 @@ function useSortableBase(itemType: string, item: any, enabled: boolean, handler:
     return [isDragging, isOver, drag, drop, preview]
 }
 
-export function useSortable(itemType: string, item: any, enabled: boolean, handler: (src: any, st: any) => void): [boolean, boolean, React.RefObject<HTMLDivElement>] {
+export function useSortable<T>(itemType: string, item: T, enabled: boolean, handler: (src: T, st: T) => void): [boolean, boolean, React.RefObject<HTMLDivElement>] {
     const ref = useRef<HTMLDivElement>(null)
     const [isDragging, isOver, drag, drop] = useSortableBase(itemType, item, enabled, handler)
     drop(drag(ref))
     return [isDragging, isOver, ref]
 }
 
-export function useSortableWithGrip(itemType: string, item: any, enabled: boolean, handler: (src: any, st: any) => void): [boolean, boolean, React.RefObject<HTMLDivElement>, React.RefObject<HTMLDivElement>] {
+export function useSortableWithGrip(itemType: string, item: ISortableWithGripItem, enabled: boolean, handler: (src: IContentBlockWithCords, st: IContentBlockWithCords) => void): [boolean, boolean, React.RefObject<HTMLDivElement>, React.RefObject<HTMLDivElement>] {
     const ref = useRef<HTMLDivElement>(null)
     const previewRef = useRef<HTMLDivElement>(null)
-    const [isDragging, isOver, drag, drop, preview] = useSortableBase(itemType, item, enabled, handler)
+    const [isDragging, isOver, drag, drop, preview] = useSortableBase(itemType, item as IContentBlockWithCords, enabled, handler)
     drag(ref)
     drop(preview(previewRef))
     return [isDragging, isOver, ref, previewRef]