Release 1.5.3

changsanjiang · Nov 5, 2019 · 2dfd295 · 2dfd295
1 parent 9518669
commit 2dfd295
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 28 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - Masonry (1.1.0)
-  - SJFullscreenPopGesture/Swift (1.5.2)
+  - SJFullscreenPopGesture/Swift (1.5.3)
   - SJScrollEntriesView (1.1.0):
     - Masonry
   - SJTransitionAnimator (1.0.2)
@@ -16,7 +16,7 @@ DEPENDENCIES:
   - SJUIFactory
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - Masonry
     - SJScrollEntriesView
     - SJTransitionAnimator
@@ -28,11 +28,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
-  SJFullscreenPopGesture: a22be80f7c981eed8443065ddaccebd927252efd
+  SJFullscreenPopGesture: d4994917bc900e79cd686970866834b4c5883565
   SJScrollEntriesView: 2388fec9dbb6ab639f8966de036394eeb753617d
   SJTransitionAnimator: 531f43f1bf883e210f7392da79fab4d39753eec1
   SJUIFactory: b3e973c5e2ae08bc5a1bd2c68d94c00f81e01a0b
 
 PODFILE CHECKSUM: 67961dacee303341e8b9fdf45c0026db2aafc22c
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.8.4
diff --git a/Example/Pods/Local Podspecs/SJFullscreenPopGesture.podspec.json b/Example/Pods/Local Podspecs/SJFullscreenPopGesture.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/.../xcuserdata/bluedancer.xcuserdatad/xcschemes/Pods-SJFullscreenPopGesture_Example.xcscheme b/.../xcuserdata/bluedancer.xcuserdatad/xcschemes/Pods-SJFullscreenPopGesture_Example.xcscheme
diff --git a/Example/Pods/Target Support Files/Masonry/Masonry.xcconfig b/Example/Pods/Target Support Files/Masonry/Masonry.xcconfig
diff --git a/...es/Pods-SJFullscreenPopGesture_Example/Pods-SJFullscreenPopGesture_Example.debug.xcconfig b/...es/Pods-SJFullscreenPopGesture_Example/Pods-SJFullscreenPopGesture_Example.debug.xcconfig
diff --git a/.../Pods-SJFullscreenPopGesture_Example/Pods-SJFullscreenPopGesture_Example.release.xcconfig b/.../Pods-SJFullscreenPopGesture_Example/Pods-SJFullscreenPopGesture_Example.release.xcconfig
diff --git a/Example/Pods/Target Support Files/SJFullscreenPopGesture/SJFullscreenPopGesture-Info.plist b/Example/Pods/Target Support Files/SJFullscreenPopGesture/SJFullscreenPopGesture-Info.plist
diff --git a/Example/Pods/Target Support Files/SJFullscreenPopGesture/SJFullscreenPopGesture.xcconfig b/Example/Pods/Target Support Files/SJFullscreenPopGesture/SJFullscreenPopGesture.xcconfig
diff --git a/Example/Pods/Target Support Files/SJScrollEntriesView/SJScrollEntriesView.xcconfig b/Example/Pods/Target Support Files/SJScrollEntriesView/SJScrollEntriesView.xcconfig
diff --git a/Example/Pods/Target Support Files/SJTransitionAnimator/SJTransitionAnimator.xcconfig b/Example/Pods/Target Support Files/SJTransitionAnimator/SJTransitionAnimator.xcconfig
diff --git a/Example/Pods/Target Support Files/SJUIFactory/SJUIFactory.xcconfig b/Example/Pods/Target Support Files/SJUIFactory/SJUIFactory.xcconfig
diff --git a/...enPopGesture.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate b/...enPopGesture.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/SJFullscreenPopGesture.podspec b/SJFullscreenPopGesture.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "SJFullscreenPopGesture"
-  s.version      = "1.5.2"
+  s.version      = "1.5.3"
   s.summary      = "fullscreen pop gestures."
   s.description  = 'https://github.com/changsanjiang/SJFullscreenPopGesture/blob/master/README.md'
 

diff --git a/SJFullscreenPopGesture/ObjC/SJFullscreenPopGesture.m b/SJFullscreenPopGesture/ObjC/SJFullscreenPopGesture.m
@@ -209,7 +209,8 @@ - (instancetype)initWithTarget:(UIViewController *)target {
         // snapshot
         switch ( target.sj_displayMode ) {
             case SJPreViewDisplayModeSnapshot: {
-                UIView *snapshot = [nav.view.superview snapshotViewAfterScreenUpdates:NO];
+                UIView *superview = nav.tabBarController != nil ? nav.tabBarController.view : nav.view;
+                UIView *snapshot = [superview snapshotViewAfterScreenUpdates:NO];
                 [_rootView addSubview:snapshot];
             }
                 break;

diff --git a/SJFullscreenPopGesture/Swift/SJFullscreenGestureInstaller.swift b/SJFullscreenPopGesture/Swift/SJFullscreenGestureInstaller.swift
@@ -586,8 +586,10 @@ fileprivate class SJSnapshot {
         switch target.sj_displayMode {
         case .snapshot:
             // snapshaot
-            if let snapshot = nav.view.superview?.snapshotView(afterScreenUpdates: false) {
-                rootView.addSubview(snapshot)
+            if let superview = nav.tabBarController != nil ? nav.tabBarController?.view : nav.view.superview {
+                if let snapshot = superview.snapshotView(afterScreenUpdates: false) {
+                    rootView.addSubview(snapshot)
+                }
             }
         case .origin:
             // nav bar snapshot