Skip to content

Commit

Permalink
pass onclick directly to network cell (#142)
Browse files Browse the repository at this point in the history
  • Loading branch information
yuyi-sl committed Aug 12, 2024
1 parent 7c3e9df commit 10232b3
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 33 deletions.
1 change: 0 additions & 1 deletion src/Components/Common/Tooltip/Tooltip.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ const Tooltip = forwardRef(({
// Merge the child's original props, with the new props provided by the trigger.
...mergeProps(child.props, eventedProps),
})}
{/* <TooltipTransition isOpen={state.isOpen}> */}
<TooltipTransition isOpen={state.isOpen}>
<TooltipLabel
ref={tooltipRef}
Expand Down
11 changes: 9 additions & 2 deletions src/Components/NetworkTable/NetworkCellValue.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ const context = classNames.bind(Styles);

const NetworkCellValue = ({
datakey,
unit,
onClick,
payload,
unit,
}) => {
const formattedValue = formatValue(datakey, payload[datakey], unit, payload);
const shouldDisplayTooltip = (
Expand Down Expand Up @@ -44,7 +45,11 @@ const NetworkCellValue = ({
delay={500}
title={getTitle()}
>
<div className={context('value-text', datakey)}>
{/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
<div
className={context('value-text', datakey)}
onClick={onClick}
>
{formattedValue}
</div>
</Tooltip>
Expand All @@ -53,11 +58,13 @@ const NetworkCellValue = ({

NetworkCellValue.propTypes = {
datakey: PropTypes.string.isRequired,
onClick: PropTypes.func,
payload: PropTypes.object,
unit: PropTypes.string,
};

NetworkCellValue.defaultProps = {
onClick: () => {},
payload: {},
unit: null,
};
Expand Down
4 changes: 4 additions & 0 deletions src/Components/NetworkTable/NetworkTableBody.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ const NetworkTableBody = ({ height }) => {
}, [data, ref]);

const handleReqSelect = (payload) => {
if (selectedReqIndex === payload.index) {
return;
}

actions.updateScrollToIndex(payload.index);
actions.selectRequest(payload);
callbacks.onRequestSelect(payload);
Expand Down
55 changes: 25 additions & 30 deletions src/Components/NetworkTable/NetworkTableRow.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ const NetworkTableRow = ({
const { state } = useNetwork();
const showReqDetail = state.get('showReqDetail');
const { showWaterfall } = useTheme();

const columns = getViewerFields(showReqDetail, showWaterfall);
const handleSelectRequest = () => onSelect(entry);

const rowProps = {
className: context(
Expand All @@ -33,39 +31,36 @@ const NetworkTableRow = ({
{ highlight: scrollHighlight },
),
id: ROW_ID_PREFIX + entry.index,
onClick: handleSelectRequest,
onClick: () => onSelect(entry),
};

return (
<div style={{ ...style }}>
<div {...rowProps}>
{Object.entries(columns)
.map(([datakey, {
key,
unit,
}]) => (
<div
key={key}
className={context(
'table-column', datakey,
{ 'limited-cols': showReqDetail },
{ 'show-waterfall': showWaterfall },
)}
>
{(key === 'waterfall' && entry.time ? (
<TimeChart
maxTime={maxTime}
timings={entry.timings}
/>
) : (
<NetworkCellValue
datakey={key}
payload={entry}
unit={unit}
/>
))}
</div>
))}
{Object.entries(columns).map(([datakey, { key, unit }]) => (
<div
key={key}
className={context(
'table-column', datakey,
{ 'limited-cols': showReqDetail },
{ 'show-waterfall': showWaterfall },
)}
>
{(key === 'waterfall' && entry.time ? (
<TimeChart
maxTime={maxTime}
timings={entry.timings}
/>
) : (
<NetworkCellValue
datakey={key}
onClick={rowProps.onClick}
payload={entry}
unit={unit}
/>
))}
</div>
))}
</div>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ exports[`NetworkTableRow renders without crashing 1`] = `
>
<NetworkCellValue
datakey="filename"
onClick={[Function]}
payload={
Object {
"domain": "developer.mozilla.org",
Expand Down Expand Up @@ -161,6 +162,7 @@ exports[`NetworkTableRow renders without crashing 1`] = `
>
<NetworkCellValue
datakey="domain"
onClick={[Function]}
payload={
Object {
"domain": "developer.mozilla.org",
Expand Down Expand Up @@ -200,6 +202,7 @@ exports[`NetworkTableRow renders without crashing 1`] = `
>
<NetworkCellValue
datakey="status"
onClick={[Function]}
payload={
Object {
"domain": "developer.mozilla.org",
Expand Down Expand Up @@ -239,6 +242,7 @@ exports[`NetworkTableRow renders without crashing 1`] = `
>
<NetworkCellValue
datakey="method"
onClick={[Function]}
payload={
Object {
"domain": "developer.mozilla.org",
Expand Down Expand Up @@ -278,6 +282,7 @@ exports[`NetworkTableRow renders without crashing 1`] = `
>
<NetworkCellValue
datakey="type"
onClick={[Function]}
payload={
Object {
"domain": "developer.mozilla.org",
Expand Down Expand Up @@ -317,6 +322,7 @@ exports[`NetworkTableRow renders without crashing 1`] = `
>
<NetworkCellValue
datakey="size"
onClick={[Function]}
payload={
Object {
"domain": "developer.mozilla.org",
Expand Down Expand Up @@ -356,6 +362,7 @@ exports[`NetworkTableRow renders without crashing 1`] = `
>
<NetworkCellValue
datakey="time"
onClick={[Function]}
payload={
Object {
"domain": "developer.mozilla.org",
Expand Down Expand Up @@ -393,6 +400,7 @@ exports[`NetworkTableRow renders without crashing 1`] = `
>
<NetworkCellValue
datakey="waterfall"
onClick={[Function]}
payload={
Object {
"domain": "developer.mozilla.org",
Expand Down

0 comments on commit 10232b3

Please sign in to comment.