SwG Release 0.1.22.67 (#24440)

* SwG Release 0.1.22.67 * SwG Release 0.1.22.67 * Merges John's changes from AMP#24385
ampproject · Sep 11, 2019 · bd3d764 · bd3d764
1 parent 4c0c76c
commit bd3d764
Show file tree

Hide file tree

Showing 6 changed files with 905 additions and 634 deletions.
diff --git a/extensions/amp-subscriptions/0.1/dialog.js b/extensions/amp-subscriptions/0.1/dialog.js
@@ -162,9 +162,7 @@ export class Dialog {
           },
           mutate: () => {
             this.viewport_.updatePaddingBottom(offsetHeight);
-            // TODO(dvoytenko, #20608): add to fixed layer, once the SwG/FL
-            // conflict is resolved.
-            // this.viewport_.addToFixedLayer(this.wrapper_, true);
+            this.viewport_.addToFixedLayer(this.wrapper_, true);
           },
         });
       });

diff --git a/extensions/amp-subscriptions/0.1/doc-impl.js b/extensions/amp-subscriptions/0.1/doc-impl.js
@@ -15,6 +15,7 @@
  */
 
 import {Doc} from '../../../third_party/subscriptions-project/config';
+import {Services} from '../../../src/services';
 import {dev} from '../../../src/log';
 
 /**
@@ -28,6 +29,9 @@ export class DocImpl {
   constructor(ampdoc) {
     /** @private @const {!../../../src/service/ampdoc-impl.AmpDoc} */
     this.ampdoc_ = ampdoc;
+
+    /** @private {!../../../src/service/viewport/viewport-interface.ViewportInterface} */
+    this.viewport_ = Services.viewportForDoc(this.ampdoc_);
   }
 
   /** @override */
@@ -65,6 +69,11 @@ export class DocImpl {
   whenReady() {
     return this.ampdoc_.whenReady();
   }
+
+  /** @override */
+  addToFixedLayer(element) {
+    return this.viewport_.addToFixedLayer(element, /* Force Transfer */ true);
+  }
 }
 
 /**

diff --git a/extensions/amp-subscriptions/0.1/test/test-dialog.js b/extensions/amp-subscriptions/0.1/test/test-dialog.js
@@ -77,11 +77,9 @@ describes.realWin('AmpSubscriptions Dialog', {amp: true}, env => {
         expect(styles.transform).to.not.contain('17');
         expect(dialog.closeButton_).to.have.display('none');
         expect(updatePaddingSpy).to.be.calledOnce.calledWith(17);
-        // TODO(dvoytenko, #20608): add to fixed layer, once the SwG/FL
-        // conflict is resolved.
-        // expect(addToFixedLayerSpy).to.be.calledOnce
-        //     .calledWith(dialog.getRoot());
-        expect(addToFixedLayerSpy).to.not.be.called;
+        expect(addToFixedLayerSpy).to.be.calledOnce.calledWith(
+          dialog.getRoot()
+        );
         expect(dialog.isVisible()).to.be.true;
       });
   });

diff --git a/src/service/fixed-layer.js b/src/service/fixed-layer.js
@@ -665,7 +665,9 @@ export class FixedLayer {
     opt_lightboxMode
   ) {
     // Warn that pub-authored inline styles may be overriden by FixedLayer.
-    this.warnAboutInlineStylesIfNecessary_(element);
+    if (!opt_forceTransfer) {
+      this.warnAboutInlineStylesIfNecessary_(element);
+    }
 
     // Ignore lightboxes because FixedLayer can interfere with their
     // opening/closing animations (#19149).

diff --git a/third_party/subscriptions-project/config.js b/third_party/subscriptions-project/config.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** Version: 0.1.22.64 */
+/** Version: 0.1.22.67 */
 /**
  * Copyright 2018 The Subscribe with Google Authors. All Rights Reserved.
  *
@@ -154,6 +154,15 @@ class Doc {
    * @return {!Promise}
    */
   whenReady() {}
+
+  /**
+   * Adds the element to the fixed layer.
+   * @param {!Element} unusedElement
+   * @return {!Promise}
+   *
+   * This is a no-op for except in AMP on iOS < 13.0.
+   */
+  addToFixedLayer(unusedElement) {}
 }
 
 /** @implements {Doc} */
@@ -208,6 +217,11 @@ class GlobalDoc {
   whenReady() {
     return whenDocumentReady(this.doc_);
   }
+
+  /** @override */
+  addToFixedLayer(unusedElement) {
+    return Promise.resolve();
+  }
 }
 
 /**
@@ -326,6 +340,9 @@ class PageConfig {
  * Debug logger, only log message if #swg.log=1
  * @param {...*} var_args [decription]
  */
+
+/* eslint-disable */
+
 function debugLog(var_args) {
   if (/swg.debug=1/.test(self.location.hash)) {
     const logArgs = Array.prototype.slice.call(arguments, 0);