bugfixes

Potatomonsta · Potatomonsta · commit 2cb8aa1904b5 · 2025-08-15T17:44:48.000+05:30
diff --git a/packages/stac/lib/src/parsers/types/type_parser.dart b/packages/stac/lib/src/parsers/types/type_parser.dart
@@ -7,7 +7,6 @@ import 'package:stac/src/utils/color_utils.dart';
 import 'package:stac_models/stac_models.dart';
 import 'package:stac_models/theme/stac_button_style/stac_button_style.dart';
 import 'package:stac_models/types/stac_alignment.dart';
-import 'package:stac_models/types/stac_axis.dart';
 import 'package:stac_models/types/stac_beveled_rectangle_border/stac_beveled_rectangle_border.dart';
 import 'package:stac_models/types/stac_blur_style.dart';
 import 'package:stac_models/types/stac_border/stac_border.dart';
@@ -16,7 +15,6 @@ import 'package:stac_models/types/stac_box_fit.dart';
 import 'package:stac_models/types/stac_box_shadow/stac_box_shadow.dart';
 import 'package:stac_models/types/stac_box_shape.dart';
 import 'package:stac_models/types/stac_circle_border/stac_circle_border.dart';
-import 'package:stac_models/types/stac_clip.dart';
 import 'package:stac_models/types/stac_continuous_rectangle_border/stac_continuous_rectangle_border.dart';
 import 'package:stac_models/types/stac_cross_axis_alignment.dart';
 import 'package:stac_models/types/stac_filter_quality.dart';
diff --git a/packages/stac/lib/src/parsers/widgets/stac_drawer/stac_drawer_parser.dart b/packages/stac/lib/src/parsers/widgets/stac_drawer/stac_drawer_parser.dart
@@ -26,7 +26,7 @@ class StacDrawerParser extends StacParser<StacDrawer> {
       shape: model.shape?.parse(context),
       width: model.width,
       semanticLabel: model.semanticLabel,
-      clipBehavior: model.clipBehavior,
+      clipBehavior: model.clipBehavior?.parse,
       child: model.child?.parse(context),
     );
   }
diff --git a/packages/stac/lib/src/parsers/widgets/stac_tab_bar/stac_tab_bar_parser.dart b/packages/stac/lib/src/parsers/widgets/stac_tab_bar/stac_tab_bar_parser.dart
@@ -9,6 +9,7 @@ import 'package:stac/src/utils/color_utils.dart';
 import 'package:stac/src/utils/widget_type.dart';
 import 'package:stac_framework/stac_framework.dart';
 import 'package:stac_models/widgets/tab_bar/stac_tab_bar.dart';
