fix MWPW-139492

adobecom · Nov 22, 2023 · 19ece39 · 19ece39
1 parent 62b363f
commit 19ece39
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 42 deletions.
diff --git a/creativecloud/features/firefly/firefly-interactive.css b/creativecloud/features/firefly/firefly-interactive.css
@@ -93,52 +93,33 @@
 }
 
 @media screen and (max-width: 1799px) and (min-width: 1650px) {
-  .firefly-selectortray {
-    top: 144px;
-    position: absolute;
-    right: calc(50% - 370px);
-  }
-
-  [dir="rtl"] .firefly-selectortray {
+  [dir="ltr"] .firefly-selectortray {
     top: 144px;
     position: absolute;
-    right: calc(50% - 407px);
+    right: -85px;
   }
 }
 
 @media screen and (max-width: 1649px) and (min-width: 1438px) {
-  .firefly-selectortray {
+  [dir="ltr"] .firefly-selectortray {
     top: 144px;
     position: absolute;
-    right: calc(50% - 320px);
-  }
-
-  [dir="rtl"] .firefly-selectortray {
-    top: 144px;
-    position: absolute;
-    right: calc(50% - 407px);
+    right: -35px;
   }
 }
 
 @media screen and (max-width: 1437px) and (min-width: 1200px) {
-  .firefly-selectortray {
-    top: 144px;
-    position: absolute;
-    right: calc(50% - 280px);
-  }
-
-  [dir="rtl"] .firefly-selectortray {
+  [dir="ltr"] .firefly-selectortray {
     top: 144px;
     position: absolute;
-    right: calc(50% - 407px);
+    right: 5px;
   }
 }
 
-@media screen and (min-width: 1800px) {
+@media screen and (min-width: 1200px) {
   .firefly-selectortray {
     top: 144px;
     position: absolute;
-    right: calc(50% - 407px);
+    right: -122px;
   }
 }
-
diff --git a/creativecloud/features/firefly/firefly-interactive.js b/creativecloud/features/firefly/firefly-interactive.js
@@ -8,9 +8,21 @@ let media;
 let mediaP;
 
 function focusOnInput() {
-  media.querySelector('#promptinput')?.focus();
+  media.querySelector('#promptinput')?.focus();;
 }
 
+function waitForModal() {
+  var checkInterval = setInterval(function () {
+    var modalClose = document.querySelector('.dialog-close');
+    if (modalClose) {
+      clearInterval(checkInterval);
+      const input = media.querySelector('#promptinput');
+      modalClose?.addEventListener('click', () => input?.focus());
+    }
+  }, 100);
+}
+
+
 function eventOnGenerate(generateButton) {
   const btnConfigs = {
     TextToImage: ['SubmitTextToImage', 'SubmitTextToImageUserContent', 'goToFirefly'],
@@ -144,6 +156,7 @@ export default function setInteractiveFirefly(el) {
     });
   }
 
+  focusOnInput();
   /* Handle action on click of each firefly option button */
 
   textToImageButton.addEventListener('click', () => {
@@ -182,3 +195,5 @@ export default function setInteractiveFirefly(el) {
     focusOnInput();
   });
 }
+
+waitForModal();
diff --git a/creativecloud/features/interactive-elements/interactive-elements.css b/creativecloud/features/interactive-elements/interactive-elements.css
@@ -1,4 +1,3 @@
-/* Prompt Bar */
 .promptbar {
   height: 30px;
   background: #FFFFFF;
@@ -37,7 +36,6 @@
   background: #111111;
 }
 
-/* Enticement */
 .enticement-arrow {
   display: none;
   width: 49px !important;
@@ -58,7 +56,6 @@
   color: #FFFFFF;
 }
 
-/* Selector Tray */
 .selector-tray {
   border-radius: 4px;
   display: flex;
@@ -126,7 +123,6 @@
   border: 1px solid #1473E6;
 }
 
-/* Genfill Prompt */
 .genfill-prompt {
   position: absolute;
   bottom: 106px;
@@ -157,7 +153,6 @@
 }
 
 @media screen and (min-width: 1200px) {
-  /* Prompt Bar */
   .promptbar {
     height: 50px;
     padding-inline-start: 40px;
@@ -171,7 +166,6 @@
     width: 294px;
   }
 
-  /* Enticement */
   .enticement-arrow {
     right: 575px;
     top: -45px;
@@ -188,7 +182,6 @@
     margin-right: 510px;
   }
 
-  /* Selector Tray */
   .options {
     margin-bottom: 16px;
     padding: 15px;
@@ -209,7 +202,6 @@
     bottom: inherit;
     justify-content: center;
     align-items: center;
-    /*height: 248px;*/
   }
 
   .selector-tray:nth-last-child(n+3) ~ .selector-tray{
@@ -238,7 +230,6 @@
     margin-bottom: auto;
   }
 
-  /* Genfill prompt */
   .genfill-prompt {
     bottom: 46px;
     margin-inline-start: 40px;
@@ -256,7 +247,6 @@
 }
 
 @media (min-width: 600px) and (max-width: 1199px) {
-  /* Prompt Bar */
   .promptbar {
     height: 40px;
     padding-inline-start: 32px;
@@ -270,7 +260,6 @@
     line-height: var(--type-body-l-lh);
   }
 
-  /* Enticement */
   .enticement-arrow {    
     right: 575px;
     top: -45px;
@@ -287,7 +276,6 @@
     margin-right: 525px;
   }
 
-  /* Genfill Prompt */
   .genfill-prompt {
     bottom: 145px;
     margin-inline-start: 32px;
@@ -303,7 +291,6 @@
     padding: 7px 18px 8px;
   }
 
-  /* Selector Tray */
   .options {
     margin-inline-end: 16px;
     padding: 7px;

diff --git a/creativecloud/scripts/scripts.js b/creativecloud/scripts/scripts.js
@@ -155,7 +155,7 @@ const miloLibs = setLibs(LIBS);
   if ((window.location.search.includes('goToFirefly')
   || window.location.search.includes('goToFireflyEffects')
   || window.location.search.includes('goToFireflyGenFill'))) {
-    await loadIms();
+    try { await loadIms(); } catch { return; }
     if (window.adobeIMS?.isSignedInUser()) {
       const { redirectWithParam } = await import('../features/firefly/firefly-susi.js');
       redirectWithParam();