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.

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

fix(camera): Allow cancelation of sheet in Web #2284

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion camera/src/web.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
document.body.appendChild(actionSheet);
}
actionSheet.header = options.promptLabelHeader || 'Photo';
actionSheet.cancelable = false;
actionSheet.cancelable = true;
actionSheet.options = [
{ title: options.promptLabelPhoto || 'From Photos' },
{ title: options.promptLabelPicture || 'Take Picture' },
Expand All @@ -36,13 +36,16 @@
this.cameraExperience(options, resolve, reject);
}
});
actionSheet.addEventListener('onCanceled', async () => {
reject(new CapacitorException('User cancelled photos app'));
});
} else {
this.cameraExperience(options, resolve, reject);
}
});
}

async pickImages(_options: GalleryImageOptions): Promise<GalleryPhotos> {

Check warning on line 48 in camera/src/web.ts

View workflow job for this annotation

GitHub Actions / lint (camera)

'_options' is defined but never used
// eslint-disable-next-line no-async-promise-executor
return new Promise<GalleryPhotos>(async (resolve, reject) => {
this.multipleFileInputExperience(resolve, reject);
Expand Down Expand Up @@ -107,8 +110,8 @@
input.type = 'file';
input.hidden = true;
document.body.appendChild(input);
input.addEventListener('change', (_e: any) => {

Check warning on line 113 in camera/src/web.ts

View workflow job for this annotation

GitHub Actions / lint (camera)

'_e' is defined but never used
const file = input.files![0];

Check warning on line 114 in camera/src/web.ts

View workflow job for this annotation

GitHub Actions / lint (camera)

Forbidden non-null assertion
let format = 'jpeg';

if (file.type === 'image/png') {
Expand Down Expand Up @@ -149,7 +152,7 @@
cleanup();
}
});
input.addEventListener('cancel', (_e: any) => {

Check warning on line 155 in camera/src/web.ts

View workflow job for this annotation

GitHub Actions / lint (camera)

'_e' is defined but never used
reject(new CapacitorException('User cancelled photos app'));
cleanup();
});
Expand Down Expand Up @@ -188,11 +191,11 @@
input.hidden = true;
input.multiple = true;
document.body.appendChild(input);
input.addEventListener('change', (_e: any) => {

Check warning on line 194 in camera/src/web.ts

View workflow job for this annotation

GitHub Actions / lint (camera)

'_e' is defined but never used
const photos = [];
// eslint-disable-next-line @typescript-eslint/prefer-for-of
for (let i = 0; i < input.files!.length; i++) {

Check warning on line 197 in camera/src/web.ts

View workflow job for this annotation

GitHub Actions / lint (camera)

Forbidden non-null assertion
const file = input.files![i];

Check warning on line 198 in camera/src/web.ts

View workflow job for this annotation

GitHub Actions / lint (camera)

Forbidden non-null assertion
let format = 'jpeg';

if (file.type === 'image/png') {
Expand All @@ -208,7 +211,7 @@
resolve({ photos });
cleanup();
});
input.addEventListener('cancel', (_e: any) => {

Check warning on line 214 in camera/src/web.ts

View workflow job for this annotation

GitHub Actions / lint (camera)

'_e' is defined but never used
reject(new CapacitorException('User cancelled photos app'));
cleanup();
});
Expand Down
Loading