chore: unified textfield and textarea api

salute-developers · Jan 14, 2025 · 1a5a3e4 · 1a5a3e4
1 parent 186ee6b
commit 1a5a3e4
Show file tree

Hide file tree

Showing 39 changed files with 368 additions and 250 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 'latest'
+          xcode-version: '16.1'
 
       - name: Install the Apple certificate and provisioning profile
         env:

diff --git a/...nts/SDDSComponentsPreview/Components/SDDSTextArea/SDDSTextAreaAppearance+Extensions.swift b/...nts/SDDSComponentsPreview/Components/SDDSTextArea/SDDSTextAreaAppearance+Extensions.swift
@@ -12,9 +12,9 @@ public extension TextAreaAppearance {
             innerTitleTypography: TextAreaTypography.innerTitle,
             captionTypography: TextAreaTypography.caption,
             counterTypography: TextAreaTypography.counter,
-            titleColor: .surfaceInverseSolidPrimary.withOpacity(0.96),
-            optionalTitleColor: .surfaceInverseSolidPrimary.withOpacity(0.28),
-            textColor: .surfaceInverseSolidPrimary.withOpacity(0.96),
+            titleColor: .textDefaultPrimary,
+            optionalTitleColor: .textDefaultTertiary,
+            textColor: .textDefaultPrimary,
             textColorError: .textDefaultNegative,
             textColorWarning: .textDefaultWarning,
             textColorSuccess: .textDefaultAccent,
@@ -32,24 +32,24 @@ public extension TextAreaAppearance {
             borderColorWarning: Color.clear.token,
             borderColorSuccess: Color.clear.token,
             backgroundColorDefault: .surfaceDefaultTransparentPrimary,
-            backgroundColorError: ColorToken(
-                darkColor: Color(UIColor(hex: "#FF293E").withAlphaComponent(0.2)),
-                lightColor: Color(UIColor(hex: "#FF293E").withAlphaComponent(0.12))
-            ),
-            backgroundColorWarning: .surfaceDefaultTransparentWarning.inverted,
-            backgroundColorSuccess: ColorToken(
-                darkColor: Color(UIColor(hex: "#1A9E32").withAlphaComponent(0.2)),
-                lightColor: Color(UIColor(hex: "#1A9E32").withAlphaComponent(0.12))
-            ),
-            captionColorDefault: .surfaceInverseSolidPrimary.withOpacity(0.56),
+            backgroundColorError: .surfaceDefaultTransparentNegative,
+            backgroundColorWarning: .surfaceDefaultTransparentWarning,
+            backgroundColorSuccess: .surfaceDefaultTransparentPositive,
+            captionColorDefault: .textDefaultSecondary,
             captionColorError: .textDefaultNegative,
             captionColorWarning: .textDefaultWarning,
             captionColorSuccess: .textDefaultAccent,
-            counterColorDefault: .surfaceInverseSolidPrimary.withOpacity(0.56),
+            counterColorDefault: .textDefaultSecondary,
             placeholderColorDefault: .textDefaultSecondary,
             placeholderColorError: .textDefaultNegative,
             placeholderColorWarning: .textDefaultWarning,
-            placeholderColorSuccess: .textDefaultAccent
+            placeholderColorSuccess: .textDefaultAccent,
+            endContentColor: .textDefaultSecondary,
+            textColorReadOnly: .textDefaultPrimary,
+            captionColorReadOnly: .textDefaultSecondary,
+            counterColorReadOnly: .textDefaultSecondary,
+            placeholderColorReadOnly: .textDefaultSecondary,
+            backgroundColorReadOnly: .surfaceDefaultSolidPrimary
         )
     }
 }

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
     }
