Merge pull request #675 from scenee/iss-672

scenee · web-flow · commit 52b0f7f29e6f · 2025-11-27T19:52:36.000+09:00
Support dynamic content updates in SwiftUI
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,13 +1,13 @@
 name: ci
 
-on: 
+on:
   push:
-    branches: 
+    branches:
       - master
   pull_request:
-    branches: 
-      - '*'
-  workflow_dispatch: 
+    branches:
+      - "*"
+  workflow_dispatch:
 
 jobs:
   build:
@@ -40,33 +40,33 @@ jobs:
           - os: "26.0.1"
             xcode: "26.0.1"
             sim: "iPhone 16 Pro"
-            parallel: NO  # Stop random test job failures
+            parallel: NO # Stop random test job failures
             runs-on: macos-15
           - os: "18.5"
             xcode: "16.4"
             sim: "iPhone 16 Pro"
-            parallel: NO  # Stop random test job failures
+            parallel: NO # Stop random test job failures
             runs-on: macos-15
           - os: "17.5"
             xcode: "15.4"
             sim: "iPhone 15 Pro"
-            parallel: NO  # Stop random test job failures
+            parallel: NO # Stop random test job failures
             runs-on: macos-14
     steps:
-    - uses: actions/checkout@v4
-    - name: Testing in iOS ${{ matrix.os }}
-      run: |
-        xcodebuild clean test \
-          -workspace FloatingPanel.xcworkspace \
-          -scheme FloatingPanel \
-          -destination 'platform=iOS Simulator,OS=${{ matrix.os }},name=${{ matrix.sim }}' \
-          -parallel-testing-enabled '${{ matrix.parallel }}'
+      - uses: actions/checkout@v4
+      - name: Testing in iOS ${{ matrix.os }}
+        run: |
+          xcodebuild clean test \
+            -workspace FloatingPanel.xcworkspace \
+            -scheme FloatingPanel \
+            -destination 'platform=iOS Simulator,OS=${{ matrix.os }},name=${{ matrix.sim }}' \
+            -parallel-testing-enabled '${{ matrix.parallel }}'
     timeout-minutes: 20
 
   example:
     runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_26.0.1.app/Contents/Developer
     strategy:
       fail-fast: false
       matrix:
@@ -78,13 +78,13 @@ jobs:
           - example: "SamplesObjC"
           - example: "SamplesSwiftUI"
     steps:
-    - uses: actions/checkout@v4
-    - name: Building ${{ matrix.example }}
-      run: |
-        xcodebuild clean build \
-          -workspace FloatingPanel.xcworkspace \
-          -scheme ${{ matrix.example }} \
-          -sdk iphonesimulator
+      - uses: actions/checkout@v4
+      - name: Building ${{ matrix.example }}
+        run: |
+          xcodebuild clean build \
+            -workspace FloatingPanel.xcworkspace \
+            -scheme ${{ matrix.example }} \
+            -sdk iphonesimulator
 
   swiftpm:
     runs-on: ${{ matrix.runs-on }}
@@ -93,7 +93,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["16.4", "15.4"]
+        xcode: ["26.0.1", "16.4", "15.4"]
         platform: [iphoneos, iphonesimulator]
         arch: [x86_64, arm64]
         exclude:
@@ -119,20 +119,20 @@ jobs:
             sys: "ios17.2-simulator"
             runs-on: macos-14
     steps:
-    - uses: actions/checkout@v4
-    - name: "Swift Package Manager build"
-      run: |
-        xcrun swift build \
-          --sdk "$(xcrun --sdk ${{ matrix.platform }} --show-sdk-path)" \
-          -Xswiftc "-target" -Xswiftc "${{ matrix.arch }}-apple-${{ matrix.sys }}"
+      - uses: actions/checkout@v4
+      - name: "Swift Package Manager build"
+        run: |
+          xcrun swift build \
+            --sdk "$(xcrun --sdk ${{ matrix.platform }} --show-sdk-path)" \
+            -Xswiftc "-target" -Xswiftc "${{ matrix.arch }}-apple-${{ matrix.sys }}"
 
   cocoapods:
     runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_26.0.1.app/Contents/Developer
     steps:
