Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2025-06-13 20:53:59 +00:00
Code Issues Projects Releases Wiki Activity

(core) Fixing bug with first click on windows

Browse Source 
Summary:
On Windows, last row is selected when a user clicks the 'new row'
while browser doesn't have focus.

Test Plan: manual tests

Reviewers: georgegevoian

Reviewed By: georgegevoian

Subscribers: georgegevoian

Differential Revision: https://phab.getgrist.com/D3503
This commit is contained in:
Jarosław Sadziński 2022-06-29 11:47:28 +02:00
parent aefe451bab
commit 637caf8105
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/client/components/Selector.js
View File

@ -19,6 +19,7 @@ var ko = require('knockout');
var _ = require('underscore');
var dispose = require('../lib/dispose');
var gutil = require('app/common/gutil');
const {isWin} = require('app/client/lib/browserInfo')
var ROW = 'row';
var COL = 'col';
@ -53,6 +54,7 @@ function Selector(view, opt) {
opt = opt || {};
this.isDisabled = opt.isDisabled || _.constant(false);
this.isWindows = isWin();
}
/**
@ -118,6 +120,17 @@ Selector.prototype.applyCallbacks = function(dragOrSelect, callbacks, mouseDownE
callbacks.mousedown[dragOrSelect].call(this.view, mouseDownElem, mouseDownEvent);
this.view.onEvent(callbacks.mousemove.source, 'mousemove', function(elem, event) {
// On windows, when browser doesn't have focus, the first click produces artificial mousemove
// event. Fortunately, the mousemove event has the same coordinates as the mousedown event, so
// we will ignore it.
// Related issues:
// https://bugs.chromium.org/p/chromium/issues/detail?id=161464
// https://bugs.chromium.org/p/chromium/issues/detail?id=721341#c34
if (self.isWindows) {
if (event.screenX === mouseDownEvent.screenX && event.screenY === mouseDownEvent.screenY) {
return;
}
}
callbacks.mousemove[dragOrSelect].call(self.view, elem, event);
});

5
app/client/lib/browserInfo.ts
View File

@ -26,3 +26,8 @@ export function isIOS() {
export function modKeyProp(): 'metaKey'|'ctrlKey' {
return /Mac|iPod|iPhone|iPad/.test(navigator.platform) ? 'metaKey' : 'ctrlKey';
}
export function isWin() {
const os = getParser().getOSName();
return os === 'Windows';
}