Skip to content

Enable context menus for mobile #698

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

Open
WoozyG wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Enable context menus for mobile #698

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a292be8
Remove mobile "Fill" overlay, implement context menu for all
WoozyG Feb 28, 2019
09bc9c8
Convert Spreadsheet to use standard connector context menu handling
WoozyG Mar 12, 2019
d649e13
Merge branch 'master' into ContextMenu
Mar 12, 2019
33613da
Fix setSheetHidden()
WoozyG Mar 13, 2019
3fd33c6
Revert "Fix setSheetHidden()"
WoozyG Mar 13, 2019
d87dc00
Merge branch 'master' into ContextMenu
Mar 13, 2019
ced73af
fixed a couple things preventing context menus on cells with custom
WoozyG Mar 13, 2019
92ff864
Fix double-adding of scroll position that caused mobile zoomed context
WoozyG Mar 14, 2019
521416a
Removed extra whitespace
Mar 26, 2019
8f65235
Removed more extra whitespace
Mar 26, 2019
252fc75
Updated screenshots
Apr 9, 2019
0661c58
Updated more screenshots
Apr 10, 2019
45ded6f
Update unit tests to handle lack of contextClick in PhantomJS.
WoozyG Apr 10, 2019
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
126 changes: 0 additions & 126 deletions vaadin-spreadsheet/src/main/java/com/vaadin/addon/spreadsheet/client/SelectionWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,9 +824,6 @@ public void setPosition(int col1, int col2, int row1, int row2) {
setFillMode(false);
}

if (!dragging) {
showTouchActions();
}
}

public void setPaintPosition(int col1, int col2, int row1, int row2) {
Expand All @@ -847,128 +844,6 @@ public void setPaintPosition(int col1, int col2, int row1, int row2) {
}
}

private void showTouchActions() {
if (touchMode) {
// show touch actions in popup

if (touchActions != null) {
// remove old
touchActions.hide();
}

touchActions = new VOverlay(true);
touchActions.setOwner((Widget) sheetWidget.actionHandler);
touchActions.addStyleName("v-contextmenu");

final MenuBar m = new MenuBar();
m.addItem(new SafeHtmlBuilder().appendEscaped("Fill").toSafeHtml(),
new ScheduledCommand() {

@Override
public void execute() {
setFillMode(true);
touchActions.hide();
}
});

touchActions.add(m);

Scheduler.get().scheduleDeferred(new ScheduledCommand() {

@Override
public void execute() {
touchActions
.setPopupPositionAndShow(new PositionCallback() {

@Override
public void setPosition(int offsetWidth,
int offsetHeight) {
// above top border
int top = 0;
int left = 0;
int bottom = 0;
int width = 0;
int parentTop = 0;
if (topRight != null
&& topRight.isVisible()) {
top = topRight.top.getAbsoluteTop();
left = topRight.top.getAbsoluteLeft();
width = topRight.top.getClientWidth();
bottom = topRight.bottom
.getAbsoluteBottom() + 5;
if (topLeft.isVisible()) {
width += topLeft.top
.getClientWidth();
}
if (bottomRight.isVisible()) {
bottom = bottomRight.bottom
.getAbsoluteBottom() + 5;
}
} else if (topLeft != null
&& topLeft.isVisible()) {
top = topLeft.top.getAbsoluteTop();
left = topLeft.top.getAbsoluteLeft();
width = topLeft.top.getClientWidth();
bottom = topLeft.bottom
.getAbsoluteBottom() + 5;
if (bottomLeft.isVisible()) {
bottom = bottomLeft.bottom
.getAbsoluteBottom() + 5;
}
} else if (bottomLeft != null
&& bottomLeft.isVisible()) {
top = bottomLeft.top.getAbsoluteTop();
left = bottomLeft.top.getAbsoluteLeft();
width = bottomLeft.top.getClientWidth();
bottom = bottomLeft.bottom
.getAbsoluteBottom() + 5;
if (bottomRight.isVisible()) {
width += bottomRight.top
.getClientWidth();
}
} else {
top = bottomRight.top.getAbsoluteTop();
left = bottomRight.top
.getAbsoluteLeft();
width = bottomRight.top
.getClientWidth();
bottom = bottomRight.bottom
.getAbsoluteBottom() + 5;
}
if (width > sheetWidget.getElement()
.getClientWidth()) {
width = sheetWidget.getElement()
.getClientWidth();
}

if (sheetWidget.hasFrozenRows()) {
parentTop = sheetWidget
.getTopRightPane()
.getAbsoluteTop();
} else {
parentTop = sheetWidget
.getBottomRightPane()
.getAbsoluteTop();
}

top -= offsetHeight + 5;
left += (width / 2) - (offsetWidth / 2);

if (parentTop > top) {
// put under instead
top = bottom + 5;
}
touchActions.setPopupPosition(left, top);

// TODO check for room
}
});
touchActions.show();
}
});
}
}

@Override
public void setWidth(String width) {

Expand Down Expand Up @@ -1224,7 +1099,6 @@ private void stopSelectingCells(Event event) {
sheetWidget.getSelectedCellRow(), tempRow);

dragging = false;
showTouchActions();
}

protected void setFillMode(boolean fillMode) {
Expand Down
Loading