Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/signals_core/lib/src/mixins/list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ mixin ListSignalMixin<E, T extends List<E>> on Signal<T> implements List<E> {
@override
bool remove(Object? value) {
final result = this.value.remove(value);
set(this.value, force: true);
if (result) {
set(this.value, force: true);
}
return result;
}

Expand Down
5 changes: 4 additions & 1 deletion packages/signals_core/lib/src/mixins/map.dart
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,11 @@ mixin MapSignalMixin<K, V, T extends Map<K, V>> on Signal<T>

@override
V? remove(Object? key) {
final lengthBefore = value.length;
final result = value.remove(key);
set(value, force: true);
if (value.length != lengthBefore) {
set(value, force: true);
}
return result;
}

Expand Down
4 changes: 3 additions & 1 deletion packages/signals_core/lib/src/mixins/set.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ mixin SetSignalMixin<E, T extends Set<E>> on Signal<T> implements Set<E> {
bool remove(Object? value) {
final list = this.value;
final result = list.remove(value);
set(list, force: true);
if (result) {
set(list, force: true);
}
return result;
}

Expand Down
11 changes: 11 additions & 0 deletions packages/signals_core/test/value/list_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,17 @@ void main() {
expect(value, true);
});

test('remove should only notify when successful', () {
final List<String> list = <String>['a', 'b', 'c'];
final s = create(list);
var called = 0;
s.subscribe((_) => called++);
expect(called, 1);
final result = s.remove('d');
expect(result, false);
expect(called, 1);
});

test('removeWhere', () {
final List<String> list = <String>['a', 'b', 'c'];
final s = create(list);
Expand Down
11 changes: 11 additions & 0 deletions packages/signals_core/test/value/map_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,17 @@ void main() {
expect(s.containsKey('c'), false);
});

test('remove should only notify when successful', () {
final map = <String, int>{'a': 1, 'b': 2, 'c': 3};
final s = map.toSignal();
var called = 0;
s.subscribe((_) => called++);
expect(called, 1);
final result = s.remove('d');
expect(result, null);
expect(called, 1);
});

test('<<', () {
final a = mapSignal<int, int>({1: 1});
final b = mapSignal<int, int>({2: 2});
Expand Down
11 changes: 11 additions & 0 deletions packages/signals_core/test/value/set_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,17 @@ void main() {
expect(value, true);
});

test('remove should only notify when successful', () {
final Set<String> list = <String>{'a', 'b', 'c'};
final s = create(list);
var called = 0;
s.subscribe((_) => called++);
expect(called, 1);
final result = s.remove('d');
expect(result, false);
expect(called, 1);
});

test('removeAll', () {
final Set<String> list = <String>{'a', 'b', 'c'};
final s = create(list);
Expand Down