Services_Bugs :- UI changes of Purchase Modal. #523
@ -39,14 +39,12 @@ const TaskReportFilterPanel = ({ handleFilter }) => {
|
|||||||
dateTo: localToUtc(formData.dateTo),
|
dateTo: localToUtc(formData.dateTo),
|
||||||
};
|
};
|
||||||
handleFilter(filterPayload);
|
handleFilter(filterPayload);
|
||||||
closePanel();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const onClear = () => {
|
const onClear = () => {
|
||||||
setResetKey((prev) => prev + 1);
|
setResetKey((prev) => prev + 1);
|
||||||
handleFilter(TaskReportDefaultValue);
|
handleFilter(TaskReportDefaultValue);
|
||||||
reset(TaskReportDefaultValue);
|
reset(TaskReportDefaultValue);
|
||||||
closePanel();
|
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
<FormProvider {...methods}>
|
<FormProvider {...methods}>
|
||||||
|
|||||||
@ -204,24 +204,34 @@ const TaskReportList = () => {
|
|||||||
<HoverPopup
|
<HoverPopup
|
||||||
id="total_pending_task"
|
id="total_pending_task"
|
||||||
title="Total Pending Task"
|
title="Total Pending Task"
|
||||||
content={<p>This shows the total pending tasks for each activity on that date.</p>}
|
content={
|
||||||
|
<div className="text-wrap" style={{ maxWidth: "200px" }}>
|
||||||
|
This shows the total pending tasks for each activity on that date.
|
||||||
|
</div>
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<i className="bx bx-xs ms-1 bx-info-circle cursor-pointer"></i>
|
<i className="bx bx-xs ms-1 bx-info-circle cursor-pointer"></i>
|
||||||
</HoverPopup>
|
</HoverPopup>
|
||||||
</span>
|
</span>
|
||||||
</th>
|
</th>
|
||||||
|
|
||||||
<th>
|
<th>
|
||||||
<span>
|
<span>
|
||||||
Reported/Planned{" "}
|
Reported/Planned{" "}
|
||||||
<HoverPopup
|
<HoverPopup
|
||||||
id="reportes_and_planned_task"
|
id="reportes_and_planned_task"
|
||||||
title="Reported and Planned Task"
|
title="Reported and Planned Task"
|
||||||
content={<p>This shows the reported versus planned tasks for each activity on that date.</p>}
|
content={
|
||||||
|
<div className="text-wrap" style={{ maxWidth: "200px" }}>
|
||||||
|
This shows the reported versus planned tasks for each activity on that date.
|
||||||
|
</div>
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<i className="bx bx-xs ms-1 bx-info-circle cursor-pointer"></i>
|
<i className="bx bx-xs ms-1 bx-info-circle cursor-pointer"></i>
|
||||||
</HoverPopup>
|
</HoverPopup>
|
||||||
</span>
|
</span>
|
||||||
</th>
|
</th>
|
||||||
|
|
||||||
<th>Assign Date</th>
|
<th>Assign Date</th>
|
||||||
<th>Team</th>
|
<th>Team</th>
|
||||||
<th className="text-center">Actions</th>
|
<th className="text-center">Actions</th>
|
||||||
|
|||||||
@ -252,16 +252,15 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
<HoverPopup
|
<HoverPopup
|
||||||
title="Payment Type"
|
title="Payment Type"
|
||||||
id="payment_type"
|
id="payment_type"
|
||||||
|
|
||||||
content={
|
content={
|
||||||
<div className=" w-50">
|
<div className="text-wrap" style={{ maxWidth: "200px" }}>
|
||||||
<p>
|
|
||||||
Choose whether the payment amount varies or remains fixed
|
Choose whether the payment amount varies or remains fixed
|
||||||
each cycle.
|
each cycle.
|
||||||
<br />
|
<br />
|
||||||
<strong>Is Variable:</strong> Amount changes per cycle.
|
<strong>Is Variable:</strong> Amount changes per cycle.
|
||||||
<br />
|
<br />
|
||||||
<strong>Fixed:</strong> Amount stays constant.
|
<strong>Fixed:</strong> Amount stays constant.
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
@ -476,10 +475,10 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
title="Payment Buffer Days"
|
title="Payment Buffer Days"
|
||||||
id="payment_buffer_days"
|
id="payment_buffer_days"
|
||||||
content={
|
content={
|
||||||
<p>
|
<div className="text-wrap" style={{ maxWidth: "200px" }}>
|
||||||
Number of extra days allowed after the due date before
|
Number of extra days allowed after the due date before
|
||||||
payment is considered late.
|
payment is considered late.
|
||||||
</p>
|
</div>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<i className="bx bx-info-circle bx-xs text-muted cursor-pointer"></i>
|
<i className="bx bx-info-circle bx-xs text-muted cursor-pointer"></i>
|
||||||
@ -511,10 +510,11 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
<HoverPopup
|
<HoverPopup
|
||||||
title="End Date"
|
title="End Date"
|
||||||
id="end_date"
|
id="end_date"
|
||||||
|
|
||||||
content={
|
content={
|
||||||
<p>
|
<div className="text-wrap" style={{ maxWidth: "200px" }}>
|
||||||
The date when the last payment in the recurrence occurs.
|
The date when the last payment in the recurrence occurs.
|
||||||
</p>
|
</div>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<i className="bx bx-info-circle bx-xs text-muted cursor-pointer"></i>
|
<i className="bx bx-info-circle bx-xs text-muted cursor-pointer"></i>
|
||||||
|
|||||||
@ -58,117 +58,43 @@ const HoverPopup = ({
|
|||||||
return () => document.removeEventListener("click", handler);
|
return () => document.removeEventListener("click", handler);
|
||||||
}, [Mode, visible, dispatch, id]);
|
}, [Mode, visible, dispatch, id]);
|
||||||
|
|
||||||
// Positioning effect: respects align prop and stays inside boundary (drawer)
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!visible || !popupRef.current || !triggerRef.current) return;
|
if (!visible || !popupRef.current || !triggerRef.current) return;
|
||||||
|
|
||||||
// run in next frame so DOM/layout settles
|
|
||||||
requestAnimationFrame(() => {
|
requestAnimationFrame(() => {
|
||||||
const popup = popupRef.current;
|
const popup = popupRef.current;
|
||||||
|
const boundaryEl = (boundaryRef && boundaryRef.current) || popup.parentElement;
|
||||||
// choose boundary: provided boundaryRef or nearest positioned parent (popup.parentElement)
|
|
||||||
const boundaryEl =
|
|
||||||
(boundaryRef && boundaryRef.current) || popup.parentElement;
|
|
||||||
if (!boundaryEl) return;
|
if (!boundaryEl) return;
|
||||||
|
|
||||||
const boundaryRect = boundaryEl.getBoundingClientRect();
|
const boundaryRect = boundaryEl.getBoundingClientRect();
|
||||||
const triggerRect = triggerRef.current.getBoundingClientRect();
|
const triggerRect = triggerRef.current.getBoundingClientRect();
|
||||||
|
|
||||||
// reset styles first
|
|
||||||
popup.style.left = "";
|
popup.style.left = "";
|
||||||
popup.style.right = "";
|
popup.style.right = "";
|
||||||
popup.style.transform = "";
|
popup.style.transform = "";
|
||||||
popup.style.top = "";
|
popup.style.top = "";
|
||||||
|
|
||||||
const popupRect = popup.getBoundingClientRect();
|
const popupRect = popup.getBoundingClientRect();
|
||||||
const parentRect = boundaryRect; // alias
|
const triggerCenterX = triggerRect.left + triggerRect.width / 2 - boundaryRect.left;
|
||||||
|
let left = triggerCenterX - popupRect.width / 2;
|
||||||
|
|
||||||
// Convert trigger center to parent coordinates
|
// Clamp to boundaries
|
||||||
const triggerCenterX =
|
left = Math.max(0, Math.min(left, boundaryRect.width - popupRect.width));
|
||||||
triggerRect.left + triggerRect.width / 2 - parentRect.left;
|
popup.style.left = `${left}px`;
|
||||||
|
|
||||||
// preferred left so popup center aligns to trigger center:
|
|
||||||
const preferredLeft = triggerCenterX - popupRect.width / 2;
|
|
||||||
|
|
||||||
// Helpers to set styles in parent's coordinate system:
|
|
||||||
const setLeft = (leftPx) => {
|
|
||||||
popup.style.left = `${leftPx}px`;
|
|
||||||
popup.style.right = "auto";
|
|
||||||
popup.style.transform = "none";
|
|
||||||
};
|
|
||||||
const setRight = (rightPx) => {
|
|
||||||
popup.style.left = "auto";
|
|
||||||
popup.style.right = `${rightPx}px`;
|
|
||||||
popup.style.transform = "none";
|
|
||||||
};
|
|
||||||
|
|
||||||
// If user forced align:
|
|
||||||
if (align === "left") {
|
|
||||||
// align popup's left to parent's left (0)
|
|
||||||
setLeft(0);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (align === "right") {
|
|
||||||
// align popup's right to parent's right (0)
|
|
||||||
setRight(0);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (align === "center") {
|
|
||||||
popup.style.left = "50%";
|
|
||||||
popup.style.right = "auto";
|
|
||||||
popup.style.transform = "translateX(-50%)";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// align === "auto": try preferred centered position, but flip fully if overflow
|
|
||||||
// clamp preferredLeft to boundaries so it doesn't render partially outside
|
|
||||||
const leftIfCentered = Math.max(
|
|
||||||
0,
|
|
||||||
Math.min(preferredLeft, parentRect.width - popupRect.width)
|
|
||||||
);
|
|
||||||
|
|
||||||
// if centered fits, use it
|
|
||||||
if (leftIfCentered === preferredLeft) {
|
|
||||||
setLeft(leftIfCentered);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// if centering would overflow right -> stick popup fully to left (left=0)
|
|
||||||
if (preferredLeft > parentRect.width - popupRect.width) {
|
|
||||||
// place popup so its right aligns to parent's right
|
|
||||||
// i.e., left = parent width - popup width
|
|
||||||
setLeft(parentRect.width - popupRect.width);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// if centering would overflow left -> stick popup fully to left=0
|
|
||||||
if (preferredLeft < 0) {
|
|
||||||
setLeft(0);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// fallback center
|
|
||||||
setLeft(leftIfCentered);
|
|
||||||
});
|
});
|
||||||
}, [visible, align, boundaryRef]);
|
}, [visible, align, boundaryRef]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="d-inline-block position-relative" // <-- ADD THIS !!
|
className="d-inline-block position-relative" // <-- ADD THIS !!
|
||||||
style={{
|
style={{ overflow: "visible" }}
|
||||||
maxWidth: "calc(700px - 100px)",
|
|
||||||
width: "100%",
|
|
||||||
wordWrap: "break-word",
|
|
||||||
overflow: "visible", // also make sure popup isn't clipped
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className="d-inline-block"
|
|
||||||
ref={triggerRef}
|
ref={triggerRef}
|
||||||
onMouseEnter={handleMouseEnter}
|
onMouseEnter={handleMouseEnter}
|
||||||
onMouseLeave={handleMouseLeave}
|
onMouseLeave={handleMouseLeave}
|
||||||
onClick={handleClick}
|
onClick={handleClick}
|
||||||
style={{ cursor: "pointer" }}
|
style={{ cursor: "pointer", display: "inline-block" }}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
@ -180,8 +106,9 @@ const HoverPopup = ({
|
|||||||
style={{
|
style={{
|
||||||
zIndex: 2000,
|
zIndex: 2000,
|
||||||
top: "100%",
|
top: "100%",
|
||||||
width: "max-content",
|
minWidth: "200px",
|
||||||
minWidth: "120px",
|
maxWidth: "300px",
|
||||||
|
wordWrap: "break-word",
|
||||||
}}
|
}}
|
||||||
onClick={(e) => e.stopPropagation()}
|
onClick={(e) => e.stopPropagation()}
|
||||||
>
|
>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user