Move settings-section animations into setting-section, make better

chrome/browser/resources/settings/settings_page/expand_card_transition.js

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+cr.define('settings', function() {
+

[dschuyler, 2016/06/30 01:24:04]

It kinda looks like most of this file
should be indented one more indent. Is
it intentionally not indented?

[michaelpg, 2016/07/07 05:27:43]

Done.

+/**
+ * Expands a card to fill its container's client height, so it covers the
+ * container from the top padding edge to the bottom padding edge.
+ * @see https://www.w3.org/TR/cssom-view-1/#terminology
+ * @constructor
+ * @extends {settings.animation.Transition}
+ * @param {!HTMLElement} card Card to expand.
+ * @param {!HTMLElement} container Container whose height the card will span.
+ */
+function ExpandCardTransition(card, container) {
+  this.card = card;
+  this.container = container;
+
+  /** @type {?settings.animation.Animation} */
+  this.animation_ = null;
+}
+
+ExpandCardTransition.prototype = {
+  __proto__: settings.animation.Transition.prototype,
+
+  /** @override */
+  play: function() {
+    // If we're running this transition before anything else, we won't have the
+    // information we need, so just expand immediately and finish.
+    if (typeof this.card.origHeight_ == 'undefined' ||
+        this.card.style.top == '' || this.card.style.height == '') {
+      this.finished = Promise.resolve();
+      return this.finished;
+    }
+
+    // Align the card with the container's padding edge.
+    var startingTop = this.card.getBoundingClientRect().top;
+
+    // Target position is the container's top edge in the viewport.
+    var targetTop = this.container.getBoundingClientRect().top;
+
+    // The target height shouldn't use the container's current height, because
+    // the container may resize when the window resizes. And height: 100%
+    // wouldn't use the container's height because we're position: fixed.
+    //
+    // Instead, find the part of the window height *not* used by the container
+    // (e.g., for a toolbar) and calc the height dynamically. This assumes the
+    // excluded height stays constant.
+    var excludedHeight = window.innerHeight - this.container.clientHeight;
+    var targetHeight = 'calc(100% - ' + excludedHeight + 'px)';
+
+    // Expand the card. The card's height must be 100% of the container's height
+    // or taller, so we use minHeight rather than height.
+    var keyframes = [{
+      top: startingTop + 'px',
+      minHeight: this.card.style.height,
+      easing: settings.animation.Timing.EASING,
+    }, {
+      top: targetTop + 'px',
+      minHeight: 'calc(100% - ' + targetTop + 'px)',
+    }];
+    var options = /** @type {!KeyframeEffectOptions} */({
+      duration: settings.animation.Timing.DURATION,
+    });
+
+    this.animation_ =
+        new settings.animation.Animation(this.card, keyframes, options);
+    this.finished = this.animation_.finished;
+    return this.finished;
+  },
+
+  /** @override */
+  finish: function() {
+    if (!this.animation_)
+      return;
+    this.animation_.finish();
+    this.animation_ = null;
+  },
+
+  /** @override */
+  cancel: function() {
+    if (!this.animation_)
+      return;
+    this.animation_.cancel();
+    this.animation_ = null;
+  },
+};
+
+/**
+ * Collapses an expanded card back into its original section.
+ * @constructor
+ * @extends {settings.animation.Transition}
+ * @param {!SettingsSectionElement} section Section that contains the card.
+ * @param {!HTMLElement} container Container the card currently spans.
+ */
+function CollapseCardTransition(section, container) {
+  /** @type {!HTMLElement} */
+  this.card = section.$['card'];
+  /** @type {!SettingsSectionElement} */
+  this.section = section;
+  this.container = container;
+
+  /** @type {?settings.animation.Animation} */
+  this.animation_ = null;
+}
+
+CollapseCardTransition.prototype = {
+  __proto__: settings.animation.Transition.prototype,
+
+  /** Sets up the transition before other page content has been unhidden. */
+  setUp: function() {
+    this.card.style.width = this.card.clientWidth + 'px';
+    this.card.style.height = this.card.clientHeight + 'px';
+  },
+
+  /** @override */
+  play: function() {
+    var startingTop = this.container.getBoundingClientRect().top;
+
+    // The card is unpositioned, so use its position as the ending state,
+    // but account for scroll.
+    var targetTop = this.card.getBoundingClientRect().top -
+        this.container.scrollTop;
+
+    // Account for the section header.
+    var headerStyle = getComputedStyle(this.section.$['header']);
+    targetTop += this.section.$['header'].offsetHeight +
+        parseInt(headerStyle.marginBottom, 10) +
+        parseInt(headerStyle.marginTop, 10);

[dschuyler, 2016/06/30 01:24:04]

I believe these may be floats. Consider
parseFloat(foo)

[michaelpg, 2016/07/07 05:27:43]

Done.

+
+    var keyframes = [{
+      top: startingTop + 'px',
+      minHeight: this.card.style.height,
+      easing: settings.animation.Timing.EASING,
+    }, {
+      top: targetTop + 'px',
+      minHeight:
+          /** @type {{origHeight_: number}} */(this.card).origHeight_ + 'px',
+    }];
+    var options = /** @type {!KeyframeEffectOptions} */({
+      duration: settings.animation.Timing.DURATION,
+    });
+
+    this.card.style.height = '';
+    this.animation_ =
+        new settings.animation.Animation(this.card, keyframes, options);
+    this.finished = this.animation_.finished;
+    // Clean up after the animation finishes or cancels.
+    this.finished.catch(function() {}).then(function() {

[michaelpg, 2016/06/28 23:45:16]

Is this idiom OK? The alternative is to pass two functions to then() which both
do the same thing. IMO this is closer to the familiar "try, catch, finally"
structure.

+      this.card.style.width = '';
+    }.bind(this));
+    return this.finished;
+  },
+
+  /** @override */
+  finish: function() {
+    if (!this.animation_)
+      return;
+    this.animation_.finish();
+    this.animation_ = null;
+  },
+
+  /** @override */
+  cancel: function() {
+    if (!this.animation_)
+      return;
+    this.animation_.cancel();
+    this.animation_ = null;
+  },
+};
+
+return {
+  CollapseCardTransition: CollapseCardTransition,
+  ExpandCardTransition: ExpandCardTransition,
+};
+
+});