各セルのSetupModelにおいてCleanup処理を先頭に持ってくるように修正

Author: Haruma-K

Assets/UnityDebugSheet/Runtime/Core/Scripts/DefaultImpl/Cells/ButtonCell.cs

@@ -20,6 +20,9 @@ protected override void SetModel(ButtonCellModel model)
         {
             _contentsCanvasGroup.alpha = model.Interactable ? 1.0f : 0.3f;
 
+            // Cleanup
+            button.onClick.RemoveAllListeners();
+            
             // Icon
             icon.Setup(model.Icon);
             icon.gameObject.SetActive(model.Icon.Sprite != null);
@@ -32,7 +35,6 @@ protected override void SetModel(ButtonCellModel model)
 
             // Button
             button.interactable = model.Interactable;
-            button.onClick.RemoveAllListeners();
             button.onClick.AddListener(model.InvokeClicked);
 
             // Height

Assets/UnityDebugSheet/Runtime/Core/Scripts/DefaultImpl/Cells/EnumMultiPickerCell.cs

@@ -51,6 +51,9 @@ protected override void SetModel(EnumMultiPickerCellModel model)
 
             _contentsCanvasGroup.alpha = model.Interactable ? 1.0f : 0.3f;
 
+            // Cleanup
+            button.onClick.RemoveAllListeners();
+            
             // Icon
             icon.Setup(model.Icon);
             icon.gameObject.SetActive(model.Icon.Sprite != null);
@@ -63,7 +66,6 @@ protected override void SetModel(EnumMultiPickerCellModel model)
 
             // Button
             button.interactable = model.Interactable;
-            button.onClick.RemoveAllListeners();
             button.onClick.AddListener(() => OnClicked(model));
 
             // Reload the picking page if it is already created.

Assets/UnityDebugSheet/Runtime/Core/Scripts/DefaultImpl/Cells/EnumPickerCell.cs

@@ -42,6 +42,9 @@ protected override void SetModel(EnumPickerCellModel model)
             }
 
             _contentsCanvasGroup.alpha = model.Interactable ? 1.0f : 0.3f;
+            
+            // Cleanup
+            button.onClick.RemoveAllListeners();
 
             // Icon
             icon.Setup(model.Icon);
@@ -55,7 +58,6 @@ protected override void SetModel(EnumPickerCellModel model)
 
             // Button
             button.interactable = model.Interactable;
-            button.onClick.RemoveAllListeners();
             button.onClick.AddListener(() => OnClicked(model));
 
             // Refresh the picking page if needed.

Assets/UnityDebugSheet/Runtime/Core/Scripts/DefaultImpl/Cells/InputFieldCell.cs

