diff --git a/packages/noodl-viewer-react/src/nodes/navigation/closepopup.js b/packages/noodl-viewer-react/src/nodes/navigation/closepopup.js index db03840..961e9a5 100644 --- a/packages/noodl-viewer-react/src/nodes/navigation/closepopup.js +++ b/packages/noodl-viewer-react/src/nodes/navigation/closepopup.js @@ -51,8 +51,9 @@ const ClosePopupNode = { } }, close: function () { - if (this._internal.closeCallback) + if (this._internal.closeCallback) { this._internal.closeCallback(this._internal.closeAction, this._internal.resultValues); + } }, closeActionTriggered: function (name) { this._internal.closeAction = name; diff --git a/packages/noodl-viewer-react/src/nodes/navigation/showpopup.js b/packages/noodl-viewer-react/src/nodes/navigation/showpopup.js index e589bac..d3076a8 100644 --- a/packages/noodl-viewer-react/src/nodes/navigation/showpopup.js +++ b/packages/noodl-viewer-react/src/nodes/navigation/showpopup.js @@ -53,15 +53,24 @@ const ShowPopupNode = { this.context.showPopup(this._internal.target, this._internal.popupParams, { senderNode: this.nodeScope.componentOwner, + /** + * @param {string | undefined} action + * @param {*} results + */ onClosePopup: (action, results) => { this._internal.closeResults = results; - for (var key in results) { - if (this.hasOutput('closeResult-' + key)) this.flagOutputDirty('closeResult-' + key); + for (const key in results) { + if (this.hasOutput('closeResult-' + key)) { + this.flagOutputDirty('closeResult-' + key); + } } - if (!action) this.sendSignalOnOutput('Closed'); - else this.sendSignalOnOutput(action); + if (!action) { + this.sendSignalOnOutput('Closed'); + } else { + this.sendSignalOnOutput(action); + } } }); },