aillieo
diff --git a/‎Assets/Runtime/ScrollView/ScrollView.cs‎
Lines changed: 13 additions & 5 deletions b/‎Assets/Runtime/ScrollView/ScrollView.cs‎
Lines changed: 13 additions & 5 deletions
diff --git a/‎Assets/Runtime/ScrollView/ScrollViewEx.cs‎
Lines changed: 6 additions & 0 deletions b/‎Assets/Runtime/ScrollView/ScrollViewEx.cs‎
Lines changed: 6 additions & 0 deletions
@@ -173,12 +173,14 @@ protected virtual void InternalScrollTo(int index)
             {
                 // vertical
                 var value = 1 - (-r.yMax / (this.content.sizeDelta.y - this.refRect.height));
+                value = Mathf.Clamp01(value);
                 this.SetNormalizedPosition(value, 1);
             }
             else
             {
                 // horizontal
                 var value = r.xMin / (this.content.sizeDelta.x - this.refRect.width);
+                value = Mathf.Clamp01(value);
                 this.SetNormalizedPosition(value, 0);
             }
         }
@@ -337,13 +339,23 @@ private void InternalUpdateData()
             }
 
             var newDataCount = 0;
-            var keepOldItems = (this.willUpdateData & 2) == 0;
 
             if (this.itemCountFunc != null)
             {
                 newDataCount = this.itemCountFunc();
             }
 
+            this.CheckDataCountChange(this.dataCount, newDataCount);
+
+            this.ResetCriticalItems();
+
+            this.willUpdateData = 0;
+        }
+
+        protected virtual void CheckDataCountChange(int oldDataCount, int newDataCount)
+        {
+            var keepOldItems = (this.willUpdateData & 2) == 0;
+
             if (newDataCount != this.managedItems.Count)
             {
                 if (this.managedItems.Count < newDataCount)
@@ -408,10 +420,6 @@ private void InternalUpdateData()
             }
 
             this.dataCount = newDataCount;
-
-            this.ResetCriticalItems();
-
-            this.willUpdateData = 0;
         }
 
         private void ResetCriticalItems()
 
@@ -103,6 +103,12 @@ protected override void InternalScrollTo(int index)
             base.InternalScrollTo(index - this.startOffset);
         }
 
+        protected override void CheckDataCountChange(int oldDataCount, int newDataCount)
+        {
+            base.CheckDataCountChange(oldDataCount, newDataCount);
+            this.startOffset = Mathf.Clamp(this.startOffset, 0, Mathf.Max(this.realItemCountFunc() - this.pageSize, 0));
+        }
+
         private void OnValueChanged(Vector2 position)
         {
             int toShow;
Original file line number	Diff line number	Diff line change
`@@ -173,12 +173,14 @@ protected virtual void InternalScrollTo(int index)`
`173`	`173`	`{`
`174`	`174`	`// vertical`
`175`	`175`	`var value = 1 - (-r.yMax / (this.content.sizeDelta.y - this.refRect.height));`
	`176`	`+ value = Mathf.Clamp01(value);`
`176`	`177`	`this.SetNormalizedPosition(value, 1);`
`177`	`178`	`}`
`178`	`179`	`else`
`179`	`180`	`{`
`180`	`181`	`// horizontal`
`181`	`182`	`var value = r.xMin / (this.content.sizeDelta.x - this.refRect.width);`
	`183`	`+ value = Mathf.Clamp01(value);`
`182`	`184`	`this.SetNormalizedPosition(value, 0);`
`183`	`185`	`}`
`184`	`186`	`}`
`@@ -337,13 +339,23 @@ private void InternalUpdateData()`
`337`	`339`	`}`
`338`	`340`
`339`	`341`	`var newDataCount = 0;`
`340`		`- var keepOldItems = (this.willUpdateData & 2) == 0;`
`341`	`342`
`342`	`343`	`if (this.itemCountFunc != null)`
`343`	`344`	`{`
`344`	`345`	`newDataCount = this.itemCountFunc();`
`345`	`346`	`}`
`346`	`347`
	`348`	`+ this.CheckDataCountChange(this.dataCount, newDataCount);`
	`349`	`+`
	`350`	`+ this.ResetCriticalItems();`
	`351`	`+`
	`352`	`+ this.willUpdateData = 0;`
	`353`	`+ }`
	`354`	`+`
	`355`	`+ protected virtual void CheckDataCountChange(int oldDataCount, int newDataCount)`
	`356`	`+ {`
	`357`	`+ var keepOldItems = (this.willUpdateData & 2) == 0;`
	`358`	`+`
`347`	`359`	`if (newDataCount != this.managedItems.Count)`
`348`	`360`	`{`
`349`	`361`	`if (this.managedItems.Count < newDataCount)`
`@@ -408,10 +420,6 @@ private void InternalUpdateData()`
`408`	`420`	`}`
`409`	`421`
`410`	`422`	`this.dataCount = newDataCount;`
`411`		`-`
`412`		`- this.ResetCriticalItems();`
`413`		`-`
`414`		`- this.willUpdateData = 0;`
`415`	`423`	`}`
`416`	`424`
`417`	`425`	`private void ResetCriticalItems()`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,12 @@ protected override void InternalScrollTo(int index)`
`103`	`103`	`base.InternalScrollTo(index - this.startOffset);`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ protected override void CheckDataCountChange(int oldDataCount, int newDataCount)`
	`107`	`+ {`
	`108`	`+ base.CheckDataCountChange(oldDataCount, newDataCount);`
	`109`	`+ this.startOffset = Mathf.Clamp(this.startOffset, 0, Mathf.Max(this.realItemCountFunc() - this.pageSize, 0));`
	`110`	`+ }`
	`111`	`+`
`106`	`112`	`private void OnValueChanged(Vector2 position)`
`107`	`113`	`{`
`108`	`114`	`int toShow;`