From 88a1f598825f4c357e79d0ce7e38a0a75126ad15 Mon Sep 17 00:00:00 2001 From: Royce Townsend Date: Thu, 5 Sep 2019 11:54:31 +0800 Subject: [PATCH 1/2] [Android] Fix/Avoid issue with sidemenu:enabled flag being clobbered. --- .../com/reactnativenavigation/parse/SideMenuOptions.java | 1 - .../com/reactnativenavigation/parse/SideMenuRootOptions.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuOptions.java b/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuOptions.java index bde3e8b7187..419dca7e86b 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuOptions.java +++ b/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuOptions.java @@ -38,7 +38,6 @@ public void mergeWith(SideMenuOptions other) { } public void mergeWithDefault(SideMenuOptions defaultOptions) { - if (!visible.hasValue()) visible = defaultOptions.visible; if (!animate.hasValue()) animate = defaultOptions.animate; if (!enabled.hasValue()) enabled = defaultOptions.enabled; if (!height.hasValue()) height = defaultOptions.height; diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuRootOptions.java b/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuRootOptions.java index 827a4712b6d..eb8a7c12b0a 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuRootOptions.java +++ b/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuRootOptions.java @@ -21,7 +21,8 @@ public void mergeWith(SideMenuRootOptions other) { right.mergeWith(other.right); } - public void mergeWithDefault(SideMenuRootOptions sideMenuRootOptions) { - + public void mergeWithDefault(SideMenuRootOptions defaultOptions) { + left.mergeWithDefault(defaultOptions.left); + right.mergeWithDefault(defaultOptions.right); } } From 846c562e027b3ceb42e7cc057cd74ad8c528745c Mon Sep 17 00:00:00 2001 From: Guy Carmeli Date: Fri, 6 Sep 2019 11:32:56 +0300 Subject: [PATCH 2/2] Update SideMenuOptions.java --- .../java/com/reactnativenavigation/parse/SideMenuOptions.java | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuOptions.java b/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuOptions.java index 419dca7e86b..bde3e8b7187 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuOptions.java +++ b/lib/android/app/src/main/java/com/reactnativenavigation/parse/SideMenuOptions.java @@ -38,6 +38,7 @@ public void mergeWith(SideMenuOptions other) { } public void mergeWithDefault(SideMenuOptions defaultOptions) { + if (!visible.hasValue()) visible = defaultOptions.visible; if (!animate.hasValue()) animate = defaultOptions.animate; if (!enabled.hasValue()) enabled = defaultOptions.enabled; if (!height.hasValue()) height = defaultOptions.height;