Use measureFrame instead of GeometryReader in POSModalViewModifier

Author: staskus

WooCommerce/Classes/POS/Presentation/Reusable Views/POSModalViewModifier.swift

@@ -8,53 +8,47 @@ struct POSRootModalViewModifier: ViewModifier {
     private let scaleTransitionAmount = Constants.scaleTransitionAmount
 
     func body(content: Content) -> some View {
-        GeometryReader { geometry in
-            ZStack {
-                content
-                    .blur(radius: modalManager.isPresented ? 8 : 0)
-                    .disabled(modalManager.isPresented)
-                    .accessibilityElement(children: modalManager.isPresented ? .ignore : .contain)
-
-                if modalManager.isPresented {
-                    Color.posSurfaceDim.opacity(0.8)
-                        .edgesIgnoringSafeArea(.all)
-                        .onTapGesture {
-                            if modalManager.allowsInteractiveDismissal {
-                                modalManager.dismiss()
-                            }
+        ZStack {
+            content
+                .blur(radius: modalManager.isPresented ? 8 : 0)
+                .disabled(modalManager.isPresented)
+                .accessibilityElement(children: modalManager.isPresented ? .ignore : .contain)
+
+            if modalManager.isPresented {
+                Color.posSurfaceDim.opacity(0.8)
+                    .edgesIgnoringSafeArea(.all)
+                    .onTapGesture {
+                        if modalManager.allowsInteractiveDismissal {
+                            modalManager.dismiss()
                         }
-                        // Don't scale/fade in the backdrop
-                        .animation(nil, value: modalManager.isPresented)
-                    ZStack {
-                        modalManager.getContent()
-                            .environment(\.posModalParentSize, modalParentSize)
-                            .background(Color.posSurfaceBright)
-                            .cornerRadius(POSCornerRadiusStyle.extraLarge.value)
-                            .posShadow(.large, cornerRadius: POSCornerRadiusStyle.extraLarge.value)
-                            .padding()
                     }
-                    .zIndex(1)
-                    // Scale the modal container in and out, fading appropriately.
-                    // Unfortunately combined doesn't work on removal.
-                    // The extra ZStack prevents changing modalContent from scaling and fading, but the ZIndex needs to be
-                    // consistent even when animating out, which it wouldn't be if unspecified.
-                    .transition(.scale(scale: scaleTransitionAmount).combined(with: .opacity))
+                // Don't scale/fade in the backdrop
+                    .animation(nil, value: modalManager.isPresented)
+                ZStack {
+                    modalManager.getContent()
+                        .environment(\.posModalParentSize, modalParentSize)
+                        .background(Color.posSurfaceBright)
+                        .cornerRadius(POSCornerRadiusStyle.extraLarge.value)
+                        .posShadow(.large, cornerRadius: POSCornerRadiusStyle.extraLarge.value)
+                        .padding()
                 }
+                .zIndex(1)
+                // Scale the modal container in and out, fading appropriately.
+                // Unfortunately combined doesn't work on removal.
+                // The extra ZStack prevents changing modalContent from scaling and fading, but the ZIndex needs to be
+                // consistent even when animating out, which it wouldn't be if unspecified.
+                .transition(.scale(scale: scaleTransitionAmount).combined(with: .opacity))
             }
-            .onAppear {
-                updateModalParentSize(from: geometry)
-            }
-            .onChange(of: geometry.size) { _ in
-                updateModalParentSize(from: geometry)
-            }
+        }
+        .measureFrame { frame in
+            updateModalParentSize(with: frame.size)
         }
         .animation(.easeInOut(duration: animationDuration), value: modalManager.isPresented)
     }
 
-    private func updateModalParentSize(from geometry: GeometryProxy) {
-        let newSize = geometry.size
-        if newSize != modalParentSize && newSize != .zero {
-            modalParentSize = newSize
+    private func updateModalParentSize(with size: CGSize) {
+        if size != modalParentSize && size != .zero {
+            modalParentSize = size
         }
     }
 }