mirror of
https://github.com/fleetdm/fleet
synced 2026-04-26 16:07:21 +00:00
## Addresses #9988 * Adjust copy in tooltips to take up less width * Refactor table headers to take an optional "isLastColumn" property that is set to true when that header is in the last column. * Use above property in conjunction with presence of TooltipWrapper as a value for the header cell to add a class specific to that state. * Use that class to adjust the location of the tooltip text and the min-width of the column to avoid the bug. The 3 states which exhibited this bug, now fixed: <img width="1496" alt="Screenshot 2023-03-27 at 4 36 01 PM" src="https://user-images.githubusercontent.com/61553566/228091971-4d5d034d-55c5-4921-955a-4946119f7785.png"> <img width="1496" alt="Screenshot 2023-03-27 at 4 36 12 PM" src="https://user-images.githubusercontent.com/61553566/228091968-adf90b32-8fd2-45d9-b56d-a64c654151ef.png"> <img width="1496" alt="Screenshot 2023-03-27 at 4 36 24 PM" src="https://user-images.githubusercontent.com/61553566/228091962-ff626daa-b13d-4093-b34f-de704b820161.png"> # Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Changes file added for user-visible changes in `changes/` - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
55 lines
1.2 KiB
TypeScript
55 lines
1.2 KiB
TypeScript
import React from "react";
|
|
|
|
import classnames from "classnames";
|
|
|
|
interface IHeaderCellProps {
|
|
value: string | JSX.Element; // either a string or a TooltipWrapper
|
|
isSortedDesc?: boolean;
|
|
disableSortBy?: boolean;
|
|
isLastColumn?: boolean;
|
|
}
|
|
|
|
const HeaderCell = ({
|
|
value,
|
|
isSortedDesc,
|
|
disableSortBy,
|
|
isLastColumn = false,
|
|
}: IHeaderCellProps): JSX.Element => {
|
|
let sortArrowClass = "";
|
|
if (isSortedDesc === undefined) {
|
|
sortArrowClass = "";
|
|
} else if (isSortedDesc) {
|
|
sortArrowClass = "descending";
|
|
} else {
|
|
sortArrowClass = "ascending";
|
|
}
|
|
|
|
let lastColumnHeaderWithTooltipClass = "";
|
|
if (
|
|
typeof value !== "string" &&
|
|
value.type.name === "TooltipWrapper" &&
|
|
isLastColumn
|
|
) {
|
|
lastColumnHeaderWithTooltipClass = "last-col-header-with-tip";
|
|
}
|
|
|
|
return (
|
|
<div
|
|
className={classnames(
|
|
"header-cell",
|
|
sortArrowClass,
|
|
lastColumnHeaderWithTooltipClass
|
|
)}
|
|
>
|
|
<span>{value}</span>
|
|
{!disableSortBy && (
|
|
<div className="sort-arrows">
|
|
<span className="ascending-arrow" />
|
|
<span className="descending-arrow" />
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export default HeaderCell;
|