From 013bb81b0fe963bed8f1602133cbf5508e609244 Mon Sep 17 00:00:00 2001
From: iDevelopper <patrick.bodet4@wanadoo.fr>
Date: Sun, 29 Sep 2024 13:00:25 +0200
Subject: [PATCH] Fixes a popup bar layout issue for custom container.

---
 .../NSObject+PBPopupSupportPrivate.h          |  2 +-
 .../Private/NSObject+PBPopupSupportPrivate.m  |  2 +-
 .../UIViewController+Private.swift            |  9 ++++++--
 .../Base.lproj/Custom.storyboard              | 22 +++++++++++++------
 .../DemoChildViewController.swift             |  7 ++++++
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/PBPopupController/PBPopupController/PBPopupController-ObjC/NSObject+PBPopupSupportPrivate.h b/PBPopupController/PBPopupController/PBPopupController-ObjC/NSObject+PBPopupSupportPrivate.h
index 0dc5cdc..dbbb113 100644
--- a/PBPopupController/PBPopupController/PBPopupController-ObjC/NSObject+PBPopupSupportPrivate.h
+++ b/PBPopupController/PBPopupController/PBPopupController-ObjC/NSObject+PBPopupSupportPrivate.h
@@ -19,7 +19,7 @@ id<UIViewControllerTransitionCoordinator> __pb_transitionCoordinator(UIViewContr
 
 @end
 
-@interface __LNFakeContext: NSObject
+@interface __PBFakeContext: NSObject
 
 @property(nonatomic, getter=isCancelled) BOOL cancelled;
 
diff --git a/PBPopupController/PBPopupController/PBPopupController-ObjC/Private/NSObject+PBPopupSupportPrivate.m b/PBPopupController/PBPopupController/PBPopupController-ObjC/Private/NSObject+PBPopupSupportPrivate.m
index 4eebbec..7a4be49 100644
--- a/PBPopupController/PBPopupController/PBPopupController-ObjC/Private/NSObject+PBPopupSupportPrivate.m
+++ b/PBPopupController/PBPopupController/PBPopupController-ObjC/Private/NSObject+PBPopupSupportPrivate.m
@@ -54,4 +54,4 @@ NSTimeInterval __pb_durationForTransition(UIViewController* vc, NSUInteger trans
 
 @end
 
-@implementation __LNFakeContext @end
+@implementation __PBFakeContext @end
diff --git a/PBPopupController/PBPopupController/PBPopupController-Swift/UIViewController+Private.swift b/PBPopupController/PBPopupController/PBPopupController-Swift/UIViewController+Private.swift
index 7e47448..6bc0267 100644
--- a/PBPopupController/PBPopupController/PBPopupController-Swift/UIViewController+Private.swift
+++ b/PBPopupController/PBPopupController/PBPopupController-Swift/UIViewController+Private.swift
@@ -1138,7 +1138,12 @@ public extension UIViewController
         self.pb_viewDidLayoutSubviews()
         if let rv = UIViewController.getAssociatedPopupBarFor(self) {
             if !(self is UITabBarController) && !(self is UINavigationController) {
-                rv.backgroundView.alpha = rv.isFloating ? 0.0 : 1.0
+                if rv.isFloating {
+                    rv.backgroundView.alpha = self.bottomBarIsHidden() ? 0.0 : 1.0
+                }
+                else {
+                    rv.backgroundView.alpha = 1.0
+                }
             }
             
             if self is UITabBarController {
@@ -1243,7 +1248,7 @@ internal extension UIViewController
     }
     
     @objc func bottomBarIsHidden() -> Bool {
-        return self.bottomBar.isHidden
+        return self.bottomBar.isHidden || self.bottomBar.frame.height == 0.0
     }
     
     @objc func insetsForBottomBar() -> UIEdgeInsets
diff --git a/PBPopupControllerSample/PBPopupControllerSample/Base.lproj/Custom.storyboard b/PBPopupControllerSample/PBPopupControllerSample/Base.lproj/Custom.storyboard
index 44ef732..41ecf0f 100755
--- a/PBPopupControllerSample/PBPopupControllerSample/Base.lproj/Custom.storyboard
+++ b/PBPopupControllerSample/PBPopupControllerSample/Base.lproj/Custom.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23502" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -300,10 +300,18 @@
                                 </connections>
                             </button>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="oca-q2-ae6">
-                                <rect key="frame" x="149.66666666666666" y="308" width="114.99999999999997" height="180"/>
+                                <rect key="frame" x="123.00000000000001" y="281" width="168.33333333333337" height="234.33333333333337"/>
                                 <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yXj-mF-Sne">
+                                        <rect key="frame" x="0.0" y="0.0" width="168.33333333333334" height="34.333333333333336"/>
+                                        <state key="normal" title="Button"/>
+                                        <buttonConfiguration key="configuration" style="plain" title="Floating Popup Bar"/>
+                                        <connections>
+                                            <action selector="popupBarIsFloating:" destination="Oie-Fg-l06" eventType="touchUpInside" id="8k8-cT-NlA"/>
+                                        </connections>
+                                    </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kwq-he-J6V">
-                                        <rect key="frame" x="0.0" y="0.0" width="115" height="30"/>
+                                        <rect key="frame" x="0.0" y="54.333333333333314" width="168.33333333333334" height="30"/>
                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
                                         <state key="normal" title="Present"/>
                                         <connections>
@@ -311,7 +319,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SQ3-dd-iFa">
-                                        <rect key="frame" x="0.0" y="50" width="115" height="30"/>
+                                        <rect key="frame" x="0.0" y="104.33333333333331" width="168.33333333333334" height="30"/>
                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
                                         <state key="normal" title="Present Custom"/>
                                         <connections>
@@ -319,7 +327,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7oe-lJ-Slq">
-                                        <rect key="frame" x="0.0" y="100" width="115" height="30"/>
+                                        <rect key="frame" x="0.0" y="154.33333333333331" width="168.33333333333334" height="30"/>
                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                         <state key="normal" title="Present Popup"/>
@@ -328,7 +336,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wd7-fx-Vo3">
-                                        <rect key="frame" x="0.0" y="150" width="115" height="30"/>
+                                        <rect key="frame" x="0.0" y="204.33333333333331" width="168.33333333333334" height="30"/>
                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
                                         <state key="normal" title="Dismiss"/>
                                         <connections>
diff --git a/PBPopupControllerSample/PBPopupControllerSample/DemoChildViewController.swift b/PBPopupControllerSample/PBPopupControllerSample/DemoChildViewController.swift
index 0489ccf..cf07ed3 100755
--- a/PBPopupControllerSample/PBPopupControllerSample/DemoChildViewController.swift
+++ b/PBPopupControllerSample/PBPopupControllerSample/DemoChildViewController.swift
@@ -53,6 +53,12 @@ class DemoChildViewController: UIViewController {
     
     // MARK: - Actions
     
+    @IBAction func popupBarIsFloating(_ sender: UIButton) {
+        if let containerVC = self.parent {
+            containerVC.popupBar.isFloating.toggle()
+        }
+    }
+    
     @IBAction func presentPopupBar(_ sender: UIButton) {
         if let containerVC = self.parent {
             containerVC.dismissPopupBar(animated: false) {
@@ -112,6 +118,7 @@ class DemoChildViewController: UIViewController {
         if let containerVC = self.parent as? DemoContainerController {
             containerVC.popupController.dataSource = containerVC
             containerVC.popupController.delegate = containerVC
+            containerVC.popupBar.isFloating = true
             containerVC.popupBar.inheritsVisualStyleFromBottomBar = false
             containerVC.popupBar.backgroundEffect = containerVC.tabBar.standardAppearance.backgroundEffect
             containerVC.popupBar.image = UIImage(named: "Cover22")