feat: 🎸 [JIRA-HCPSDKFIORIUIKIT-2606]Form Cells: Mandatory Field

SAP · Jun 12, 2024 · 3931672 · 3931672
1 parent 9920828
commit 3931672
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Apps/Examples/Examples/FioriSwiftUICore/FormViews/KeyValueFormViewExample.swift b/Apps/Examples/Examples/FioriSwiftUICore/FormViews/KeyValueFormViewExample.swift
@@ -78,10 +78,10 @@ struct KeyValueFormViewExample: View {
                 KeyValueFormView(title: self.key3, text: self.$valueText3, placeholder: "Please enter something", errorMessage: self.getErrorMessage(), minTextEditorHeight: 50, maxTextEditorHeight: 200, hintText: self.getHintText(), allowsBeyondLimit: self.allowsBeyondLimit, isRequired: self.isRequired)
 
                 Text("Disabled")
-                KeyValueFormView(title: "Disabled", text: self.$disabledText, placeholder: "Disabled", controlState: .disabled, minTextEditorHeight: 50, maxTextEditorHeight: 200)
+                KeyValueFormView(title: "Disabled", text: self.$disabledText, placeholder: "Disabled", controlState: .disabled, minTextEditorHeight: 50, maxTextEditorHeight: 200, isRequired: self.isRequired)
 
                 Text("Read-Only")
-                KeyValueFormView(title: "Read-Only", text: self.$readOnlyText, placeholder: "Read-Only", controlState: .readOnly, minTextEditorHeight: 50, maxTextLength: 200, hidesReadOnlyHint: self.hidesReadonlyHint)
+                KeyValueFormView(title: "Read-Only", text: self.$readOnlyText, placeholder: "Read-Only", controlState: .readOnly, minTextEditorHeight: 50, maxTextLength: 200, hidesReadOnlyHint: self.hidesReadonlyHint, isRequired: self.isRequired)
             }
             .scrollDismissesKeyboard(.immediately)
         }

diff --git a/Sources/FioriSwiftUICore/_ComponentProtocols/BaseComponentProtocols.swift b/Sources/FioriSwiftUICore/_ComponentProtocols/BaseComponentProtocols.swift
@@ -18,13 +18,13 @@ protocol _SubtitleComponent {
 }
 
 // sourcery: BaseComponent
-protocol _MandatoryFieldIndicator {
+protocol _MandatoryFieldIndicatorComponent {
     // sourcery: resultBuilder.name = @ViewBuilder, resultBuilder.backingComponent = TextOrIconView
     // sourcery: defaultValue = .text("*")
     var mandatoryFieldIndicator: TextOrIcon? { get }
 }
 
-protocol _MandatoryField: _MandatoryFieldIndicator {
+protocol _MandatoryField: _MandatoryFieldIndicatorComponent {
     // sourcery: defaultValue = false
     var isRequired: Bool { get }
 }

diff --git a/Sources/FioriSwiftUICore/_FioriStyles/KeyValueFormViewStyle.fiori.swift b/Sources/FioriSwiftUICore/_FioriStyles/KeyValueFormViewStyle.fiori.swift
@@ -23,10 +23,6 @@ extension KeyValueFormViewFioriStyle {
     struct ContentFioriStyle: KeyValueFormViewStyle {
         func makeBody(_ configuration: KeyValueFormViewConfiguration) -> some View {
             KeyValueFormView(configuration)
-                .mandatoryFieldIndicatorStyle { indicatorConf in
-                    MandatoryFieldIndicator(indicatorConf)
-                        .foregroundStyle(Color.preferredColor(configuration.controlState == .disabled ? .separator : .primaryLabel))
-                }
         }
     }
 
@@ -87,6 +83,7 @@ extension KeyValueFormViewFioriStyle {
         func makeBody(_ configuration: MandatoryFieldIndicatorConfiguration) -> some View {
             MandatoryFieldIndicator(configuration)
                 .foregroundStyle(Color.preferredColor(self.keyValueFormViewConfiguration.controlState == .disabled ? .separator : .primaryLabel))
+                .font(.fiori(forTextStyle: .subheadline, weight: .semibold))
                 .padding(.bottom, -4)
                 .padding(.top, 11)
         }

diff --git a/Sources/FioriSwiftUICore/_FioriStyles/TextFieldFormViewStyle.fiori.swift b/Sources/FioriSwiftUICore/_FioriStyles/TextFieldFormViewStyle.fiori.swift
@@ -33,6 +33,7 @@ extension TextFieldFormViewFioriStyle {
                 .mandatoryFieldIndicatorStyle { indicatorConf in
                     MandatoryFieldIndicator(indicatorConf)
                         .foregroundStyle(self.getTitleColor(configuration))
+                        .font(.fiori(forTextStyle: .subheadline, weight: .semibold))
                 }
                 .placeholderTextFieldStyle { config in
                     HStack {