From 00be6c219a1a47d192c3695f323d78605577b757 Mon Sep 17 00:00:00 2001 From: Shemy Gan Date: Thu, 12 Dec 2024 09:58:11 -0500 Subject: [PATCH] - Fix the warning button can not be descendant of button - Fix the warning possible change from uncontrolled to controlled component --- .../TabPanels/Status/Card/index.jsx | 31 +++++++++---------- .../TabPanels/Status/ContentPanel.jsx | 2 +- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Client/src/Components/TabPanels/Status/Card/index.jsx b/Client/src/Components/TabPanels/Status/Card/index.jsx index 456b0ab22..a16c3d1ee 100644 --- a/Client/src/Components/TabPanels/Status/Card/index.jsx +++ b/Client/src/Components/TabPanels/Status/Card/index.jsx @@ -2,22 +2,19 @@ import React, { useRef } from "react"; import { useDrag, useDrop } from "react-dnd"; import ItemTypes from "./ItemTypes"; import Card from "@mui/material/Card"; -import CardActionArea from "@mui/material/CardActionArea"; -import CardContent from "@mui/material/CardContent"; import Server from "./Server" +import { CardContent } from "@mui/material"; const CustomCard = React.forwardRef((props, ref) => ( - - - - - + + + )); @@ -68,7 +65,7 @@ const MyCard = ({ id, index, moveCard, removeCard, value, onChange }) => { item.index = hoverIndex; } }); - const [ {isDragging}, drag] = useDrag({ + const [ _, drag] = useDrag({ type: ItemTypes.CARD, item: {id: id, index:index}, collect: monitor => ({ @@ -76,14 +73,14 @@ const MyCard = ({ id, index, moveCard, removeCard, value, onChange }) => { }) }); drag(drop(ref)); - return ( + return ( + onChange={onChange} + /> ); }; diff --git a/Client/src/Components/TabPanels/Status/ContentPanel.jsx b/Client/src/Components/TabPanels/Status/ContentPanel.jsx index 88eb3b912..9607f7c33 100644 --- a/Client/src/Components/TabPanels/Status/ContentPanel.jsx +++ b/Client/src/Components/TabPanels/Status/ContentPanel.jsx @@ -169,7 +169,7 @@ const ContentPanel = () => { text={"" + idx} moveCard={moveCard} removeCard={removeCard} - value={card?.url} + value={card?.url??""} onChange = {handleCardChange} /> ))}