@@ -3362,52 +3362,53 @@ const DataEditorImpl: React.ForwardRefRenderFunction<DataEditorRef, DataEditorPr
33623362 col = Number . MAX_SAFE_INTEGER ;
33633363 } else if ( isHotkey ( keys . goToFirstColumn , event , details ) ) {
33643364 col = Number . MIN_SAFE_INTEGER ;
3365- } else if ( isHotkey ( keys . contextMenu , event , details ) &&
3366- bounds !== undefined &&
3367- event . location !== undefined
3365+ } else if (
3366+ isHotkey ( keys . contextMenu , event , details ) &&
3367+ bounds !== undefined &&
3368+ event . location !== undefined
33683369 ) {
3369- const {
3370- location,
3371- ctrlKey,
3372- metaKey,
3373- shiftKey,
3374- } = event ;
3375-
3376- onContextMenu (
3377- {
3378- kind : "cell" ,
3379- isFillHandle : false ,
3380- isTouch : false ,
3381- isEdge : false ,
3382- button : 0 ,
3383- scrollEdge : [ 0 , 0 ] ,
3384- localEventX : bounds . width / 2 ,
3385- localEventY : bounds . height / 2 ,
3370+ const {
33863371 location,
3387- bounds,
33883372 ctrlKey,
33893373 metaKey,
33903374 shiftKey,
3391- buttons : 0
3392- } , cancel )
3375+ } = event ;
3376+
3377+ onContextMenu (
3378+ {
3379+ kind : "cell" ,
3380+ isFillHandle : false ,
3381+ isTouch : false ,
3382+ isEdge : false ,
3383+ button : 0 ,
3384+ scrollEdge : [ 0 , 0 ] ,
3385+ localEventX : bounds . width / 2 ,
3386+ localEventY : bounds . height / 2 ,
3387+ location,
3388+ bounds,
3389+ ctrlKey,
3390+ metaKey,
3391+ shiftKey,
3392+ buttons : 0
3393+ } , cancel )
33933394 } else if ( rangeSelect === "rect" || rangeSelect === "multi-rect" ) {
3394- if ( isHotkey ( keys . selectGrowDown , event , details ) ) {
3395- adjustSelection ( [ 0 , 1 ] ) ;
3396- } else if ( isHotkey ( keys . selectGrowUp , event , details ) ) {
3397- adjustSelection ( [ 0 , - 1 ] ) ;
3398- } else if ( isHotkey ( keys . selectGrowRight , event , details ) ) {
3399- adjustSelection ( [ 1 , 0 ] ) ;
3400- } else if ( isHotkey ( keys . selectGrowLeft , event , details ) ) {
3401- adjustSelection ( [ - 1 , 0 ] ) ;
3402- } else if ( isHotkey ( keys . selectToLastRow , event , details ) ) {
3403- adjustSelection ( [ 0 , 2 ] ) ;
3404- } else if ( isHotkey ( keys . selectToFirstRow , event , details ) ) {
3405- adjustSelection ( [ 0 , - 2 ] ) ;
3406- } else if ( isHotkey ( keys . selectToLastColumn , event , details ) ) {
3407- adjustSelection ( [ 2 , 0 ] ) ;
3408- } else if ( isHotkey ( keys . selectToFirstColumn , event , details ) ) {
3409- adjustSelection ( [ - 2 , 0 ] ) ;
3410- }
3395+ if ( isHotkey ( keys . selectGrowDown , event , details ) ) {
3396+ adjustSelection ( [ 0 , 1 ] ) ;
3397+ } else if ( isHotkey ( keys . selectGrowUp , event , details ) ) {
3398+ adjustSelection ( [ 0 , - 1 ] ) ;
3399+ } else if ( isHotkey ( keys . selectGrowRight , event , details ) ) {
3400+ adjustSelection ( [ 1 , 0 ] ) ;
3401+ } else if ( isHotkey ( keys . selectGrowLeft , event , details ) ) {
3402+ adjustSelection ( [ - 1 , 0 ] ) ;
3403+ } else if ( isHotkey ( keys . selectToLastRow , event , details ) ) {
3404+ adjustSelection ( [ 0 , 2 ] ) ;
3405+ } else if ( isHotkey ( keys . selectToFirstRow , event , details ) ) {
3406+ adjustSelection ( [ 0 , - 2 ] ) ;
3407+ } else if ( isHotkey ( keys . selectToLastColumn , event , details ) ) {
3408+ adjustSelection ( [ 2 , 0 ] ) ;
3409+ } else if ( isHotkey ( keys . selectToFirstColumn , event , details ) ) {
3410+ adjustSelection ( [ - 2 , 0 ] ) ;
3411+ }
34113412 }
34123413 cancelOnlyOnMove = details . didMatch ;
34133414 } else {
0 commit comments