Fix "dependencies" not working for ChangeNotifierProvider

fixes rrousselGit#800
manuelperez96 · Oct 9, 2021 · 8e2947e · 8e2947e
1 parent 90d5aa4
commit 8e2947e
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 2 deletions.
diff --git a/packages/flutter_riverpod/lib/src/change_notifier_provider/auto_dispose.dart b/packages/flutter_riverpod/lib/src/change_notifier_provider/auto_dispose.dart
@@ -52,7 +52,7 @@ class AutoDisposeChangeNotifierProvider<Notifier extends ChangeNotifier>
     ref.onDispose(notifier.dispose);
 
     return notifier;
-  });
+  }, dependencies: dependencies);
 
   @override
   Notifier create(AutoDisposeProviderElementBase<Notifier> ref) {

diff --git a/packages/flutter_riverpod/lib/src/change_notifier_provider/base.dart b/packages/flutter_riverpod/lib/src/change_notifier_provider/base.dart
@@ -53,7 +53,7 @@ class ChangeNotifierProvider<Notifier extends ChangeNotifier>
     ref.onDispose(notifier.dispose);
 
     return notifier;
-  });
+  }, dependencies: dependencies);
 
   @override
   Notifier create(ProviderElementBase<Notifier> ref) {

diff --git a/...r_riverpod/test/providers/change_notifier/auto_dispose_change_notifier_provider_test.dart b/...r_riverpod/test/providers/change_notifier/auto_dispose_change_notifier_provider_test.dart
@@ -64,5 +64,23 @@ void main() {
         expect(root.getAllProviderElements(), isEmpty);
       });
     });
+
+    test('can be auto-scoped', () async {
+      final dep = Provider((ref) => 0);
+      final provider = ChangeNotifierProvider.autoDispose(
+        (ref) => ValueNotifier(ref.watch(dep)),
+        dependencies: [dep],
+      );
+      final root = createContainer();
+      final container = createContainer(
+        parent: root,
+        overrides: [dep.overrideWithValue(42)],
+      );
+
+      expect(container.read(provider).value, 42);
+      expect(container.read(provider.notifier).value, 42);
+
+      expect(root.getAllProviderElements(), isEmpty);
+    });
   });
 }
diff --git a/packages/flutter_riverpod/test/providers/change_notifier/change_notifier_provider_test.dart b/packages/flutter_riverpod/test/providers/change_notifier/change_notifier_provider_test.dart
@@ -234,6 +234,24 @@ void main() {
     expect(notifier2.mounted, true);
     expect(notifier.mounted, true);
   });
+
+  test('ChangeNotifier can be auto-scoped', () async {
+    final dep = Provider((ref) => 0);
+    final provider = ChangeNotifierProvider(
+      (ref) => ValueNotifier(ref.watch(dep)),
+      dependencies: [dep],
+    );
+    final root = createContainer();
+    final container = createContainer(
+      parent: root,
+      overrides: [dep.overrideWithValue(42)],
+    );
+
+    expect(container.read(provider).value, 42);
+    expect(container.read(provider.notifier).value, 42);
+
+    expect(root.getAllProviderElements(), isEmpty);
+  });
 }
 
 class TestNotifier extends ChangeNotifier {

diff --git a/...pod/test/providers/change_notifier/family_auto_dispose_change_notifier_provider_test.dart b/...pod/test/providers/change_notifier/family_auto_dispose_change_notifier_provider_test.dart
@@ -26,6 +26,25 @@ void main() {
         );
         expect(root.getAllProviderElementsInOrder(), isEmpty);
       });
+
+      test('ChangeNotifier can be auto-scoped', () async {
+        final dep = Provider((ref) => 0);
+        final provider =
+            ChangeNotifierProvider.autoDispose.family<ValueNotifier<int>, int>(
+          (ref, i) => ValueNotifier(ref.watch(dep) + i),
+          dependencies: [dep],
+        );
+        final root = createContainer();
+        final container = createContainer(
+          parent: root,
+          overrides: [dep.overrideWithValue(42)],
+        );
+
+        expect(container.read(provider(10)).value, 52);
+        expect(container.read(provider(10).notifier).value, 52);
+
+        expect(root.getAllProviderElements(), isEmpty);
+      });
     });
   });
 }
diff --git a/...flutter_riverpod/test/providers/change_notifier/family_change_notifier_provider_test.dart b/...flutter_riverpod/test/providers/change_notifier/family_change_notifier_provider_test.dart
@@ -27,5 +27,23 @@ void main() {
         expect(root.getAllProviderElementsInOrder(), isEmpty);
       });
     });
+
+    test('ChangeNotifier can be auto-scoped', () async {
+      final dep = Provider((ref) => 0);
+      final provider = ChangeNotifierProvider.family<ValueNotifier<int>, int>(
+        (ref, i) => ValueNotifier(ref.watch(dep) + i),
+        dependencies: [dep],
+      );
+      final root = createContainer();
+      final container = createContainer(
+        parent: root,
+        overrides: [dep.overrideWithValue(42)],
+      );
+
+      expect(container.read(provider(10)).value, 52);
+      expect(container.read(provider(10).notifier).value, 52);
+
+      expect(root.getAllProviderElements(), isEmpty);
+    });
   });
 }