Disentangle Material and InkSplash

sky/framework/components/popup_menu.dart

 // Copyright 2015 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.
 
 import 'animated_component.dart';
 import '../animation/animated_value.dart';
 import '../fn.dart';
 import '../theme/colors.dart';
 import '../theme/view-configuration.dart';
 import 'dart:async';
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 import 'material.dart';
 import 'popup_menu_item.dart';
 
 const double _kMenuOpenDuration = 300.0;
-const double _kMenuCloneDuration = 200.0;
+const double _kMenuCloseDuration = 200.0;
+const double _kMenuCloseDelay = 100.0;
 
 class PopupMenuController {
   bool isOpen = false;
   AnimatedValue position = new AnimatedValue(0.0);
 
   void open() {
     isOpen = true;
     position.animateTo(1.0, _kMenuOpenDuration);
   }
 
   Future close() {
-    return position.animateTo(0.0, _kMenuCloneDuration).then((_) {
+    return position.animateTo(0.0, _kMenuCloseDuration,
+        initialDelay: _kMenuCloseDelay).then((_) {
       isOpen = false;
     });
   }
 }
 
 class PopupMenu extends AnimatedComponent {
   static final Style _style = new Style('''
     border-radius: 2px;
     padding: 8px 0;
     box-sizing: border-box;
@@ skipping 40 matching lines @@
     });
   }
 
   Node build() {
     int i = 0;
     List<Node> children = new List.from(items.map((List<Node> item) {
       double opacity = _opacityFor(i);
       return new PopupMenuItem(key: i++, children: item, opacity: opacity);
     }));
 
-    return new StyleNode(
-      new Material(
+    return new Material(
+      content: new Container(
+        style: _style,
         inlineStyle: _inlineStyle(),
-        children: children,
-        level: level),
-      _style);
+        children: children
+      ),
+      level: level);
   }
 }