Skip to content

Commit 19b554d

Browse files
farfromrefugfarfromrefug
committed
fix: N 8.4 final fix
1 parent 5bb2162 commit 19b554d

File tree

2 files changed

+60
-60
lines changed

2 files changed

+60
-60
lines changed

‎src/gesturehandler/gesturehandler.android.ts‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { Application, View } from '@nativescript/core';
1+
import { Application, Utils, View } from '@nativescript/core';
22
import { GestureEventData, GestureTypes } from '@nativescript/core/ui/gestures';
33
import { Page } from '@nativescript/core/ui/page';
4-
import { layout } from '@nativescript/core/utils/layout-helper';
54
import {
65
HandlerOptions,
76
LongPressGestureHandlerOptions,
@@ -159,7 +158,7 @@ export abstract class Handler<T extends com.swmansion.gesturehandler.GestureHand
159158
toNative(value) {
160159
const HIT_SLOP_NONE = GestureHandler.HIT_SLOP_NONE;
161160
if (typeof value === 'number') {
162-
const hitSlop = layout.toDevicePixels(value);
161+
const hitSlop = Utils.layout.toDevicePixels(value);
163162
return [hitSlop, hitSlop, hitSlop, hitSlop, HIT_SLOP_NONE, HIT_SLOP_NONE];
164163
} else {
165164
let left = HIT_SLOP_NONE,
@@ -169,36 +168,37 @@ export abstract class Handler<T extends com.swmansion.gesturehandler.GestureHand
169168
let width = HIT_SLOP_NONE,
170169
height = HIT_SLOP_NONE;
171170
if (value.hasOwnProperty(KEY_HIT_SLOP_HORIZONTAL)) {
172-
const horizontalPad = layout.toDevicePixels(value[KEY_HIT_SLOP_HORIZONTAL]);
171+
const horizontalPad = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_HORIZONTAL]);
173172
left = right = horizontalPad;
174173
}
175174
if (value.hasOwnProperty(KEY_HIT_SLOP_VERTICAL)) {
176-
const verticalPad = layout.toDevicePixels(value[KEY_HIT_SLOP_VERTICAL]);
175+
const verticalPad = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_VERTICAL]);
177176
top = bottom = verticalPad;
178177
}
179178
if (value.hasOwnProperty(KEY_HIT_SLOP_LEFT)) {
180-
left = layout.toDevicePixels(value[KEY_HIT_SLOP_LEFT]);
179+
left = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_LEFT]);
181180
}
182181
if (value.hasOwnProperty(KEY_HIT_SLOP_TOP)) {
183-
top = layout.toDevicePixels(value[KEY_HIT_SLOP_TOP]);
182+
top = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_TOP]);
184183
}
185184
if (value.hasKey(KEY_HIT_SLOP_RIGHT)) {
186-
right = layout.toDevicePixels(value[KEY_HIT_SLOP_RIGHT]);
185+
right = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_RIGHT]);
187186
}
188187
if (value.hasOwnProperty(KEY_HIT_SLOP_BOTTOM)) {
189-
bottom = layout.toDevicePixels(value[KEY_HIT_SLOP_BOTTOM]);
188+
bottom = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_BOTTOM]);
190189
}
191190
if (value.hasOwnProperty(KEY_HIT_SLOP_WIDTH)) {
192-
width = layout.toDevicePixels(value[KEY_HIT_SLOP_WIDTH]);
191+
width = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_WIDTH]);
193192
}
194193
if (value.hasOwnProperty(KEY_HIT_SLOP_HEIGHT)) {
195-
height = layout.toDevicePixels(value[KEY_HIT_SLOP_HEIGHT]);
194+
height = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_HEIGHT]);
196195
}
197196
return [left, top, right, bottom, width, height];
198197
}
199198
},
200199
},
201-
}) hitSlop;
200+
})
201+
hitSlop;
202202
@nativeProperty enabled: boolean;
203203
@nativeProperty shouldCancelWhenOutside: boolean;
204204
shouldStartGesture: (arg) => boolean;
@@ -210,12 +210,12 @@ export abstract class Handler<T extends com.swmansion.gesturehandler.GestureHand
210210
const numberOfPointers = handler.getNumberOfPointers();
211211
const positions = [];
212212
for (let index = 0; index < numberOfPointers; index++) {
213-
positions.push(layout.toDeviceIndependentPixels(handler.getXAtIndex(index)));
214-
positions.push(layout.toDeviceIndependentPixels(handler.getYAtIndex(index)));
213+
positions.push(Utils.layout.toDeviceIndependentPixels(handler.getXAtIndex(index)));
214+
positions.push(Utils.layout.toDeviceIndependentPixels(handler.getYAtIndex(index)));
215215
}
216216
return {
217-
// x: layout.toDeviceIndependentPixels(handler.getX()),
218-
// y: layout.toDeviceIndependentPixels(handler.getY()),
217+
// x: Utils.layout.toDeviceIndependentPixels(handler.getX()),
218+
// y: Utils.layout.toDeviceIndependentPixels(handler.getY()),
219219
positions,
220220
numberOfPointers,
221221
};
@@ -318,34 +318,34 @@ export class TapGestureHandler extends Handler<com.swmansion.gesturehandler.TapG
318318
@nativeProperty maxDelayMs: number;
319319
@nativeProperty({ nativeSetterName: 'setMaxDx' }) maxDeltaX: number;
320320
@nativeProperty({ nativeSetterName: 'setMaxDy' }) maxDeltaY: number;
321-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) maxDist: number;
321+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) maxDist: number;
322322
@nativeProperty({ nativeSetterName: 'setMinNumberOfPointers' }) minPointers: number;
323323
createNative(options) {
324324
return new com.swmansion.gesturehandler.TapGestureHandler();
325325
}
326326
getExtraData(handler: com.swmansion.gesturehandler.TapGestureHandler) {
327327
return Object.assign(super.getExtraData(handler), {
328-
x: layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
329-
y: layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
330-
absoluteX: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
331-
absoluteY: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
328+
x: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
329+
y: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
330+
absoluteX: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
331+
absoluteY: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
332332
});
333333
}
334334
}
335335

