fix: Simplify table border configuration

BuildMirai · Jan 21, 2025 · a2481a4 · a2481a4
1 parent ff847ad
commit a2481a4
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 328 deletions.
diff --git a/examples/mirai_gallery/assets/json/table_example.json b/examples/mirai_gallery/assets/json/table_example.json
@@ -17,11 +17,8 @@
         "value": 1
       },
       "border": {
-        "type": "tableBorder",
-        "borderSide": {
-          "color": "#000000",
-          "width": 1.0
-        }
+        "color": "#000000",
+        "width": 1.0
       },
       "children": [
         {

diff --git a/packages/mirai/lib/src/parsers/mirai_table/mirai_table.dart b/packages/mirai/lib/src/parsers/mirai_table/mirai_table.dart
@@ -45,13 +45,10 @@ class MiraiTableRow with _$MiraiTableRow {
 @freezed
 class MiraiTableBorder with _$MiraiTableBorder {
   const factory MiraiTableBorder({
-    MiraiBorderSide? top,
-    MiraiBorderSide? right,
-    MiraiBorderSide? bottom,
-    MiraiBorderSide? left,
-    MiraiBorderSide? horizontalInside,
-    MiraiBorderSide? verticalInside,
-    MiraiBorderRadius? borderRadius,
+    @Default('#000000') String color,
+    @Default(1.0) double width,
+    @Default(BorderStyle.solid) BorderStyle style,
+    @Default(MiraiBorderRadius()) MiraiBorderRadius borderRadius,
   }) = _MiraiTableBorder;
 
   factory MiraiTableBorder.fromJson(Map<String, dynamic> json) =>