Skip to content

Include uuid in annotation removed event #349

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

Merged
merged 4 commits into from
Feb 12, 2020
Merged

Include uuid in annotation removed event #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b8fb4c
Include uuid in annotation removed event
Feb 10, 2020
ac5e403
Include creator name
Feb 11, 2020
acfa17a
Merge branch 'master' into reinhard/update-on-annotations-changed
Feb 12, 2020
94cea42
Bump version number
Feb 12, 2020
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
1 change: 1 addition & 0 deletions android/src/main/java/com/pspdfkit/react/events/PdfViewAnnotationChangedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public void dispatch(RCTEventEmitter rctEventEmitter) {
annotationMap = new HashMap<>();
annotationMap.put("name", annotation.getName());
annotationMap.put("creatorName", annotation.getCreator());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On iOS, we are not including the creator's name when an annotation is deleted:

react-native/ios/RCTPSPDFKit/Converters/RCTConvert+PSPDFAnnotation.m

Line 27 in 1ff0220

[annotationsJSON addObject:@{@"uuid" : annotation.uuid, @"name" : annotation.name ?: [NSNull null]}];

The change would be pretty trivial:

- [annotationsJSON addObject:@{@"uuid" : annotation.uuid, @"name" : annotation.name ?: [NSNull null]}];
+ [annotationsJSON addObject:@{@"uuid" : annotation.uuid, @"name" : annotation.name ?: [NSNull null], @"creatorName" : annotation.user ?: [NSNull null]}];

@davidschreiber can you please make this change in this PR? Otherwise, I can do it myself in the PR or a followup PR.

Pinging @nickwinder, as I am not sure what Windows does when an annotation is deleted.

annotationMap.put("uuid", annotation.getUuid());
} else {
JSONObject instantJson = new JSONObject(annotation.toInstantJson());
annotationMap = JsonUtilities.jsonObjectToMap(instantJson);
Expand Down
2 changes: 1 addition & 1 deletion ios/RCTPSPDFKit/Converters/RCTConvert+PSPDFAnnotation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ @implementation RCTConvert (PSPDFAnnotation)
}
} else {
// We only generate Instant JSON data for attached annotations. When an annotation is deleted, we only set the annotation uuid and name.
[annotationsJSON addObject:@{@"uuid" : annotation.uuid, @"name" : annotation.name ?: [NSNull null]}];
[annotationsJSON addObject:@{@"uuid" : annotation.uuid, @"name" : annotation.name ?: [NSNull null], @"creatorName" : annotation.user ?: [NSNull null]}];
}
}

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-pspdfkit",
"version": "1.27.2",
"version": "1.27.3",
"description": "A React Native module for the PSPDFKit library.",
"keywords": [
"react native",
Expand Down
2 changes: 1 addition & 1 deletion samples/Catalog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Catalog",
"version": "1.27.2",
"version": "1.27.3",
"private": true,
"scripts": {
"start": "react-native start",
Expand Down
2 changes: 1 addition & 1 deletion samples/NativeCatalog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "NativeCatalog",
"version": "1.27.2",
"version": "1.27.3",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand Down