chore: unified textfield/textarea api to match config

vkaltyrin · vkaltyrin · commit bf4ee15d5965 · 2025-01-13T15:50:07.000+03:00
diff --git a/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextArea/SDDSTextAreaAppearance+Extensions.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextArea/SDDSTextAreaAppearance+Extensions.swift
@@ -53,7 +53,9 @@ public extension TextAreaAppearance {
             endContentColor: .surfaceInverseSolidPrimary.withOpacity(0.96),
             textColorReadOnly: .surfaceInverseSolidPrimary.withOpacity(0.96),
             captionColorReadOnly: .surfaceInverseSolidPrimary.withOpacity(0.56),
-            placeholderColorReadOnly: .textDefaultSecondary
+            counterColorReadOnly: .surfaceInverseSolidPrimary.withOpacity(0.56),
+            placeholderColorReadOnly: .textDefaultSecondary,
+            backgroundColorReadOnly: .surfaceDefaultTransparentPrimary
         )
     }
 }
diff --git a/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextArea/SDDSTextAreaSize.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextArea/SDDSTextAreaSize.swift
@@ -3,6 +3,7 @@ import SwiftUI
 import SDDSComponents
 
 public enum SDDSTextAreaSize: String, TextAreaSizeConfiguration {
+    
     case large
     case medium
     case small
@@ -34,6 +35,10 @@ public enum SDDSTextAreaSize: String, TextAreaSizeConfiguration {
         }
     }
     
+    public var chipsPadding: CGFloat {
+        6
+    }
+    
     public var textBeforeLeadingPadding: CGFloat {
         return 0
     }
diff --git a/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextArea/TextAreaChipSize.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextArea/TextAreaChipSize.swift
@@ -90,19 +90,23 @@ public enum TextAreaChipSize: String, ChipSizeConfiguration {
         }
     }
     
-    public var borderStyle: ChipBorderStyle {
-        switch self {
-        case .large:
-            return .default(8)
-        case .medium:
-            return .default(6)
-        case .small:
-            return .default(4)
-        case .extraSmall:
-            return .default(2)
+    public func cornerRadius(style: ComponentShapeStyle) -> CGFloat {
+        switch style {
+        case .cornered:
+            switch self {
+            case .large:
+                return 8
+            case .medium:
+                return 6
+            case .small:
+                return 4
+            case .extraSmall:
+                return 2
+            }
+        case .pilled:
+            return height / 2
         }
     }
-
 }
 
 #Preview {
diff --git a/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextField/TextFieldChipSize.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextField/TextFieldChipSize.swift
@@ -90,19 +90,23 @@ public enum TextFieldChipSize: ChipSizeConfiguration {
         }
     }
     
-    public var borderStyle: ChipBorderStyle {
-        switch self {
-        case .large:
-            return .default(8)
-        case .medium:
-            return .default(6)
-        case .small:
-            return .default(4)
-        case .extraSmall:
-            return .default(2)
+    public func cornerRadius(style: SDDSComponents.ComponentShapeStyle) -> CGFloat {
+        switch style {
+        case .cornered:
+            switch self {
+            case .large:
+                return 8
+            case .medium:
+                return 6
+            case .small:
+                return 4
+            case .extraSmall:
+                return 2
+            }
+        case .pilled:
+            return height / 2
         }
     }
-
 }
 
 #Preview {
diff --git a/SDDSComponents/Sources/SDDSComponents/Common/ColorToken+Extensions.swift b/SDDSComponents/Sources/SDDSComponents/Common/ColorToken+Extensions.swift
@@ -105,6 +105,12 @@ public extension ColorToken {
     }
 }
 
