Skip to content

Scheduling profiler: UX tweaks #21971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 27, 2021
Merged

Scheduling profiler: UX tweaks #21971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6719de
Sceduling profiler: Merged separate active/hovered view refs into one
Jul 27, 2021
d70b583
Don't show tooltips when mouse is down on an active view/surface/tool
Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-devtools-scheduling-profiler/src/CanvasPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ function AutoSizedCanvas({data, height, width}: AutoSizedCanvasProps) {
);
}}
</ContextMenu>
{!isContextMenuShown && (
{!isContextMenuShown && !surfaceRef.current.hasActiveView() && (
<EventTooltip
data={data}
hoveredEvent={hoveredEvent}
Expand Down
18 changes: 5 additions & 13 deletions packages/react-devtools-scheduling-profiler/src/content-views/FlamechartView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import type {
MouseMoveInteraction,
Rect,
Size,
ViewRef,
ViewRefs,
} from '../view-base';

import {
Expand Down Expand Up @@ -246,11 +246,7 @@ class FlamechartStackLayerView extends View {
/**
* @private
*/
_handleMouseMove(
interaction: MouseMoveInteraction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
_handleMouseMove(interaction: MouseMoveInteraction, viewRefs: ViewRefs) {
const {_stackLayer, frame, _intrinsicSize, _onHover, visibleArea} = this;
const {location} = interaction.payload;
if (!_onHover || !rectContainsPoint(location, visibleArea)) {
Expand All @@ -270,7 +266,7 @@ class FlamechartStackLayerView extends View {
const x = Math.floor(timestampToPosition(timestamp, scaleFactor, frame));
if (x <= location.x && x + width >= location.x) {
this.currentCursor = 'pointer';
hoveredViewRef.current = this;
viewRefs.hoveredView = this;
_onHover(flamechartStackFrame);
return;
}
Expand All @@ -287,14 +283,10 @@ class FlamechartStackLayerView extends View {

_didGrab: boolean = false;

handleInteraction(
interaction: Interaction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
handleInteraction(interaction: Interaction, viewRefs: ViewRefs) {
switch (interaction.type) {
case 'mousemove':
this._handleMouseMove(interaction, activeViewRef, hoveredViewRef);
this._handleMouseMove(interaction, viewRefs);
break;
}
}
Expand Down
18 changes: 5 additions & 13 deletions packages/react-devtools-scheduling-profiler/src/content-views/NativeEventsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
MouseMoveInteraction,
Rect,
Size,
ViewRef,
ViewRefs,
} from '../view-base';

import {
Expand Down Expand Up @@ -255,11 +255,7 @@ export class NativeEventsView extends View {
/**
* @private
*/
_handleMouseMove(
interaction: MouseMoveInteraction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
_handleMouseMove(interaction: MouseMoveInteraction, viewRefs: ViewRefs) {
const {frame, _intrinsicSize, onHover, visibleArea} = this;
if (!onHover) {
return;
Expand Down Expand Up @@ -290,7 +286,7 @@ export class NativeEventsView extends View {
) {
this.currentCursor = 'pointer';

hoveredViewRef.current = this;
viewRefs.hoveredView = this;

onHover(nativeEvent);
return;
Expand All @@ -301,14 +297,10 @@ export class NativeEventsView extends View {
onHover(null);
}

handleInteraction(
interaction: Interaction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
handleInteraction(interaction: Interaction, viewRefs: ViewRefs) {
switch (interaction.type) {
case 'mousemove':
this._handleMouseMove(interaction, activeViewRef, hoveredViewRef);
this._handleMouseMove(interaction, viewRefs);
break;
}
}
Expand Down
18 changes: 5 additions & 13 deletions packages/react-devtools-scheduling-profiler/src/content-views/ReactEventsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
MouseMoveInteraction,
Rect,
Size,
ViewRef,
ViewRefs,
} from '../view-base';

import {
Expand Down Expand Up @@ -231,11 +231,7 @@ export class ReactEventsView extends View {
/**
* @private
*/
_handleMouseMove(
interaction: MouseMoveInteraction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
_handleMouseMove(interaction: MouseMoveInteraction, viewRefs: ViewRefs) {
const {frame, onHover, visibleArea} = this;
if (!onHover) {
return;
Expand Down Expand Up @@ -271,7 +267,7 @@ export class ReactEventsView extends View {
hoverTimestamp <= timestamp + eventTimestampAllowance
) {
this.currentCursor = 'pointer';
hoveredViewRef.current = this;
viewRefs.hoveredView = this;
onHover(event);
return;
}
Expand All @@ -280,14 +276,10 @@ export class ReactEventsView extends View {
onHover(null);
}

handleInteraction(
interaction: Interaction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
handleInteraction(interaction: Interaction, viewRefs: ViewRefs) {
switch (interaction.type) {
case 'mousemove':
this._handleMouseMove(interaction, activeViewRef, hoveredViewRef);
this._handleMouseMove(interaction, viewRefs);
break;
}
}
Expand Down
18 changes: 5 additions & 13 deletions packages/react-devtools-scheduling-profiler/src/content-views/ReactMeasuresView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
MouseMoveInteraction,
Rect,
Size,
ViewRef,
ViewRefs,
} from '../view-base';

import {
Expand Down Expand Up @@ -256,11 +256,7 @@ export class ReactMeasuresView extends View {
/**
* @private
*/
_handleMouseMove(
interaction: MouseMoveInteraction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
_handleMouseMove(interaction: MouseMoveInteraction, viewRefs: ViewRefs) {
const {
frame,
_intrinsicSize,
Expand Down Expand Up @@ -311,7 +307,7 @@ export class ReactMeasuresView extends View {
hoverTimestamp <= timestamp + duration
) {
this.currentCursor = 'pointer';
hoveredViewRef.current = this;
viewRefs.hoveredView = this;
onHover(measure);
return;
}
Expand All @@ -320,14 +316,10 @@ export class ReactMeasuresView extends View {
onHover(null);
}

handleInteraction(
interaction: Interaction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
handleInteraction(interaction: Interaction, viewRefs: ViewRefs) {
switch (interaction.type) {
case 'mousemove':
this._handleMouseMove(interaction, activeViewRef, hoveredViewRef);
this._handleMouseMove(interaction, viewRefs);
break;
}
}
Expand Down
18 changes: 5 additions & 13 deletions packages/react-devtools-scheduling-profiler/src/content-views/UserTimingMarksView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
MouseMoveInteraction,
Rect,
Size,
ViewRef,
ViewRefs,
} from '../view-base';

import {
Expand Down Expand Up @@ -191,11 +191,7 @@ export class UserTimingMarksView extends View {
/**
* @private
*/
_handleMouseMove(
interaction: MouseMoveInteraction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
_handleMouseMove(interaction: MouseMoveInteraction, viewRefs: ViewRefs) {
const {frame, onHover, visibleArea} = this;
if (!onHover) {
return;
Expand Down Expand Up @@ -229,7 +225,7 @@ export class UserTimingMarksView extends View {
hoverTimestamp <= timestamp + markTimestampAllowance
) {
this.currentCursor = 'pointer';
hoveredViewRef.current = this;
viewRefs.hoveredView = this;
onHover(mark);
return;
}
Expand All @@ -238,14 +234,10 @@ export class UserTimingMarksView extends View {
onHover(null);
}

handleInteraction(
interaction: Interaction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
handleInteraction(interaction: Interaction, viewRefs: ViewRefs) {
switch (interaction.type) {
case 'mousemove':
this._handleMouseMove(interaction, activeViewRef, hoveredViewRef);
this._handleMouseMove(interaction, viewRefs);
break;
}
}
Expand Down
42 changes: 13 additions & 29 deletions packages/react-devtools-scheduling-profiler/src/view-base/HorizontalPanAndZoomView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import type {
} from './useCanvasInteraction';
import type {Rect} from './geometry';
import type {ScrollState} from './utils/scrollState';
import type {ViewRef} from './Surface';
import type {ViewRefs} from './Surface';

import {Surface} from './Surface';
import {View} from './View';
Expand Down Expand Up @@ -156,34 +156,26 @@ export class HorizontalPanAndZoomView extends View {
this._setScrollState(newState);
}

_handleMouseDown(
interaction: MouseDownInteraction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
_handleMouseDown(interaction: MouseDownInteraction, viewRefs: ViewRefs) {
if (rectContainsPoint(interaction.payload.location, this.frame)) {
this._isPanning = true;

activeViewRef.current = this;
viewRefs.activeView = this;

this.currentCursor = 'grabbing';
}
}

_handleMouseMove(
interaction: MouseMoveInteraction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
_handleMouseMove(interaction: MouseMoveInteraction, viewRefs: ViewRefs) {
const isHovered = rectContainsPoint(
interaction.payload.location,
this.frame,
);
if (isHovered) {
hoveredViewRef.current = this;
viewRefs.hoveredView = this;
}

if (activeViewRef.current === this) {
if (viewRefs.activeView === this) {
this.currentCursor = 'grabbing';
} else if (isHovered) {
this.currentCursor = 'grab';
Expand All @@ -200,17 +192,13 @@ export class HorizontalPanAndZoomView extends View {
this._setStateAndInformCallbacksIfChanged(newState);
}

_handleMouseUp(
interaction: MouseUpInteraction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
_handleMouseUp(interaction: MouseUpInteraction, viewRefs: ViewRefs) {
if (this._isPanning) {
this._isPanning = false;
}

if (activeViewRef.current === this) {
activeViewRef.current = null;
if (viewRefs.activeView === this) {
viewRefs.activeView = null;
}
}

Expand Down Expand Up @@ -273,20 +261,16 @@ export class HorizontalPanAndZoomView extends View {
this._setStateAndInformCallbacksIfChanged(newState);
}

handleInteraction(
interaction: Interaction,
activeViewRef: ViewRef,
hoveredViewRef: ViewRef,
) {
handleInteraction(interaction: Interaction, viewRefs: ViewRefs) {
switch (interaction.type) {
case 'mousedown':
this._handleMouseDown(interaction, activeViewRef, hoveredViewRef);
this._handleMouseDown(interaction, viewRefs);
break;
case 'mousemove':
this._handleMouseMove(interaction, activeViewRef, hoveredViewRef);
this._handleMouseMove(interaction, viewRefs);
break;
case 'mouseup':
this._handleMouseUp(interaction, activeViewRef, hoveredViewRef);
this._handleMouseUp(interaction, viewRefs);
break;
case 'wheel-plain':
this._handleWheelPlain(interaction);
Expand Down
Loading