fix: Change Form to App scope.

mathrunet · Apr 20, 2024 · 2cd4c22 · 2cd4c22
1 parent 8425343
commit 2cd4c22
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/packages/masamune/lib/form/form.dart b/packages/masamune/lib/form/form.dart
@@ -8,7 +8,8 @@ extension MasamuneFormRefHasPageExtensions on RefHasPage {
     "It is no longer possible to use [form] by directly specifying [PageRef] or [WidgetRef]. Instead, use [ref.page.form] to specify the scope. [PageRef]や[WidgetRef]を直接指定しての[form]の利用はできなくなります。代わりに[ref.page.form]でスコープを指定しての利用を行ってください。",
   )
   FormController<TModel> form<TModel>(
-    FormControllerQueryBase<TModel> query,
+    ChangeNotifierScopedQueryBase<FormController<TModel>, PageScopedValueRef>
+        query,
   ) {
     return page.query(query);
   }
@@ -17,7 +18,7 @@ extension MasamuneFormRefHasPageExtensions on RefHasPage {
 /// Create an extension method for [PageScopedValueRef] to handle Query for form.
 ///
 /// フォーム用のQueryを処理するための[PageScopedValueRef]の拡張メソッドを作成します。
-extension MasamuneFormPageScopedValueRefExtensions on PageScopedValueRef {
+extension MasamuneFormPageScopedValueRefExtensions on AppScopedValueOrAppRef {
   /// [FormController] is obtained by passing [FormControllerQueryBase] for the form generated by the builder.
   ///
   /// The state is always saved in page scope.
@@ -40,7 +41,7 @@ extension MasamuneFormPageScopedValueRefExtensions on PageScopedValueRef {
 ///
 /// フォーム用のQueryを処理するための[QueryScopedValueRef]の拡張メソッドを作成します。
 extension QueryScopedValueRefMasamuneFormPageScopedValueRefExtensions
-    on QueryScopedValueRef<PageScopedValueRef> {
+    on QueryScopedValueRef<AppScopedValueOrAppRef> {
   /// [FormController] is obtained by passing [FormControllerQueryBase] for the form generated by the builder.
   ///
   /// The state is always saved in page scope.
@@ -67,8 +68,8 @@ extension FormControllerQueryBaseExtensions<TModel>
   /// Get [FormController<TModel>] while monitoring it with the widget associated with [ref] in the same way as `ref.page.controller`.
   ///
   /// `ref.page.controller`と同じように[ref]に関連するウィジェットで監視を行いつつ[FormController<TModel>]を取得します。
-  FormController<TModel> watch(RefHasPage ref) {
-    return ref.page.form(this);
+  FormController<TModel> watch(RefHasApp ref) {
+    return ref.app.form(this);
   }
 }
 
@@ -81,7 +82,7 @@ extension FormControllerQueryBaseExtensions<TModel>
 /// 基本的には[ChangeNotifier]を継承したクラスを取得することが出来ます。
 abstract class FormControllerQueryBase<TModel>
     extends ChangeNotifierScopedQueryBase<FormController<TModel>,
-        PageScopedValueRef> {
+        AppScopedValueOrAppRef> {
   /// Base class for creating state-to-state usage queries for [FormController] that are code-generated by the builder.
   ///
   /// Basically, you can get a class that inherits from [ChangeNotifier].