Merge pull request #337 from UnityTech/fix_keep_alive_bug_full

fix keep alive bug (full fix)

Author: Yuncong Zhang

Runtime/rendering/sliver_multi_box_adaptor.cs

@@ -36,8 +36,12 @@ public class SliverMultiBoxAdaptorParentData : ContainerParentDataMixinSliverLog
 
         public bool keepAlive = false;
 
-        internal bool _keptAlive = false;
+        public bool keptAlive {
+            get { return this._keptAlive; }
+        }
 
+        internal bool _keptAlive = false;
+        
         public override string ToString() {
             return $"index={this.index}; {(this.keepAlive ? "keeyAlive; " : "")}{base.ToString()}";
         }
@@ -80,6 +84,7 @@ bool _debugAssertChildListLocked() {
         }
 
         public override void insert(RenderBox child, RenderBox after = null) {
+            D.assert(!this._keepAliveBucket.ContainsValue(value: child));
             base.insert(child, after: after);
             D.assert(this.firstChild != null);
             D.assert(() => {

Runtime/widgets/sliver.cs

@@ -355,29 +355,27 @@ protected override void performRebuild() {
             this._currentBeforeChild = null;
             D.assert(this._currentlyUpdatingChildIndex == null);
             try {
-                int firstIndex = 0;
-                int lastIndex = 0;
-
-                if (!this._childElements.isEmpty()) {
-                    firstIndex = this._childElements.First().Key;
-                    lastIndex = this._childElements.Last().Key;
-                    if (this._didUnderflow) {
-                        lastIndex += 1;
-                    }
-                }
-
-                for (int index = firstIndex; index <= lastIndex; ++index) {
+                void processElement(int index) {
                     this._currentlyUpdatingChildIndex = index;
                     Element newChild = this.updateChild(this._childElements.getOrDefault(index), this._build(index),
                         index);
                     if (newChild != null) {
                         this._childElements[index] = newChild;
-                        this._currentBeforeChild = (RenderBox) newChild.renderObject;
+                        var parentData = (SliverMultiBoxAdaptorParentData) newChild.renderObject.parentData;
+                        if (!parentData.keptAlive) {
+                            this._currentBeforeChild = (RenderBox) newChild.renderObject;
+                        }
                     }
                     else {
                         this._childElements.Remove(index);
                     }
                 }
+                // processElement may modify the Map - need to do a .toList() here.
+                this._childElements.Keys.ToList().ForEach(action: processElement);
+                if (this._didUnderflow) {
+                    var lastKey = this._childElements?.Last().Key ?? -1;
+                    processElement(lastKey + 1);
+                }
             }
             finally {
                 this._currentlyUpdatingChildIndex = null;