Skip to content
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

Add form editing configuration #365

Merged
merged 9 commits into from
Apr 27, 2020
Merged

Add form editing configuration #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
09f00d7
Add form editing configuration
tomassurin Apr 23, 2020
4e00c81
Implement `disableFormEditing` on iOS
Apr 23, 2020
ff021d2
Update comments
Apr 23, 2020
509f28b
Rename `disableFormEditing` to `enableFormEditing`
Apr 23, 2020
c1e18c5
Implement isFormEditingEnabled property
tomassurin Apr 23, 2020
4da5755
Don’t disable forms altogether for the document, just disable forms e…
Apr 24, 2020
c212829
Revert "Implement isFormEditingEnabled property"
tomassurin Apr 24, 2020
a3940f7
Merge remote-tracking branch 'origin/master' into tomas/add-enable-fo…
tomassurin Apr 27, 2020
d696f25
Update the package version to 1.29.1
tomassurin Apr 27, 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
12 changes: 12 additions & 0 deletions android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public class ConfigurationAdapter {
private static final String START_PAGE = "startPage";
private static final String ENABLE_ANNOTATION_EDITING = "enableAnnotationEditing";
private static final String ENABLE_TEXT_SELECTION = "enableTextSelection";
private static final String ENABLE_FORM_EDITING = "enableFormEditing";
private static final String SHOW_SHARE_ACTION = "showShareAction";
private static final String SHOW_PRINT_ACTION = "showPrintAction";
private static final String SHOW_DOCUMENT_INFO_VIEW = "showDocumentInfoView";
Expand Down Expand Up @@ -145,6 +146,9 @@ public ConfigurationAdapter(@NonNull Context context, ReadableMap configuration)
if (configuration.hasKey(ENABLE_ANNOTATION_EDITING)) {
configureEnableAnnotationEditing(configuration.getBoolean(ENABLE_ANNOTATION_EDITING));
}
if (configuration.hasKey(ENABLE_FORM_EDITING)) {
configureEnableFormEditing(configuration.getBoolean(ENABLE_FORM_EDITING));
}
if (configuration.hasKey(SHOW_SHARE_ACTION)) {
configureShowShareAction(configuration.getBoolean(SHOW_SHARE_ACTION));
}
Expand Down Expand Up @@ -320,6 +324,14 @@ private void configureEnableAnnotationEditing(boolean enableAnnotationEditing) {
}
}

private void configureEnableFormEditing(boolean enableFormEditing) {
if (enableFormEditing) {
configuration.enableFormEditing();
} else {
configuration.disableFormEditing();
}
}

private void configureShowShareAction(boolean showShareAction) {
if (showShareAction) {
configuration.setEnabledShareFeatures(ShareFeatures.all());
Expand Down
6 changes: 6 additions & 0 deletions ios/RCTPSPDFKit/Converters/RCTConvert+PSPDFConfiguration.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,12 @@ - (void)setupFromJSON:(id)json {
self.editableAnnotationTypes = nil;
}

if (dictionary[@"enableFormEditing"] && ![RCTConvert BOOL:dictionary[@"enableFormEditing"]]) {
NSMutableSet *editableTypes = [self.editableAnnotationTypes mutableCopy];
[editableTypes removeObject:PSPDFAnnotationStringWidget];
self.editableAnnotationTypes = [editableTypes copy];
}

if (dictionary[@"sharingConfigurations"]) {
[self setRCTSharingConfigurations:[RCTConvert NSArray:dictionary[@"sharingConfigurations"]]];
}
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.29.0",
"version": "1.29.1",
"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.29.0",
"version": "1.29.1",
"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.29.0",
"version": "1.29.1",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand Down