Merge pull request #114 from salute-developers/release/01-11-2024

Release 01-11-2024
salute-developers · Nov 1, 2024 · 5d1d258 · 5d1d258
2 parents 1662ee8 + 46bb450
commit 5d1d258
Show file tree

Hide file tree

Showing 83 changed files with 3,334 additions and 236 deletions.
diff --git a/SDDSComponents/Assets.xcassets/textFieldChipIcon.imageset/Contents.json b/SDDSComponents/Assets.xcassets/textFieldChipIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icon-24×24.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/SDDSComponents/Assets.xcassets/textFieldChipIcon.imageset/icon-24×24.pdf b/SDDSComponents/Assets.xcassets/textFieldChipIcon.imageset/icon-24×24.pdf
diff --git a/SDDSComponents/Package.swift b/SDDSComponents/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         ),
         .target(
             name: "SDDSComponentsPreview",
-            dependencies: ["SDDSServTheme", "SDDSThemeCore"],
+            dependencies: ["SDDSServTheme", "SDDSThemeCore", "SDDSComponents"],
             path: "SDDSComponentsPreview",
             exclude: ["SDDSComponentsPreview.h"],
             resources: [

diff --git a/SDDSComponents/SDDSComponents.xcodeproj/project.pbxproj b/SDDSComponents/SDDSComponents.xcodeproj/project.pbxproj
diff --git a/...nts/SDDSComponentsPreview/Assets.xcassets/checkboxOff.imageset/CheckBoxDark.svg b/...nts/SDDSComponentsPreview/Assets.xcassets/checkboxOff.imageset/CheckBoxDark.svg
diff --git a/...ts/SDDSComponentsPreview/Assets.xcassets/checkboxOff.imageset/CheckBoxOff 1.svg b/...ts/SDDSComponentsPreview/Assets.xcassets/checkboxOff.imageset/CheckBoxOff 1.svg
diff --git a/SDDSComponents/SDDSComponentsPreview/Assets.xcassets/checkboxOff.imageset/Contents.json b/SDDSComponents/SDDSComponentsPreview/Assets.xcassets/checkboxOff.imageset/Contents.json
@@ -3,6 +3,26 @@
     {
       "filename" : "CheckBoxOff.svg",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "CheckBoxOff 1.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "CheckBoxDark.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

diff --git a/SDDSComponents/SDDSComponentsPreview/Assets.xcassets/radioboxOff.imageset/Contents.json b/SDDSComponents/SDDSComponentsPreview/Assets.xcassets/radioboxOff.imageset/Contents.json
@@ -3,6 +3,26 @@
     {
       "filename" : "RadioBoxOff.svg",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "RadioBoxDark 1.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "RadioBoxDark.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

diff --git a/...s/SDDSComponentsPreview/Assets.xcassets/radioboxOff.imageset/RadioBoxDark 1.svg b/...s/SDDSComponentsPreview/Assets.xcassets/radioboxOff.imageset/RadioBoxDark 1.svg
diff --git a/...nts/SDDSComponentsPreview/Assets.xcassets/radioboxOff.imageset/RadioBoxDark.svg b/...nts/SDDSComponentsPreview/Assets.xcassets/radioboxOff.imageset/RadioBoxDark.svg
diff --git a/SDDSComponents/SDDSComponentsPreview/Components/SDDSAvatar/AvatarTypography.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSAvatar/AvatarTypography.swift
@@ -31,7 +31,7 @@ extension AvatarTypography {
             extraExtraLarge: Typographies.headerH2Bold.typography,
             large: Typographies.headerH4Bold.typography,
             medium: Typographies.headerH5Bold.typography,
-            small: Typographies.headerH5Bold.typography
+            small: Typographies.textXsBold.typography
         ).asContainer
     }
 }
diff --git a/SDDSComponents/SDDSComponentsPreview/Components/SDDSAvatar/SDDSAvatarPreview.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSAvatar/SDDSAvatarPreview.swift
@@ -114,7 +114,7 @@ struct SDDSAvatarPreview: PreviewProvider {
         .padding()
     }
 
-    static var defaultAccessibility: AvatarAccessibility {
+    private static var defaultAccessibility: AvatarAccessibility {
         AvatarAccessibility(label: "User Avatar", hint: "Displays user status and initials or image")
     }
 }
diff --git a/...Components/SDDSComponentsPreview/Components/SDDSButton/SDDSButton+SDDSServeB2CStyle.swift b/...Components/SDDSComponentsPreview/Components/SDDSButton/SDDSButton+SDDSServeB2CStyle.swift
@@ -1,8 +1,8 @@
 import Foundation
 import SDDSComponents
 
-public extension SDDSServeB2CStyle {
-    var defaultButtonAppearance: ButtonAppearance {
+extension SDDSServeB2CStyle {
+    public var defaultButtonAppearance: ButtonAppearance {
         switch self {
         case .default:
             return .default
@@ -25,7 +25,7 @@ public extension SDDSServeB2CStyle {
         }
     }
 
-    var defaultLinkButtonAppearance: ButtonAppearance {
+    public var defaultLinkButtonAppearance: ButtonAppearance {
         switch self {
         case .default:
             return .linkDefault

diff --git a/...ponents/SDDSComponentsPreview/Components/SDDSCheckbox/CheckboxAppearance+Extensions.swift b/...ponents/SDDSComponentsPreview/Components/SDDSCheckbox/CheckboxAppearance+Extensions.swift
@@ -10,8 +10,7 @@ public extension CheckboxAppearance {
             subtitleTypography: RadioboxTypography.description,
             titleColor: .backgroundInversePrimary,
             subtitleColor: .surfaceInverseSolidPrimary.withOpacity(0.56),
-            disabledAlpha: 0.4,
-            imageTintColor: .surfaceDefaultAccent
+            disabledAlpha: 0.4
         )
     }
 }
diff --git a/SDDSComponents/SDDSComponentsPreview/Components/SDDSChipGroup/DefaultChipGroupSize.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSChipGroup/DefaultChipGroupSize.swift
@@ -11,9 +11,9 @@ import SDDSComponents
     - maxColumns: Максимальное количество столбцов в ряду.
     - alignment: Выравнивание группы чипов.
  */
-public struct DefaultChipGroupSize: ChipGroupSizeConfiguration {
+public struct DefaultChipGroupSize: ChipGroupSizeConfiguration, Hashable {
     public var debugDescription: String {
-        String(reflecting: self)
+        alignment.rawValue
     }
 
     public var insets: EdgeInsets {
@@ -29,4 +29,12 @@ public struct DefaultChipGroupSize: ChipGroupSizeConfiguration {
     public init(alignment: ChipGroupAlignment = .center) {
         self.alignment = alignment
     }
+
+    public static var allCases: [DefaultChipGroupSize] {
+        [.init(alignment: .center), .init(alignment: .left), .init(alignment: .right), .init(alignment: .decreasingLeft), .init(alignment: .decreasingRight)]
+    }
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(alignment)
+    }
 }
diff --git a/SDDSComponents/SDDSComponentsPreview/Components/SDDSChipGroup/SDDSChipGroup+Preview.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSChipGroup/SDDSChipGroup+Preview.swift
@@ -8,7 +8,7 @@ struct SDDSChipGroupPreview: PreviewProvider {
         let chipSize = SDDSChipSize.medium(.pilled)
         let chipAccessibility = ChipAccessibility()
 
-        let chipData = (1...12).map { index in
+        let chipData = (1...32).map { index in
             ChipData(
                 title: "Label",
                 isEnabled: true,

diff --git a/...ponents/SDDSComponentsPreview/Components/SDDSRadiobox/RadioboxAppearance+Extensions.swift b/...ponents/SDDSComponentsPreview/Components/SDDSRadiobox/RadioboxAppearance+Extensions.swift
@@ -10,8 +10,8 @@ public extension RadioboxAppearance {
             subtitleTypography: RadioboxTypography.description,
             titleColor: .backgroundInversePrimary,
             subtitleColor: .surfaceInverseSolidPrimary.withOpacity(0.56),
-            disabledAlpha: 0.4,
-            imageTintColor: .surfaceDefaultAccent
+            disabledAlpha: 0.4, 
+            imageTintColor: nil
         )
     }
 }

diff --git a/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextArea/SDDSTextArea+Preview.swift b/SDDSComponents/SDDSComponentsPreview/Components/SDDSTextArea/SDDSTextArea+Preview.swift
@@ -0,0 +1,87 @@
+import Foundation
+import SDDSComponents
+import SwiftUI
+import SDDSServTheme
+
+// MARK: - Preview
+
+struct SDDSTextAreaPreview: PreviewProvider {
+    static var previews: some View {
+        let chips = (1...12).map { index in
+            ChipData(
+                title: "Label",
+                isEnabled: true,
+                iconImage: nil,
+                buttonImage: Image.image("textFieldChipIcon"),
+                appearance: .textArea,
+                size: TextAreaChipSize.medium,
+                accessibility: ChipAccessibility(),
+                removeAction: {}
+            )
+        }
+
+        return Group {
+            SDDSTextArea(
+                value: .constant(.single("")),
+                title: "Title",
+                optionalTitle: "optional",
+                placeholder: "Placeholder",
+                caption: "caption",
+                counter: "counter",
+                disabled: false,
+                readOnly: false,
+                style: .default,
+                labelPlacement: .none,
+                required: true,
+                requiredPlacement: .left,
+                appearance: .defaultAppearance,
+                size: SDDSTextAreaSize.medium,
+                chipGroupSize: SDDSTextAreaSize.large.chipGroupSize,
+                layout: .default,
+                iconActionViewProvider: ViewProvider(iconActionView)
+            )
+            .previewDisplayName("Outer Label")
+            .previewLayout(.sizeThatFits)
+            .padding()
+
+            SDDSTextArea(
+                value: .constant(.multiple("", chips)),
+                title: "Title",
+                optionalTitle: "optional",
+                placeholder: "Placeholder",
+                caption: "caption",
+                counter: "counter",
+                disabled: false,
+                style: .default,
+                labelPlacement: .none,
+                required: true,
+                requiredPlacement: .left,
+                appearance: .defaultAppearance,
+                size: SDDSTextAreaSize.large,
+                chipGroupSize: SDDSTextAreaSize.large.chipGroupSize,
+                layout: .default,
+                iconActionViewProvider: ViewProvider(iconActionView)
+            )
+            .previewDisplayName("Multiple – Default Label")
+            .previewLayout(.sizeThatFits)
+            .padding()
+        }
+    }
+
+    @ViewBuilder
+    private static var iconView: some View {
+        Image.image("textFieldIcon")
+            .renderingMode(.template)
+            .resizable()
+            .aspectRatio(contentMode: .fit)
+    }
+
+    @ViewBuilder
+    private static var iconActionView: some View {
+        Image.image("textFieldIconAction")
+            .renderingMode(.template)
+            .resizable()
+            .aspectRatio(contentMode: .fit)
+
+    }
+}