✨ AI proposal
This commit is contained in:
@@ -43,6 +43,7 @@ sealed class StreamThinkingRequest with _$StreamThinkingRequest {
|
|||||||
const factory StreamThinkingRequest({
|
const factory StreamThinkingRequest({
|
||||||
required String userMessage,
|
required String userMessage,
|
||||||
String? sequenceId,
|
String? sequenceId,
|
||||||
|
@Default([]) List<String> accpetProposals,
|
||||||
}) = _StreamThinkingRequest;
|
}) = _StreamThinkingRequest;
|
||||||
|
|
||||||
factory StreamThinkingRequest.fromJson(Map<String, dynamic> json) =>
|
factory StreamThinkingRequest.fromJson(Map<String, dynamic> json) =>
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
|
|||||||
/// @nodoc
|
/// @nodoc
|
||||||
mixin _$StreamThinkingRequest {
|
mixin _$StreamThinkingRequest {
|
||||||
|
|
||||||
String get userMessage; String? get sequenceId;
|
String get userMessage; String? get sequenceId; List<String> get accpetProposals;
|
||||||
/// Create a copy of StreamThinkingRequest
|
/// Create a copy of StreamThinkingRequest
|
||||||
/// with the given fields replaced by the non-null parameter values.
|
/// with the given fields replaced by the non-null parameter values.
|
||||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||||
@@ -28,16 +28,16 @@ $StreamThinkingRequestCopyWith<StreamThinkingRequest> get copyWith => _$StreamTh
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
bool operator ==(Object other) {
|
bool operator ==(Object other) {
|
||||||
return identical(this, other) || (other.runtimeType == runtimeType&&other is StreamThinkingRequest&&(identical(other.userMessage, userMessage) || other.userMessage == userMessage)&&(identical(other.sequenceId, sequenceId) || other.sequenceId == sequenceId));
|
return identical(this, other) || (other.runtimeType == runtimeType&&other is StreamThinkingRequest&&(identical(other.userMessage, userMessage) || other.userMessage == userMessage)&&(identical(other.sequenceId, sequenceId) || other.sequenceId == sequenceId)&&const DeepCollectionEquality().equals(other.accpetProposals, accpetProposals));
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||||
@override
|
@override
|
||||||
int get hashCode => Object.hash(runtimeType,userMessage,sequenceId);
|
int get hashCode => Object.hash(runtimeType,userMessage,sequenceId,const DeepCollectionEquality().hash(accpetProposals));
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String toString() {
|
String toString() {
|
||||||
return 'StreamThinkingRequest(userMessage: $userMessage, sequenceId: $sequenceId)';
|
return 'StreamThinkingRequest(userMessage: $userMessage, sequenceId: $sequenceId, accpetProposals: $accpetProposals)';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@ abstract mixin class $StreamThinkingRequestCopyWith<$Res> {
|
|||||||
factory $StreamThinkingRequestCopyWith(StreamThinkingRequest value, $Res Function(StreamThinkingRequest) _then) = _$StreamThinkingRequestCopyWithImpl;
|
factory $StreamThinkingRequestCopyWith(StreamThinkingRequest value, $Res Function(StreamThinkingRequest) _then) = _$StreamThinkingRequestCopyWithImpl;
|
||||||
@useResult
|
@useResult
|
||||||
$Res call({
|
$Res call({
|
||||||
String userMessage, String? sequenceId
|
String userMessage, String? sequenceId, List<String> accpetProposals
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@@ -65,11 +65,12 @@ class _$StreamThinkingRequestCopyWithImpl<$Res>
|
|||||||
|
|
||||||
/// Create a copy of StreamThinkingRequest
|
/// Create a copy of StreamThinkingRequest
|
||||||
/// with the given fields replaced by the non-null parameter values.
|
/// with the given fields replaced by the non-null parameter values.
|
||||||
@pragma('vm:prefer-inline') @override $Res call({Object? userMessage = null,Object? sequenceId = freezed,}) {
|
@pragma('vm:prefer-inline') @override $Res call({Object? userMessage = null,Object? sequenceId = freezed,Object? accpetProposals = null,}) {
|
||||||
return _then(_self.copyWith(
|
return _then(_self.copyWith(
|
||||||
userMessage: null == userMessage ? _self.userMessage : userMessage // ignore: cast_nullable_to_non_nullable
|
userMessage: null == userMessage ? _self.userMessage : userMessage // ignore: cast_nullable_to_non_nullable
|
||||||
as String,sequenceId: freezed == sequenceId ? _self.sequenceId : sequenceId // ignore: cast_nullable_to_non_nullable
|
as String,sequenceId: freezed == sequenceId ? _self.sequenceId : sequenceId // ignore: cast_nullable_to_non_nullable
|
||||||
as String?,
|
as String?,accpetProposals: null == accpetProposals ? _self.accpetProposals : accpetProposals // ignore: cast_nullable_to_non_nullable
|
||||||
|
as List<String>,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -151,10 +152,10 @@ return $default(_that);case _:
|
|||||||
/// }
|
/// }
|
||||||
/// ```
|
/// ```
|
||||||
|
|
||||||
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String userMessage, String? sequenceId)? $default,{required TResult orElse(),}) {final _that = this;
|
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String userMessage, String? sequenceId, List<String> accpetProposals)? $default,{required TResult orElse(),}) {final _that = this;
|
||||||
switch (_that) {
|
switch (_that) {
|
||||||
case _StreamThinkingRequest() when $default != null:
|
case _StreamThinkingRequest() when $default != null:
|
||||||
return $default(_that.userMessage,_that.sequenceId);case _:
|
return $default(_that.userMessage,_that.sequenceId,_that.accpetProposals);case _:
|
||||||
return orElse();
|
return orElse();
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -172,10 +173,10 @@ return $default(_that.userMessage,_that.sequenceId);case _:
|
|||||||
/// }
|
/// }
|
||||||
/// ```
|
/// ```
|
||||||
|
|
||||||
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String userMessage, String? sequenceId) $default,) {final _that = this;
|
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String userMessage, String? sequenceId, List<String> accpetProposals) $default,) {final _that = this;
|
||||||
switch (_that) {
|
switch (_that) {
|
||||||
case _StreamThinkingRequest():
|
case _StreamThinkingRequest():
|
||||||
return $default(_that.userMessage,_that.sequenceId);}
|
return $default(_that.userMessage,_that.sequenceId,_that.accpetProposals);}
|
||||||
}
|
}
|
||||||
/// A variant of `when` that fallback to returning `null`
|
/// A variant of `when` that fallback to returning `null`
|
||||||
///
|
///
|
||||||
@@ -189,10 +190,10 @@ return $default(_that.userMessage,_that.sequenceId);}
|
|||||||
/// }
|
/// }
|
||||||
/// ```
|
/// ```
|
||||||
|
|
||||||
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String userMessage, String? sequenceId)? $default,) {final _that = this;
|
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String userMessage, String? sequenceId, List<String> accpetProposals)? $default,) {final _that = this;
|
||||||
switch (_that) {
|
switch (_that) {
|
||||||
case _StreamThinkingRequest() when $default != null:
|
case _StreamThinkingRequest() when $default != null:
|
||||||
return $default(_that.userMessage,_that.sequenceId);case _:
|
return $default(_that.userMessage,_that.sequenceId,_that.accpetProposals);case _:
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -204,11 +205,18 @@ return $default(_that.userMessage,_that.sequenceId);case _:
|
|||||||
@JsonSerializable()
|
@JsonSerializable()
|
||||||
|
|
||||||
class _StreamThinkingRequest implements StreamThinkingRequest {
|
class _StreamThinkingRequest implements StreamThinkingRequest {
|
||||||
const _StreamThinkingRequest({required this.userMessage, this.sequenceId});
|
const _StreamThinkingRequest({required this.userMessage, this.sequenceId, final List<String> accpetProposals = const []}): _accpetProposals = accpetProposals;
|
||||||
factory _StreamThinkingRequest.fromJson(Map<String, dynamic> json) => _$StreamThinkingRequestFromJson(json);
|
factory _StreamThinkingRequest.fromJson(Map<String, dynamic> json) => _$StreamThinkingRequestFromJson(json);
|
||||||
|
|
||||||
@override final String userMessage;
|
@override final String userMessage;
|
||||||
@override final String? sequenceId;
|
@override final String? sequenceId;
|
||||||
|
final List<String> _accpetProposals;
|
||||||
|
@override@JsonKey() List<String> get accpetProposals {
|
||||||
|
if (_accpetProposals is EqualUnmodifiableListView) return _accpetProposals;
|
||||||
|
// ignore: implicit_dynamic_type
|
||||||
|
return EqualUnmodifiableListView(_accpetProposals);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Create a copy of StreamThinkingRequest
|
/// Create a copy of StreamThinkingRequest
|
||||||
/// with the given fields replaced by the non-null parameter values.
|
/// with the given fields replaced by the non-null parameter values.
|
||||||
@@ -223,16 +231,16 @@ Map<String, dynamic> toJson() {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
bool operator ==(Object other) {
|
bool operator ==(Object other) {
|
||||||
return identical(this, other) || (other.runtimeType == runtimeType&&other is _StreamThinkingRequest&&(identical(other.userMessage, userMessage) || other.userMessage == userMessage)&&(identical(other.sequenceId, sequenceId) || other.sequenceId == sequenceId));
|
return identical(this, other) || (other.runtimeType == runtimeType&&other is _StreamThinkingRequest&&(identical(other.userMessage, userMessage) || other.userMessage == userMessage)&&(identical(other.sequenceId, sequenceId) || other.sequenceId == sequenceId)&&const DeepCollectionEquality().equals(other._accpetProposals, _accpetProposals));
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||||
@override
|
@override
|
||||||
int get hashCode => Object.hash(runtimeType,userMessage,sequenceId);
|
int get hashCode => Object.hash(runtimeType,userMessage,sequenceId,const DeepCollectionEquality().hash(_accpetProposals));
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String toString() {
|
String toString() {
|
||||||
return 'StreamThinkingRequest(userMessage: $userMessage, sequenceId: $sequenceId)';
|
return 'StreamThinkingRequest(userMessage: $userMessage, sequenceId: $sequenceId, accpetProposals: $accpetProposals)';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -243,7 +251,7 @@ abstract mixin class _$StreamThinkingRequestCopyWith<$Res> implements $StreamThi
|
|||||||
factory _$StreamThinkingRequestCopyWith(_StreamThinkingRequest value, $Res Function(_StreamThinkingRequest) _then) = __$StreamThinkingRequestCopyWithImpl;
|
factory _$StreamThinkingRequestCopyWith(_StreamThinkingRequest value, $Res Function(_StreamThinkingRequest) _then) = __$StreamThinkingRequestCopyWithImpl;
|
||||||
@override @useResult
|
@override @useResult
|
||||||
$Res call({
|
$Res call({
|
||||||
String userMessage, String? sequenceId
|
String userMessage, String? sequenceId, List<String> accpetProposals
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@@ -260,11 +268,12 @@ class __$StreamThinkingRequestCopyWithImpl<$Res>
|
|||||||
|
|
||||||
/// Create a copy of StreamThinkingRequest
|
/// Create a copy of StreamThinkingRequest
|
||||||
/// with the given fields replaced by the non-null parameter values.
|
/// with the given fields replaced by the non-null parameter values.
|
||||||
@override @pragma('vm:prefer-inline') $Res call({Object? userMessage = null,Object? sequenceId = freezed,}) {
|
@override @pragma('vm:prefer-inline') $Res call({Object? userMessage = null,Object? sequenceId = freezed,Object? accpetProposals = null,}) {
|
||||||
return _then(_StreamThinkingRequest(
|
return _then(_StreamThinkingRequest(
|
||||||
userMessage: null == userMessage ? _self.userMessage : userMessage // ignore: cast_nullable_to_non_nullable
|
userMessage: null == userMessage ? _self.userMessage : userMessage // ignore: cast_nullable_to_non_nullable
|
||||||
as String,sequenceId: freezed == sequenceId ? _self.sequenceId : sequenceId // ignore: cast_nullable_to_non_nullable
|
as String,sequenceId: freezed == sequenceId ? _self.sequenceId : sequenceId // ignore: cast_nullable_to_non_nullable
|
||||||
as String?,
|
as String?,accpetProposals: null == accpetProposals ? _self._accpetProposals : accpetProposals // ignore: cast_nullable_to_non_nullable
|
||||||
|
as List<String>,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,11 @@ _StreamThinkingRequest _$StreamThinkingRequestFromJson(
|
|||||||
) => _StreamThinkingRequest(
|
) => _StreamThinkingRequest(
|
||||||
userMessage: json['user_message'] as String,
|
userMessage: json['user_message'] as String,
|
||||||
sequenceId: json['sequence_id'] as String?,
|
sequenceId: json['sequence_id'] as String?,
|
||||||
|
accpetProposals:
|
||||||
|
(json['accpet_proposals'] as List<dynamic>?)
|
||||||
|
?.map((e) => e as String)
|
||||||
|
.toList() ??
|
||||||
|
const [],
|
||||||
);
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$StreamThinkingRequestToJson(
|
Map<String, dynamic> _$StreamThinkingRequestToJson(
|
||||||
@@ -18,6 +23,7 @@ Map<String, dynamic> _$StreamThinkingRequestToJson(
|
|||||||
) => <String, dynamic>{
|
) => <String, dynamic>{
|
||||||
'user_message': instance.userMessage,
|
'user_message': instance.userMessage,
|
||||||
'sequence_id': instance.sequenceId,
|
'sequence_id': instance.sequenceId,
|
||||||
|
'accpet_proposals': instance.accpetProposals,
|
||||||
};
|
};
|
||||||
|
|
||||||
_SnThinkingChunk _$SnThinkingChunkFromJson(Map<String, dynamic> json) =>
|
_SnThinkingChunk _$SnThinkingChunkFromJson(Map<String, dynamic> json) =>
|
||||||
|
|||||||
@@ -16,8 +16,13 @@ import "package:island/widgets/app_scaffold.dart";
|
|||||||
import "package:island/widgets/content/markdown.dart";
|
import "package:island/widgets/content/markdown.dart";
|
||||||
import "package:island/widgets/response.dart";
|
import "package:island/widgets/response.dart";
|
||||||
import "package:island/widgets/thought/thought_sequence_list.dart";
|
import "package:island/widgets/thought/thought_sequence_list.dart";
|
||||||
|
import "package:island/route.dart";
|
||||||
import "package:material_symbols_icons/material_symbols_icons.dart";
|
import "package:material_symbols_icons/material_symbols_icons.dart";
|
||||||
|
import "package:styled_widget/styled_widget.dart";
|
||||||
import "package:super_sliver_list/super_sliver_list.dart";
|
import "package:super_sliver_list/super_sliver_list.dart";
|
||||||
|
import "package:markdown/markdown.dart" as markdown;
|
||||||
|
import "package:markdown_widget/markdown_widget.dart";
|
||||||
|
import "package:collection/collection.dart";
|
||||||
|
|
||||||
part 'think.g.dart';
|
part 'think.g.dart';
|
||||||
|
|
||||||
@@ -40,6 +45,36 @@ class ThoughtScreen extends HookConsumerWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
|
// Extract proposals from text content
|
||||||
|
List<Map<String, String>> extractProposals(String content) {
|
||||||
|
final proposalRegex = RegExp(
|
||||||
|
r'<proposal\s+type="([^"]+)">(.*?)<\/proposal>',
|
||||||
|
dotAll: true,
|
||||||
|
);
|
||||||
|
final matches = proposalRegex.allMatches(content);
|
||||||
|
return matches.map((match) {
|
||||||
|
return {'type': match.group(1)!, 'content': match.group(2)!};
|
||||||
|
}).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
void handleProposalAction(
|
||||||
|
BuildContext context,
|
||||||
|
Map<String, String> proposal,
|
||||||
|
) {
|
||||||
|
switch (proposal['type']) {
|
||||||
|
case 'post_create':
|
||||||
|
// Navigate to post creation screen with the proposal content
|
||||||
|
AppRouter.push(
|
||||||
|
context,
|
||||||
|
'/posts/compose?initialContent=${Uri.encodeComponent(proposal['content'] ?? '')}&source=ai_proposal',
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Show a snackbar for unsupported proposal types
|
||||||
|
showSnackBar('Unsupported proposal type: ${proposal['type']}');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final selectedSequenceId = useState<String?>(null);
|
final selectedSequenceId = useState<String?>(null);
|
||||||
final thoughts =
|
final thoughts =
|
||||||
selectedSequenceId.value != null
|
selectedSequenceId.value != null
|
||||||
@@ -124,6 +159,7 @@ class ThoughtScreen extends HookConsumerWidget {
|
|||||||
final request = StreamThinkingRequest(
|
final request = StreamThinkingRequest(
|
||||||
userMessage: userMessage,
|
userMessage: userMessage,
|
||||||
sequenceId: selectedSequenceId.value,
|
sequenceId: selectedSequenceId.value,
|
||||||
|
accpetProposals: ['post_create'],
|
||||||
);
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -290,6 +326,10 @@ class ThoughtScreen extends HookConsumerWidget {
|
|||||||
Widget thoughtItem(SnThinkingThought thought, int index) {
|
Widget thoughtItem(SnThinkingThought thought, int index) {
|
||||||
final key = Key('thought-${thought.id}');
|
final key = Key('thought-${thought.id}');
|
||||||
|
|
||||||
|
// Extract proposals from thought content
|
||||||
|
final proposals =
|
||||||
|
thought.content != null ? extractProposals(thought.content!) : [];
|
||||||
|
|
||||||
final thoughtWidget = Container(
|
final thoughtWidget = Container(
|
||||||
margin: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
|
margin: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
|
||||||
padding: const EdgeInsets.all(12),
|
padding: const EdgeInsets.all(12),
|
||||||
@@ -350,8 +390,51 @@ class ThoughtScreen extends HookConsumerWidget {
|
|||||||
MarkdownTextContent(
|
MarkdownTextContent(
|
||||||
isSelectable: true,
|
isSelectable: true,
|
||||||
content: thought.content!,
|
content: thought.content!,
|
||||||
|
extraBlockSyntaxList: [ProposalBlockSyntax()],
|
||||||
textStyle: Theme.of(context).textTheme.bodyMedium,
|
textStyle: Theme.of(context).textTheme.bodyMedium,
|
||||||
|
extraGenerators: [
|
||||||
|
ProposalGenerator(
|
||||||
|
backgroundColor:
|
||||||
|
Theme.of(context).colorScheme.secondaryContainer,
|
||||||
|
foregroundColor:
|
||||||
|
Theme.of(context).colorScheme.onSecondaryContainer,
|
||||||
|
borderColor: Theme.of(context).colorScheme.outline,
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
|
if (proposals.isNotEmpty &&
|
||||||
|
thought.role == ThinkingThoughtRole.assistant) ...[
|
||||||
|
const Gap(12),
|
||||||
|
Wrap(
|
||||||
|
spacing: 8,
|
||||||
|
runSpacing: 8,
|
||||||
|
children:
|
||||||
|
proposals.map((proposal) {
|
||||||
|
return ElevatedButton.icon(
|
||||||
|
onPressed:
|
||||||
|
() => handleProposalAction(context, proposal),
|
||||||
|
icon: Icon(switch (proposal['type']) {
|
||||||
|
'post_create' => Symbols.add,
|
||||||
|
_ => Symbols.lightbulb,
|
||||||
|
}, size: 16),
|
||||||
|
label: Text(switch (proposal['type']) {
|
||||||
|
'post_create' => 'Create Post',
|
||||||
|
_ => proposal['type'] ?? 'Action',
|
||||||
|
}),
|
||||||
|
style: ElevatedButton.styleFrom(
|
||||||
|
backgroundColor:
|
||||||
|
Theme.of(context).colorScheme.primaryContainer,
|
||||||
|
foregroundColor:
|
||||||
|
Theme.of(context).colorScheme.onPrimaryContainer,
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 12,
|
||||||
|
vertical: 8,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}).toList(),
|
||||||
|
),
|
||||||
|
],
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -406,6 +489,16 @@ class ThoughtScreen extends HookConsumerWidget {
|
|||||||
MarkdownTextContent(
|
MarkdownTextContent(
|
||||||
content: streamingText.value,
|
content: streamingText.value,
|
||||||
textStyle: Theme.of(context).textTheme.bodyMedium,
|
textStyle: Theme.of(context).textTheme.bodyMedium,
|
||||||
|
extraBlockSyntaxList: [ProposalBlockSyntax()],
|
||||||
|
extraGenerators: [
|
||||||
|
ProposalGenerator(
|
||||||
|
backgroundColor:
|
||||||
|
Theme.of(context).colorScheme.secondaryContainer,
|
||||||
|
foregroundColor:
|
||||||
|
Theme.of(context).colorScheme.onSecondaryContainer,
|
||||||
|
borderColor: Theme.of(context).colorScheme.outline,
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
if (reasoningChunks.value.isNotEmpty ||
|
if (reasoningChunks.value.isNotEmpty ||
|
||||||
functionCalls.value.isNotEmpty) ...[
|
functionCalls.value.isNotEmpty) ...[
|
||||||
@@ -616,3 +709,135 @@ class ThoughtScreen extends HookConsumerWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ProposalBlockSyntax extends markdown.BlockSyntax {
|
||||||
|
@override
|
||||||
|
RegExp get pattern => RegExp(r'^<proposal', caseSensitive: false);
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool canParse(markdown.BlockParser parser) {
|
||||||
|
return pattern.hasMatch(parser.current.content);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool canEndBlock(markdown.BlockParser parser) {
|
||||||
|
return parser.current.content.contains('</proposal>');
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
markdown.Node parse(markdown.BlockParser parser) {
|
||||||
|
final childLines = <String>[];
|
||||||
|
|
||||||
|
// Extract type from opening tag
|
||||||
|
final openingLine = parser.current.content;
|
||||||
|
final attrsMatch = RegExp(
|
||||||
|
r'<proposal(\s[^>]*)?>',
|
||||||
|
caseSensitive: false,
|
||||||
|
).firstMatch(openingLine);
|
||||||
|
final attrs = attrsMatch?.group(1) ?? '';
|
||||||
|
final typeMatch = RegExp(r'type="([^"]*)"').firstMatch(attrs);
|
||||||
|
final type = typeMatch?.group(1) ?? '';
|
||||||
|
|
||||||
|
// Collect all lines until closing tag
|
||||||
|
while (!parser.isDone) {
|
||||||
|
childLines.add(parser.current.content);
|
||||||
|
if (canEndBlock(parser)) {
|
||||||
|
parser.advance();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
parser.advance();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract content between tags
|
||||||
|
final fullContent = childLines.join('\n');
|
||||||
|
final contentMatch = RegExp(
|
||||||
|
r'<proposal[^>]*>(.*?)</proposal>',
|
||||||
|
dotAll: true,
|
||||||
|
caseSensitive: false,
|
||||||
|
).firstMatch(fullContent);
|
||||||
|
final content = contentMatch?.group(1)?.trim() ?? '';
|
||||||
|
|
||||||
|
final element = markdown.Element('proposal', [markdown.Text(content)])
|
||||||
|
..attributes['type'] = type;
|
||||||
|
|
||||||
|
return element;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ProposalGenerator extends SpanNodeGeneratorWithTag {
|
||||||
|
ProposalGenerator({
|
||||||
|
required Color backgroundColor,
|
||||||
|
required Color foregroundColor,
|
||||||
|
required Color borderColor,
|
||||||
|
}) : super(
|
||||||
|
tag: 'proposal',
|
||||||
|
generator: (
|
||||||
|
markdown.Element element,
|
||||||
|
MarkdownConfig config,
|
||||||
|
WidgetVisitor visitor,
|
||||||
|
) {
|
||||||
|
return ProposalSpanNode(
|
||||||
|
text: element.textContent,
|
||||||
|
type: element.attributes['type'] ?? '',
|
||||||
|
backgroundColor: backgroundColor,
|
||||||
|
foregroundColor: foregroundColor,
|
||||||
|
borderColor: borderColor,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
class ProposalSpanNode extends SpanNode {
|
||||||
|
final String text;
|
||||||
|
final String type;
|
||||||
|
final Color backgroundColor;
|
||||||
|
final Color foregroundColor;
|
||||||
|
final Color borderColor;
|
||||||
|
|
||||||
|
ProposalSpanNode({
|
||||||
|
required this.text,
|
||||||
|
required this.type,
|
||||||
|
required this.backgroundColor,
|
||||||
|
required this.foregroundColor,
|
||||||
|
required this.borderColor,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
InlineSpan build() {
|
||||||
|
return WidgetSpan(
|
||||||
|
child: Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: backgroundColor,
|
||||||
|
border: Border.all(color: borderColor, width: 1),
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
),
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
spacing: 6,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
spacing: 6,
|
||||||
|
children: [
|
||||||
|
Icon(Symbols.lightbulb, size: 16, color: foregroundColor),
|
||||||
|
Text(
|
||||||
|
'SN-chan suggest you to create a post',
|
||||||
|
).fontSize(13).opacity(0.8),
|
||||||
|
],
|
||||||
|
).padding(top: 3, bottom: 4),
|
||||||
|
Flexible(
|
||||||
|
child: Text(
|
||||||
|
text,
|
||||||
|
style: TextStyle(
|
||||||
|
color: foregroundColor,
|
||||||
|
fontSize: 14,
|
||||||
|
fontWeight: FontWeight.w500,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -32,6 +32,9 @@ class MarkdownTextContent extends HookConsumerWidget {
|
|||||||
final EdgeInsets? linesMargin;
|
final EdgeInsets? linesMargin;
|
||||||
final bool isSelectable;
|
final bool isSelectable;
|
||||||
final List<SnCloudFile>? attachments;
|
final List<SnCloudFile>? attachments;
|
||||||
|
final List<markdown.InlineSyntax> extraInlineSyntaxList;
|
||||||
|
final List<markdown.BlockSyntax> extraBlockSyntaxList;
|
||||||
|
final List<dynamic> extraGenerators;
|
||||||
|
|
||||||
const MarkdownTextContent({
|
const MarkdownTextContent({
|
||||||
super.key,
|
super.key,
|
||||||
@@ -43,6 +46,9 @@ class MarkdownTextContent extends HookConsumerWidget {
|
|||||||
this.isSelectable = false,
|
this.isSelectable = false,
|
||||||
this.linesMargin,
|
this.linesMargin,
|
||||||
this.attachments,
|
this.attachments,
|
||||||
|
this.extraInlineSyntaxList = const [],
|
||||||
|
this.extraBlockSyntaxList = const [],
|
||||||
|
this.extraGenerators = const [],
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -218,7 +224,10 @@ class MarkdownTextContent extends HookConsumerWidget {
|
|||||||
highlightGenerator,
|
highlightGenerator,
|
||||||
spoilerGenerator,
|
spoilerGenerator,
|
||||||
stickerGenerator,
|
stickerGenerator,
|
||||||
|
...extraGenerators,
|
||||||
],
|
],
|
||||||
|
extraInlineSyntaxList: extraInlineSyntaxList,
|
||||||
|
extraBlockSyntaxList: extraBlockSyntaxList,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -227,6 +236,8 @@ class MarkdownTextContent extends HookConsumerWidget {
|
|||||||
bool isDark = false,
|
bool isDark = false,
|
||||||
EdgeInsets? linesMargin,
|
EdgeInsets? linesMargin,
|
||||||
List<dynamic> generators = const [],
|
List<dynamic> generators = const [],
|
||||||
|
List<markdown.InlineSyntax> extraInlineSyntaxList = const [],
|
||||||
|
List<markdown.BlockSyntax> extraBlockSyntaxList = const [],
|
||||||
}) {
|
}) {
|
||||||
return MarkdownGenerator(
|
return MarkdownGenerator(
|
||||||
generators: [latexGenerator, ...generators],
|
generators: [latexGenerator, ...generators],
|
||||||
@@ -236,7 +247,9 @@ class MarkdownTextContent extends HookConsumerWidget {
|
|||||||
_SpoilerInlineSyntax(),
|
_SpoilerInlineSyntax(),
|
||||||
_StickerInlineSyntax(),
|
_StickerInlineSyntax(),
|
||||||
LatexSyntax(isDark),
|
LatexSyntax(isDark),
|
||||||
|
...extraInlineSyntaxList,
|
||||||
],
|
],
|
||||||
|
blockSyntaxList: extraBlockSyntaxList,
|
||||||
linesMargin: linesMargin ?? EdgeInsets.symmetric(vertical: 4),
|
linesMargin: linesMargin ?? EdgeInsets.symmetric(vertical: 4),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user