-    - uses: actions/checkout@v4
-    - name: "CocoaPods: pod lib lint"
-      run: pod lib lint --allow-warnings --verbose
-    - name: "CocoaPods: pod spec lint"
-      run: pod spec lint --allow-warnings --verbose
+      - uses: actions/checkout@v4
+      - name: "CocoaPods: pod lib lint"
+        run: pod lib lint --allow-warnings --verbose
+      - name: "CocoaPods: pod spec lint"
+        run: pod spec lint --allow-warnings --verbose
diff --git a/Examples/SamplesSwiftUI/SamplesSwiftUI/UseCases/MainView.swift b/Examples/SamplesSwiftUI/SamplesSwiftUI/UseCases/MainView.swift
@@ -6,26 +6,28 @@ import UIKit
 import os.log
 
 struct MainView: View {
+    enum CardContent: String, CaseIterable, Identifiable {
+        case list
+        case detail
+
+        var id: String { rawValue }
+    }
     @State private var panelLayout: FloatingPanelLayout? = MyFloatingPanelLayout()
     @State private var panelState: FloatingPanelState?
+    @State private var selectedContent: CardContent = .list
 
     var body: some View {
         ZStack {
             Color.orange
                 .ignoresSafeArea()
-                .floatingPanel(
-                    coordinator: MyPanelCoordinator.self
-                ) { proxy in
-                    ContentView(proxy: proxy)
-                }
-                .floatingPanelSurfaceAppearance(.transparent())
-                .floatingPanelLayout(panelLayout)
-                .floatingPanelState($panelState)
-                .onChange(of: panelState) { newValue in
-                    Logger().debug("Panel state changed: \(newValue ?? .hidden)")
-                }
-
             VStack(spacing: 32) {
+                Picker("type", selection: $selectedContent) {
+                    ForEach(CardContent.allCases) {
+                        type in
+                        Text(type.rawValue).tag(type)
+                    }
+                }
+                .pickerStyle(.segmented)
                 Button("Move to full") {
                     withAnimation(.interactiveSpring) {
                         panelState = .full
@@ -46,8 +48,37 @@ struct MainView: View {
                         Text("Switch to My layout")
                     }
                 }
+                Spacer()
             }
         }
+        .floatingPanel(
+            coordinator: MyPanelCoordinator.self
+        ) { proxy in
+            switch selectedContent {
+            case .list:
+                ContentView(proxy: proxy)
+            case .detail:
+                HStack {
+                    Spacer()
+                    VStack {
+                        Text("Detail content")
+                            .padding(.top, 32)
+                        Spacer()
+                    }
+                    Spacer()
+                }
+                .padding()
+                .background {
+                    BackgroundView()
+                }
+            }
+        }
+        .floatingPanelSurfaceAppearance(.transparent())
+        .floatingPanelLayout(panelLayout)
+        .floatingPanelState($panelState)
+        .onChange(of: panelState) { newValue in
+            Logger().debug("Panel state changed: \(newValue ?? .hidden)")
+        }
     }
 }
 
diff --git a/Examples/SamplesSwiftUI/SamplesSwiftUI/Views/BackgroundView.swift b/Examples/SamplesSwiftUI/SamplesSwiftUI/Views/BackgroundView.swift
@@ -0,0 +1,23 @@
+import SwiftUI
+
+struct BackgroundView: View {
+    var body: some View {
+        GeometryReader { geometry in
+            Rectangle()
+                .fill(.clear)
+                .frame(height: geometry.size.height * 2)
+                .backgroundEffect()
+        }
+    }
+}
+
+extension View {
+    @ViewBuilder
+    fileprivate func backgroundEffect() -> some View {
+        if #available(iOS 26, *) {
+            self.glassEffect(.regular, in: .rect)
+        } else {
+            self.background(.regularMaterial)
+        }
+    }
+}
diff --git a/Examples/SamplesSwiftUI/SamplesSwiftUI/Views/ContentView.swift b/Examples/SamplesSwiftUI/SamplesSwiftUI/Views/ContentView.swift
@@ -15,6 +15,7 @@ struct ContentView: View {
                                 .frame(maxWidth: .infinity, alignment: .leading)
                                 .frame(height: 60)
                                 .background(.clear)
+                                .padding(.horizontal)
                         }
                     }
                 }
