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(feedback): Call dialog.close() in dialog close callbacks in _loadAndRenderDialog #13203

Merged
merged 3 commits into from
Aug 2, 2024
Merged

fix(feedback): Call dialog.close() in dialog close callbacks in _loadAndRenderDialog #13203

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9a040a
Call dialog.close() in onFormClose and onFormSubmitted callbacks for …
spalmurray-codecov Aug 2, 2024
841d57c
Move dialog.close() call into _loadAndRenderDialog
spalmurray-codecov Aug 2, 2024
7be412c
Revert change to onFormClose for _attachTo
spalmurray-codecov Aug 2, 2024
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
20 changes: 14 additions & 6 deletions packages/feedback/src/core/integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,24 @@ export const buildFeedbackIntegration = ({
logger.error('[Feedback] Missing feedback screenshot integration. Proceeding without screenshots.');
}

return modalIntegration.createDialog({
options,
const dialog = modalIntegration.createDialog({
options: {
...options,
onFormClose: () => {
dialog && dialog.close();
options.onFormClose && options.onFormClose();
},
onFormSubmitted: () => {
dialog && dialog.close();
options.onFormSubmitted && options.onFormSubmitted();
},
},
screenshotIntegration: screenshotRequired ? screenshotIntegration : undefined,
sendFeedback,
shadow: _createShadow(options),
});

return dialog;
};

const _attachTo = (el: Element | string, optionOverrides: OverrideFeedbackConfiguration = {}): Unsubscribe => {
Expand All @@ -233,10 +245,6 @@ export const buildFeedbackIntegration = ({
if (!dialog) {
dialog = await _loadAndRenderDialog({
...mergedOptions,
onFormClose: () => {
dialog && dialog.close();
mergedOptions.onFormClose && mergedOptions.onFormClose();
},
onFormSubmitted: () => {
dialog && dialog.removeFromDom();
mergedOptions.onFormSubmitted && mergedOptions.onFormSubmitted();
Expand Down
Loading