v13.0.0

GleapSDK · Nov 21, 2023 · 9a4c299 · 9a4c299
1 parent b4a5cca
commit 9a4c299
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 23 deletions.
diff --git a/build/index.js b/build/index.js
diff --git a/demo/main.js b/demo/main.js
@@ -6,7 +6,7 @@ Gleap.setWSApiUrl("ws://0.0.0.0:8080");
 
 // Gleap.setLanguage("en");
 
-Gleap.initialize("ogWhNhuiZcGWrva5nlDS8l7a78OfaLlV");
+Gleap.initialize("X5C0grjFCjUMbZKi131MjZLaGRwg2iKH");
 
 /*Gleap.setUrlHandler((url, newTab) => {
   alert("URL: " + url + " newTab: " + newTab);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gleap",
-  "version": "12.8.1",
+  "version": "13.0.0",
   "main": "build/index.js",
   "scripts": {
     "start": "NODE_OPTIONS=--openssl-legacy-provider webpack serve",

diff --git a/published/13.0.0/index.js b/published/13.0.0/index.js
diff --git a/published/latest/index.js b/published/latest/index.js
diff --git a/src/GleapAdminManager.js b/src/GleapAdminManager.js
@@ -1,7 +1,11 @@
-
 export default class GleapAdminManager {
   libraryInstance = null;
   lastUrl = undefined;
+  injectedFrame = false;
+  gleapFrameContainer = null;
+  gleapFrame = null;
+  configData = null;
+  status = "navigate";
 
   // GleapAdminManager singleton
   static instance;
@@ -17,7 +21,7 @@ export default class GleapAdminManager {
     if (currentUrl && currentUrl !== this.lastUrl) {
       this.lastUrl = currentUrl;
 
-      this.sendMessage({
+      this.sendMessageToTourBuilder({
         name: "page-changed",
         data: {
           page: currentUrl,
@@ -60,43 +64,77 @@ export default class GleapAdminManager {
         self.libraryInstance = new window.GleapHelper.default();
         if (self.libraryInstance) {
           self.libraryInstance.onElementPicked = (selector) => {
-            self.sendMessage({
+            self.sendMessageToTourBuilder({
               name: "element-picked",
               data: {
                 selector
               }
             });
           };
+
+          self.injectFrame();
+          self.setFrameHeight("loading");
         }
       }
     });
   }
 
+  setFrameHeight(state) {
+    if (this.gleapFrameContainer) {
+      var height = "";
+      if (state === "picker" || state === "navigate") {
+        height = "65px";
+      } else if (state === "editor") {
+        height = "100vh";
+      } else {
+        height = "0px";
+      }
+      this.gleapFrameContainer.style.height = height;
+    }
+  }
+
   start() {
     var self = this;
 
     // Add window message listener.
     window.addEventListener("message", (event) => {
-      if (!event.origin || !(event.origin === "https://app.gleap.io" || event.origin.startsWith("http://localhost"))) {
+      if (!event.origin || !event.origin === "https://app.gleap.io") {
         return;
       }
 
       try {
         const data = JSON.parse(event.data);
-        if (data.type !== "admin") {
-          return;
+        if (data.type === "admin") {
+          if (data.name === "load") {
+            self.configData = data.data;
+            self.loadAdminScript();
+          }
         }
 
-        if (data.name === "load") {
-          self.loadAdminScript();
-        }
+        if (data.type === "tourbuilder") {
+          if (data.name === "loaddata") {
+            this.sendMessageToTourBuilder({
+              name: "data",
+              data: self.configData,
+            });
+          }
 
-        if (data.name === "pick") {
-          self.libraryInstance.startPicker();
-        }
+          if (data.name === "save") {
+            this.sendMessage({
+              name: "save",
+              data: data.data,
+            });
+          }
 
-        if (data.name === "navigate") {
-          self.libraryInstance.stopPicker();
+          if (data.name === "status-changed") {
+            self.status = data.data;
+            this.setFrameHeight(self.status);
+            self.libraryInstance.stopPicker();
+
+            if (self.status === "picker") {
+              self.libraryInstance.startPicker();
+            }
+          }
         }
       } catch (exp) { }
     });
@@ -110,13 +148,40 @@ export default class GleapAdminManager {
 
   sendMessage(data) {
     try {
-      if (window && window.parent) {
-        window.parent.postMessage(JSON.stringify({
+      if (window && window.opener) {
+        window.opener.postMessage(JSON.stringify({
           ...data,
           type: "admin"
         }), "*");
       }
     } catch (e) { }
   }
 
+  sendMessageToTourBuilder(data) {
+    try {
+      if (this.gleapFrame && this.gleapFrame.contentWindow) {
+        this.gleapFrame.contentWindow.postMessage(JSON.stringify({
+          ...data,
+          type: "tourbuilder"
+        }), "*");
+      }
+    } catch (e) { }
+  }
+
+  injectFrame = () => {
+    if (this.injectedFrame) {
+      return;
+    }
+    this.injectedFrame = true;
+
+    // Inject widget HTML.
+    var elem = document.createElement("div");
+    elem.className =
+      "gleap-admin-frame-container";
+    elem.innerHTML = `<iframe src="https://app.gleap.io/producttourbuilder" class="gleap-admin-frame" scrolling="no" title="Gleap Admin Window" allow="autoplay; encrypted-media; fullscreen;" frameborder="0"></iframe>`;
+    document.body.appendChild(elem);
+
+    this.gleapFrameContainer = elem;
+    this.gleapFrame = document.querySelector(".gleap-admin-frame");
+  };
 }
diff --git a/src/GleapProductTours.js b/src/GleapProductTours.js
@@ -54,10 +54,11 @@ export default class GleapProductTours {
             </div>`;
             } else {
                 var senderHTML = ``;
-                if (step.sender && step.sender.name) {
+
+                if (config.sender && config.sender.firstName) {
                     senderHTML = `<div class="gleap-tour-sender">
-                <div class="gleap-tour-sender-image" style="background-image: url('${step.sender.profileImageUrl}');"></div>
-                <div class="gleap-tour-sender-name">${step.sender.name}</div>
+                <div class="gleap-tour-sender-image" style="background-image: url('${config.sender.profileImageUrl}');"></div>
+                <div class="gleap-tour-sender-name">${config.sender.firstName}</div>
               </div>`;
                 }
 

diff --git a/src/UI.js b/src/UI.js
@@ -1678,6 +1678,23 @@ export const injectStyledCSS = (
       display: block;
       border-radius: 8px;
     }
+
+    .gleap-admin-frame-container {
+      position: fixed;
+      bottom: 0px;
+      left: 0px;
+      right: 0px;
+      width: 100vw;
+      z-index: 2147483730;
+    }
+
+    .gleap-admin-frame {
+      width: 100%;
+      height: 100%;
+      border: none;
+      outline: none;
+      display: block;
+    }
     
     .gleap-tour-message .linktype-link {
       display: inline-block !important;