Skip to content

Add Bug Verification for presenting a fullscreen modal #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2023
Merged

Add Bug Verification for presenting a fullscreen modal #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions Demos/BugVerificationControllers/PresentFullscreenModalCausesDidDismiss.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
//
// PresentSecondModal.swift
// Demos
//
// Created by Andrew Breckenridge on 5/9/23.
// Copyright © 2023 Gordon Tucker. All rights reserved.
//

import Foundation
import UIKit
import FittedSheets

class PresentFullscreenModalCausesDidDismiss: UIViewController, Demoable {
static var name: String { "presenting a further view controller with `modalPresentationStyle` of `crossDissolve` causes incorrect `didDismiss` on the sheet" }

override func viewDidLoad() {
super.viewDidLoad()

DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(1)) {
let controller2 = UIStoryboard(name: "IntrinsicAndFullscreenDemo", bundle: nil).instantiateInitialViewController()!
controller2.modalPresentationStyle = .fullScreen // <- CAUSES UNDEFINED BEHAVIOR
self.present(controller2, animated: true)
}
}

static func openDemo(from parent: UIViewController, in view: UIView?) {
let useInlineMode = view != nil

let controller = PresentFullscreenModalCausesDidDismiss()

let options = SheetOptions(
useFullScreenMode: false,
useInlineMode: useInlineMode)
let sheet = SheetViewController(controller: controller, sizes: [.fullscreen, .intrinsic], options: options)
sheet.minimumSpaceAbovePullBar = 44
sheet.didDismiss = { _ in
fatalError("shouldn't dismiss when you present the second view")
}

addSheetEventLogging(to: sheet)

if let view = view {
sheet.animateIn(to: view, in: parent)
} else {
parent.present(sheet, animated: true, completion: nil)
}
}
}

1 change: 1 addition & 0 deletions Demos/BugVerificationsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class BugVerificationsViewController: UIViewController {
super.viewDidLoad()

self.addButton(for: SlideInAnimationBug118ViewController.self)
self.addButton(for: PresentFullscreenModalCausesDidDismiss.self)
}

func addButton(for demo: (UIViewController & Demoable).Type, onTap: (() -> Void)? = nil) {
Expand Down
4 changes: 4 additions & 0 deletions FittedSheets.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/* Begin PBXBuildFile section */
0D18902926C015F700CB6790 /* RubberBandDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D18902826C015F700CB6790 /* RubberBandDemo.swift */; };
42F0967527040EE7009774EA /* Compatible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42F0967427040EE7009774EA /* Compatible.swift */; };
46E78D7A2A0B083F0021A5A3 /* PresentFullscreenModalCausesDidDismiss.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46E78D792A0B083F0021A5A3 /* PresentFullscreenModalCausesDidDismiss.swift */; };
C4E231E524E55E4E00D367FD /* BlurDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E231E424E55E4E00D367FD /* BlurDemo.swift */; };
D9C73C1F290B2BDF002590EC /* CornerCurveDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9C73C1E290B2BDF002590EC /* CornerCurveDemo.swift */; };
F8034165212625DD00EAD717 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8034164212625DD00EAD717 /* AppDelegate.swift */; };
Expand Down Expand Up @@ -105,6 +106,7 @@
0D18902826C015F700CB6790 /* RubberBandDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RubberBandDemo.swift; sourceTree = "<group>"; };
42F0967427040EE7009774EA /* Compatible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Compatible.swift; sourceTree = "<group>"; };
46334410249C041700F334E5 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
46E78D792A0B083F0021A5A3 /* PresentFullscreenModalCausesDidDismiss.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentFullscreenModalCausesDidDismiss.swift; sourceTree = "<group>"; };
C4E231E424E55E4E00D367FD /* BlurDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlurDemo.swift; sourceTree = "<group>"; };
D9C73C1E290B2BDF002590EC /* CornerCurveDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CornerCurveDemo.swift; sourceTree = "<group>"; };
F8034161212625DD00EAD717 /* Demos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demos.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -242,6 +244,7 @@
isa = PBXGroup;
children = (
F83058F725BF774100EE17E1 /* SlideInAnimationBug118 */,
46E78D792A0B083F0021A5A3 /* PresentFullscreenModalCausesDidDismiss.swift */,
);
path = BugVerificationControllers;
sourceTree = "<group>";
Expand Down Expand Up @@ -464,6 +467,7 @@
F8A42B8D24DB24F9005DE55B /* Yalta.swift in Sources */,
F83058FC25BF777400EE17E1 /* SlideInAnimationBug118ViewController.swift in Sources */,
F857D0B22204D761004C862F /* ScrollViewDemo.swift in Sources */,
46E78D7A2A0B083F0021A5A3 /* PresentFullscreenModalCausesDidDismiss.swift in Sources */,
F8799C9325BF5B230095F24F /* ScrollInNavigationDemo.swift in Sources */,
F8A42B5A24D36893005DE55B /* ModalDemosViewController.swift in Sources */,
F857D0A72204B856004C862F /* SimpleDemo.swift in Sources */,
Expand Down