@@ -28,6 +29,7 @@ struct ContentView: View {
                                 .frame(maxWidth: .infinity, alignment: .leading)
                                 .frame(height: 60)
                                 .background(.clear)
+                                .padding(.horizontal)
                         }
                     }
                 }
@@ -38,12 +40,7 @@ struct ContentView: View {
         }
         // Prevent revealing underlying content at the bottom of the panel when the panel is moving beyond its fully‑expanded position.
         .background {
-            GeometryReader { geometry in
-                Rectangle()
-                    .fill(.clear)
-                    .frame(height: geometry.size.height * 2)
-                    .background(.regularMaterial)
-            }
+            BackgroundView()
         }
     }
 }
diff --git a/Sources/SwiftUI/FloatingPanelView.swift b/Sources/SwiftUI/FloatingPanelView.swift
@@ -110,7 +110,11 @@ struct FloatingPanelView<MainView: View, ContentView: View>: UIViewControllerRep
         _ uiViewController: UIHostingController<MainView>,
         context: Context
     ) {
+        uiViewController.rootView = main
+
+        context.coordinator.updateContent(content(context.coordinator.proxy))
         context.coordinator.onUpdate(context: context)
+
         applyEnvironment(context: context)
         applyAnimatableEnvironment(context: context)
     }
@@ -160,6 +164,9 @@ class FloatingPanelCoordinatorProxy {
 
     private var subscriptions: Set<AnyCancellable> = Set()
 
+    // Store a reference to the content hosting controller for dynamic updates
+    private weak var contentHostingController: UIViewController?
+
     var proxy: FloatingPanelProxy { origin.proxy }
     var controller: FloatingPanelController { origin.controller }
 
@@ -181,12 +188,25 @@ class FloatingPanelCoordinatorProxy {
         mainHostingController: UIHostingController<Main>,
         contentHostingController: UIHostingController<Content>
     ) {
+        // Store the content hosting controller reference
+        self.contentHostingController = contentHostingController
+
         origin.setupFloatingPanel(
             mainHostingController: mainHostingController,
             contentHostingController: contentHostingController
         )
     }
 
+    /// Updates the content of the floating panel with new content.
+    func updateContent<Content: View>(_ newContent: Content) {
+        guard
+            let hostingController = contentHostingController as? UIHostingController<Content>
+        else {
+            return
+        }
+        hostingController.rootView = newContent
+    }
+
     func onUpdate<Representable>(
         context: UIViewControllerRepresentableContext<Representable>
     ) where Representable: UIViewControllerRepresentable {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ struct ContentView: View {`
`15`	`15`	`.frame(maxWidth: .infinity, alignment: .leading)`
`16`	`16`	`.frame(height: 60)`
`17`	`17`	`.background(.clear)`
	`18`	`+ .padding(.horizontal)`
`18`	`19`	`}`
`19`	`20`	`}`
`20`	`21`	`}`
`@@ -28,6 +29,7 @@ struct ContentView: View {`
`28`	`29`	`.frame(maxWidth: .infinity, alignment: .leading)`
`29`	`30`	`.frame(height: 60)`
`30`	`31`	`.background(.clear)`
	`32`	`+ .padding(.horizontal)`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`	`}`
`@@ -38,12 +40,7 @@ struct ContentView: View {`
`38`	`40`	`}`
`39`	`41`	`// Prevent revealing underlying content at the bottom of the panel when the panel is moving beyond its fully‑expanded position.`
`40`	`42`	`.background {`
`41`		`- GeometryReader { geometry in`
`42`		`- Rectangle()`
`43`		`- .fill(.clear)`
`44`		`- .frame(height: geometry.size.height * 2)`
`45`		`- .background(.regularMaterial)`
`46`		`- }`
	`43`	`+ BackgroundView()`
`47`	`44`	`}`
`48`	`45`	`}`
`49`	`46`	`}`