336336
export class PanGestureHandler extends Handler<com.swmansion.gesturehandler.PanGestureHandler, PanGestureHandlerOptions> {
337-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) minDist: number;
338-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) activeOffsetXStart: number;
339-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) activeOffsetXEnd: number;
340-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) failOffsetXStart: number;
341-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) failOffsetXEnd: number;
342-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) activeOffsetYStart: number;
343-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) activeOffsetYEnd: number;
344-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) failOffsetYStart: number;
345-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) failOffsetYEnd: number;
346-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) minVelocity: number;
347-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) minVelocityX: number;
348-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) minVelocityY: number;
337+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) minDist: number;
338+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) activeOffsetXStart: number;
339+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) activeOffsetXEnd: number;
340+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) failOffsetXStart: number;
341+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) failOffsetXEnd: number;
342+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) activeOffsetYStart: number;
343+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) activeOffsetYEnd: number;
344+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) failOffsetYStart: number;
345+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) failOffsetYEnd: number;
346+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) minVelocity: number;
347+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) minVelocityX: number;
348+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) minVelocityY: number;
349349
@nativeProperty minPointers: number;
350350
@nativeProperty maxPointers: number;
351351
@nativeProperty({ nativeSetterName: 'setAverageTouches' }) avgTouches: number;
@@ -356,32 +356,32 @@ export class PanGestureHandler extends Handler<com.swmansion.gesturehandler.PanG
356356
}
357357
getExtraData(handler: com.swmansion.gesturehandler.PanGestureHandler) {
358358
return Object.assign(super.getExtraData(handler), {
359-
x: layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
360-
y: layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
361-
absoluteX: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
362-
absoluteY: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
363-
translationX: layout.toDeviceIndependentPixels(handler.getTranslationX()),
364-
translationY: layout.toDeviceIndependentPixels(handler.getTranslationY()),
365-
velocityX: layout.toDeviceIndependentPixels(handler.getVelocityX()),
366-
velocityY: layout.toDeviceIndependentPixels(handler.getVelocityY()),
359+
x: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
360+
y: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
361+
absoluteX: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
362+
absoluteY: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
363+
translationX: Utils.layout.toDeviceIndependentPixels(handler.getTranslationX()),
364+
translationY: Utils.layout.toDeviceIndependentPixels(handler.getTranslationY()),
365+
velocityX: Utils.layout.toDeviceIndependentPixels(handler.getVelocityX()),
366+
velocityY: Utils.layout.toDeviceIndependentPixels(handler.getVelocityY()),
367367
});
368368
}
369369
}
370370