+public extension ShapeToken {
+    static var `default`: ShapeToken {
+        .default
+    }
+}
+
 public extension ColorToken {
     func withOpacity(_ opacity: Double) -> ColorToken {
         return ColorToken(
diff --git a/SDDSComponents/Sources/SDDSComponents/Components/SDDSButton/ButtonAppearance/ButtonAppearance.swift b/SDDSComponents/Sources/SDDSComponents/Components/SDDSButton/ButtonAppearance/ButtonAppearance.swift
@@ -28,9 +28,9 @@ public struct ButtonAppearance {
     public let size: ButtonSizeConfiguration
     
     /**
-     Стиль формы кнопки (например, закругленная или овальная), определяемый `ButtonShapeStyle`.
+     Стиль формы кнопки (например, закругленная или овальная), определяемый `ComponentShapeStyle`.
      */
-    public let shapeStyle: ButtonShapeStyle
+    public let shapeStyle: ComponentShapeStyle
     
     /**
      Типографика для текста заголовка кнопки, определяемая `TypographyConfiguration`.
@@ -95,7 +95,7 @@ public struct ButtonAppearance {
      */
     public init(
         size: ButtonSizeConfiguration = DefaultButtonSize(),
-        shapeStyle: ButtonShapeStyle = .default,
+        shapeStyle: ComponentShapeStyle = .cornered,
         titleTypography: TypographyConfiguration = .default,
         titleColor: ButtonColor = ButtonColor(),
         subtitleTypography: TypographyConfiguration = .default,
diff --git a/SDDSComponents/Sources/SDDSComponents/Components/SDDSButton/ButtonAppearance/ButtonSize.swift b/SDDSComponents/Sources/SDDSComponents/Components/SDDSButton/ButtonAppearance/ButtonSize.swift
@@ -22,7 +22,7 @@ public protocol ButtonSizeConfiguration: SizeConfiguration, CustomDebugStringCon
     /**
      Радиус скругления углов кнопки.
      */
-    var cornerRadius: CGFloat { get }
+    func cornerRadius(style: ComponentShapeStyle) -> CGFloat
     
     /**
      Внутренние отступы кнопки.
@@ -48,11 +48,12 @@ public protocol ButtonSizeConfiguration: SizeConfiguration, CustomDebugStringCon
      Горизонтальный промежуток между заголовком и подзаголовком кнопки.
      */
     var titleHorizontalGap: CGFloat { get }
+    
 }
 
 public struct DefaultButtonSize: ButtonSizeConfiguration {
     public var height: CGFloat = 0
-    public var cornerRadius: CGFloat = 0
+    public func cornerRadius(style: ComponentShapeStyle) -> CGFloat { 0 }
     public var paddings: EdgeInsets = .init()
     public var iconSize: CGSize = .zero
     public var spinnerSize: CGSize = .zero
diff --git a/SDDSComponents/Sources/SDDSComponents/Components/SDDSButton/Generated/ButtonAppearance+Extensions.swift b/SDDSComponents/Sources/SDDSComponents/Components/SDDSButton/Generated/ButtonAppearance+Extensions.swift
@@ -18,7 +18,7 @@ public extension ButtonAppearance {
         )
     }
     
-    func shapeStyle(_ shapeStyle: ButtonShapeStyle) -> ButtonAppearance {
+    func shapeStyle(_ shapeStyle: ComponentShapeStyle) -> ButtonAppearance {
         return ButtonAppearance(
             size: self.size,
             shapeStyle: shapeStyle,
diff --git a/SDDSComponents/Sources/SDDSComponents/Components/SDDSButton/SDDSButton.swift b/SDDSComponents/Sources/SDDSComponents/Components/SDDSButton/SDDSButton.swift
@@ -174,12 +174,7 @@ public struct SDDSButton: View {
 
 private extension SDDSButton {
     var cornerRadius: CGFloat {
-        switch appearance.shapeStyle {
-        case .default:
-            return appearance.size.cornerRadius
-        case .pilled:
-            return appearance.size.height / 2
-        }
+        return appearance.size.cornerRadius(style: appearance.shapeStyle)
     }
     
     func currentColor(for buttonColor: ButtonColor) -> Color {
diff --git a/SDDSComponents/Sources/SDDSComponents/Components/SDDSChip/ChipAppearance/ChipAppearance.swift b/SDDSComponents/Sources/SDDSComponents/Components/SDDSChip/ChipAppearance/ChipAppearance.swift
@@ -21,6 +21,7 @@ public struct ChipAppearance: Hashable {
     public let imageTintColor: ColorToken
     public let buttonTintColor: ColorToken
     public let backgroundColor: ColorToken
+    public let shapeStyle: ComponentShapeStyle
     public let disabledAlpha: CGFloat
 
     public init(
@@ -30,6 +31,7 @@ public struct ChipAppearance: Hashable {
         imageTintColor: ColorToken = .clearColor,
         buttonTintColor: ColorToken = .clearColor,
         backgroundColor: ColorToken = .clearColor,
+        shapeStyle: ComponentShapeStyle = .cornered,
         disabledAlpha: CGFloat = 0
     ) {
         self.size = size
@@ -38,6 +40,7 @@ public struct ChipAppearance: Hashable {
         self.imageTintColor = imageTintColor
         self.buttonTintColor = buttonTintColor
         self.backgroundColor = backgroundColor
+        self.shapeStyle = shapeStyle
         self.disabledAlpha = disabledAlpha
     }
     
diff --git a/SDDSComponents/Sources/SDDSComponents/Components/SDDSChip/ChipAppearance/ChipBorderStyle.swift b/SDDSComponents/Sources/SDDSComponents/Components/SDDSChip/ChipAppearance/ChipBorderStyle.swift
@@ -1,20 +1,19 @@
 import Foundation
 
 /**
- `ChipBorderStyle` определяет стиль границы для чипа.
+ `ComponentShapeStyle` определяет стиль границы для чипа.
  
- - `default`: Стиль по умолчанию с заданным радиусом скругления.
+ - `cornered`: Стиль по умолчанию с заданным радиусом скругления.
  - `pilled`: Закругленный стиль с максимальным радиусом скругления.
  */
-public enum ChipBorderStyle: Hashable {
-    case `default`(_ cornerRadius: CGFloat)
+public enum ComponentShapeStyle: Hashable {
+    case cornered
     case pilled
     
     public func hash(into hasher: inout Hasher) {
         switch self {
-        case .default(let cornerRadius):
-            hasher.combine("default")
-            hasher.combine(cornerRadius)
+        case .cornered:
+            hasher.combine("cornered")
         case .pilled:
             hasher.combine("pilled")
         }
diff --git a/SDDSComponents/Sources/SDDSComponents/Components/SDDSChip/ChipAppearance/ChipSizeConfiguration.swift b/SDDSComponents/Sources/SDDSComponents/Components/SDDSChip/ChipAppearance/ChipSizeConfiguration.swift
@@ -18,8 +18,8 @@ public protocol ChipSizeConfiguration: SizeConfiguration, CustomDebugStringConve
     var leadingInset: CGFloat { get }
     var trailingInset: CGFloat { get }
     var spacing: CGFloat { get }
-    var borderStyle: ChipBorderStyle { get }
     var height: CGFloat { get }
+    func cornerRadius(style: ComponentShapeStyle) -> CGFloat
 }
 
 public struct ZeroChipSize: ChipSizeConfiguration {
@@ -28,8 +28,8 @@ public struct ZeroChipSize: ChipSizeConfiguration {
     public var leadingInset: CGFloat { 0 }
     public var trailingInset: CGFloat { 0 }
     public var spacing: CGFloat { 0 }
-    public var borderStyle: ChipBorderStyle { .default(0) }
     public var height: CGFloat { 0 }
+    public func cornerRadius(style: ComponentShapeStyle) -> CGFloat { 0 }
     public var debugDescription: String { "ZeroChipSize" }
     public init() {}
 }
diff --git a/SDDSComponents/Sources/SDDSComponents/Components/SDDSChip/SDDSChip.swift b/SDDSComponents/Sources/SDDSComponents/Components/SDDSChip/SDDSChip.swift
@@ -123,12 +123,7 @@ public struct SDDSChip: View {
     }
     
     private var borderRadius: CGFloat {
-        switch appearance.size.borderStyle {
-        case .default(let cornerRadius):
-            return cornerRadius
-        case .pilled:
-            return appearance.size.height / 2
-        }
+        return appearance.size.cornerRadius(style: appearance.shapeStyle)
     }
     
     private func handleRemove() {
diff --git a/SDDSComponents/Sources/SDDSComponents/Components/SDDSTextArea/SDDSTextArea.swift b/SDDSComponents/Sources/SDDSComponents/Components/SDDSTextArea/SDDSTextArea.swift
@@ -792,15 +792,10 @@ public struct SDDSTextArea: View {
         case .single:
             return 0
         case .multiple(_, let chips):
-            guard let chipSize = chips.first?.appearance.size else {
+            guard let chipAppearance = chips.first?.appearance else {
                 return 0
             }
-            switch chipSize.borderStyle {
-            case .default(let radius):
-                return radius
-            case .pilled:
-                return chipSize.height / 2
-            }
+            return chipAppearance.size.cornerRadius(style: chipAppearance.shapeStyle)
         }
     }
 
diff --git a/SDDSComponents/Sources/SDDSComponents/Components/SDDSTextField/SDDSTextField.swift b/SDDSComponents/Sources/SDDSComponents/Components/SDDSTextField/SDDSTextField.swift
@@ -779,15 +779,10 @@ public struct SDDSTextField: View {
         case .single:
             return 0
         case .multiple(_, let chips):
-            guard let chipSize = chips.first?.appearance.size else {
+            guard let chipAppearance = chips.first?.appearance else {
                 return 0
             }
-            switch chipSize.borderStyle {
-            case .default(let radius):
-                return radius
-            case .pilled:
-                return chipSize.height / 2
-            }
+            return chipAppearance.size.cornerRadius(style: chipAppearance.shapeStyle)
         }
     }
     
diff --git a/SDDSThemeBuilder/SDDSThemeBuilderCore/Stencil/BasicButtonSize+ButtonSizeConfiguration.stencil b/SDDSThemeBuilder/SDDSThemeBuilderCore/Stencil/BasicButtonSize+ButtonSizeConfiguration.stencil
@@ -19,12 +19,17 @@ extension BasicButtonSize: ButtonSizeConfiguration {
         {%- endfor %}
         }
     }
-
-    public var cornerRadius: CGFloat {
-        switch self {
-        {%- for variation, config in variations.size %}
-        case .{{ variation | sizeKey }}: return {{ config.shape.name | adjustedCornerRadius:config.shape.adjustment }}
-        {%- endfor %}
+    
+    public func cornerRadius(style: ComponentShapeStyle) -> CGFloat {
+        switch style {
+        case .cornered:
+            switch self {
+            {%- for variation, config in variations.size %}
+            case .{{ variation | sizeKey }}: return {{ config.shape.name | adjustedCornerRadius:config.shape.adjustment }}
+            {%- endfor %}
+            }
+        case .pilled:
+            return height / 2
         }
     }
 
diff --git a/SDDSThemeBuilder/SDDSThemeBuilderCore/Stencil/IconButtonSize+ButtonSizeConfiguration.stencil b/SDDSThemeBuilder/SDDSThemeBuilderCore/Stencil/IconButtonSize+ButtonSizeConfiguration.stencil
@@ -20,11 +20,16 @@ extension IconButtonSize: ButtonSizeConfiguration {
         }
     }
 
-    public var cornerRadius: CGFloat {
-        switch self {
-        {%- for variation, config in variations.size %}
-        case .{{ variation | sizeKey }}: return {{ config.shape.name | adjustedCornerRadius:config.shape.adjustment }}
-        {%- endfor %}
+    public func cornerRadius(style: ComponentShapeStyle) -> CGFloat {
+        switch style {
+        case .cornered:
+            switch self {
+            {%- for variation, config in variations.size %}
+            case .{{ variation | sizeKey }}: return {{ config.shape.name | adjustedCornerRadius:config.shape.adjustment }}
+            {%- endfor %}
+            }
+        case .pilled:
+            return height / 2
         }
     }
 
diff --git a/SDDSThemeBuilder/SDDSThemeBuilderCore/Stencil/LinkButtonSize+ButtonSizeConfiguration.stencil b/SDDSThemeBuilder/SDDSThemeBuilderCore/Stencil/LinkButtonSize+ButtonSizeConfiguration.stencil
@@ -20,9 +20,7 @@ extension LinkButtonSize: ButtonSizeConfiguration {
         }
     }
 
-    public var cornerRadius: CGFloat {
-        0
-    }
+    public func cornerRadius(style: ComponentShapeStyle) -> CGFloat { 0 }
 
     public var paddings: EdgeInsets {
         switch self {
diff --git a/SDDSThemeBuilder/SDDSThemeCore/Sources/SDDSThemeCore/Extensions/ColorToken+Alpha.swift b/SDDSThemeBuilder/SDDSThemeCore/Sources/SDDSThemeCore/Extensions/ColorToken+Alpha.swift
@@ -0,0 +1,12 @@
+import Foundation
+import SwiftUI
+
+public extension ColorToken {
+    /// Применяет альфу к токену путем умножения альфы к исходной альфе токена
+    func withAlpha(multipliedBy alpha: Double) {
+        return ColorToken(
+            darkColor: self.darkColor.opacity(alpha),
+            lightColor: self.lightColor.opacity(alpha)
+        )
+    }
+}
diff --git a/Themes/SDDSservTheme/SDDSButton/BasicButtonSize+ButtonSizeConfiguration.swift b/Themes/SDDSservTheme/SDDSButton/BasicButtonSize+ButtonSizeConfiguration.swift
diff --git a/Themes/SDDSservTheme/SDDSButton/IconButtonSize+ButtonSizeConfiguration.swift b/Themes/SDDSservTheme/SDDSButton/IconButtonSize+ButtonSizeConfiguration.swift
diff --git a/Themes/SDDSservTheme/SDDSButton/LinkButtonSize+ButtonSizeConfiguration.swift b/Themes/SDDSservTheme/SDDSButton/LinkButtonSize+ButtonSizeConfiguration.swift
diff --git a/Themes/SDDSservTheme/SDDSChip/SDDSChip+Pilled.swift b/Themes/SDDSservTheme/SDDSChip/SDDSChip+Pilled.swift
diff --git a/Themes/SDDSservTheme/SDDSChip/SDDSChip+SizeVariations.swift b/Themes/SDDSservTheme/SDDSChip/SDDSChip+SizeVariations.swift
diff --git a/Themes/SDDSservTheme/SDDSChip/SDDSChipSize.swift b/Themes/SDDSservTheme/SDDSChip/SDDSChipSize.swift

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,9 @@ public extension TextAreaAppearance {`
`53`	`53`	`endContentColor: .surfaceInverseSolidPrimary.withOpacity(0.96),`
`54`	`54`	`textColorReadOnly: .surfaceInverseSolidPrimary.withOpacity(0.96),`
`55`	`55`	`captionColorReadOnly: .surfaceInverseSolidPrimary.withOpacity(0.56),`
`56`		`- placeholderColorReadOnly: .textDefaultSecondary`
	`56`	`+ counterColorReadOnly: .surfaceInverseSolidPrimary.withOpacity(0.56),`
	`57`	`+ placeholderColorReadOnly: .textDefaultSecondary,`
	`58`	`+ backgroundColorReadOnly: .surfaceDefaultTransparentPrimary`
`57`	`59`	`)`
`58`	`60`	`}`
`59`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import SwiftUI`
`3`	`3`	`import SDDSComponents`
`4`	`4`
`5`	`5`	`public enum SDDSTextAreaSize: String, TextAreaSizeConfiguration {`
	`6`	`+`
`6`	`7`	`case large`
`7`	`8`	`case medium`
`8`	`9`	`case small`
`@@ -34,6 +35,10 @@ public enum SDDSTextAreaSize: String, TextAreaSizeConfiguration {`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`
	`38`	`+ public var chipsPadding: CGFloat {`
	`39`	`+ 6`
	`40`	`+ }`
	`41`	`+`
`37`	`42`	`public var textBeforeLeadingPadding: CGFloat {`
`38`	`43`	`return 0`
`39`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,12 @@ public extension ColorToken {`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
	`108`	`+public extension ShapeToken {`
	`109`	+ static var `default`: ShapeToken {
	`110`	`+ .default`
	`111`	`+ }`
	`112`	`+}`
	`113`	`+`
`108`	`114`	`public extension ColorToken {`
`109`	`115`	`func withOpacity(_ opacity: Double) -> ColorToken {`
`110`	`116`	`return ColorToken(`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public extension ButtonAppearance {`
`18`	`18`	`)`
`19`	`19`	`}`
`20`	`20`
`21`		`- func shapeStyle(_ shapeStyle: ButtonShapeStyle) -> ButtonAppearance {`
	`21`	`+ func shapeStyle(_ shapeStyle: ComponentShapeStyle) -> ButtonAppearance {`
`22`	`22`	`return ButtonAppearance(`
`23`	`23`	`size: self.size,`
`24`	`24`	`shapeStyle: shapeStyle,`
Original file line number	Diff line number	Diff line change
`@@ -123,12 +123,7 @@ public struct SDDSChip: View {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`private var borderRadius: CGFloat {`
`126`		`- switch appearance.size.borderStyle {`
`127`		`- case .default(let cornerRadius):`
`128`		`- return cornerRadius`
`129`		`- case .pilled:`
`130`		`- return appearance.size.height / 2`
`131`		`- }`
	`126`	`+ return appearance.size.cornerRadius(style: appearance.shapeStyle)`
`132`	`127`	`}`
`133`	`128`
`134`	`129`	`private func handleRemove() {`
Original file line number	Diff line number	Diff line change
`@@ -792,15 +792,10 @@ public struct SDDSTextArea: View {`
`792`	`792`	`case .single:`
`793`	`793`	`return 0`
`794`	`794`	`case .multiple(_, let chips):`
`795`		`- guard let chipSize = chips.first?.appearance.size else {`
	`795`	`+ guard let chipAppearance = chips.first?.appearance else {`
`796`	`796`	`return 0`
`797`	`797`	`}`
`798`		`- switch chipSize.borderStyle {`
`799`		`- case .default(let radius):`
`800`		`- return radius`
`801`		`- case .pilled:`
`802`		`- return chipSize.height / 2`
`803`		`- }`
	`798`	`+ return chipAppearance.size.cornerRadius(style: chipAppearance.shapeStyle)`
`804`	`799`	`}`
`805`	`800`	`}`
`806`	`801`
Original file line number	Diff line number	Diff line change
`@@ -779,15 +779,10 @@ public struct SDDSTextField: View {`
`779`	`779`	`case .single:`
`780`	`780`	`return 0`
`781`	`781`	`case .multiple(_, let chips):`
`782`		`- guard let chipSize = chips.first?.appearance.size else {`
	`782`	`+ guard let chipAppearance = chips.first?.appearance else {`
`783`	`783`	`return 0`
`784`	`784`	`}`
`785`		`- switch chipSize.borderStyle {`
`786`		`- case .default(let radius):`
`787`		`- return radius`
`788`		`- case .pilled:`
`789`		`- return chipSize.height / 2`
`790`		`- }`
	`785`	`+ return chipAppearance.size.cornerRadius(style: chipAppearance.shapeStyle)`
`791`	`786`	`}`
`792`	`787`	`}`
`793`	`788`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,17 @@ extension BasicButtonSize: ButtonSizeConfiguration {`
`19`	`19`	`{%- endfor %}`
`20`	`20`	`}`
`21`	`21`	`}`
`22`		`-`
`23`		`- public var cornerRadius: CGFloat {`
`24`		`- switch self {`
`25`		`- {%- for variation, config in variations.size %}`
`26`		`- case .{{ variation \| sizeKey }}: return {{ config.shape.name \| adjustedCornerRadius:config.shape.adjustment }}`
`27`		`- {%- endfor %}`
	`22`	`+`
	`23`	`+ public func cornerRadius(style: ComponentShapeStyle) -> CGFloat {`
	`24`	`+ switch style {`
	`25`	`+ case .cornered:`
	`26`	`+ switch self {`
	`27`	`+ {%- for variation, config in variations.size %}`
	`28`	`+ case .{{ variation \| sizeKey }}: return {{ config.shape.name \| adjustedCornerRadius:config.shape.adjustment }}`
	`29`	`+ {%- endfor %}`
	`30`	`+ }`
	`31`	`+ case .pilled:`
	`32`	`+ return height / 2`
`28`	`33`	`}`
`29`	`34`	`}`
`30`	`35`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,16 @@ extension IconButtonSize: ButtonSizeConfiguration {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`- public var cornerRadius: CGFloat {`
`24`		`- switch self {`
`25`		`- {%- for variation, config in variations.size %}`
`26`		`- case .{{ variation \| sizeKey }}: return {{ config.shape.name \| adjustedCornerRadius:config.shape.adjustment }}`
`27`		`- {%- endfor %}`
	`23`	`+ public func cornerRadius(style: ComponentShapeStyle) -> CGFloat {`
	`24`	`+ switch style {`
	`25`	`+ case .cornered:`
	`26`	`+ switch self {`
	`27`	`+ {%- for variation, config in variations.size %}`
	`28`	`+ case .{{ variation \| sizeKey }}: return {{ config.shape.name \| adjustedCornerRadius:config.shape.adjustment }}`
	`29`	`+ {%- endfor %}`
	`30`	`+ }`
	`31`	`+ case .pilled:`
	`32`	`+ return height / 2`
`28`	`33`	`}`
`29`	`34`	`}`
`30`	`35`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,7 @@ extension LinkButtonSize: ButtonSizeConfiguration {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`- public var cornerRadius: CGFloat {`
`24`		`- 0`
`25`		`- }`
	`23`	`+ public func cornerRadius(style: ComponentShapeStyle) -> CGFloat { 0 }`
`26`	`24`
`27`	`25`	`public var paddings: EdgeInsets {`
`28`	`26`	`switch self {`