chore: replace T generic

gravity-ui · Feb 9, 2024 · 2dc1fc2 · 2dc1fc2
1 parent ce6f78e
commit 2dc1fc2
Showing 1 changed file with 46 additions and 43 deletions.
diff --git a/src/components/TreeSelect/DndTreeSelect.tsx b/src/components/TreeSelect/DndTreeSelect.tsx
@@ -47,7 +47,7 @@ export function DndTreeSelect<T extends DndTreeSelectItem>({
         () => initialDroppableId || `default-droppable-id-${dndTreeSelectCount++}`,
     );
 
-    const renderContainer = React.useCallback<RenderContainerType<T>>(
+    const renderContainer = React.useCallback<RenderContainerType<DndTreeSelectItem>>(
         ({renderItem, visibleFlattenIds, items: _items, containerRef, id}) => {
             const handleDrugEnd: OnDragEndResponder = ({destination, source}) => {
                 if (destination?.index !== undefined && destination?.index !== source.index) {
@@ -86,48 +86,51 @@ export function DndTreeSelect<T extends DndTreeSelectItem>({
         [items, setItems, propsRenderContainer, droppableId],
     );
 
-    const renderDndItem = React.useCallback<RenderItem<T>>((item, state, _, idx) => {
-        const endSlot =
-            item.endSlot ?? (item.isDragDisabled ? undefined : <Icon data={Grip} size={16} />);
-
-        const commonProps = {
-            ...state,
-            ...item,
-            endSlot,
-        };
-
-        return (
-            <Draggable
-                draggableId={state.id}
-                index={Number(idx)}
-                key={`item-key-${state.id}`}
-                isDragDisabled={item.isDragDisabled}
-            >
-                {(provided, snapshot) => {
-                    const style: React.CSSProperties = {
-                        ...provided.draggableProps.style,
-                    };
-
-                    // not expected offset appears, one way to fix - remove this offsets explicitly
-                    if (snapshot.isDragging) {
-                        style.left = undefined;
-                        style.top = undefined;
-                    }
-
-                    return (
-                        <TreeSelectItem
-                            ref={provided.innerRef}
-                            {...commonProps}
-                            {...provided.draggableProps}
-                            {...provided.dragHandleProps}
-                            style={style}
-                            active={snapshot.isDragging}
-                        />
-                    );
-                }}
-            </Draggable>
-        );
-    }, []);
+    const renderDndItem = React.useCallback<RenderItem<DndTreeSelectItem>>(
+        (item, state, _, idx) => {
+            const endSlot =
+                item.endSlot ?? (item.isDragDisabled ? undefined : <Icon data={Grip} size={16} />);
+
+            const commonProps = {
+                ...state,
+                ...item,
+                endSlot,
+            };
+
+            return (
+                <Draggable
+                    draggableId={state.id}
+                    index={Number(idx)}
+                    key={`item-key-${state.id}`}
+                    isDragDisabled={item.isDragDisabled}
+                >
+                    {(provided, snapshot) => {
+                        const style: React.CSSProperties = {
+                            ...provided.draggableProps.style,
+                        };
+
+                        // not expected offset appears, one way to fix - remove this offsets explicitly
+                        if (snapshot.isDragging) {
+                            style.left = undefined;
+                            style.top = undefined;
+                        }
+
+                        return (
+                            <TreeSelectItem
+                                ref={provided.innerRef}
+                                {...commonProps}
+                                {...provided.draggableProps}
+                                {...provided.dragHandleProps}
+                                style={style}
+                                active={snapshot.isDragging}
+                            />
+                        );
+                    }}
+                </Draggable>
+            );
+        },
+        [],
+    );
 
     return (
         <TreeSelect