Skip to content

7.5.0-beta2 #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vasilich6107 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

7.5.0-beta2 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ab1e1c
7.5.0-beta2
vasilich6107 Apr 25, 2026
34338c4
anal9
vasilich6107 May 6, 2026
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
7 changes: 3 additions & 4 deletions packages/generator_tests/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ version: 1.0.0+1

environment:
flutter: ">=3.0.0"
sdk: ">=3.8.0 <4.0.0"
sdk: ">=3.9.0 <4.0.0"
resolution: workspace

dependencies:
Expand All @@ -45,6 +45,5 @@ dev_dependencies:
flutter_lints: ^6.0.0

dependency_overrides:
analyzer: 8.2.0
_fe_analyzer_shared: 89.0.0
test_core: 0.6.8
analyzer: 9.0.0
_fe_analyzer_shared: 92.0.0
172 changes: 63 additions & 109 deletions packages/generator_tests/test/doc/animated_url_list_output_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ class _AnimatedUrlLisOFormBuilderState
AnimatedUrlLisOForm.formElements(widget.model),
null,
null,
initialModel: widget.model,
);

if (_formModel.form.disabled) {
Expand Down Expand Up @@ -242,7 +243,9 @@ class _AnimatedUrlLisOFormBuilderState
@override
void didUpdateWidget(covariant AnimatedUrlLisOFormBuilder oldWidget) {
if (widget.model != oldWidget.model) {
_formModel.updateValue(widget.model);
_formModel
..updateValue(widget.model)
..commitInitial(widget.model);
}

super.didUpdateWidget(oldWidget);
Expand Down Expand Up @@ -278,8 +281,12 @@ final _logAnimatedUrlLisOForm = Logger.detached('AnimatedUrlLisOForm');

class AnimatedUrlLisOForm
implements FormModel<AnimatedUrlLisO, AnimatedUrlLisOOutput> {
AnimatedUrlLisOForm(this.form, this.path, this._formModel)
: initial = form.rawValue;
AnimatedUrlLisOForm(
this.form,
this.path,
this._formModel, {
AnimatedUrlLisO? initialModel,
}) : _ownInitialModel = initialModel;

static const String urlListControlName = "urlList";

Expand All @@ -292,8 +299,10 @@ class AnimatedUrlLisOForm

final Map<String, bool> _disabled = {};

@override
final Map<String, Object?> initial;
AnimatedUrlLisO? _ownInitialModel;

late Map<String, Object?> _ownInitialRawValue =
AnimatedUrlLisOForm.formElements(_ownInitialModel).rawValue;

String urlListControlPath() => pathBuilder(urlListControlName);

Expand Down Expand Up @@ -554,10 +563,28 @@ class AnimatedUrlLisOForm
bool get hasChanged {
return !const DeepCollectionEquality().equals(
currentForm.rawValue,
initial,
FormModel.sliceByPath(initialRawValue, path),
);
}

@override
Map<String, Object?> get initialRawValue {
return _formModel != null
? _formModel!.initialRawValue
: _ownInitialRawValue;
}

AnimatedUrlLisO? get initialModel {
return _ownInitialModel;
}

void commitInitial([AnimatedUrlLisO? newModel]) {
_ownInitialModel = newModel ?? rawModel;
_ownInitialRawValue = AnimatedUrlLisOForm.formElements(
_ownInitialModel,
).rawValue;
}

@override
FormGroup get currentForm {
return path == null ? form : form.control(path!) as FormGroup;
Expand Down Expand Up @@ -596,55 +623,6 @@ class AnimatedUrlLisOForm
emitEvent: emitEvent,
);

@override
void updateInitial(Map<String, Object?>? value, String? path) {
if (_formModel != null) {
_formModel?.updateInitial(currentForm.rawValue, path);
return;
}

if (value == null) return;

if (path == null || path.isEmpty) {
initial.addAll(value);
return;
}

final keys = path.split('.');
Object? current = initial;
for (var i = 0; i < keys.length - 1; i++) {
final key = keys[i];

if (current is List) {
final index = int.tryParse(key);
if (index != null && index >= 0 && index < current.length) {
current = current[index];
continue;
}
}

if (current is Map) {
if (!current.containsKey(key)) {
current[key] = <String, Object?>{};
}
current = current[key];
continue;
}

return;
}

final key = keys.last;
if (current is List) {
final index = int.tryParse(key);
if (index != null && index >= 0 && index < current.length) {
current[index] = value;
}
} else if (current is Map) {
current[key] = value;
}
}

String pathBuilder(String? pathItem) =>
[path, pathItem].whereType<String>().join(".");

Expand All @@ -670,8 +648,12 @@ class AnimatedUrlLisOForm
final _logUrlEntityOForm = Logger.detached('UrlEntityOForm');

class UrlEntityOForm implements FormModel<UrlEntityO, UrlEntityOOutput> {
UrlEntityOForm(this.form, this.path, this._formModel)
: initial = form.rawValue;
UrlEntityOForm(
this.form,
this.path,
this._formModel, {
UrlEntityO? initialModel,
}) : _ownInitialModel = initialModel;

static const String labelControlName = "label";

Expand All @@ -686,8 +668,11 @@ class UrlEntityOForm implements FormModel<UrlEntityO, UrlEntityOOutput> {

final Map<String, bool> _disabled = {};

@override
final Map<String, Object?> initial;
UrlEntityO? _ownInitialModel;

late Map<String, Object?> _ownInitialRawValue = UrlEntityOForm.formElements(
_ownInitialModel,
).rawValue;

String labelControlPath() => pathBuilder(labelControlName);

Expand Down Expand Up @@ -965,10 +950,28 @@ class UrlEntityOForm implements FormModel<UrlEntityO, UrlEntityOOutput> {
bool get hasChanged {
return !const DeepCollectionEquality().equals(
currentForm.rawValue,
initial,
FormModel.sliceByPath(initialRawValue, path),
);
}

@override
Map<String, Object?> get initialRawValue {
return _formModel != null
? _formModel!.initialRawValue
: _ownInitialRawValue;
}

UrlEntityO? get initialModel {
return _ownInitialModel;
}

void commitInitial([UrlEntityO? newModel]) {
_ownInitialModel = newModel ?? rawModel;
_ownInitialRawValue = UrlEntityOForm.formElements(
_ownInitialModel,
).rawValue;
}

@override
FormGroup get currentForm {
return path == null ? form : form.control(path!) as FormGroup;
Expand Down Expand Up @@ -1007,55 +1010,6 @@ class UrlEntityOForm implements FormModel<UrlEntityO, UrlEntityOOutput> {
emitEvent: emitEvent,
);

@override
void updateInitial(Map<String, Object?>? value, String? path) {
if (_formModel != null) {
_formModel?.updateInitial(currentForm.rawValue, path);
return;
}

if (value == null) return;

if (path == null || path.isEmpty) {
initial.addAll(value);
return;
}

final keys = path.split('.');
Object? current = initial;
for (var i = 0; i < keys.length - 1; i++) {
final key = keys[i];

if (current is List) {
final index = int.tryParse(key);
if (index != null && index >= 0 && index < current.length) {
current = current[index];
continue;
}
}

if (current is Map) {
if (!current.containsKey(key)) {
current[key] = <String, Object?>{};
}
current = current[key];
continue;
}

return;
}

final key = keys.last;
if (current is List) {
final index = int.tryParse(key);
if (index != null && index >= 0 && index < current.length) {
current[index] = value;
}
} else if (current is Map) {
current[key] = value;
}
}

String pathBuilder(String? pathItem) =>
[path, pathItem].whereType<String>().join(".");

Expand Down
Loading