Merge pull request #94 from Yalantis/develop

Develop
Yalantis · Jan 31, 2019 · cc1e44f · cc1e44f · kdwayne22 · Aug 20, 2022
2 parents 2e28534 + 7c27eef
commit cc1e44f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/src/main/java/com/yalantis/contextmenu/lib/ContextMenuDialogFragment.kt b/lib/src/main/java/com/yalantis/contextmenu/lib/ContextMenuDialogFragment.kt
@@ -46,7 +46,7 @@ open class ContextMenuDialogFragment : DialogFragment() {
             if (menuParams.isClosableOutside) {
                 rootRelativeLayout.setOnClickListener {
                     if (isAdded) {
-                        dismissAllowingStateLoss()
+                        dropDownMenuAdapter.closeOutside()
                     }
                 }
             }
@@ -65,6 +65,10 @@ open class ContextMenuDialogFragment : DialogFragment() {
             ).apply {
                 setAnimationDuration(menuParams.animationDuration)
 
+                onCloseOutsideClickListener = { _ ->
+                    close()
+                }
+
                 onItemClickListener = { view ->
                     val position = (view.parent as ViewGroup).indexOfChild(view)
                     menuItemClickListener(view, position)

diff --git a/lib/src/main/java/com/yalantis/contextmenu/lib/MenuAdapter.kt b/lib/src/main/java/com/yalantis/contextmenu/lib/MenuAdapter.kt
@@ -17,6 +17,7 @@ open class MenuAdapter(
         private val gravity: MenuGravity
 ) {
 
+    var onCloseOutsideClickListener: (view: View) -> Unit = {}
     var onItemClickListener: (view: View) -> Unit = {}
     var onItemLongClickListener: (view: View) -> Unit = {}
     private var onItemClickListenerCalled: (view: View) -> Unit = {}
@@ -68,6 +69,13 @@ open class MenuAdapter(
         }
     }
 
+    fun closeOutside() {
+        onItemClickListenerCalled = onCloseOutsideClickListener
+        menuWrapper.getChildAt(FIRST_CHILD_INDEX)?.let {
+            viewClicked(it)
+        }
+    }
+
     fun getItemCount() = menuObjects.size
 
     private fun getLastItemPosition() = getItemCount() - 1
@@ -204,12 +212,12 @@ open class MenuAdapter(
         return AnimatorSet().apply {
             duration = animationDurationMillis
             startDelay = 0
+            interpolator = HesitateInterpolator()
 
             playTogether(
                     AnimatorSet().apply { playSequentially(textAnimations) },
                     AnimatorSet().apply { playSequentially(imageAnimations) }
             )
-            setInterpolator(HesitateInterpolator())
             onAnimationEnd { toggleIsAnimationRun() }
         }
     }
@@ -403,5 +411,7 @@ open class MenuAdapter(
     companion object {
 
         const val ANIMATION_DURATION_MILLIS = 100L
+
+        private const val FIRST_CHILD_INDEX = 0
     }
 }