@@ -49,8 +54,21 @@ public enum SDDSTextAreaSize: String, TextAreaSizeConfiguration {
     public var textAfterTrailingPadding: CGFloat {
         return 2
     }
-
-    public var fieldHorizontalPadding: CGFloat {
+
+    public var boxLeadingPadding: CGFloat {
+        switch self {
+        case .large:
+            16
+        case .medium:
+            8
+        case .small:
+            8
+        case .extraSmall:
+            8
+        }
+    }
+
+    public var boxTrailingPadding: CGFloat {
         switch self {
         case .large:
             16

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/...ponents/SDDSComponentsPreview/Components/SDDSTextField/ChipAppearance+SDDSTextField.swift b/...ponents/SDDSComponentsPreview/Components/SDDSTextField/ChipAppearance+SDDSTextField.swift
@@ -10,7 +10,7 @@ public extension ChipAppearance {
             titleTypography: ChipTextFieldTypography.text,
             imageTintColor: ColorToken.textDefaultPrimary,
             buttonTintColor: ColorToken.textDefaultPrimary,
-            backgroundColor: .surfaceDefaultTransparentSecondary,
+            backgroundColor: .surfaceDefaultSolidPrimary,
             disabledAlpha: 0.5
         )
     }

diff --git a/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextField/SDDSTextField+Preview.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextField/SDDSTextField+Preview.swift
@@ -13,7 +13,7 @@ struct SDDSTextFieldPreview: PreviewProvider {
                 isEnabled: true,
                 iconImage: nil,
                 buttonImage: Image.image("textFieldChipIcon"),
-                appearance: .textField,
+                appearance: SDDSChip.accent.medium.pilled.appearance,
                 accessibility: ChipAccessibility(),
                 removeAction: {}
             )
@@ -76,7 +76,7 @@ struct SDDSTextFieldPreview: PreviewProvider {
                 disabled: false,
                 style: .default,
                 labelPlacement: .inner,
-                required: true,
+                required: false,
                 requiredPlacement: .left,
                 appearance: .defaultAppearance,
                 size: SDDSTextFieldSize.large,
@@ -144,7 +144,7 @@ struct SDDSTextFieldPreview: PreviewProvider {
                 appearance: .defaultAppearance,
                 size: SDDSTextFieldSize.large,
                 layout: .default,
-                iconViewProvider: ViewProvider(iconView),
+                iconViewProvider: nil,
                 iconActionViewProvider: ViewProvider(iconActionView)
             )
             .previewDisplayName("Multiple – Default Label")

diff --git a/...nents/SDDSComponentsPreview/Components/SDDSTextField/TextFieldAppearance+Extensions.swift b/...nents/SDDSComponentsPreview/Components/SDDSTextField/TextFieldAppearance+Extensions.swift
@@ -14,9 +14,9 @@ public extension TextFieldAppearance {
             captionTypography: TextFieldTypography.caption,
             textBeforeTypography: TextFieldTypography.text,
             textAfterTypography: TextFieldTypography.text,
-            titleColor: .surfaceInverseSolidPrimary.withOpacity(0.96),
-            optionalTitleColor: .surfaceInverseSolidPrimary.withOpacity(0.28),
-            textColor: .surfaceInverseSolidPrimary.withOpacity(0.96),
+            titleColor: .textDefaultPrimary,
+            optionalTitleColor: .textDefaultTertiary,
+            textColor: .textDefaultPrimary,
             textColorError: .textDefaultNegative,
             textColorWarning: .textDefaultWarning,
             textColorSuccess: .textDefaultAccent,
@@ -34,17 +34,11 @@ public extension TextFieldAppearance {
             borderColorWarning: Color.clear.token,
             borderColorSuccess: Color.clear.token,
             backgroundColorDefault: .surfaceDefaultTransparentPrimary,
-            backgroundColorReadOnly: .surfaceDefaultTransparentPrimary,
-            backgroundColorError: ColorToken(
-                darkColor: Color(UIColor(hex: "#FF293E").withAlphaComponent(0.2)),
-                lightColor: Color(UIColor(hex: "#FF293E").withAlphaComponent(0.12))
-            ),
-            backgroundColorWarning: .surfaceDefaultTransparentWarning.inverted,
-            backgroundColorSuccess: ColorToken(
-                darkColor: Color(UIColor(hex: "#1A9E32").withAlphaComponent(0.2)),
-                lightColor: Color(UIColor(hex: "#1A9E32").withAlphaComponent(0.12))
-            ),
-            captionColorDefault: .surfaceInverseSolidPrimary.withOpacity(0.56),
+            backgroundColorReadOnly: .surfaceDefaultSolidPrimary,
+            backgroundColorError: .surfaceDefaultTransparentNegative,
+            backgroundColorWarning: .surfaceDefaultTransparentWarning,
+            backgroundColorSuccess: .surfaceDefaultTransparentPositive,
+            captionColorDefault: .textDefaultSecondary,
             captionColorError: .textDefaultNegative,
             captionColorWarning: .textDefaultWarning,
             captionColorSuccess: .textDefaultAccent,
@@ -53,7 +47,12 @@ public extension TextFieldAppearance {
             placeholderColorWarning: .textDefaultWarning,
             placeholderColorSuccess: .textDefaultAccent,
             textBeforeColor: .textDefaultTertiary,
-            textAfterColor: .textDefaultTertiary
+            textAfterColor: .textDefaultTertiary,
+            startContentColor: .textDefaultSecondary,
+            endContentColor: .textDefaultSecondary,
+            textColorReadOnly: .textDefaultPrimary,
+            captionColorReadOnly: .textDefaultSecondary,
+            placeholderColorReadOnly: .textDefaultSecondary
         )
     }
 }

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/SDDSComponentsPreview/Components/SDDSTextField/TextFieldDefaultSize.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextField/TextFieldDefaultSize.swift
@@ -53,8 +53,21 @@ public enum SDDSTextFieldSize: String, TextFieldSizeConfiguration {
     public var textAfterTrailingPadding: CGFloat {
         return 2
     }
+
+    public var boxLeadingPadding: CGFloat {
+        switch self {
+        case .large:
+            16
+        case .medium:
+            8
+        case .small:
+            8
+        case .extraSmall:
+            8
+        }
+    }
 
-    public var fieldHorizontalPadding: CGFloat {
+    public var boxTrailingPadding: CGFloat {
         switch self {
         case .large:
             16
@@ -70,13 +83,9 @@ public enum SDDSTextFieldSize: String, TextFieldSizeConfiguration {
     public var captionTopPadding: CGFloat {
         4
     }
-
-    public var textInputPaddings: EdgeInsets {
-        .init(top: 2, leading: 0, bottom: 0, trailing: 0)
-    }
 
-    public var textHorizontalPadding: CGFloat {
-        return 1.0
+    public var optionalPadding: CGFloat {
+        4
     }
 
     public var cornerRadius: CGFloat {
@@ -237,12 +246,16 @@ public enum SDDSTextFieldSize: String, TextFieldSizeConfiguration {
             CGSize(width: 16, height: 16)
         }
     }
+
+    public var chipsPadding: CGFloat {
+        6
+    }
 
     public var multipleValueHorizontalPadding: CGFloat {
         2
     }
 
-    public var lineWidth: CGFloat {
+    public var dividerHeight: CGFloat {
         1
     }
 

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/...ents/Sources/SDDSComponents/Components/SDDSButton/ButtonAppearance/ButtonAppearance.swift b/...ents/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/...Components/Sources/SDDSComponents/Components/SDDSButton/ButtonAppearance/ButtonSize.swift b/...Components/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/.../Sources/SDDSComponents/Components/SDDSButton/Generated/ButtonAppearance+Extensions.swift b/.../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 {