From 32a614277e55e52afce21d9d699b19544935a4ad Mon Sep 17 00:00:00 2001 From: monologue Date: Thu, 28 Feb 2019 17:19:39 +0800 Subject: [PATCH 1/2] fix: DZNEmptyDataSet is overriding scrollEnabled #198 --- Source/UIScrollView+EmptyDataSet.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/UIScrollView+EmptyDataSet.m b/Source/UIScrollView+EmptyDataSet.m index 27d0a3a7..49f0cc00 100644 --- a/Source/UIScrollView+EmptyDataSet.m +++ b/Source/UIScrollView+EmptyDataSet.m @@ -51,7 +51,7 @@ - (void)prepareForReuse; static char const * const kEmptyDataSetSource = "emptyDataSetSource"; static char const * const kEmptyDataSetDelegate = "emptyDataSetDelegate"; static char const * const kEmptyDataSetView = "emptyDataSetView"; - +static BOOL tempScrollEnabled = YES; #define kEmptyImageViewAnimationKey @"com.dzn.emptyDataSet.imageViewAnimation" @interface UIScrollView () @@ -536,6 +536,8 @@ - (void)dzn_reloadEmptyDataSet [view layoutIfNeeded]; }]; + // Record scroll permission + tempScrollEnabled = self.scrollEnabled; // Configure scroll permission self.scrollEnabled = [self dzn_isScrollAllowed]; @@ -572,7 +574,8 @@ - (void)dzn_invalidate [self setEmptyDataSetView:nil]; } - self.scrollEnabled = YES; + // restore scroll permission + self.scrollEnabled = tempScrollEnabled; // Notifies that the empty dataset view did disappear [self dzn_didDisappear]; From 3d03b4cb1d051010ef769f79c51bc818e1028f95 Mon Sep 17 00:00:00 2001 From: monologue Date: Thu, 28 Feb 2019 17:47:07 +0800 Subject: [PATCH 2/2] fix --- Source/UIScrollView+EmptyDataSet.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/UIScrollView+EmptyDataSet.m b/Source/UIScrollView+EmptyDataSet.m index 49f0cc00..b7c18940 100644 --- a/Source/UIScrollView+EmptyDataSet.m +++ b/Source/UIScrollView+EmptyDataSet.m @@ -51,7 +51,7 @@ - (void)prepareForReuse; static char const * const kEmptyDataSetSource = "emptyDataSetSource"; static char const * const kEmptyDataSetDelegate = "emptyDataSetDelegate"; static char const * const kEmptyDataSetView = "emptyDataSetView"; -static BOOL tempScrollEnabled = YES; +static BOOL tempScrollEnabled; #define kEmptyImageViewAnimationKey @"com.dzn.emptyDataSet.imageViewAnimation" @interface UIScrollView () @@ -393,6 +393,8 @@ - (void)dzn_didTapDataButton:(id)sender - (void)setEmptyDataSetSource:(id)datasource { if (!datasource || ![self dzn_canDisplay]) { + // Record scroll permission + tempScrollEnabled = self.scrollEnabled; [self dzn_invalidate]; } @@ -410,6 +412,8 @@ - (void)setEmptyDataSetSource:(id)datasource - (void)setEmptyDataSetDelegate:(id)delegate { if (!delegate) { + // Record scroll permission + tempScrollEnabled = self.scrollEnabled; [self dzn_invalidate]; }