@@ -20,6 +20,9 @@ protected override void SetModel(InputFieldCellModel model)
         {
             _contentsCanvasGroup.alpha = model.Interactable ? 1.0f : 0.3f;
 
+            // Cleanup
+            inputField.onValueChanged.RemoveAllListeners();
+            
             // Icon
             icon.Setup(model.Icon);
             icon.gameObject.SetActive(model.Icon.Sprite != null);
@@ -36,7 +39,6 @@ protected override void SetModel(InputFieldCellModel model)
             inputField.interactable = model.Interactable;
             inputField.SetTextWithoutNotify(model.Value);
 
-            inputField.onValueChanged.RemoveAllListeners();
             inputField.onValueChanged.AddListener(x =>
             {
                 model.Value = x;

Assets/UnityDebugSheet/Runtime/Core/Scripts/DefaultImpl/Cells/MultiPickerCell.cs

@@ -26,6 +26,9 @@ public sealed class MultiPickerCell : Cell<MultiPickerCellModel>
         protected override void SetModel(MultiPickerCellModel model)
         {
             _contentsCanvasGroup.alpha = model.Interactable ? 1.0f : 0.3f;
+            
+            // Cleanup
+            button.onClick.RemoveAllListeners();
 
             // Icon
             icon.Setup(model.Icon);
@@ -39,7 +42,6 @@ protected override void SetModel(MultiPickerCellModel model)
 
             // Button
             button.interactable = model.Interactable;
-            button.onClick.RemoveAllListeners();
             button.onClick.AddListener(() => OnClicked(model));
 
             // Reload the picking page if it is already created.

Assets/UnityDebugSheet/Runtime/Core/Scripts/DefaultImpl/Cells/PageLinkButtonCell.cs

@@ -21,6 +21,9 @@ protected override void SetModel(PageLinkButtonCellModel model)
             var pageType = model.PageType ?? typeof(DebugPage);
 
             _contentsCanvasGroup.alpha = model.Interactable ? 1.0f : 0.3f;
+            
+            // Cleanup
+            button.onClick.RemoveAllListeners();
 
             // Icon
             icon.Setup(model.Icon);
@@ -34,7 +37,6 @@ protected override void SetModel(PageLinkButtonCellModel model)
 
             // Button
             button.interactable = model.Interactable;
-            button.onClick.RemoveAllListeners();
             button.onClick.AddListener(() =>
             {
                 if (model.Prefab == null)

Assets/UnityDebugSheet/Runtime/Core/Scripts/DefaultImpl/Cells/PickerCell.cs

@@ -25,12 +25,15 @@ public sealed class PickerCell : Cell<PickerCellModel>
         protected override void SetModel(PickerCellModel model)
         {
             _contentsCanvasGroup.alpha = model.Interactable ? 1.0f : 0.3f;
+            
+            // Cleanup
+            button.onClick.RemoveAllListeners();
 
             // Icon
             icon.Setup(model.Icon);
             icon.gameObject.SetActive(model.Icon.Sprite != null);
 
-            //Texts
+            // Texts
             cellTexts.Text = model.Text;
             var option = model.Options[model.ActiveOptionIndex];
             cellTexts.SubText = option;
@@ -39,7 +42,6 @@ protected override void SetModel(PickerCellModel model)
 
             // Button
             button.interactable = model.Interactable;
-            button.onClick.RemoveAllListeners();
             button.onClick.AddListener(() => OnClicked(model));
 
             // Refresh the picking page if needed.

Assets/UnityDebugSheet/Runtime/Core/Scripts/DefaultImpl/Cells/PickerOptionCell.cs

@@ -18,6 +18,9 @@ public sealed class PickerOptionCell : Cell<PickerOptionCellModel>
         protected override void SetModel(PickerOptionCellModel model)
         {
             _contentsCanvasGroup.alpha = model.Interactable ? 1.0f : 0.3f;
+            
+            // Cleanup
+            toggle.onValueChanged.RemoveAllListeners();
 
             // Icon
             icon.Setup(model.Icon);
@@ -29,7 +32,6 @@ protected override void SetModel(PickerOptionCellModel model)
             // Toggle
             toggle.interactable = model.Interactable;
             toggle.SetIsOnWithoutNotify(model.IsOn);
-            toggle.onValueChanged.RemoveAllListeners();
             toggle.onValueChanged.AddListener(x =>
             {
                 model.IsOn = x;

Assets/UnityDebugSheet/Runtime/Core/Scripts/DefaultImpl/Cells/SearchFieldCell.cs

@@ -11,10 +11,12 @@ public sealed class SearchFieldCell : Cell<SearchFieldCellModel>
 
         protected override void SetModel(SearchFieldCellModel model)
         {
-            _inputField.interactable = model.Interactable;
+            // Cleanup
             _inputField.onValueChanged.RemoveAllListeners();
-            _inputField.onValueChanged.AddListener(model.InvokeValueChanged);
             _inputField.onEndEdit.RemoveAllListeners();
+            
+            _inputField.interactable = model.Interactable;
+            _inputField.onValueChanged.AddListener(model.InvokeValueChanged);
             _inputField.onEndEdit.AddListener(model.InvokeSubmitted);
 
             _placeholderText.text = model.Placeholder;

Assets/UnityDebugSheet/Runtime/Core/Scripts/DefaultImpl/Cells/SliderCell.cs

@@ -21,6 +21,10 @@ public sealed class SliderCell : Cell<SliderCellModel>
         protected override void SetModel(SliderCellModel model)
         {
             _contentsCanvasGroup.alpha = model.Interactable ? 1.0f : 0.3f;
+            
+            // Cleanup
+            valueField.onValueChanged.RemoveAllListeners();
+            slider.onValueChanged.RemoveAllListeners();
 
             // Icon
             icon.Setup(model.Icon);
@@ -33,7 +37,6 @@ protected override void SetModel(SliderCellModel model)
 
             // TextField
             var valueTextFormat = string.IsNullOrEmpty(model.ValueTextFormat) ? "F2" : model.ValueTextFormat;
-            valueField.onValueChanged.RemoveAllListeners();
             valueField.gameObject.SetActive(model.ShowValueText);
             valueField.SetTextWithoutNotify(value.ToString(valueTextFormat));
             valueField.keyboardType = TouchScreenKeyboardType.DecimalPad;
@@ -51,7 +54,6 @@ protected override void SetModel(SliderCellModel model)
 
             // Slider
             slider.interactable = model.Interactable;
-            slider.onValueChanged.RemoveAllListeners();
             slider.minValue = model.MinValue;
             slider.maxValue = model.MaxValue;
             slider.SetValueWithoutNotify(value);