diff --git a/packages/remix/lib/src/components/accordion/accordion.g.dart b/packages/remix/lib/src/components/accordion/accordion.g.dart index 3f9a8d8..d150676 100644 --- a/packages/remix/lib/src/components/accordion/accordion.g.dart +++ b/packages/remix/lib/src/components/accordion/accordion.g.dart @@ -6,13 +6,16 @@ part of 'accordion.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixAccordionSpecMethods on Spec, Diagnosticable { +mixin _$RemixAccordionSpec implements Spec, Diagnosticable { StyleSpec get trigger; StyleSpec get leadingIcon; StyleSpec get title; StyleSpec get trailingIcon; StyleSpec get content; + @override + Type get type => RemixAccordionSpec; + @override RemixAccordionSpec copyWith({ StyleSpec? trigger, @@ -41,9 +44,54 @@ mixin _$RemixAccordionSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [ + trigger, + leadingIcon, + title, + trailingIcon, + content, + ]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixAccordionSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('trigger', trigger)) ..add(DiagnosticsProperty('leadingIcon', leadingIcon)) @@ -51,17 +99,13 @@ mixin _$RemixAccordionSpecMethods on Spec, Diagnosticable { ..add(DiagnosticsProperty('trailingIcon', trailingIcon)) ..add(DiagnosticsProperty('content', content)); } - - @override - List get props => [ - trigger, - leadingIcon, - title, - trailingIcon, - content, - ]; } +@Deprecated( + 'Rename to `_\$RemixAccordionSpec` and migrate the class declaration to `class RemixAccordionSpec with _\$RemixAccordionSpec`. The `_\$RemixAccordionSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixAccordionSpecMethods = _$RemixAccordionSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/accordion/accordion_spec.dart b/packages/remix/lib/src/components/accordion/accordion_spec.dart index b256ca1..6fbdfa5 100644 --- a/packages/remix/lib/src/components/accordion/accordion_spec.dart +++ b/packages/remix/lib/src/components/accordion/accordion_spec.dart @@ -1,8 +1,7 @@ part of 'accordion.dart'; @MixableSpec() -class RemixAccordionSpec extends Spec - with Diagnosticable, _$RemixAccordionSpecMethods { +class RemixAccordionSpec with _$RemixAccordionSpec { @override final StyleSpec trigger; @override diff --git a/packages/remix/lib/src/components/avatar/avatar.g.dart b/packages/remix/lib/src/components/avatar/avatar.g.dart index 97de435..4512ef9 100644 --- a/packages/remix/lib/src/components/avatar/avatar.g.dart +++ b/packages/remix/lib/src/components/avatar/avatar.g.dart @@ -6,11 +6,14 @@ part of 'avatar.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixAvatarSpecMethods on Spec, Diagnosticable { +mixin _$RemixAvatarSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get text; StyleSpec get icon; + @override + Type get type => RemixAvatarSpec; + @override RemixAvatarSpec copyWith({ StyleSpec? container, @@ -33,19 +36,60 @@ mixin _$RemixAvatarSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, text, icon]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixAvatarSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('text', text)) ..add(DiagnosticsProperty('icon', icon)); } - - @override - List get props => [container, text, icon]; } +@Deprecated( + 'Rename to `_\$RemixAvatarSpec` and migrate the class declaration to `class RemixAvatarSpec with _\$RemixAvatarSpec`. The `_\$RemixAvatarSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixAvatarSpecMethods = _$RemixAvatarSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/avatar/avatar_spec.dart b/packages/remix/lib/src/components/avatar/avatar_spec.dart index 4511aa5..82203e1 100644 --- a/packages/remix/lib/src/components/avatar/avatar_spec.dart +++ b/packages/remix/lib/src/components/avatar/avatar_spec.dart @@ -1,8 +1,7 @@ part of 'avatar.dart'; @MixableSpec() -class RemixAvatarSpec extends Spec - with Diagnosticable, _$RemixAvatarSpecMethods { +class RemixAvatarSpec with _$RemixAvatarSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/badge/badge.g.dart b/packages/remix/lib/src/components/badge/badge.g.dart index 836f31f..bdc4bda 100644 --- a/packages/remix/lib/src/components/badge/badge.g.dart +++ b/packages/remix/lib/src/components/badge/badge.g.dart @@ -6,10 +6,13 @@ part of 'badge.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixBadgeSpecMethods on Spec, Diagnosticable { +mixin _$RemixBadgeSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get text; + @override + Type get type => RemixBadgeSpec; + @override RemixBadgeSpec copyWith({ StyleSpec? container, @@ -29,18 +32,59 @@ mixin _$RemixBadgeSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, text]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixBadgeSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('text', text)); } - - @override - List get props => [container, text]; } +@Deprecated( + 'Rename to `_\$RemixBadgeSpec` and migrate the class declaration to `class RemixBadgeSpec with _\$RemixBadgeSpec`. The `_\$RemixBadgeSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixBadgeSpecMethods = _$RemixBadgeSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/badge/badge_spec.dart b/packages/remix/lib/src/components/badge/badge_spec.dart index e2aef68..18f491e 100644 --- a/packages/remix/lib/src/components/badge/badge_spec.dart +++ b/packages/remix/lib/src/components/badge/badge_spec.dart @@ -1,8 +1,7 @@ part of 'badge.dart'; @MixableSpec() -class RemixBadgeSpec extends Spec - with Diagnosticable, _$RemixBadgeSpecMethods { +class RemixBadgeSpec with _$RemixBadgeSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/button/button.g.dart b/packages/remix/lib/src/components/button/button.g.dart index a188182..e5b56a2 100644 --- a/packages/remix/lib/src/components/button/button.g.dart +++ b/packages/remix/lib/src/components/button/button.g.dart @@ -6,13 +6,16 @@ part of 'button.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixButtonSpecMethods on Spec, Diagnosticable { +mixin _$RemixButtonSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get label; StyleSpec get icon; StyleSpec get spinner; IconAlignment get iconAlignment; + @override + Type get type => RemixButtonSpec; + @override RemixButtonSpec copyWith({ StyleSpec? container, @@ -41,9 +44,48 @@ mixin _$RemixButtonSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, label, icon, spinner, iconAlignment]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixButtonSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('label', label)) @@ -51,11 +93,13 @@ mixin _$RemixButtonSpecMethods on Spec, Diagnosticable { ..add(DiagnosticsProperty('spinner', spinner)) ..add(DiagnosticsProperty('iconAlignment', iconAlignment)); } - - @override - List get props => [container, label, icon, spinner, iconAlignment]; } +@Deprecated( + 'Rename to `_\$RemixButtonSpec` and migrate the class declaration to `class RemixButtonSpec with _\$RemixButtonSpec`. The `_\$RemixButtonSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixButtonSpecMethods = _$RemixButtonSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/button/button_spec.dart b/packages/remix/lib/src/components/button/button_spec.dart index 2b9fe3b..721eb28 100644 --- a/packages/remix/lib/src/components/button/button_spec.dart +++ b/packages/remix/lib/src/components/button/button_spec.dart @@ -50,8 +50,7 @@ part of 'button.dart'; /// - [RemixButton] for the widget implementation /// - [Spec] for the base specification pattern @MixableSpec() -class RemixButtonSpec extends Spec - with Diagnosticable, _$RemixButtonSpecMethods { +class RemixButtonSpec with _$RemixButtonSpec { /// Styling specification for the button's container. /// /// Controls the button's layout, background, borders, padding, diff --git a/packages/remix/lib/src/components/callout/callout.g.dart b/packages/remix/lib/src/components/callout/callout.g.dart index a34c7db..485e7eb 100644 --- a/packages/remix/lib/src/components/callout/callout.g.dart +++ b/packages/remix/lib/src/components/callout/callout.g.dart @@ -6,11 +6,14 @@ part of 'callout.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixCalloutSpecMethods on Spec, Diagnosticable { +mixin _$RemixCalloutSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get text; StyleSpec get icon; + @override + Type get type => RemixCalloutSpec; + @override RemixCalloutSpec copyWith({ StyleSpec? container, @@ -33,19 +36,60 @@ mixin _$RemixCalloutSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, text, icon]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixCalloutSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('text', text)) ..add(DiagnosticsProperty('icon', icon)); } - - @override - List get props => [container, text, icon]; } +@Deprecated( + 'Rename to `_\$RemixCalloutSpec` and migrate the class declaration to `class RemixCalloutSpec with _\$RemixCalloutSpec`. The `_\$RemixCalloutSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixCalloutSpecMethods = _$RemixCalloutSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/callout/callout_spec.dart b/packages/remix/lib/src/components/callout/callout_spec.dart index c80f7fb..9e231f3 100644 --- a/packages/remix/lib/src/components/callout/callout_spec.dart +++ b/packages/remix/lib/src/components/callout/callout_spec.dart @@ -1,8 +1,7 @@ part of 'callout.dart'; @MixableSpec() -class RemixCalloutSpec extends Spec - with Diagnosticable, _$RemixCalloutSpecMethods { +class RemixCalloutSpec with _$RemixCalloutSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/card/card.g.dart b/packages/remix/lib/src/components/card/card.g.dart index 79d71bc..218c55c 100644 --- a/packages/remix/lib/src/components/card/card.g.dart +++ b/packages/remix/lib/src/components/card/card.g.dart @@ -6,9 +6,12 @@ part of 'card.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixCardSpecMethods on Spec, Diagnosticable { +mixin _$RemixCardSpec implements Spec, Diagnosticable { StyleSpec get container; + @override + Type get type => RemixCardSpec; + @override RemixCardSpec copyWith({StyleSpec? container}) { return RemixCardSpec(container: container ?? this.container); @@ -20,15 +23,56 @@ mixin _$RemixCardSpecMethods on Spec, Diagnosticable { } @override - void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); - properties..add(DiagnosticsProperty('container', container)); + List get props => [container]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixCardSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); } @override - List get props => [container]; + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + + @override + void debugFillProperties(DiagnosticPropertiesBuilder properties) { + properties..add(DiagnosticsProperty('container', container)); + } } +@Deprecated( + 'Rename to `_\$RemixCardSpec` and migrate the class declaration to `class RemixCardSpec with _\$RemixCardSpec`. The `_\$RemixCardSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixCardSpecMethods = _$RemixCardSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/card/card_spec.dart b/packages/remix/lib/src/components/card/card_spec.dart index ccfdf11..ea08375 100644 --- a/packages/remix/lib/src/components/card/card_spec.dart +++ b/packages/remix/lib/src/components/card/card_spec.dart @@ -1,8 +1,7 @@ part of 'card.dart'; @MixableSpec() -class RemixCardSpec extends Spec - with Diagnosticable, _$RemixCardSpecMethods { +class RemixCardSpec with _$RemixCardSpec { @override final StyleSpec container; diff --git a/packages/remix/lib/src/components/checkbox/checkbox.g.dart b/packages/remix/lib/src/components/checkbox/checkbox.g.dart index 5301a8b..0f8ded9 100644 --- a/packages/remix/lib/src/components/checkbox/checkbox.g.dart +++ b/packages/remix/lib/src/components/checkbox/checkbox.g.dart @@ -6,10 +6,13 @@ part of 'checkbox.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixCheckboxSpecMethods on Spec, Diagnosticable { +mixin _$RemixCheckboxSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get indicator; + @override + Type get type => RemixCheckboxSpec; + @override RemixCheckboxSpec copyWith({ StyleSpec? container, @@ -29,18 +32,59 @@ mixin _$RemixCheckboxSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, indicator]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixCheckboxSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('indicator', indicator)); } - - @override - List get props => [container, indicator]; } +@Deprecated( + 'Rename to `_\$RemixCheckboxSpec` and migrate the class declaration to `class RemixCheckboxSpec with _\$RemixCheckboxSpec`. The `_\$RemixCheckboxSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixCheckboxSpecMethods = _$RemixCheckboxSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/checkbox/checkbox_spec.dart b/packages/remix/lib/src/components/checkbox/checkbox_spec.dart index 263612e..b1639d4 100644 --- a/packages/remix/lib/src/components/checkbox/checkbox_spec.dart +++ b/packages/remix/lib/src/components/checkbox/checkbox_spec.dart @@ -54,8 +54,7 @@ part of 'checkbox.dart'; /// - [RemixCheckbox] for the widget implementation /// - [Spec] for the base specification pattern @MixableSpec() -class RemixCheckboxSpec extends Spec - with Diagnosticable, _$RemixCheckboxSpecMethods { +class RemixCheckboxSpec with _$RemixCheckboxSpec { /// Styling specification for the checkbox box container. /// /// Defines the appearance of the checkbox box itself, including diff --git a/packages/remix/lib/src/components/dialog/dialog.g.dart b/packages/remix/lib/src/components/dialog/dialog.g.dart index 9c96015..0f7bd28 100644 --- a/packages/remix/lib/src/components/dialog/dialog.g.dart +++ b/packages/remix/lib/src/components/dialog/dialog.g.dart @@ -6,13 +6,16 @@ part of 'dialog.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixDialogSpecMethods on Spec, Diagnosticable { +mixin _$RemixDialogSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get title; StyleSpec get description; StyleSpec get actions; StyleSpec get overlay; + @override + Type get type => RemixDialogSpec; + @override RemixDialogSpec copyWith({ StyleSpec? container, @@ -41,9 +44,48 @@ mixin _$RemixDialogSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, title, description, actions, overlay]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixDialogSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('title', title)) @@ -51,11 +93,13 @@ mixin _$RemixDialogSpecMethods on Spec, Diagnosticable { ..add(DiagnosticsProperty('actions', actions)) ..add(DiagnosticsProperty('overlay', overlay)); } - - @override - List get props => [container, title, description, actions, overlay]; } +@Deprecated( + 'Rename to `_\$RemixDialogSpec` and migrate the class declaration to `class RemixDialogSpec with _\$RemixDialogSpec`. The `_\$RemixDialogSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixDialogSpecMethods = _$RemixDialogSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/dialog/dialog_spec.dart b/packages/remix/lib/src/components/dialog/dialog_spec.dart index 13a7c82..4ec3f19 100644 --- a/packages/remix/lib/src/components/dialog/dialog_spec.dart +++ b/packages/remix/lib/src/components/dialog/dialog_spec.dart @@ -1,8 +1,7 @@ part of 'dialog.dart'; @MixableSpec() -class RemixDialogSpec extends Spec - with Diagnosticable, _$RemixDialogSpecMethods { +class RemixDialogSpec with _$RemixDialogSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/divider/divider.g.dart b/packages/remix/lib/src/components/divider/divider.g.dart index 35516e1..5391578 100644 --- a/packages/remix/lib/src/components/divider/divider.g.dart +++ b/packages/remix/lib/src/components/divider/divider.g.dart @@ -6,9 +6,12 @@ part of 'divider.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixDividerSpecMethods on Spec, Diagnosticable { +mixin _$RemixDividerSpec implements Spec, Diagnosticable { StyleSpec get container; + @override + Type get type => RemixDividerSpec; + @override RemixDividerSpec copyWith({StyleSpec? container}) { return RemixDividerSpec(container: container ?? this.container); @@ -20,15 +23,56 @@ mixin _$RemixDividerSpecMethods on Spec, Diagnosticable { } @override - void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); - properties..add(DiagnosticsProperty('container', container)); + List get props => [container]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixDividerSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); } @override - List get props => [container]; + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + + @override + void debugFillProperties(DiagnosticPropertiesBuilder properties) { + properties..add(DiagnosticsProperty('container', container)); + } } +@Deprecated( + 'Rename to `_\$RemixDividerSpec` and migrate the class declaration to `class RemixDividerSpec with _\$RemixDividerSpec`. The `_\$RemixDividerSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixDividerSpecMethods = _$RemixDividerSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/divider/divider_spec.dart b/packages/remix/lib/src/components/divider/divider_spec.dart index 9f33899..3d3f7cc 100644 --- a/packages/remix/lib/src/components/divider/divider_spec.dart +++ b/packages/remix/lib/src/components/divider/divider_spec.dart @@ -1,8 +1,7 @@ part of 'divider.dart'; @MixableSpec() -class RemixDividerSpec extends Spec - with Diagnosticable, _$RemixDividerSpecMethods { +class RemixDividerSpec with _$RemixDividerSpec { @override final StyleSpec container; diff --git a/packages/remix/lib/src/components/icon_button/icon_button.g.dart b/packages/remix/lib/src/components/icon_button/icon_button.g.dart index 899bd38..4d50517 100644 --- a/packages/remix/lib/src/components/icon_button/icon_button.g.dart +++ b/packages/remix/lib/src/components/icon_button/icon_button.g.dart @@ -6,12 +6,15 @@ part of 'icon_button.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixIconButtonSpecMethods - on Spec, Diagnosticable { +mixin _$RemixIconButtonSpec + implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get icon; StyleSpec get spinner; + @override + Type get type => RemixIconButtonSpec; + @override RemixIconButtonSpec copyWith({ StyleSpec? container, @@ -34,19 +37,60 @@ mixin _$RemixIconButtonSpecMethods ); } + @override + List get props => [container, icon, spinner]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixIconButtonSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('icon', icon)) ..add(DiagnosticsProperty('spinner', spinner)); } - - @override - List get props => [container, icon, spinner]; } +@Deprecated( + 'Rename to `_\$RemixIconButtonSpec` and migrate the class declaration to `class RemixIconButtonSpec with _\$RemixIconButtonSpec`. The `_\$RemixIconButtonSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixIconButtonSpecMethods = _$RemixIconButtonSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/icon_button/icon_button_spec.dart b/packages/remix/lib/src/components/icon_button/icon_button_spec.dart index 61b0326..a44f660 100644 --- a/packages/remix/lib/src/components/icon_button/icon_button_spec.dart +++ b/packages/remix/lib/src/components/icon_button/icon_button_spec.dart @@ -1,8 +1,7 @@ part of 'icon_button.dart'; @MixableSpec() -class RemixIconButtonSpec extends Spec - with Diagnosticable, _$RemixIconButtonSpecMethods { +class RemixIconButtonSpec with _$RemixIconButtonSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/menu/menu.g.dart b/packages/remix/lib/src/components/menu/menu.g.dart index 978f999..b528930 100644 --- a/packages/remix/lib/src/components/menu/menu.g.dart +++ b/packages/remix/lib/src/components/menu/menu.g.dart @@ -6,12 +6,15 @@ part of 'menu.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixMenuTriggerSpecMethods - on Spec, Diagnosticable { +mixin _$RemixMenuTriggerSpec + implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get label; StyleSpec get icon; + @override + Type get type => RemixMenuTriggerSpec; + @override RemixMenuTriggerSpec copyWith({ StyleSpec? container, @@ -34,25 +37,69 @@ mixin _$RemixMenuTriggerSpecMethods ); } + @override + List get props => [container, label, icon]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixMenuTriggerSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('label', label)) ..add(DiagnosticsProperty('icon', icon)); } - - @override - List get props => [container, label, icon]; } -mixin _$RemixMenuSpecMethods on Spec, Diagnosticable { +@Deprecated( + 'Rename to `_\$RemixMenuTriggerSpec` and migrate the class declaration to `class RemixMenuTriggerSpec with _\$RemixMenuTriggerSpec`. The `_\$RemixMenuTriggerSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixMenuTriggerSpecMethods = _$RemixMenuTriggerSpec; // ignore: unused_element + +mixin _$RemixMenuSpec implements Spec, Diagnosticable { StyleSpec get trigger; StyleSpec get overlay; StyleSpec get item; StyleSpec get divider; + @override + Type get type => RemixMenuSpec; + @override RemixMenuSpec copyWith({ StyleSpec? trigger, @@ -78,26 +125,70 @@ mixin _$RemixMenuSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [trigger, overlay, item, divider]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixMenuSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('trigger', trigger)) ..add(DiagnosticsProperty('overlay', overlay)) ..add(DiagnosticsProperty('item', item)) ..add(DiagnosticsProperty('divider', divider)); } - - @override - List get props => [trigger, overlay, item, divider]; } -mixin _$RemixMenuItemSpecMethods on Spec, Diagnosticable { +@Deprecated( + 'Rename to `_\$RemixMenuSpec` and migrate the class declaration to `class RemixMenuSpec with _\$RemixMenuSpec`. The `_\$RemixMenuSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixMenuSpecMethods = _$RemixMenuSpec; // ignore: unused_element + +mixin _$RemixMenuItemSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get label; StyleSpec get leadingIcon; StyleSpec get trailingIcon; + @override + Type get type => RemixMenuItemSpec; + @override RemixMenuItemSpec copyWith({ StyleSpec? container, @@ -123,20 +214,61 @@ mixin _$RemixMenuItemSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, label, leadingIcon, trailingIcon]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixMenuItemSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('label', label)) ..add(DiagnosticsProperty('leadingIcon', leadingIcon)) ..add(DiagnosticsProperty('trailingIcon', trailingIcon)); } - - @override - List get props => [container, label, leadingIcon, trailingIcon]; } +@Deprecated( + 'Rename to `_\$RemixMenuItemSpec` and migrate the class declaration to `class RemixMenuItemSpec with _\$RemixMenuItemSpec`. The `_\$RemixMenuItemSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixMenuItemSpecMethods = _$RemixMenuItemSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/menu/menu_spec.dart b/packages/remix/lib/src/components/menu/menu_spec.dart index 7ef20d1..e804e26 100644 --- a/packages/remix/lib/src/components/menu/menu_spec.dart +++ b/packages/remix/lib/src/components/menu/menu_spec.dart @@ -5,8 +5,7 @@ part of 'menu.dart'; // ============================================================================ @MixableSpec() -class RemixMenuTriggerSpec extends Spec - with Diagnosticable, _$RemixMenuTriggerSpecMethods { +class RemixMenuTriggerSpec with _$RemixMenuTriggerSpec { @override final StyleSpec container; @override @@ -28,8 +27,7 @@ class RemixMenuTriggerSpec extends Spec // ============================================================================ @MixableSpec() -class RemixMenuSpec extends Spec - with Diagnosticable, _$RemixMenuSpecMethods { +class RemixMenuSpec with _$RemixMenuSpec { @override final StyleSpec trigger; @override @@ -55,8 +53,7 @@ class RemixMenuSpec extends Spec // ============================================================================ @MixableSpec() -class RemixMenuItemSpec extends Spec - with Diagnosticable, _$RemixMenuItemSpecMethods { +class RemixMenuItemSpec with _$RemixMenuItemSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/progress/progress.g.dart b/packages/remix/lib/src/components/progress/progress.g.dart index 0db3bd5..57e15b9 100644 --- a/packages/remix/lib/src/components/progress/progress.g.dart +++ b/packages/remix/lib/src/components/progress/progress.g.dart @@ -6,12 +6,15 @@ part of 'progress.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixProgressSpecMethods on Spec, Diagnosticable { +mixin _$RemixProgressSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get track; StyleSpec get indicator; StyleSpec get trackContainer; + @override + Type get type => RemixProgressSpec; + @override RemixProgressSpec copyWith({ StyleSpec? container, @@ -37,20 +40,61 @@ mixin _$RemixProgressSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, track, indicator, trackContainer]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixProgressSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('track', track)) ..add(DiagnosticsProperty('indicator', indicator)) ..add(DiagnosticsProperty('trackContainer', trackContainer)); } - - @override - List get props => [container, track, indicator, trackContainer]; } +@Deprecated( + 'Rename to `_\$RemixProgressSpec` and migrate the class declaration to `class RemixProgressSpec with _\$RemixProgressSpec`. The `_\$RemixProgressSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixProgressSpecMethods = _$RemixProgressSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/progress/progress_spec.dart b/packages/remix/lib/src/components/progress/progress_spec.dart index 61ccce7..03e2c7e 100644 --- a/packages/remix/lib/src/components/progress/progress_spec.dart +++ b/packages/remix/lib/src/components/progress/progress_spec.dart @@ -1,8 +1,7 @@ part of 'progress.dart'; @MixableSpec() -class RemixProgressSpec extends Spec - with Diagnosticable, _$RemixProgressSpecMethods { +class RemixProgressSpec with _$RemixProgressSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/radio/radio.g.dart b/packages/remix/lib/src/components/radio/radio.g.dart index 940b516..f55c243 100644 --- a/packages/remix/lib/src/components/radio/radio.g.dart +++ b/packages/remix/lib/src/components/radio/radio.g.dart @@ -6,10 +6,13 @@ part of 'radio.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixRadioSpecMethods on Spec, Diagnosticable { +mixin _$RemixRadioSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get indicator; + @override + Type get type => RemixRadioSpec; + @override RemixRadioSpec copyWith({ StyleSpec? container, @@ -29,18 +32,59 @@ mixin _$RemixRadioSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, indicator]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixRadioSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('indicator', indicator)); } - - @override - List get props => [container, indicator]; } +@Deprecated( + 'Rename to `_\$RemixRadioSpec` and migrate the class declaration to `class RemixRadioSpec with _\$RemixRadioSpec`. The `_\$RemixRadioSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixRadioSpecMethods = _$RemixRadioSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/radio/radio_spec.dart b/packages/remix/lib/src/components/radio/radio_spec.dart index 4876698..adf7855 100644 --- a/packages/remix/lib/src/components/radio/radio_spec.dart +++ b/packages/remix/lib/src/components/radio/radio_spec.dart @@ -6,8 +6,7 @@ part of 'radio.dart'; /// building the control. It provides two [StyleSpec] segments representing the /// container (outer ring) and the indicator fill shown when the radio is selected. @MixableSpec() -class RemixRadioSpec extends Spec - with Diagnosticable, _$RemixRadioSpecMethods { +class RemixRadioSpec with _$RemixRadioSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/select/select.g.dart b/packages/remix/lib/src/components/select/select.g.dart index 0dd36ea..e962c7b 100644 --- a/packages/remix/lib/src/components/select/select.g.dart +++ b/packages/remix/lib/src/components/select/select.g.dart @@ -6,11 +6,14 @@ part of 'select.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixSelectSpecMethods on Spec, Diagnosticable { +mixin _$RemixSelectSpec implements Spec, Diagnosticable { StyleSpec get trigger; StyleSpec get menuContainer; StyleSpec get item; + @override + Type get type => RemixSelectSpec; + @override RemixSelectSpec copyWith({ StyleSpec? trigger, @@ -33,25 +36,69 @@ mixin _$RemixSelectSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [trigger, menuContainer, item]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixSelectSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('trigger', trigger)) ..add(DiagnosticsProperty('menuContainer', menuContainer)) ..add(DiagnosticsProperty('item', item)); } - - @override - List get props => [trigger, menuContainer, item]; } -mixin _$RemixSelectTriggerSpecMethods - on Spec, Diagnosticable { +@Deprecated( + 'Rename to `_\$RemixSelectSpec` and migrate the class declaration to `class RemixSelectSpec with _\$RemixSelectSpec`. The `_\$RemixSelectSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixSelectSpecMethods = _$RemixSelectSpec; // ignore: unused_element + +mixin _$RemixSelectTriggerSpec + implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get label; StyleSpec get icon; + @override + Type get type => RemixSelectTriggerSpec; + @override RemixSelectTriggerSpec copyWith({ StyleSpec? container, @@ -74,25 +121,69 @@ mixin _$RemixSelectTriggerSpecMethods ); } + @override + List get props => [container, label, icon]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixSelectTriggerSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('label', label)) ..add(DiagnosticsProperty('icon', icon)); } - - @override - List get props => [container, label, icon]; } -mixin _$RemixSelectMenuItemSpecMethods - on Spec, Diagnosticable { +@Deprecated( + 'Rename to `_\$RemixSelectTriggerSpec` and migrate the class declaration to `class RemixSelectTriggerSpec with _\$RemixSelectTriggerSpec`. The `_\$RemixSelectTriggerSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixSelectTriggerSpecMethods = _$RemixSelectTriggerSpec; // ignore: unused_element + +mixin _$RemixSelectMenuItemSpec + implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get text; StyleSpec get icon; + @override + Type get type => RemixSelectMenuItemSpec; + @override RemixSelectMenuItemSpec copyWith({ StyleSpec? container, @@ -115,19 +206,60 @@ mixin _$RemixSelectMenuItemSpecMethods ); } + @override + List get props => [container, text, icon]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixSelectMenuItemSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('text', text)) ..add(DiagnosticsProperty('icon', icon)); } - - @override - List get props => [container, text, icon]; } +@Deprecated( + 'Rename to `_\$RemixSelectMenuItemSpec` and migrate the class declaration to `class RemixSelectMenuItemSpec with _\$RemixSelectMenuItemSpec`. The `_\$RemixSelectMenuItemSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixSelectMenuItemSpecMethods = _$RemixSelectMenuItemSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/select/select_spec.dart b/packages/remix/lib/src/components/select/select_spec.dart index fd58117..b1c77c3 100644 --- a/packages/remix/lib/src/components/select/select_spec.dart +++ b/packages/remix/lib/src/components/select/select_spec.dart @@ -1,8 +1,7 @@ part of 'select.dart'; @MixableSpec() -class RemixSelectSpec extends Spec - with Diagnosticable, _$RemixSelectSpecMethods { +class RemixSelectSpec with _$RemixSelectSpec { @override final StyleSpec trigger; @override @@ -20,8 +19,7 @@ class RemixSelectSpec extends Spec } @MixableSpec() -class RemixSelectTriggerSpec extends Spec - with Diagnosticable, _$RemixSelectTriggerSpecMethods { +class RemixSelectTriggerSpec with _$RemixSelectTriggerSpec { @override final StyleSpec container; @override @@ -39,8 +37,7 @@ class RemixSelectTriggerSpec extends Spec } @MixableSpec() -class RemixSelectMenuItemSpec extends Spec - with Diagnosticable, _$RemixSelectMenuItemSpecMethods { +class RemixSelectMenuItemSpec with _$RemixSelectMenuItemSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/slider/slider.g.dart b/packages/remix/lib/src/components/slider/slider.g.dart index fd2bf1b..e59fd68 100644 --- a/packages/remix/lib/src/components/slider/slider.g.dart +++ b/packages/remix/lib/src/components/slider/slider.g.dart @@ -6,13 +6,16 @@ part of 'slider.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixSliderSpecMethods on Spec, Diagnosticable { +mixin _$RemixSliderSpec implements Spec, Diagnosticable { StyleSpec get thumb; Color get trackColor; double get trackWidth; Color get rangeColor; double get rangeWidth; + @override + Type get type => RemixSliderSpec; + @override RemixSliderSpec copyWith({ StyleSpec? thumb, @@ -41,9 +44,54 @@ mixin _$RemixSliderSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [ + thumb, + trackColor, + trackWidth, + rangeColor, + rangeWidth, + ]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixSliderSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('thumb', thumb)) ..add(ColorProperty('trackColor', trackColor)) @@ -51,13 +99,9 @@ mixin _$RemixSliderSpecMethods on Spec, Diagnosticable { ..add(ColorProperty('rangeColor', rangeColor)) ..add(DoubleProperty('rangeWidth', rangeWidth)); } - - @override - List get props => [ - thumb, - trackColor, - trackWidth, - rangeColor, - rangeWidth, - ]; } + +@Deprecated( + 'Rename to `_\$RemixSliderSpec` and migrate the class declaration to `class RemixSliderSpec with _\$RemixSliderSpec`. The `_\$RemixSliderSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixSliderSpecMethods = _$RemixSliderSpec; // ignore: unused_element diff --git a/packages/remix/lib/src/components/slider/slider_spec.dart b/packages/remix/lib/src/components/slider/slider_spec.dart index 47c7b41..2b1ba96 100644 --- a/packages/remix/lib/src/components/slider/slider_spec.dart +++ b/packages/remix/lib/src/components/slider/slider_spec.dart @@ -8,8 +8,7 @@ const Color _defaultTrackColor = MixColors.grey; const Color _defaultRangeColor = MixColors.black; @MixableSpec() -class RemixSliderSpec extends Spec - with Diagnosticable, _$RemixSliderSpecMethods { +class RemixSliderSpec with _$RemixSliderSpec { static const Size defaultThumbSize = _remixSliderDefaultThumbSize; static const double defaultTrackStrokeWidth = _remixSliderDefaultTrackStrokeWidth; diff --git a/packages/remix/lib/src/components/spinner/spinner.g.dart b/packages/remix/lib/src/components/spinner/spinner.g.dart index fb0d64a..57f9797 100644 --- a/packages/remix/lib/src/components/spinner/spinner.g.dart +++ b/packages/remix/lib/src/components/spinner/spinner.g.dart @@ -6,7 +6,7 @@ part of 'spinner.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixSpinnerSpecMethods on Spec, Diagnosticable { +mixin _$RemixSpinnerSpec implements Spec, Diagnosticable { double? get size; double? get strokeWidth; Color? get indicatorColor; @@ -14,6 +14,9 @@ mixin _$RemixSpinnerSpecMethods on Spec, Diagnosticable { double? get trackStrokeWidth; Duration? get duration; + @override + Type get type => RemixSpinnerSpec; + @override RemixSpinnerSpec copyWith({ double? size, @@ -49,9 +52,55 @@ mixin _$RemixSpinnerSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [ + size, + strokeWidth, + indicatorColor, + trackColor, + trackStrokeWidth, + duration, + ]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixSpinnerSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DoubleProperty('size', size)) ..add(DoubleProperty('strokeWidth', strokeWidth)) @@ -60,18 +109,13 @@ mixin _$RemixSpinnerSpecMethods on Spec, Diagnosticable { ..add(DoubleProperty('trackStrokeWidth', trackStrokeWidth)) ..add(DiagnosticsProperty('duration', duration)); } - - @override - List get props => [ - size, - strokeWidth, - indicatorColor, - trackColor, - trackStrokeWidth, - duration, - ]; } +@Deprecated( + 'Rename to `_\$RemixSpinnerSpec` and migrate the class declaration to `class RemixSpinnerSpec with _\$RemixSpinnerSpec`. The `_\$RemixSpinnerSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixSpinnerSpecMethods = _$RemixSpinnerSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/spinner/spinner_spec.dart b/packages/remix/lib/src/components/spinner/spinner_spec.dart index 3c45c7d..2efef19 100644 --- a/packages/remix/lib/src/components/spinner/spinner_spec.dart +++ b/packages/remix/lib/src/components/spinner/spinner_spec.dart @@ -1,8 +1,7 @@ part of 'spinner.dart'; @MixableSpec() -class RemixSpinnerSpec extends Spec - with Diagnosticable, _$RemixSpinnerSpecMethods { +class RemixSpinnerSpec with _$RemixSpinnerSpec { @override final double? size; @override diff --git a/packages/remix/lib/src/components/switch/switch.g.dart b/packages/remix/lib/src/components/switch/switch.g.dart index 2a04a2f..2c17313 100644 --- a/packages/remix/lib/src/components/switch/switch.g.dart +++ b/packages/remix/lib/src/components/switch/switch.g.dart @@ -6,10 +6,13 @@ part of 'switch.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixSwitchSpecMethods on Spec, Diagnosticable { +mixin _$RemixSwitchSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get thumb; + @override + Type get type => RemixSwitchSpec; + @override RemixSwitchSpec copyWith({ StyleSpec? container, @@ -29,18 +32,59 @@ mixin _$RemixSwitchSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, thumb]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixSwitchSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('thumb', thumb)); } - - @override - List get props => [container, thumb]; } +@Deprecated( + 'Rename to `_\$RemixSwitchSpec` and migrate the class declaration to `class RemixSwitchSpec with _\$RemixSwitchSpec`. The `_\$RemixSwitchSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixSwitchSpecMethods = _$RemixSwitchSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/switch/switch_spec.dart b/packages/remix/lib/src/components/switch/switch_spec.dart index 21a4c0a..0289aad 100644 --- a/packages/remix/lib/src/components/switch/switch_spec.dart +++ b/packages/remix/lib/src/components/switch/switch_spec.dart @@ -1,8 +1,7 @@ part of 'switch.dart'; @MixableSpec() -class RemixSwitchSpec extends Spec - with Diagnosticable, _$RemixSwitchSpecMethods { +class RemixSwitchSpec with _$RemixSwitchSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/tabs/tabs.g.dart b/packages/remix/lib/src/components/tabs/tabs.g.dart index 48722c2..ee292fd 100644 --- a/packages/remix/lib/src/components/tabs/tabs.g.dart +++ b/packages/remix/lib/src/components/tabs/tabs.g.dart @@ -6,9 +6,12 @@ part of 'tabs.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixTabBarSpecMethods on Spec, Diagnosticable { +mixin _$RemixTabBarSpec implements Spec, Diagnosticable { StyleSpec get container; + @override + Type get type => RemixTabBarSpec; + @override RemixTabBarSpec copyWith({StyleSpec? container}) { return RemixTabBarSpec(container: container ?? this.container); @@ -20,20 +23,64 @@ mixin _$RemixTabBarSpecMethods on Spec, Diagnosticable { } @override - void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); - properties..add(DiagnosticsProperty('container', container)); + List get props => [container]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixTabBarSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); } @override - List get props => [container]; + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + + @override + void debugFillProperties(DiagnosticPropertiesBuilder properties) { + properties..add(DiagnosticsProperty('container', container)); + } } -mixin _$RemixTabSpecMethods on Spec, Diagnosticable { +@Deprecated( + 'Rename to `_\$RemixTabBarSpec` and migrate the class declaration to `class RemixTabBarSpec with _\$RemixTabBarSpec`. The `_\$RemixTabBarSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixTabBarSpecMethods = _$RemixTabBarSpec; // ignore: unused_element + +mixin _$RemixTabSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get label; StyleSpec get icon; + @override + Type get type => RemixTabSpec; + @override RemixTabSpec copyWith({ StyleSpec? container, @@ -56,22 +103,66 @@ mixin _$RemixTabSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, label, icon]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixTabSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('label', label)) ..add(DiagnosticsProperty('icon', icon)); } - - @override - List get props => [container, label, icon]; } -mixin _$RemixTabViewSpecMethods on Spec, Diagnosticable { +@Deprecated( + 'Rename to `_\$RemixTabSpec` and migrate the class declaration to `class RemixTabSpec with _\$RemixTabSpec`. The `_\$RemixTabSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixTabSpecMethods = _$RemixTabSpec; // ignore: unused_element + +mixin _$RemixTabViewSpec implements Spec, Diagnosticable { StyleSpec get container; + @override + Type get type => RemixTabViewSpec; + @override RemixTabViewSpec copyWith({StyleSpec? container}) { return RemixTabViewSpec(container: container ?? this.container); @@ -83,15 +174,56 @@ mixin _$RemixTabViewSpecMethods on Spec, Diagnosticable { } @override - void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); - properties..add(DiagnosticsProperty('container', container)); + List get props => [container]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixTabViewSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); } @override - List get props => [container]; + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + + @override + void debugFillProperties(DiagnosticPropertiesBuilder properties) { + properties..add(DiagnosticsProperty('container', container)); + } } +@Deprecated( + 'Rename to `_\$RemixTabViewSpec` and migrate the class declaration to `class RemixTabViewSpec with _\$RemixTabViewSpec`. The `_\$RemixTabViewSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixTabViewSpecMethods = _$RemixTabViewSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/tabs/tabs_spec.dart b/packages/remix/lib/src/components/tabs/tabs_spec.dart index a4ed33e..19eaad6 100644 --- a/packages/remix/lib/src/components/tabs/tabs_spec.dart +++ b/packages/remix/lib/src/components/tabs/tabs_spec.dart @@ -1,8 +1,7 @@ part of 'tabs.dart'; @MixableSpec() -class RemixTabBarSpec extends Spec - with Diagnosticable, _$RemixTabBarSpecMethods { +class RemixTabBarSpec with _$RemixTabBarSpec { @override final StyleSpec container; @@ -11,8 +10,7 @@ class RemixTabBarSpec extends Spec } @MixableSpec() -class RemixTabSpec extends Spec - with Diagnosticable, _$RemixTabSpecMethods { +class RemixTabSpec with _$RemixTabSpec { @override final StyleSpec container; @override @@ -30,8 +28,7 @@ class RemixTabSpec extends Spec } @MixableSpec() -class RemixTabViewSpec extends Spec - with Diagnosticable, _$RemixTabViewSpecMethods { +class RemixTabViewSpec with _$RemixTabViewSpec { @override final StyleSpec container; diff --git a/packages/remix/lib/src/components/textfield/textfield.g.dart b/packages/remix/lib/src/components/textfield/textfield.g.dart index 40b287b..39b30d8 100644 --- a/packages/remix/lib/src/components/textfield/textfield.g.dart +++ b/packages/remix/lib/src/components/textfield/textfield.g.dart @@ -6,7 +6,7 @@ part of 'textfield.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixTextFieldSpecMethods on Spec, Diagnosticable { +mixin _$RemixTextFieldSpec implements Spec, Diagnosticable { StyleSpec get text; StyleSpec get hintText; TextAlign? get textAlign; @@ -25,6 +25,9 @@ mixin _$RemixTextFieldSpecMethods on Spec, Diagnosticable { StyleSpec get helperText; StyleSpec get label; + @override + Type get type => RemixTextFieldSpec; + @override RemixTextFieldSpec copyWith({ StyleSpec? text, @@ -106,9 +109,66 @@ mixin _$RemixTextFieldSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [ + text, + hintText, + textAlign, + cursorWidth, + cursorHeight, + cursorRadius, + cursorColor, + cursorOffset, + selectionHeightStyle, + selectionWidthStyle, + scrollPadding, + keyboardAppearance, + cursorOpacityAnimates, + spacing, + container, + helperText, + label, + ]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixTextFieldSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('text', text)) ..add(DiagnosticsProperty('hintText', hintText)) @@ -128,29 +188,13 @@ mixin _$RemixTextFieldSpecMethods on Spec, Diagnosticable { ..add(DiagnosticsProperty('helperText', helperText)) ..add(DiagnosticsProperty('label', label)); } - - @override - List get props => [ - text, - hintText, - textAlign, - cursorWidth, - cursorHeight, - cursorRadius, - cursorColor, - cursorOffset, - selectionHeightStyle, - selectionWidthStyle, - scrollPadding, - keyboardAppearance, - cursorOpacityAnimates, - spacing, - container, - helperText, - label, - ]; } +@Deprecated( + 'Rename to `_\$RemixTextFieldSpec` and migrate the class declaration to `class RemixTextFieldSpec with _\$RemixTextFieldSpec`. The `_\$RemixTextFieldSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixTextFieldSpecMethods = _$RemixTextFieldSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/textfield/textfield_spec.dart b/packages/remix/lib/src/components/textfield/textfield_spec.dart index 630e35b..f9e6348 100644 --- a/packages/remix/lib/src/components/textfield/textfield_spec.dart +++ b/packages/remix/lib/src/components/textfield/textfield_spec.dart @@ -50,8 +50,7 @@ part of 'textfield.dart'; /// - [RemixTextField] for the widget implementation /// - [Spec] for the base specification pattern @MixableSpec() -class RemixTextFieldSpec extends Spec - with Diagnosticable, _$RemixTextFieldSpecMethods { +class RemixTextFieldSpec with _$RemixTextFieldSpec { /// Styling specification for the input text. /// /// Controls typography, color, and text-specific properties diff --git a/packages/remix/lib/src/components/toggle/toggle.g.dart b/packages/remix/lib/src/components/toggle/toggle.g.dart index 3da8856..76154dd 100644 --- a/packages/remix/lib/src/components/toggle/toggle.g.dart +++ b/packages/remix/lib/src/components/toggle/toggle.g.dart @@ -6,11 +6,14 @@ part of 'toggle.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixToggleSpecMethods on Spec, Diagnosticable { +mixin _$RemixToggleSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get label; StyleSpec get icon; + @override + Type get type => RemixToggleSpec; + @override RemixToggleSpec copyWith({ StyleSpec? container, @@ -33,19 +36,60 @@ mixin _$RemixToggleSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, label, icon]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixToggleSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('label', label)) ..add(DiagnosticsProperty('icon', icon)); } - - @override - List get props => [container, label, icon]; } +@Deprecated( + 'Rename to `_\$RemixToggleSpec` and migrate the class declaration to `class RemixToggleSpec with _\$RemixToggleSpec`. The `_\$RemixToggleSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixToggleSpecMethods = _$RemixToggleSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/toggle/toggle_spec.dart b/packages/remix/lib/src/components/toggle/toggle_spec.dart index 44b7dce..dfa6802 100644 --- a/packages/remix/lib/src/components/toggle/toggle_spec.dart +++ b/packages/remix/lib/src/components/toggle/toggle_spec.dart @@ -1,8 +1,7 @@ part of 'toggle.dart'; @MixableSpec() -class RemixToggleSpec extends Spec - with Diagnosticable, _$RemixToggleSpecMethods { +class RemixToggleSpec with _$RemixToggleSpec { @override final StyleSpec container; @override diff --git a/packages/remix/lib/src/components/tooltip/tooltip.g.dart b/packages/remix/lib/src/components/tooltip/tooltip.g.dart index e5f73d6..013f554 100644 --- a/packages/remix/lib/src/components/tooltip/tooltip.g.dart +++ b/packages/remix/lib/src/components/tooltip/tooltip.g.dart @@ -6,12 +6,15 @@ part of 'tooltip.dart'; // SpecGenerator // ************************************************************************** -mixin _$RemixTooltipSpecMethods on Spec, Diagnosticable { +mixin _$RemixTooltipSpec implements Spec, Diagnosticable { StyleSpec get container; StyleSpec get label; Duration? get waitDuration; Duration? get showDuration; + @override + Type get type => RemixTooltipSpec; + @override RemixTooltipSpec copyWith({ StyleSpec? container, @@ -37,20 +40,61 @@ mixin _$RemixTooltipSpecMethods on Spec, Diagnosticable { ); } + @override + List get props => [container, label, waitDuration, showDuration]; + + @override + bool operator ==(Object other) { + return identical(this, other) || + other is RemixTooltipSpec && + runtimeType == other.runtimeType && + propsEquals(props, other.props); + } + + @override + int get hashCode => propsHash(runtimeType, props); + + @override + bool get stringify => true; + + @override + Map getDiff(Equatable other) { + if (this == other) return const {}; + + return propsDiff(props, other.props); + } + + @override + String toStringShort() => '$runtimeType'; + + @override + String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) => + toDiagnosticsNode( + style: DiagnosticsTreeStyle.singleLine, + ).toString(minLevel: minLevel); + + @override + DiagnosticsNode toDiagnosticsNode({ + String? name, + DiagnosticsTreeStyle? style, + }) => + DiagnosticableNode(name: name, value: this, style: style); + @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); properties ..add(DiagnosticsProperty('container', container)) ..add(DiagnosticsProperty('label', label)) ..add(DiagnosticsProperty('waitDuration', waitDuration)) ..add(DiagnosticsProperty('showDuration', showDuration)); } - - @override - List get props => [container, label, waitDuration, showDuration]; } +@Deprecated( + 'Rename to `_\$RemixTooltipSpec` and migrate the class declaration to `class RemixTooltipSpec with _\$RemixTooltipSpec`. The `_\$RemixTooltipSpecMethods` alias will be removed in mix_generator 3.0.', +) +typedef _$RemixTooltipSpecMethods = _$RemixTooltipSpec; // ignore: unused_element + // ************************************************************************** // StylerGenerator // ************************************************************************** diff --git a/packages/remix/lib/src/components/tooltip/tooltip_spec.dart b/packages/remix/lib/src/components/tooltip/tooltip_spec.dart index 61dc402..4c19291 100644 --- a/packages/remix/lib/src/components/tooltip/tooltip_spec.dart +++ b/packages/remix/lib/src/components/tooltip/tooltip_spec.dart @@ -1,8 +1,7 @@ part of 'tooltip.dart'; @MixableSpec() -class RemixTooltipSpec extends Spec - with Diagnosticable, _$RemixTooltipSpecMethods { +class RemixTooltipSpec with _$RemixTooltipSpec { @override final StyleSpec container; @override