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

Jump to bottom

fix(camera): reject promise on web input cancel event #1964

Merged
merged 1 commit into from
Dec 14, 2023
Merged

fix(camera): reject promise on web input cancel event #1964

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 20 additions & 8 deletions camera/src/web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class CameraWeb extends WebPlugin implements CameraPlugin {
// eslint-disable-next-line no-async-promise-executor
return new Promise<Photo>(async (resolve, reject) => {
if (options.webUseInput || options.source === CameraSource.Photos) {
this.fileInputExperience(options, resolve);
this.fileInputExperience(options, resolve, reject);
} else if (options.source === CameraSource.Prompt) {
let actionSheet: any = document.querySelector('pwa-action-sheet');
if (!actionSheet) {
Expand All @@ -31,7 +31,7 @@ export class CameraWeb extends WebPlugin implements CameraPlugin {
actionSheet.addEventListener('onSelection', async (e: any) => {
const selection = e.detail;
if (selection === 0) {
this.fileInputExperience(options, resolve);
this.fileInputExperience(options, resolve, reject);
} else {
this.cameraExperience(options, resolve, reject);
}
Expand All @@ -44,8 +44,8 @@ export class CameraWeb extends WebPlugin implements CameraPlugin {

async pickImages(_options: GalleryImageOptions): Promise<GalleryPhotos> {
// eslint-disable-next-line no-async-promise-executor
return new Promise<GalleryPhotos>(async resolve => {
this.multipleFileInputExperience(resolve);
return new Promise<GalleryPhotos>(async (resolve, reject) => {
this.multipleFileInputExperience(resolve, reject);
});
}

Expand Down Expand Up @@ -78,17 +78,21 @@ export class CameraWeb extends WebPlugin implements CameraPlugin {

cameraModal.present();
} catch (e) {
this.fileInputExperience(options, resolve);
this.fileInputExperience(options, resolve, reject);
}
} else {
console.error(
`Unable to load PWA Element 'pwa-camera-modal'. See the docs: https://capacitorjs.com/docs/web/pwa-elements.`,
);
this.fileInputExperience(options, resolve);
this.fileInputExperience(options, resolve, reject);
}
}

private fileInputExperience(options: ImageOptions, resolve: any) {
private fileInputExperience(
options: ImageOptions,
resolve: any,
reject: any,
) {
let input = document.querySelector(
'#_capacitor-camera-input',
) as HTMLInputElement;
Expand Down Expand Up @@ -145,6 +149,10 @@ export class CameraWeb extends WebPlugin implements CameraPlugin {
cleanup();
}
});
input.addEventListener('cancel', (_e: any) => {
reject(new CapacitorException('User cancelled photos app'));
cleanup();
});
}

input.accept = 'image/*';
Expand All @@ -164,7 +172,7 @@ export class CameraWeb extends WebPlugin implements CameraPlugin {
input.click();
}

private multipleFileInputExperience(resolve: any) {
private multipleFileInputExperience(resolve: any, reject: any) {
let input = document.querySelector(
'#_capacitor-camera-input-multiple',
) as HTMLInputElement;
Expand Down Expand Up @@ -200,6 +208,10 @@ export class CameraWeb extends WebPlugin implements CameraPlugin {
resolve({ photos });
cleanup();
});
input.addEventListener('cancel', (_e: any) => {
reject(new CapacitorException('User cancelled photos app'));
cleanup();
});
}

input.accept = 'image/*';
Expand Down
Loading