Skip to content

[Windows] Add onContextMenu callback to GestureView #599

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
erictraut merged 8 commits into from
Apr 25, 2018
Merged

[Windows] Add onContextMenu callback to GestureView #599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a55aab
add isRightButton property to GestureView tap
Apr 17, 2018
9c193b0
generic handling of mouse tap on GestureView
Apr 18, 2018
0b59cdb
add onContextMenu handling
Apr 20, 2018
b006cb4
add conversion for Mac
Apr 23, 2018
15c433c
cleanup whitespace changes
Apr 23, 2018
b1ea334
PR fixes: change MouseEvent.button back to number, unify comment form…
Apr 23, 2018
ce6fb5f
Merge branch 'master' into windows-right-button-gestureview
Apr 25, 2018
ba766e5
rename onContextMenuGesture to onContextMenu; add e.stopPropagation t…
Apr 25, 2018
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: 2 additions & 0 deletions src/common/Types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,7 @@ export interface TapGestureState extends GestureState {
clientY: number;
pageX: number;
pageY: number;
isRightButton?: boolean; // UWP only, for desktop context menu
Copy link
Copy Markdown
Contributor

@erictraut erictraut Apr 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency with MouseEvent, this should be called "button", it should return the integer corresponding to the button, and it should be implemented for all mouse-based platforms (not just UWP).

Copy link
Copy Markdown
Contributor

@erictraut erictraut Apr 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, since this is an addition to the public interface, it will need to be documented (in GestureView.md) and added to the ReactXP test app (GestureViewTest.tsx).

}

export enum GestureMouseCursor {
Expand Down Expand Up @@ -1197,6 +1198,7 @@ export interface TouchEvent extends SyntheticEvent {
pageX?: number;
pageY?: number;
touches: TouchList;
isRightButton?: boolean; // UWP only
}

export interface WheelEvent extends SyntheticEvent {
Expand Down
2 changes: 1 addition & 1 deletion src/native-common/GestureView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ export abstract class GestureView extends ViewBase<Types.GestureViewProps, {}> {
return panEvent;
}

private _sendTapEvent(e: Types.TouchEvent) {
protected _sendTapEvent(e: Types.TouchEvent) {
if (this.props.onTap) {
const tapEvent: Types.TapGestureState = {
pageX: e.pageX!!!,
Expand Down
17 changes: 16 additions & 1 deletion src/windows/GestureView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class GestureView extends BaseGestureView {
super(props);
}

protected _getPreferredPanRatio(): number {
protected _getPreferredPanRatio(): number {
return _preferredPanRatio;
}

Expand All @@ -37,6 +37,21 @@ export class GestureView extends BaseGestureView {

return timestamp.valueOf();
}

protected _sendTapEvent(e: Types.TouchEvent) {
if (this.props.onTap) {
const tapEvent: Types.TapGestureState = {
pageX: e.pageX!!!,
pageY: e.pageY!!!,
clientX: e.locationX!!!,
clientY: e.locationY!!!,
timeStamp: e.timeStamp,
isRightButton: e.isRightButton
};

this.props.onTap(tapEvent);
}
}
}

export default GestureView;