Merge branch 'main' into fix-automaticasync

flutter-stripe · May 21, 2024 · d5f0099 · d5f0099
2 parents ce52f14 + 7a49035
commit d5f0099
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+*.freezed.dart linguist-generated=true
+*.g.dart linguist-generated=true
diff --git a/packages/stripe_web/lib/src/widgets/card_field.dart b/packages/stripe_web/lib/src/widgets/card_field.dart
@@ -53,6 +53,8 @@ class WebCardField extends StatefulWidget {
 class WebStripeCardState extends State<WebCardField> with CardFieldContext {
   CardEditController get controller => widget.controller;
 
+  late MutationObserver mutationObserver;
+
   @override
   void initState() {
     // ignore: undefined_prefixed_name
@@ -62,6 +64,24 @@ class WebStripeCardState extends State<WebCardField> with CardFieldContext {
         ..id = 'card-element'
         ..style.border = 'none',
     );
+    mutationObserver = MutationObserver((entries, observer) {
+      if (document.getElementById('card-element') != null) {
+        mutationObserver.disconnect();
+
+        updateCardDetails(
+          const CardFieldInputDetails(complete: false),
+          controller,
+        );
+        element = WebStripe.js
+            .elements(createElementOptions())
+            .createCard(createOptions())
+          ..mount('#card-element')
+          ..onBlur(requestBlur)
+          ..onFocus(requestFocus)
+          ..onChange(onCardChanged);
+      }
+    });
+    mutationObserver.observe(document, childList: true, subtree: true);
     initStripe();
     super.initState();
   }
@@ -80,19 +100,6 @@ class WebStripeCardState extends State<WebCardField> with CardFieldContext {
           dev.log('WARNING! Initial card data value has been ignored. \n'
               '$kDebugPCIMessage');
         }
-        ambiguate(WidgetsBinding.instance)?.addPostFrameCallback((timeStamp) {
-          updateCardDetails(
-            const CardFieldInputDetails(complete: false),
-            controller,
-          );
-          element = WebStripe.js
-              .elements(createElementOptions())
-              .createCard(createOptions())
-            ..mount('#card-element')
-            ..onBlur(requestBlur)
-            ..onFocus(requestFocus)
-            ..onChange(onCardChanged);
-        });
       }
     });
   }
@@ -162,8 +169,7 @@ class WebStripeCardState extends State<WebCardField> with CardFieldContext {
     return js.CardElementOptions(
       style: {
         'base': {
-          if (textColor != null)
-            'color': '${colorToCssString(textColor)}'
+          if (textColor != null) 'color': '${colorToCssString(textColor)}'
         }
       },
       hidePostalCode: !widget.enablePostalCode,
@@ -191,6 +197,7 @@ class WebStripeCardState extends State<WebCardField> with CardFieldContext {
   void dispose() {
     detachController(controller);
     element?.unmount();
+    mutationObserver.disconnect();
     super.dispose();
   }