https://github.com/AndreiMisiukevich/ContextMenu/issues/5

AndreiMisiukevich · Sep 27, 2018 · 805ab45 · 805ab45
1 parent 5520cef
commit 805ab45
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/ContextMenu/SideActionBarCell.cs b/ContextMenu/SideActionBarCell.cs
@@ -1,11 +1,12 @@
 using Xamarin.Forms;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 
 namespace ContextMenu
 {
     public class SideActionBarCell : BaseActionViewCell
     {
-        private static readonly Dictionary<Element, BaseActionViewCell> _cellBindings = new Dictionary<Element, BaseActionViewCell>();
+        public static SideActionBarCell LastOpenedCell { get; private set; }
 
         public SideActionBarCell()
         {
@@ -15,27 +16,23 @@ public SideActionBarCell()
 
         protected virtual void OnTouchStarted(BaseActionViewCell sender)
         {
-            if (_cellBindings.TryGetValue(Parent, out BaseActionViewCell cell))
+            if (LastOpenedCell == this)
             {
-                if (cell == this)
-                {
-                    return;
-                }
-                cell.ForceClose();
+                return;
             }
-            _cellBindings[Parent] = this;
+            LastOpenedCell?.ForceClose();
+            LastOpenedCell = this;
         }
 
         protected override void SetContextView(View context)
         => (View as ContextMenuScrollView).ContextView = context;
 
         protected override void OnDisappearing()
         {
-            base.OnDisappearing();
-            if (_cellBindings.TryGetValue(Parent, out BaseActionViewCell cell) && cell == this)
+            if (this == LastOpenedCell)
             {
-                ForceClose(false);
-                _cellBindings.Remove(Parent);
+                LastOpenedCell?.ForceClose(false);
+                LastOpenedCell = null;
             }
         }
     }

diff --git a/ContextMenuSample/ContextMenuSample.iOS/ContextMenuSample.iOS.csproj b/ContextMenuSample/ContextMenuSample.iOS/ContextMenuSample.iOS.csproj
@@ -25,7 +25,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <MtouchArch>x86_64</MtouchArch>
-    <MtouchLink>None</MtouchLink>
+    <MtouchLink>SdkOnly</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">