Skip to content
Merged
Show file tree
Hide file tree
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: 5 additions & 0 deletions .changeset/eight-pumpkins-pull.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tma.js/sdk": patch
---

When opening QrScanner, update the isOpened flag. Listen to its changes to resolve the promise. After the promise was resolved, update the flag again.
24 changes: 18 additions & 6 deletions packages/sdk/src/features/QrScanner/QrScanner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export class QrScanner {
const wrapSupportedTask = createWithChecksFp({ ...wrapOptions, returns: 'task' });

const isOpened = signal(false);
const toggleClosed = () => {
const setClosed = () => {
isOpened.set(false);
};

Expand All @@ -97,25 +97,37 @@ export class QrScanner {
);
});
this.closeFp = wrapSupportedEither(() => {
return pipe(postEvent('web_app_close_scan_qr_popup'), E.map(toggleClosed));
return pipe(postEvent('web_app_close_scan_qr_popup'), E.map(setClosed));
});
this.openFp = wrapSupportedTask(options => {
return pipe(
this.isOpened()
isOpened()
? TE.left(new ConcurrentCallError('The QR Scanner is already opened'))
: async () => postEvent('web_app_open_scan_qr_popup', { text: options.text }),
TE.chainW(() => {
isOpened.set(true);
const [addToCleanup, cleanup] = createCbCollector();
const withCleanup = <T>(value: T): T => {
const onSettled = <T>(value: T): T => {
cleanup();
isOpened.set(false);
return value;
};

return pipe(
BetterTaskEither<never, void>(resolve => {
addToCleanup(onClosed(resolve), onTextReceived(options.onCaptured));
addToCleanup(
// The scanner was closed externally.
onClosed(resolve),
// The scanner was closed internally.
isOpened.sub(isOpenedValue => {
if (!isOpenedValue) {
resolve();
}
}),
onTextReceived(options.onCaptured),
);
}, options),
TE.mapBoth(withCleanup, withCleanup),
TE.mapBoth(onSettled, onSettled),
);
}),
);
Expand Down