fix/decoration-merge (#190)

nank1ro · Nov 5, 2024 · 367b69b · 367b69b
1 parent 1bbe4cd
commit 367b69b
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.15.1
+
+- **FIX**: Decoration merge
+
 ## 0.15.0
 
 - **FEAT**: New `ShadDatePicker` component.

diff --git a/lib/src/components/alert.dart b/lib/src/components/alert.dart
@@ -88,15 +88,17 @@ class ShadAlert extends StatelessWidget {
         effectiveAlertTheme.iconPadding ??
         const EdgeInsets.only(right: 12);
 
-    final effectiveDecoration = decoration ??
-        effectiveAlertTheme.decoration ??
-        ShadDecoration(
-          border: ShadBorder.all(
-            color: theme.colorScheme.border,
-            radius: theme.radius,
-            padding: const EdgeInsets.all(16),
-          ),
-        );
+    final defaultDecoration = ShadDecoration(
+      border: ShadBorder.all(
+        color: theme.colorScheme.border,
+        radius: theme.radius,
+        padding: const EdgeInsets.all(16),
+      ),
+    );
+
+    final effectiveDecoration = defaultDecoration
+        .mergeWith(effectiveAlertTheme.decoration)
+        .mergeWith(decoration);
 
     final effectiveIconColor = iconColor ??
         effectiveAlertTheme.iconColor ??

diff --git a/lib/src/components/calendar.dart b/lib/src/components/calendar.dart
@@ -1144,8 +1144,8 @@ class _ShadCalendarState extends State<ShadCalendar> {
             .5;
 
     final effectiveDecoration =
-        theme.calendarTheme.decoration?.mergeWith(widget.decoration) ??
-            widget.decoration;
+        (theme.calendarTheme.decoration ?? const ShadDecoration())
+            .mergeWith(widget.decoration);
 
     final effectiveSpacingBetweenMonths = widget.spacingBetweenMonths ??
         theme.calendarTheme.spacingBetweenMonths ??

diff --git a/lib/src/components/context_menu.dart b/lib/src/components/context_menu.dart
@@ -303,7 +303,8 @@ class ShadContextMenuState extends State<ShadContextMenu> {
         const EdgeInsets.symmetric(vertical: 4);
 
     final effectiveDecoration =
-        widget.decoration ?? theme.contextMenuTheme.decoration;
+        (theme.contextMenuTheme.decoration ?? const ShadDecoration())
+            .mergeWith(widget.decoration);
 
     final effectiveFilter = widget.filter ?? theme.contextMenuTheme.filter;
 
@@ -688,12 +689,12 @@ class _ShadContextMenuItemState extends State<ShadContextMenuItem> {
         theme.contextMenuTheme.buttonVariant ??
         ShadButtonVariant.ghost;
 
-    final effectiveDecoration = widget.decoration ??
-        theme.contextMenuTheme.itemDecoration ??
-        const ShadDecoration(
-          secondaryBorder: ShadBorder.none,
-          secondaryFocusedBorder: ShadBorder.none,
-        );
+    final effectiveDecoration = const ShadDecoration(
+      secondaryBorder: ShadBorder.none,
+      secondaryFocusedBorder: ShadBorder.none,
+    )
+        .mergeWith(theme.contextMenuTheme.itemDecoration)
+        .mergeWith(widget.decoration);
 
     final effectiveTextStyle = widget.textStyle ??
         theme.contextMenuTheme.textStyle ??

diff --git a/lib/src/components/resizable.dart b/lib/src/components/resizable.dart
@@ -277,15 +277,15 @@ class ShadResizablePanelGroupState extends State<ShadResizablePanelGroup> {
         theme.resizableTheme.dividerColor ??
         theme.colorScheme.border;
 
-    final effectiveHandleDecoration = widget.handleDecoration ??
-        theme.resizableTheme.handleDecoration ??
-        ShadDecoration(
-          color: theme.colorScheme.border,
-          border: ShadBorder.all(
-            radius: const BorderRadius.all(Radius.circular(4)),
-            width: 0,
-          ),
-        );
+    final effectiveHandleDecoration = ShadDecoration(
+      color: theme.colorScheme.border,
+      border: ShadBorder.all(
+        radius: const BorderRadius.all(Radius.circular(4)),
+        width: 0,
+      ),
+    )
+        .mergeWith(theme.resizableTheme.handleDecoration)
+        .mergeWith(widget.handleDecoration);
 
     final effectiveHandlePadding = widget.handlePadding ??
         theme.resizableTheme.handlePadding ??

diff --git a/lib/src/components/tabs.dart b/lib/src/components/tabs.dart
@@ -280,13 +280,11 @@ class ShadTabsState<T> extends State<ShadTabs<T>> with RestorationMixin {
     final effectivePadding =
         widget.padding ?? tabsTheme.padding ?? EdgeInsets.zero;
 
-    final effectiveDecoration = widget.decoration ??
-        tabsTheme.decoration ??
-        ShadDecoration(
-          merge: false,
-          color: theme.colorScheme.muted,
-          border: ShadBorder.all(radius: theme.radius, width: 0),
-        );
+    final effectiveDecoration = ShadDecoration(
+      merge: false,
+      color: theme.colorScheme.muted,
+      border: ShadBorder.all(radius: theme.radius, width: 0),
+    ).mergeWith(tabsTheme.decoration).mergeWith(widget.decoration);
 
     final effectiveGap = widget.gap ?? tabsTheme.gap ?? 8;
 

diff --git a/lib/src/components/tooltip.dart b/lib/src/components/tooltip.dart
@@ -128,7 +128,9 @@ class _ShadTooltipState extends State<ShadTooltip> {
     final effectiveEffects = widget.effects ?? theme.tooltipTheme.effects ?? [];
     final effectivePadding = widget.padding ?? theme.tooltipTheme.padding;
     final effectiveDecoration =
-        widget.decoration ?? theme.tooltipTheme.decoration;
+        (theme.tooltipTheme.decoration ?? const ShadDecoration())
+            .mergeWith(widget.decoration);
+
     final effectiveAnchor = widget.anchor ??
         theme.tooltipTheme.anchor ??
         const ShadAnchorAuto(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: shadcn_ui
 description: shadcn-ui ported in Flutter. Awesome UI components for Flutter, fully customizable.
-version: 0.15.0
+version: 0.15.1
 homepage: https://flutter-shadcn-ui.mariuti.com
 repository: https://github.com/nank1ro/flutter-shadcn-ui
 documentation: https://flutter-shadcn-ui.mariuti.com