390 bugfix large modal hotkeys (#391)

varianter · Dec 12, 2023 · ffb0bdc · ffb0bdc
1 parent d25df06
commit ffb0bdc
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 35 deletions.
diff --git a/frontend/src/components/Staffing/AddEngagementHoursModal/AddEngagementHoursRow.tsx b/frontend/src/components/Staffing/AddEngagementHoursModal/AddEngagementHoursRow.tsx
@@ -26,7 +26,6 @@ export function AddEngagementHoursRow({
   const [currentDragWeek, setCurrentDragWeek] = useState<number | undefined>(
     undefined,
   );
-  const [isRowHovered, setIsRowHovered] = useState(false);
   const [consultantWHours, setConsultantsWHours] = useState<
     ConsultantWithWeekHours | undefined
   >(consultantWWeekHours);
@@ -90,8 +89,6 @@ export function AddEngagementHoursRow({
           setHourDragValue={setHourDragValue}
           setStartDragWeek={setStartDragWeek}
           setCurrentDragWeek={setCurrentDragWeek}
-          isRowHovered={isRowHovered}
-          setIsRowHovered={setIsRowHovered}
           numWeeks={weekList.length}
           firstDayInWeek={day}
           initHours={

diff --git a/frontend/src/components/Staffing/AddEngagementHoursModal/DetailedEngagementModalCell.tsx b/frontend/src/components/Staffing/AddEngagementHoursModal/DetailedEngagementModalCell.tsx
@@ -21,8 +21,6 @@ export function DetailedEngagementModalCell({
   startDragWeek,
   setStartDragWeek,
   setCurrentDragWeek,
-  isRowHovered,
-  setIsRowHovered,
   numWeeks,
   firstDayInWeek,
   initHours,
@@ -36,8 +34,6 @@ export function DetailedEngagementModalCell({
   setHourDragValue: React.Dispatch<React.SetStateAction<number | undefined>>;
   setStartDragWeek: React.Dispatch<React.SetStateAction<number | undefined>>;
   setCurrentDragWeek: React.Dispatch<React.SetStateAction<number | undefined>>;
-  isRowHovered: boolean;
-  setIsRowHovered: React.Dispatch<React.SetStateAction<boolean>>;
   numWeeks: number;
   firstDayInWeek: DateTime;
   initHours: number;
@@ -46,14 +42,12 @@ export function DetailedEngagementModalCell({
   const [hours, setHours] = useState(initHours);
   const [isChangingHours, setIsChangingHours] = useState(false);
   const [oldHours, setOldHours] = useState(0);
-  const { setIsDisabledHotkeys } = useContext(FilteredContext);
 
   const [isInputFocused, setIsInputFocused] = useState(false);
   const inputRef = useRef<HTMLInputElement | null>(null);
   const organisationName = usePathname().split("/")[1];
 
   function updateSingularHours() {
-    setIsDisabledHotkeys(false);
     if (oldHours != hours && hourDragValue == undefined) {
       setOldHours(hours);
       setDetailedBookingHours({
@@ -69,14 +63,7 @@ export function DetailedEngagementModalCell({
     }
   }
 
-  useEffect(() => {
-    if (!isRowHovered && inputRef.current) {
-      inputRef.current.blur();
-    }
-  }, [isRowHovered]);
-
   function updateDragHours() {
-    setIsDisabledHotkeys(false);
     if (
       hourDragValue == undefined ||
       startDragWeek == undefined ||
@@ -134,10 +121,8 @@ export function DetailedEngagementModalCell({
         }`}
         onMouseEnter={() => {
           setIsChangingHours(true);
-          setIsRowHovered(true);
         }}
         onMouseLeave={() => {
-          setIsRowHovered(false);
           setIsChangingHours(false);
           !isInputFocused && updateSingularHours();
         }}
@@ -176,12 +161,10 @@ export function DetailedEngagementModalCell({
           onFocus={(e) => {
             e.target.select();
             setIsInputFocused(true);
-            setIsDisabledHotkeys(true);
           }}
           onBlur={() => {
             updateSingularHours();
             setIsInputFocused(false);
-            setIsDisabledHotkeys(false);
           }}
           onDragStart={() => {
             setHourDragValue(hours);

diff --git a/frontend/src/components/Staffing/DetailedBookingRows.tsx b/frontend/src/components/Staffing/DetailedBookingRows.tsx
@@ -65,7 +65,6 @@ export function DetailedBookingRows(props: {
   const [currentDragWeek, setCurrentDragWeek] = useState<number | undefined>(
     undefined,
   );
-  const [isRowHovered, setIsRowHovered] = useState(false);
 
   const [editOfferDropdownIsOpen, setEditOfferDropdownIsOpen] = useState(false);
   const menuRef = useRef(null);
@@ -167,8 +166,6 @@ export function DetailedBookingRows(props: {
             startDragWeek={startDragWeek}
             setStartDragWeek={setStartDragWeek}
             setCurrentDragWeek={setCurrentDragWeek}
-            isRowHovered={isRowHovered}
-            setIsRowHovered={setIsRowHovered}
           />
         ))}
     </tr>
@@ -217,8 +214,6 @@ function DetailedBookingCell({
   startDragWeek,
   setStartDragWeek,
   setCurrentDragWeek,
-  isRowHovered,
-  setIsRowHovered,
 }: {
   detailedBooking: DetailedBooking;
   detailedBookingHours: WeeklyHours;
@@ -229,8 +224,6 @@ function DetailedBookingCell({
   setHourDragValue: React.Dispatch<React.SetStateAction<number | undefined>>;
   setStartDragWeek: React.Dispatch<React.SetStateAction<number | undefined>>;
   setCurrentDragWeek: React.Dispatch<React.SetStateAction<number | undefined>>;
-  isRowHovered: boolean;
-  setIsRowHovered: React.Dispatch<React.SetStateAction<boolean>>;
 }) {
   const { setConsultants } = useContext(FilteredContext);
   const [hours, setHours] = useState(detailedBookingHours.hours);
@@ -262,12 +255,6 @@ function DetailedBookingCell({
     }
   }
 
-  useEffect(() => {
-    if (!isRowHovered && inputRef.current) {
-      inputRef.current.blur();
-    }
-  }, [isRowHovered]);
-
   useEffect(() => {
     setHours(detailedBookingHours.hours);
     setOldHours(detailedBookingHours.hours);
@@ -326,10 +313,8 @@ function DetailedBookingCell({
         }`}
         onMouseEnter={() => {
           setIsChangingHours(true);
-          setIsRowHovered(true);
         }}
         onMouseLeave={() => {
-          setIsRowHovered(false);
           setIsChangingHours(false);
           !isInputFocused && updateSingularHours();
         }}