371371
export class PinchGestureHandler extends Handler<com.swmansion.gesturehandler.PinchGestureHandler, PinchGestureHandlerOptions> {
372-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) minSpan: number;
372+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) minSpan: number;
373373
createNative(options) {
374374
return new com.swmansion.gesturehandler.PinchGestureHandler();
375375
}
376376
getExtraData(handler: com.swmansion.gesturehandler.PinchGestureHandler) {
377377
return Object.assign(super.getExtraData(handler), {
378-
x: layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
379-
y: layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
380-
absoluteX: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
381-
absoluteY: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
378+
x: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
379+
y: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
380+
absoluteX: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
381+
absoluteY: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
382382
scale: handler.getScale(),
383-
focalX: layout.toDeviceIndependentPixels(handler.getFocalPointX()),
384-
focalY: layout.toDeviceIndependentPixels(handler.getFocalPointY()),
383+
focalX: Utils.layout.toDeviceIndependentPixels(handler.getFocalPointX()),
384+
focalY: Utils.layout.toDeviceIndependentPixels(handler.getFocalPointY()),
385385
velocity: handler.getVelocity(),
386386
});
387387
}
@@ -435,17 +435,17 @@ export class FlingGestureHandler extends Handler<com.swmansion.gesturehandler.Fl
435435
}
436436
export class LongPressGestureHandler extends Handler<com.swmansion.gesturehandler.LongPressGestureHandler, LongPressGestureHandlerOptions> {
437437
@nativeProperty minDurationMs: number;
438-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) maxDist: number;
438+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) maxDist: number;
439439
createNative(options) {
440440
const context = Application.android.context as android.content.Context;
441441
return new com.swmansion.gesturehandler.LongPressGestureHandler(context);
442442
}
443443
getExtraData(handler: com.swmansion.gesturehandler.LongPressGestureHandler) {
444444
return Object.assign(super.getExtraData(handler), {
445-
x: layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
446-
y: layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
447-
absoluteX: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
448-
absoluteY: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
445+
x: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
446+
y: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
447+
absoluteX: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
448+
absoluteY: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
449449
});
450450
}
451451
}
@@ -455,13 +455,13 @@ export class RotationGestureHandler extends Handler<com.swmansion.gesturehandler
455455
}
456456
getExtraData(handler: com.swmansion.gesturehandler.RotationGestureHandler) {
457457
return Object.assign(super.getExtraData(handler), {
458-
x: layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
459-
y: layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
460-
absoluteX: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
461-
absoluteY: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
458+
x: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
459+
y: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
460+
absoluteX: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
461+
absoluteY: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
462462
rotation: handler.getRotation(),
463-
anchorX: layout.toDeviceIndependentPixels(handler.getAnchorX()),
464-
anchorY: layout.toDeviceIndependentPixels(handler.getAnchorY()),
463+
anchorX: Utils.layout.toDeviceIndependentPixels(handler.getAnchorX()),
464+
anchorY: Utils.layout.toDeviceIndependentPixels(handler.getAnchorY()),
465465
velocity: handler.getVelocity(),
466466
});
467467
}

‎src/gesturehandler/gesturehandler.common.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-redeclare */
22
import Observable from '@nativescript-community/observable';
33
import { EventData, GridLayout } from '@nativescript/core';
4-
import { CssProperty, Property, Style, View, booleanConverter } from '@nativescript/core/ui';
4+
import { CssProperty, Style, View, booleanConverter } from '@nativescript/core/ui';
55
import {
66
FlingGestureHandler,
77
FlingGestureHandlerOptions,

0 commit comments

Comments
 (0)