Skip to content

Commit

Permalink
fix(app-vite;app-webpack): bex communication - listener parsing #12974
Browse files Browse the repository at this point in the history
  • Loading branch information
rstoenescu committed Mar 29, 2022
1 parent 362cb11 commit 5ee83bd
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion app-vite/templates/entry/bex/entry-dom.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { listenForWindowEvents } from './window-event-listener'
import runDevlandDom from '../../src-bex/dom'

let bridge = new Bridge({
listen (fn) { },
listen (_fn) { },
send (data) {
const payload = {
...data,
Expand Down
8 changes: 5 additions & 3 deletions app-vite/templates/entry/bex/window-event-listener.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ export const listenForWindowEvents = (bridge, type) => {
}

if (payload.data.from !== void 0 && payload.data.from === type) {
const bridgeEvents = bridge.getEvents()
const
eventData = payload.data[0],
bridgeEvents = bridge.getEvents()

for (let event in bridgeEvents) {
if (event === payload.data.event) {
bridgeEvents[event](payload.data.payload)
if (event === eventData.event) {
bridgeEvents[event](eventData.payload)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app-webpack/templates/entry/bex/content/dom-script.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import attachDomHooks from 'src-bex/js/dom-hooks'
import { listenForWindowEvents } from './window-event-listener'

let bridge = new Bridge({
listen (fn) { },
listen (_fn) { },
send (data) {
const payload = {
...data,
Expand Down
11 changes: 7 additions & 4 deletions app-webpack/templates/entry/bex/content/window-event-listener.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable */
/**
* THIS FILE IS GENERATED AUTOMATICALLY.
* DO NOT EDIT.
Expand All @@ -9,7 +10,7 @@
* @param bridge
* @param type
*/
export const listenForWindowEvents = (bridge, type) => {
export const listenForWindowEvents = (bridge, type) => {
// Listen for any events from the web page and transmit to the BEX bridge.
window.addEventListener('message', payload => {
// We only accept messages from this window to itself [i.e. not from any iframes]
Expand All @@ -18,11 +19,13 @@
}

if (payload.data.from !== void 0 && payload.data.from === type) {
const bridgeEvents = bridge.getEvents()
const
eventData = payload.data[0],
bridgeEvents = bridge.getEvents()

for (let event in bridgeEvents) {
if (event === payload.data.event) {
bridgeEvents[event](payload.data.payload)
if (event === eventData.event) {
bridgeEvents[event](eventData.payload)
}
}
}
Expand Down

0 comments on commit 5ee83bd

Please sign in to comment.