Skip to content

Commit 90e7a52

Browse files
authored
Fix thumbnails and document editor cell selection (#42)
* Make sure gesture recognizer is only added on document view * Bump version number to 1.1.7
1 parent 1ee928f commit 90e7a52

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pspdfkit-cordova",
3-
"version": "1.1.6",
3+
"version": "1.1.7",
44
"description": "PSPDFKit Cordova Plugin for Android and iOS",
55
"cordova": {
66
"id": "pspdfkit-cordova",

plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="pspdfkit-cordova" version="1.1.6">
2+
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="pspdfkit-cordova" version="1.1.7">
33
<engines>
44
<engine name="cordova" version="&gt;=6.3.1" />
55
</engines>

src/ios/PSPDFKitPlugin.m

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#define VALIDATE_DOCUMENT(document, ...) { if (!document.isValid) { [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Document is invalid."] callbackId:command.callbackId]; return __VA_ARGS__; }}
1919

20-
@interface PSPDFKitPlugin () <PSPDFViewControllerDelegate, PSPDFFlexibleToolbarContainerDelegate, UIGestureRecognizerDelegate>
20+
@interface PSPDFKitPlugin () <PSPDFViewControllerDelegate, PSPDFFlexibleToolbarContainerDelegate>
2121

2222
@property (nonatomic, strong) UINavigationController *navigationController;
2323
@property (nonatomic, strong) PSPDFViewController *pdfController;
@@ -480,13 +480,15 @@ - (void)configurePDFViewControllerWithPath:(NSString *)path options:(NSDictionar
480480
_pdfController.document = _pdfDocument;
481481

482482
// Setup gesture recognizers.
483-
UITapGestureRecognizer *tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGestureRecognizerDidChangeState:)];
483+
UITapGestureRecognizer *tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGestureRecognizerDidFire:)];
484+
tapGestureRecognizer.cancelsTouchesInView = NO;
484485
[_pdfController.interactions.allInteractions allowSimultaneousRecognitionWithGestureRecognizer:tapGestureRecognizer];
485-
[_pdfController.view addGestureRecognizer:tapGestureRecognizer];
486+
[_pdfController.documentViewController.view addGestureRecognizer:tapGestureRecognizer];
486487

487-
UILongPressGestureRecognizer *longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPressGestureRecognizerDidChangeState:)];
488+
UILongPressGestureRecognizer *longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPressGestureRecognizerDidFire:)];
489+
longPressGestureRecognizer.cancelsTouchesInView = NO;
488490
[_pdfController.interactions.allInteractions allowSimultaneousRecognitionWithGestureRecognizer:longPressGestureRecognizer];
489-
[_pdfController.view addGestureRecognizer:longPressGestureRecognizer];
491+
[_pdfController.documentViewController.view addGestureRecognizer:longPressGestureRecognizer];
490492

491493
// Notifications
492494
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(annotationChangedNotification:) name:PSPDFAnnotationsAddedNotification object:nil];
@@ -1593,20 +1595,14 @@ - (CGRect)flexibleToolbarContainerContentRect:(PSPDFFlexibleToolbarContainer *)c
15931595
return container.bounds;
15941596
}
15951597

1596-
#pragma mark - UIGestureRecognizerDelegate
1597-
1598-
- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer {
1599-
return [_pdfController.interactions.allAnnotationInteractions canActivateAtPoint:[gestureRecognizer locationInView:_pdfController.view] inCoordinateSpace:_pdfController.view];
1600-
}
1601-
16021598
#pragma mark - Gesture Recognizers
16031599

1604-
- (void)tapGestureRecognizerDidChangeState:(UITapGestureRecognizer *)gestureRecognizer {
1600+
- (void)tapGestureRecognizerDidFire:(UITapGestureRecognizer *)gestureRecognizer {
16051601
CGPoint viewPoint = [gestureRecognizer locationInView:_pdfController.view];
16061602
[self sendEventWithJSON:[NSString stringWithFormat:@"{type:'didTapOnPageView',viewPoint:[%g,%g]}", viewPoint.x, viewPoint.y]];
16071603
}
16081604

1609-
- (void)longPressGestureRecognizerDidChangeState:(UILongPressGestureRecognizer *)gestureRecognizer {
1605+
- (void)longPressGestureRecognizerDidFire:(UILongPressGestureRecognizer *)gestureRecognizer {
16101606
CGPoint viewPoint = [gestureRecognizer locationInView:_pdfController.view];
16111607
[self sendEventWithJSON:[NSString stringWithFormat:@"{type:'didLongPressOnPageView',viewPoint:[%g,%g]}", viewPoint.x, viewPoint.y]];
16121608
}

0 commit comments

Comments
 (0)