+import 'package:stac_models/types/types.dart';
 
 class StacTabBarParser extends StacParser<StacTabBar> {
   const StacTabBarParser({this.controller});
@@ -35,7 +36,15 @@ class StacTabBarParser extends StacParser<StacTabBar> {
       indicatorWeight: model.indicatorWeight ?? 2.0,
       indicatorPadding: model.indicatorPadding?.parse ?? EdgeInsets.zero,
       indicator: model.indicator?.parse(context),
-      indicatorSize: model.indicatorSize,
+      indicatorSize: () {
+        switch (model.indicatorSize) {
+          case StacTabBarIndicatorSize.label:
+            return TabBarIndicatorSize.label;
+          case StacTabBarIndicatorSize.tab:
+          default:
+            return TabBarIndicatorSize.tab;
+        }
+      }(),
       labelColor: model.labelColor?.toColor(context),
       labelStyle: model.labelStyle?.parse(context),
       labelPadding: model.labelPadding?.parse,
@@ -46,7 +55,19 @@ class StacTabBarParser extends StacParser<StacTabBar> {
       enableFeedback: model.enableFeedback,
       onTap: (_) {},
       physics: model.physics?.parse,
-      tabAlignment: model.tabAlignment,
+      tabAlignment: () {
+        switch (model.tabAlignment) {
+          case StacTabAlignment.center:
+            return TabAlignment.center;
+          case StacTabAlignment.fill:
+            return TabAlignment.fill;
+          case StacTabAlignment.startOffset:
+            return TabAlignment.startOffset;
+          case StacTabAlignment.start:
+          default:
+            return TabAlignment.start;
+        }
+      }(),
       dividerColor: model.dividerColor?.toColor(context),
       dividerHeight: model.dividerHeight,
     );
diff --git a/packages/stac_models/lib/types/stac_tab_alignment.dart b/packages/stac_models/lib/types/stac_tab_alignment.dart
@@ -0,0 +1,16 @@
+/// Controls how tabs are aligned within a TabBar.
+///
+/// Maps to Flutter's TabAlignment (Material 3).
+enum StacTabAlignment {
+  /// Align tabs to the start.
+  start,
+
+  /// Align tabs to the start with additional offset behavior.
+  startOffset,
+
+  /// Stretch tabs to fill the available width.
+  fill,
+
+  /// Center tabs in the available width.
+  center,
+}
diff --git a/packages/stac_models/lib/types/stac_tab_bar_indicator_size.dart b/packages/stac_models/lib/types/stac_tab_bar_indicator_size.dart
@@ -0,0 +1,10 @@
+/// Defines how the tab indicator's size is computed.
+///
+/// Maps to Flutter's TabBarIndicatorSize.
+enum StacTabBarIndicatorSize {
+  /// Indicator will match the entire tab's width.
+  tab,
+
+  /// Indicator will match the width of the tab's label.
+  label,
+}
diff --git a/packages/stac_models/lib/types/types.dart b/packages/stac_models/lib/types/types.dart
@@ -38,3 +38,5 @@ export 'stac_rect/stac_rect.dart';
 export 'stac_rect_tween/stac_rect_tween.dart';
 export 'stac_bottom_navigation_bar_item/stac_bottom_navigation_bar_item.dart';
 export 'stac_axis.dart';
+export 'stac_tab_bar_indicator_size.dart';
+export 'stac_tab_alignment.dart';
diff --git a/packages/stac_models/lib/widgets/drawer/stac_drawer.dart b/packages/stac_models/lib/widgets/drawer/stac_drawer.dart
@@ -1,9 +1,9 @@
-import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:stac_models/core/converters/double_converter.dart';
 import 'package:stac_models/core/stac_widget.dart';
 import 'package:stac_models/painting/stac_color/stac_colors.dart';
 import 'package:stac_models/types/stac_shape_border/stac_shape_border.dart';
+import 'package:stac_models/types/stac_clip.dart';
 
 part 'stac_drawer.g.dart';
 
@@ -96,7 +96,7 @@ class StacDrawer extends StacWidget {
   final String? semanticLabel;
 
   /// The clip behavior for the drawer's content.
-  final Clip? clipBehavior;
+  final StacClip? clipBehavior;
 
   /// Widget type identifier for this model.
   @override
diff --git a/packages/stac_models/lib/widgets/drawer/stac_drawer.g.dart b/packages/stac_models/lib/widgets/drawer/stac_drawer.g.dart
diff --git a/packages/stac_models/lib/widgets/outlined_button/stac_outlined_button.dart b/packages/stac_models/lib/widgets/outlined_button/stac_outlined_button.dart
@@ -1,7 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:stac_models/stac_models.dart';
 import 'package:stac_models/theme/stac_button_style/stac_button_style.dart';
-import 'package:stac_models/types/stac_clip.dart';
 
 part 'stac_outlined_button.g.dart';
 
diff --git a/packages/stac_models/lib/widgets/single_child_scroll_view/stac_single_child_scroll_view.dart b/packages/stac_models/lib/widgets/single_child_scroll_view/stac_single_child_scroll_view.dart
@@ -1,7 +1,11 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:stac_models/stac_models.dart';
+import 'package:stac_models/core/stac_widget.dart';
+import 'package:stac_models/painting/stac_edge_insets/stac_edge_insets.dart';
 import 'package:stac_models/types/stac_axis.dart';
 import 'package:stac_models/types/stac_clip.dart';
+import 'package:stac_models/types/stac_drag_start_behavior.dart';
+import 'package:stac_models/types/stac_scroll_physics.dart';
+import 'package:stac_models/types/stac_scroll_view_keyboard_dismiss_behavior.dart';
 
 part 'stac_single_child_scroll_view.g.dart';
 
diff --git a/packages/stac_models/lib/widgets/tab_bar/stac_tab_bar.dart b/packages/stac_models/lib/widgets/tab_bar/stac_tab_bar.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:stac_models/core/converters/double_converter.dart';
 import 'package:stac_models/core/stac_widget.dart';
@@ -8,6 +7,8 @@ import 'package:stac_models/painting/stac_edge_insets/stac_edge_insets.dart';
 import 'package:stac_models/painting/stac_text_style/stac_text_style.dart';
 import 'package:stac_models/types/stac_drag_start_behavior.dart';
 import 'package:stac_models/types/stac_scroll_physics.dart';
+import 'package:stac_models/types/stac_tab_bar_indicator_size.dart';
+import 'package:stac_models/types/stac_tab_alignment.dart';
 
 part 'stac_tab_bar.g.dart';
 
@@ -102,7 +103,7 @@ class StacTabBar extends StacWidget {
   final StacBoxDecoration? indicator;
 
   /// How the indicator's size is computed.
-  final TabBarIndicatorSize? indicatorSize;
+  final StacTabBarIndicatorSize? indicatorSize;
 
   /// Color of selected tab labels.
   final StacColor? labelColor;
@@ -129,7 +130,7 @@ class StacTabBar extends StacWidget {
   final StacScrollPhysics? physics;
 
   /// How the tabs should be aligned.
-  final TabAlignment? tabAlignment;
+  final StacTabAlignment? tabAlignment;
 
   /// Divider color drawn below the tab bar (Material 3).
   final StacColor? dividerColor;
diff --git a/packages/stac_models/lib/widgets/tab_bar/stac_tab_bar.g.dart b/packages/stac_models/lib/widgets/tab_bar/stac_tab_bar.g.dart
diff --git a/packages/stac_models/lib/widgets/text_button/stac_text_button.dart b/packages/stac_models/lib/widgets/text_button/stac_text_button.dart
@@ -1,5 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:stac_models/stac_models.dart';
+import 'package:stac_models/core/stac_widget.dart';
+import 'package:stac_models/core/stac_action.dart';
 import 'package:stac_models/theme/stac_button_style/stac_button_style.dart';
 import 'package:stac_models/types/stac_clip.dart';
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class StacDrawerParser extends StacParser<StacDrawer> {`
`26`	`26`	`shape: model.shape?.parse(context),`
`27`	`27`	`width: model.width,`
`28`	`28`	`semanticLabel: model.semanticLabel,`
`29`		`- clipBehavior: model.clipBehavior,`
	`29`	`+ clipBehavior: model.clipBehavior?.parse,`
`30`	`30`	`child: model.child?.parse(context),`
`31`	`31`	`);`
`32`	`32`	`}`