diff --git a/Sources/HTMLKit/Abstraction/Attributes/AriaAttributes.swift b/Sources/HTMLKit/Abstraction/Attributes/AriaAttributes.swift index d177284f..ccff5801 100644 --- a/Sources/HTMLKit/Abstraction/Attributes/AriaAttributes.swift +++ b/Sources/HTMLKit/Abstraction/Attributes/AriaAttributes.swift @@ -1,5 +1,5 @@ @_documentation(visibility: internal) -public typealias GlobalAriaAttributes = AriaAtomicAttribute & AriaBusyAttribute & AriaControlsAttribute & AriaCurrentAttribute & AriaDescribedAttribute & AriaDetailsAttribute & AriaDisabledAttribute & AriaErrorMessageAttribute & AriaFlowToAttribute & AriaPopupAttribute & AriaHiddenAttribute & AriaInvalidAttribute & AriaShortcutsAttribute & AriaLabelAttribute & AriaLabeledAttribute & AriaLiveAttribute & AriaOwnsAttribute & AriaRelevantAttribute & AriaRoleDescriptionAttribute +public typealias GlobalAriaAttributes = AriaAtomicAttribute & BusyAccessibilityAttribute & AriaControlsAttribute & AriaCurrentAttribute & AriaDescribedAttribute & AriaDetailsAttribute & DisabledAccessibilityAttribute & FlowAccessibilityAttribute & AriaPopupAttribute & HiddenAccessibilityAttribute & InvalidAccessibilityAttribute & AriaShortcutsAttribute & LabelAccessibilityAttribute & AriaLabeledAttribute & LiveAccessibilityAttribute & OwnsAccessibilityAttribute & AriaRelevantAttribute & AriaRoleDescriptionAttribute /// The protocol provides the element with accessibility handler. @_documentation(visibility: internal) @@ -80,26 +80,32 @@ extension AriaAutoCompleteAttribute where Self: EmptyNode { } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityBusy` modifier. @_documentation(visibility: internal) -public protocol AriaBusyAttribute: Attribute { +public protocol BusyAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-busy'. + /// Indicate an element is occupied and should be announced after its finished. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .accessibilityBusy(false) /// ``` - func aria(busy value: Bool) -> Self + /// + /// - Parameter value: Whether the element is occupied. + /// + /// - Returns: The element + func accessibilityBusy(_ value: Bool) -> Self } -extension AriaBusyAttribute where Self: ContentNode { +extension BusyAccessibilityAttribute where Self: ContentNode { internal func mutate(ariabusy value: AttributeData) -> Self { return self.mutate(key: "aria-busy", value: value) } } -extension AriaBusyAttribute where Self: EmptyNode { +extension BusyAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariabusy value: AttributeData) -> Self { return self.mutate(key: "aria-busy", value: value) @@ -132,78 +138,99 @@ extension AriaCheckedAttribute where Self: EmptyNode { } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityColumnCount` modifier. @_documentation(visibility: internal) -public protocol AriaColumnCountAttribute: Attribute { +public protocol ColumnCountAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-colcount'. + /// Indicate the total number of columns in a element. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .role(.grid) + /// .accessibilityColumnCount(941) /// ``` - func aria(columnCount value: Int) -> Self + /// + /// - Parameter value: The total number of columns. + /// + /// - Returns: The element + func accessibilityColumnCount(_ value: Int) -> Self } -extension AriaColumnCountAttribute where Self: ContentNode { +extension ColumnCountAccessibilityAttribute where Self: ContentNode { internal func mutate(ariacolcount value: AttributeData) -> Self { return self.mutate(key: "aria-colcount", value: value) } } -extension AriaColumnCountAttribute where Self: EmptyNode { +extension ColumnCountAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariacolcount value: AttributeData) -> Self { return self.mutate(key: "aria-colcount", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityColumnIndex` modifier. @_documentation(visibility: internal) -public protocol AriaColumnIndexAttribute: Attribute { +public protocol ColumnIndexAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-colindex'. + /// Indicate the column index of the element. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .role(.row) + /// .accessibilityColumnIndex(1) /// ``` - func aria(columnIndex value: Int) -> Self + /// + /// - Parameter value: The column index the element is in. + /// + /// - Returns: The element + func accessibilityColumnIndex(_ value: Int) -> Self } -extension AriaColumnIndexAttribute where Self: ContentNode { +extension ColumnIndexAccessibilityAttribute where Self: ContentNode { internal func mutate(ariacolindex value: AttributeData) -> Self { return self.mutate(key: "aria-colindex", value: value) } } -extension AriaColumnIndexAttribute where Self: EmptyNode { +extension ColumnIndexAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariacolindex value: AttributeData) -> Self { return self.mutate(key: "aria-colindex", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityColumnSpan` modifier. @_documentation(visibility: internal) -public protocol AriaColumnSpanAttribute: Attribute { +public protocol ColumnSpanAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-colspan'. + /// Indicate the number of columns the element spans. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .role(.columnHeader) + /// .accessibilityColumnSpan(2) /// ``` - func aria(columnSpan value: Int) -> Self + /// + /// - Parameter value: The number of columns to span. + /// + /// - Returns: The element + func accessibilityColumnSpan(_ value: Int) -> Self } -extension AriaColumnSpanAttribute where Self: ContentNode { +extension ColumnSpanAccessibilityAttribute where Self: ContentNode { internal func mutate(ariacolspan value: AttributeData) -> Self { return self.mutate(key: "aria-colspan", value: value) } } -extension AriaColumnSpanAttribute where Self: EmptyNode { +extension ColumnSpanAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariacolspan value: AttributeData) -> Self { return self.mutate(key: "aria-colspan", value: value) @@ -314,58 +341,39 @@ extension AriaDetailsAttribute where Self: EmptyNode { } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityDisabled` modifier. @_documentation(visibility: internal) -public protocol AriaDisabledAttribute: Attribute { +public protocol DisabledAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-disabled'. + /// Indicate that the element is perceivable but disabled. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .role(.button) + /// .accessibilityDisabled() /// ``` - func aria(disabled value: Bool) -> Self + /// + /// - Parameter value: Whether the element is disabled. + /// + /// - Returns: The element + func accessibilityDisabled(_ value: Bool) -> Self } -extension AriaDisabledAttribute where Self: ContentNode { +extension DisabledAccessibilityAttribute where Self: ContentNode { internal func mutate(ariadisabled value: AttributeData) -> Self { return self.mutate(key: "aria-disabled", value: value) } } -extension AriaDisabledAttribute where Self: EmptyNode { +extension DisabledAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariadisabled value: AttributeData) -> Self { return self.mutate(key: "aria-disabled", value: value) } } -/// The protocol provides the element with accessibility handler. -@_documentation(visibility: internal) -public protocol AriaErrorMessageAttribute: Attribute { - - /// The function represents the html-attribute 'aria-errormessage'. - /// - /// ```html - /// - /// ``` - func aria(errorMessage value: String) -> Self -} - -extension AriaErrorMessageAttribute where Self: ContentNode { - - internal func mutate(ariaerrormessage value: AttributeData) -> Self { - return self.mutate(key: "aria-errormessage", value: value) - } -} - -extension AriaErrorMessageAttribute where Self: EmptyNode { - - internal func mutate(ariaerrormessage value: AttributeData) -> Self { - return self.mutate(key: "aria-errormessage", value: value) - } -} - /// The protocol provides the element with accessibility handler. @_documentation(visibility: internal) public protocol AriaExpandedAttribute: Attribute { @@ -392,26 +400,55 @@ extension AriaExpandedAttribute where Self: EmptyNode { } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityFlowTo` modifier. @_documentation(visibility: internal) -public protocol AriaFlowToAttribute: Attribute { +public protocol FlowAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-flowto'. + /// Suggest an alternate reading order. /// - /// ```html - /// + /// ```swift + /// Heading1 { + /// "Lorem ipsum" + /// } + /// .accessibilityFlowTo(["id", "id"]) + /// Article { + /// "Lorem ipsum..." + /// } + /// .id("id") + /// ``` + /// + /// - Parameter ids: The identifiers... + /// + /// - Returns: The element + func accessibilityFlowTo(_ ids: [String]) -> Self + + /// Suggest an alternate reading order. + /// + /// ```swift + /// Heading1 { + /// "Lorem ipsum" + /// } + /// .accessibilityFlowTo("id", "id") + /// Article { + /// "Lorem ipsum..." + /// } + /// .id("id") /// ``` - func aria(flowTo value: String) -> Self + /// + /// - Parameter ids: The identifiers... + /// + /// - Returns: The element + func accessibilityFlowTo(_ ids: String...) -> Self } -extension AriaFlowToAttribute where Self: ContentNode { +extension FlowAccessibilityAttribute where Self: ContentNode { internal func mutate(ariaflowto value: AttributeData) -> Self { return self.mutate(key: "aria-flowto", value: value) } } -extension AriaFlowToAttribute where Self: EmptyNode { +extension FlowAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariaflowto value: AttributeData) -> Self { return self.mutate(key: "aria-flowto", value: value) @@ -446,53 +483,91 @@ extension AriaPopupAttribute where Self: EmptyNode { /// The protocol provides the element with accessibility handler. @_documentation(visibility: internal) -public protocol AriaHiddenAttribute: Attribute { +public protocol HiddenAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-hidden'. + /// Indicate whether the element should be announced. /// - /// ```html - /// + /// ```swift + /// Vector { + /// Path { + /// } + /// .draw("M...") + /// } + /// .accessibilityHidden() /// ``` - func aria(hidden value: Bool) -> Self + /// + /// - Parameter value: Whether the element should be announced. + /// + /// - Returns: The element + func accessibilityHidden(_ value: Bool) -> Self } -extension AriaHiddenAttribute where Self: ContentNode { +extension HiddenAccessibilityAttribute where Self: ContentNode { internal func mutate(ariahidden value: AttributeData) -> Self { return self.mutate(key: "aria-hidden", value: value) } } -extension AriaHiddenAttribute where Self: EmptyNode { +extension HiddenAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariahidden value: AttributeData) -> Self { return self.mutate(key: "aria-hidden", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityDisabled` modifier. @_documentation(visibility: internal) -public protocol AriaInvalidAttribute: Attribute { - - /// The function represents the html-attribute 'aria-invalid'. - /// - /// ```html - /// +public protocol InvalidAccessibilityAttribute: Attribute { + + /// Indicate the entered value does not conform to the expected format. + /// + /// ```swift + /// Division { + /// } + /// .editable() + /// .accessibilityInvalid(.grammar) + /// ``` + /// + /// - Parameter value: The reason why the entered value is invalid. + /// + /// - Returns: The element + func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Self + + /// Indicate the entered value does not conform to the expected format. + /// + /// ```swift + /// Input() + /// .type(.email) + /// .accessibilityInvalid(.true, message: "id") /// ``` - func aria(invalid value: Values.Accessibility.Invalid) -> Self + /// + /// - Parameter value: Whether the entered value is invalid. + /// - Parameter id: The identifier of the element that provides the error message. + /// + /// - Returns: The element + func accessibilityInvalid(_ value: Bool, message id: String?) -> Self } -extension AriaInvalidAttribute where Self: ContentNode { +extension InvalidAccessibilityAttribute where Self: ContentNode { internal func mutate(ariainvalid value: AttributeData) -> Self { - return self.mutate(key: "aria-invalid", value: value) + return self.mutate(key: "aria-invalid", value: value) + } + + internal func mutate(ariaerrormessage value: AttributeData) -> Self { + return self.mutate(key: "aria-errormessage", value: value) } } -extension AriaInvalidAttribute where Self: EmptyNode { +extension InvalidAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariainvalid value: AttributeData) -> Self { - return self.mutate(key: "aria-invalid", value: value) + return self.mutate(key: "aria-invalid", value: value) + } + + internal func mutate(ariaerrormessage value: AttributeData) -> Self { + return self.mutate(key: "aria-errormessage", value: value) } } @@ -522,26 +597,70 @@ extension AriaShortcutsAttribute where Self: EmptyNode { } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityLabel` modifier. @_documentation(visibility: internal) -public protocol AriaLabelAttribute: Attribute { +public protocol LabelAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-label'. + /// Indicate a label for the current element. /// - /// ```html - /// + /// ```swift + /// Button { + /// Vector { + /// Path { + /// } + /// .draw("M...") + /// } + /// } + /// .accessibilityLabel("Lorem ipsum") + /// ``` + /// - Parameter value: The label to describe the element. + /// + /// - Returns: The element + func accessibilityLabel(_ value: String) -> Self + + /// Indicate a localized label for the current element. + /// + /// ```swift + /// Button { + /// Vector { + /// Path { + /// } + /// .draw("M...") + /// } + /// } + /// .accessibilityLabel("Lorem ipsum") + /// ``` + /// - Parameter value: The label to describe the element. + /// + /// - Returns: The element + func accessibilityLabel(_ localized: LocalizedStringKey, tableName: String?) -> Self + + /// Indicate a label for the current element. + /// + /// ```swift + /// Button { + /// Vector { + /// Path { + /// } + /// .draw("M...") + /// } + /// } + /// .accessibilityLabel(verbatim: "Lorem ipsum") /// ``` - func aria(label value: String) -> Self + /// - Parameter value: The label to describe the element. + /// + /// - Returns: The element + func accessibilityLabel(verbatim value: String) -> Self } -extension AriaLabelAttribute where Self: ContentNode { +extension LabelAccessibilityAttribute where Self: ContentNode { internal func mutate(arialabel value: AttributeData) -> Self { return self.mutate(key: "aria-label", value: value) } } -extension AriaLabelAttribute where Self: EmptyNode { +extension LabelAccessibilityAttribute where Self: EmptyNode { internal func mutate(arialabel value: AttributeData) -> Self { return self.mutate(key: "aria-label", value: value) @@ -574,238 +693,347 @@ extension AriaLabeledAttribute where Self: EmptyNode { } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityLevel` modifier. @_documentation(visibility: internal) -public protocol AriaLevelAttribute: Attribute { +public protocol LevelAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-level'. + /// Announce the hierarchical level of the element. /// - /// ```html - /// + /// ```swift + /// Division { + /// "Lorem ipsum" + /// } + /// .role(.heading) + /// .accessibilityLevel(2) /// ``` - func aria(level value: Int) -> Self + /// - Parameter value: The level the element is at. + /// + /// - Returns: The element + func accessibilityLevel(_ value: Int) -> Self } -extension AriaLevelAttribute where Self: ContentNode { +extension LevelAccessibilityAttribute where Self: ContentNode { internal func mutate(arialevel value: AttributeData) -> Self { return self.mutate(key: "aria-level", value: value) } } -extension AriaLevelAttribute where Self: EmptyNode { +extension LevelAccessibilityAttribute where Self: EmptyNode { internal func mutate(arialevel value: AttributeData) -> Self { return self.mutate(key: "aria-level", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityLive` modifier. @_documentation(visibility: internal) -public protocol AriaLiveAttribute: Attribute { +public protocol LiveAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-live'. + /// Indicate that the element will be updated and how. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .accessibilityLive(.polite) /// ``` - func aria(live value: Values.Accessibility.Live) -> Self + /// - Parameter value: The manner on how to notify. + /// + /// - Returns: The element + func accessibilityLive(_ value: Values.Accessibility.Live) -> Self } -extension AriaLiveAttribute where Self: ContentNode { +extension LiveAccessibilityAttribute where Self: ContentNode { internal func mutate(arialive value: AttributeData) -> Self { return self.mutate(key: "aria-live", value: value) } } -extension AriaLiveAttribute where Self: EmptyNode { +extension LiveAccessibilityAttribute where Self: EmptyNode { internal func mutate(arialive value: AttributeData) -> Self { return self.mutate(key: "aria-live", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityModal` modifier. @_documentation(visibility: internal) -public protocol AriaModalAttribute: Attribute { - - /// The function represents the html-attribute 'aria-modal'. - /// - /// ```html - /// +public protocol ModalAccessibilityAttribute: Attribute { + + /// Indicate whether an element is modal when displayed. + /// + /// ```swift + /// Divsion { + /// } + /// .role(.dialog) + /// .accessibilityModal(true) /// ``` - func aria(modal value: Bool) -> Self + /// - Parameter value: Whether the element is a modal. + /// + /// - Returns: The element + func accessibilityModal(_ value: Bool) -> Self } -extension AriaModalAttribute where Self: ContentNode { +extension ModalAccessibilityAttribute where Self: ContentNode { internal func mutate(ariamodal value: AttributeData) -> Self { return self.mutate(key: "aria-modal", value: value) } } -extension AriaModalAttribute where Self: EmptyNode { +extension ModalAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariamodal value: AttributeData) -> Self { return self.mutate(key: "aria-modal", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityMultiline` modifier. @_documentation(visibility: internal) -public protocol AriaMultilineAttribute: Attribute { - - /// The function represents the html-attribute 'aria-multiline'. - /// - /// ```html - /// +public protocol MultilineAccessibilityAttribute: Attribute { + + /// Indicate whether a text control accepts multiple lines or a single line. + /// + /// ```swift + /// Division { + /// } + /// .role(.textbox) + /// .accessibilityMultiline(true) /// ``` - func aria(multiline value: Bool) -> Self + /// - Parameter value: Whether the text control accepts multiple lines. + /// + /// - Returns: The element + func accessibilityMultiline(_ value: Bool) -> Self } -extension AriaMultilineAttribute where Self: ContentNode { +extension MultilineAccessibilityAttribute where Self: ContentNode { internal func mutate(ariamultiline value: AttributeData) -> Self { return self.mutate(key: "aria-multiline", value: value) } } -extension AriaMultilineAttribute where Self: EmptyNode { +extension MultilineAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariamultiline value: AttributeData) -> Self { return self.mutate(key: "aria-multiline", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityMultiselect` modifier. @_documentation(visibility: internal) -public protocol AriaMultiselectAttribute: Attribute { +public protocol MultiselectAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-multiselectable'. + /// Indicate that the user may select more than one item. /// - /// ```html - /// + /// ```swift + /// UnorderedList { + /// ListItem { + /// "Lorem ipsum" + /// } + /// } + /// .role(.listbox) + /// .accessibilityMultiselect(true) /// ``` - func aria(multiselectable value: Bool) -> Self + /// - Parameter value: Whether the element is multiselectable. + /// + /// - Returns: The element + func accessibilityMultiselect(_ value: Bool) -> Self } -extension AriaMultiselectAttribute where Self: ContentNode { +extension MultiselectAccessibilityAttribute where Self: ContentNode { internal func mutate(ariamultiselectable value: AttributeData) -> Self { return self.mutate(key: "aria-multiselectable", value: value) } } -extension AriaMultiselectAttribute where Self: EmptyNode { +extension MultiselectAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariamultiselectable value: AttributeData) -> Self { return self.mutate(key: "aria-multiselectable", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityOrientation` modifier. @_documentation(visibility: internal) -public protocol AriaOrientationAttribute: Attribute { +public protocol OrientationAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-orientation'. + /// Indicate the orientation of the element. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .role(.scrollbar) + /// .accessibilityOrientation(.horizontal) /// ``` - func aria(orientation value: Values.Accessibility.Orientation) -> Self + /// - Parameter value: The orientation the element is in. + /// + /// - Returns: The element + func accessibilityOrientation(_ value: Values.Accessibility.Orientation) -> Self } -extension AriaOrientationAttribute where Self: ContentNode { +extension OrientationAccessibilityAttribute where Self: ContentNode { internal func mutate(ariaorientation value: AttributeData) -> Self { return self.mutate(key: "aria-orientation", value: value) } } -extension AriaOrientationAttribute where Self: EmptyNode { +extension OrientationAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariaorientation value: AttributeData) -> Self { return self.mutate(key: "aria-orientation", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityOwns` modifier. @_documentation(visibility: internal) -public protocol AriaOwnsAttribute: Attribute { +public protocol OwnsAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-owns'. + /// Identifies elements... /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .accessibilityOwns(["id", "id"]) /// ``` - func aria(owns value: String) -> Self + /// - Parameter ids: The identifiers to associate the element with. + /// + /// - Returns: The element + func accessibilityOwns(_ ids: [String]) -> Self + + /// Identifies elements... + /// + /// ```swift + /// Division { + /// } + /// .accessibilityOwns("id", "id") + /// ``` + /// - Parameter ids: The identifiers to associate the element with. + /// + /// - Returns: The element + func accessibilityOwns(_ ids: String...) -> Self } -extension AriaOwnsAttribute where Self: ContentNode { +extension OwnsAccessibilityAttribute where Self: ContentNode { internal func mutate(ariaowns value: AttributeData) -> Self { return self.mutate(key: "aria-owns", value: value) } } -extension AriaOwnsAttribute where Self: EmptyNode { +extension OwnsAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariaowns value: AttributeData) -> Self { return self.mutate(key: "aria-owns", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityHint` modifier. @_documentation(visibility: internal) -public protocol AriaPlaceholderAttribute: Attribute { - - /// The function represents the html-attribute 'aria-placeholder'. +public protocol HintAccessibilityAttribute: Attribute { + + /// Provide a short hint. + /// + /// ```swift + /// Division { + /// } + /// .role(.textbox) + /// .accessibilityHint("Lorem ipsum") + /// ``` + /// - Parameter value: A hint to give more context. /// - /// ```html - /// + /// - Returns: The element + func accessibilityHint(_ value: String) -> Self + + /// Provide a localized short hint. + /// + /// ```swift + /// Division { + /// } + /// .role(.textbox) + /// .accessibilityHint("Lorem ipsum") + /// ``` + /// - Parameter localizedKey: The string key to be translated. + /// - Parameter tableName: The translation table to look in. + /// + /// - Returns: The element + func accessibilityHint(_ localized: LocalizedStringKey, tableName: String?) -> Self + + /// Provide a short hint without localization. + /// + /// ```swift + /// Division { + /// } + /// .role(.textbox) + /// .accessibilityHint(verbatim: "Lorem ipsum") /// ``` - func aria(placeholder value: String) -> Self + /// - Parameter value: A hint to give more context. + /// + /// - Returns: The element + func accessibilityHint(verbatim value: String) -> Self } -extension AriaPlaceholderAttribute where Self: ContentNode { +extension HintAccessibilityAttribute where Self: ContentNode { internal func mutate(ariaplaceholder value: AttributeData) -> Self { return self.mutate(key: "aria-placeholder", value: value) } } -extension AriaPlaceholderAttribute where Self: EmptyNode { +extension HintAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariaplaceholder value: AttributeData) -> Self { return self.mutate(key: "aria-placeholder", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityPosition` modifier. @_documentation(visibility: internal) -public protocol AriaPositionInsetAttribute: Attribute { - - /// The function represents the html-attribute 'aria-posinset'. - /// - /// ```html - /// +public protocol PositionAccessibilityAttribute: Attribute { + + /// Indicate the position of the element in a set. + /// + /// ```swift + /// UnorderedList { + /// ListItem { + /// "Lorem ipsum" + /// } + /// .role(.option) + /// .accessibilityPosition(5, in: 10) + /// } + /// .role(listbox) /// ``` - func aria(positionInset_ value: Int) -> Self + /// + /// - Parameter index: The position index the element is in. + /// - Parameter size: The total number of items in the set. + /// + /// - Returns: The element + func accessibilityPosition(_ index: Int, in size: Int) -> Self } -extension AriaPositionInsetAttribute where Self: ContentNode { +extension PositionAccessibilityAttribute where Self: ContentNode { internal func mutate(ariaposinset value: AttributeData) -> Self { return self.mutate(key: "aria-posinset", value: value) } + + internal func mutate(ariasetsize value: AttributeData) -> Self { + return self.mutate(key: "aria-setsize", value: value) + } } -extension AriaPositionInsetAttribute where Self: EmptyNode { +extension PositionAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariaposinset value: AttributeData) -> Self { return self.mutate(key: "aria-posinset", value: value) } + + internal func mutate(ariasetsize value: AttributeData) -> Self { + return self.mutate(key: "aria-setsize", value: value) + } } /// The protocol provides the element with accessibility handler. @@ -834,26 +1062,33 @@ extension AriaPressedAttribute where Self: EmptyNode { } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityReadonly` modifier. @_documentation(visibility: internal) -public protocol AriaReadonlyAttribute: Attribute { +public protocol ReadOnlyAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-readonly'. + /// Indicate the element as read only. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .role(.checkbox) + /// .accessibilityReadonly(true) /// ``` - func aria(readonly value: Bool) -> Self + /// + /// - Parameter value: Whether the element should be read only. + /// + /// - Returns: The element + func accessibilityReadonly(_ value: Bool) -> Self } -extension AriaReadonlyAttribute where Self: ContentNode { +extension ReadOnlyAccessibilityAttribute where Self: ContentNode { internal func mutate(ariareadonly value: AttributeData) -> Self { return self.mutate(key: "aria-readonly", value: value) } } -extension AriaReadonlyAttribute where Self: EmptyNode { +extension ReadOnlyAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariareadonly value: AttributeData) -> Self { return self.mutate(key: "aria-readonly", value: value) @@ -886,26 +1121,37 @@ extension AriaRelevantAttribute where Self: EmptyNode { } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityRequired` modifier. @_documentation(visibility: internal) -public protocol AriaRequiredAttribute: Attribute { +public protocol RequiredAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-required'. + /// Indicate that input is required on the element. /// - /// ```html - /// + /// ```swift + /// UnorderedList { + /// ListItem { + /// "Lorem ipsum" + /// } + /// .role(radio) + /// } + /// .role(.radiogroup) + /// .accessibilityRequired(true) /// ``` - func aria(required value: Bool) -> Self + /// + /// - Parameter condition: TODO + /// + /// - Returns: The element + func accessibilityRequired(_ value: Bool) -> Self } -extension AriaRequiredAttribute where Self: ContentNode { +extension RequiredAccessibilityAttribute where Self: ContentNode { internal func mutate(ariarequired value: AttributeData) -> Self { return self.mutate(key: "aria-required", value: value) } } -extension AriaRequiredAttribute where Self: EmptyNode { +extension RequiredAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariarequired value: AttributeData) -> Self { return self.mutate(key: "aria-required", value: value) @@ -938,78 +1184,99 @@ extension AriaRoleDescriptionAttribute where Self: EmptyNode { } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityRowCount` modifier. @_documentation(visibility: internal) -public protocol AriaRowCountAttribute: Attribute { - - /// The function represents the html-attribute 'aria-rowcount'. - /// - /// ```html - /// +public protocol RowCountAccessibilityAttribute: Attribute { + + /// Indicate the total number of rows in a element. + /// + /// ```swift + /// Division { + /// } + /// .role(.grid) + /// .accessibilityRowCount(941) /// ``` - func aria(rowCount value: Int) -> Self + /// + /// - Parameter value: The total rows within the element. + /// + /// - Returns: The element + func accessibilityRowCount(_ value: Int) -> Self } -extension AriaRowCountAttribute where Self: ContentNode { +extension RowCountAccessibilityAttribute where Self: ContentNode { internal func mutate(ariarowcount value: AttributeData) -> Self { return self.mutate(key: "aria-rowcount", value: value) } } -extension AriaRowCountAttribute where Self: EmptyNode { +extension RowCountAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariarowcount value: AttributeData) -> Self { return self.mutate(key: "aria-rowcount", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityRowIndex` modifier. @_documentation(visibility: internal) -public protocol AriaRowIndexAttribute: Attribute { +public protocol RowIndexAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-rowindex'. + /// Indicate an element's row index. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .role(.row) + /// .accessibilityRowIndex(1) /// ``` - func aria(rowIndex value: Int) -> Self + /// + /// - Parameter value: The row index the element is in. + /// + /// - Returns: The element + func accessibilityRowIndex(_ value: Int) -> Self } -extension AriaRowIndexAttribute where Self: ContentNode { +extension RowIndexAccessibilityAttribute where Self: ContentNode { internal func mutate(ariarowindex value: AttributeData) -> Self { return self.mutate(key: "aria-rowindex", value: value) } } -extension AriaRowIndexAttribute where Self: EmptyNode { +extension RowIndexAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariarowindex value: AttributeData) -> Self { return self.mutate(key: "aria-rowindex", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityRowSpan` modifier. @_documentation(visibility: internal) -public protocol AriaRowSpanAttribute: Attribute { +public protocol RowSpanAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-rowspan'. + /// Indicate the number of rows the element spans. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .role(.columnHeader) + /// .accessibilityRowSpan(2) /// ``` - func aria(rowSpan value: Int) -> Self + /// + /// - Parameter value: The number of rows to span. + /// + /// - Returns: The element + func accessibilityRowSpan(_ value: Int) -> Self } -extension AriaRowSpanAttribute where Self: ContentNode { +extension RowSpanAccessibilityAttribute where Self: ContentNode { internal func mutate(ariarowspan value: AttributeData) -> Self { return self.mutate(key: "aria-rowspan", value: value) } } -extension AriaRowSpanAttribute where Self: EmptyNode { +extension RowSpanAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariarowspan value: AttributeData) -> Self { return self.mutate(key: "aria-rowspan", value: value) @@ -1042,156 +1309,161 @@ extension AriaSelectedAttribute where Self: EmptyNode { } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilitySort` modifier. @_documentation(visibility: internal) -public protocol AriaSetSizeAttribute: Attribute { +public protocol SortAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-setsize'. + /// Indicate the direction of a sort order. /// - /// ```html - /// + /// ```swift + /// Table { + /// TableRow { + /// HeaderCell { + /// "Lorem ipsum" + /// } + /// .accessibilitySort(.ascending) + /// } + /// } /// ``` - func aria(setSize value: Int) -> Self -} - -extension AriaSetSizeAttribute where Self: ContentNode { - - internal func mutate(ariasetsize value: AttributeData) -> Self { - return self.mutate(key: "aria-setsize", value: value) - } -} - -extension AriaSetSizeAttribute where Self: EmptyNode { - - internal func mutate(ariasetsize value: AttributeData) -> Self { - return self.mutate(key: "aria-setsize", value: value) - } -} - -/// The protocol provides the element with accessibility handler. -@_documentation(visibility: internal) -public protocol AriaSortAttribute: Attribute { - - /// The function represents the html-attribute 'aria-sort'. /// - /// ```html - /// - /// ``` - func aria(sort value: Values.Accessibility.Sort) -> Self + /// - Parameter value: The direction it is sort. + /// + /// - Returns: The element + func accessibilitySort(_ value: Values.Accessibility.Sort) -> Self } -extension AriaSortAttribute where Self: ContentNode { +extension SortAccessibilityAttribute where Self: ContentNode { internal func mutate(ariasort value: AttributeData) -> Self { return self.mutate(key: "aria-sort", value: value) } } -extension AriaSortAttribute where Self: EmptyNode { +extension SortAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariasort value: AttributeData) -> Self { return self.mutate(key: "aria-sort", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityValueMaximum` modifier. @_documentation(visibility: internal) -public protocol AriaValueMaximumAttribute: Attribute { +public protocol MaximumValueAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-valuemax'. + /// Indicate the maximum bound for the range. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .role(.meter) + /// .accessibilityMaximumValue(20.0) /// ``` - func aria(valueMaximum value: Float) -> Self + /// + /// - Parameter value: The value to consider maximum. + /// + /// - Returns: The element + func accessibilityMaximumValue(_ value: Float) -> Self } -extension AriaValueMaximumAttribute where Self: ContentNode { +extension MaximumValueAccessibilityAttribute where Self: ContentNode { internal func mutate(ariavaluemax value: AttributeData) -> Self { return self.mutate(key: "aria-valuemax", value: value) } } -extension AriaValueMaximumAttribute where Self: EmptyNode { +extension MaximumValueAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariavaluemax value: AttributeData) -> Self { return self.mutate(key: "aria-valuemax", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityMinimumValue` modifier. @_documentation(visibility: internal) -public protocol AriaValueMininumAttribute: Attribute { +public protocol MinimumValueAccessibilityAttribute: Attribute { - /// The function represents the html-attribute 'aria-valuemin'. + /// Indicate the minimum bound for the range. /// - /// ```html - /// + /// ```swift + /// Division { + /// } + /// .role(.meter) + /// .accessibilityMinimumValue(20.0) /// ``` - func aria(valueMinimum value: Float) -> Self + /// + /// - Parameter value: The value to consider minimum. + /// + /// - Returns: The element + func accessibilityMinimumValue(_ value: Float) -> Self } -extension AriaValueMininumAttribute where Self: ContentNode { +extension MinimumValueAccessibilityAttribute where Self: ContentNode { internal func mutate(ariavaluemin value: AttributeData) -> Self { return self.mutate(key: "aria-valuemin", value: value) } } -extension AriaValueMininumAttribute where Self: EmptyNode { +extension MinimumValueAccessibilityAttribute where Self: EmptyNode { internal func mutate(ariavaluemin value: AttributeData) -> Self { return self.mutate(key: "aria-valuemin", value: value) } } -/// The protocol provides the element with accessibility handler. +/// A type that provides the `accessibilityValue` modifier. @_documentation(visibility: internal) -public protocol AriaValueNowAttribute: Attribute { - - /// The function represents the html-attribute 'aria-valuenow"'. - /// - /// ```html - /// +public protocol ValueAccessibilityAttribute: Attribute { + + /// Indicate the current value of the range. + /// + /// ```swift + /// Division { + /// } + /// .role(.meter) + /// .accessibilityValue(20.0, alternate: "Lorem ipsum") /// ``` - func aria(valueNow value: Float) -> Self + /// + /// - Parameter value: The current value within the range. + /// - Parameter text: The alternate text to describe the value. + /// + /// - Returns: The element + func accessibilityValue(_ value: Float, description text: String?) -> Self + + /// Indicate the current value of the range. + /// + /// ```swift + /// Division { + /// } + /// .role(.meter) + /// .accessibilityValue(20.0, alternate: "Lorem ipsum") + /// ``` + /// + /// - Parameter value: The current value within the range. + /// - Parameter localizedKey:The localized key to describe the value. + /// - Parameter tableName: The translation table to look in. + /// + /// - Returns: The element + func accessibilityValue(_ value: Float, description localizedKey: LocalizedStringKey, tableName: String?) -> Self } -extension AriaValueNowAttribute where Self: ContentNode { +extension ValueAccessibilityAttribute where Self: ContentNode { internal func mutate(ariavaluenow value: AttributeData) -> Self { return self.mutate(key: "aria-valuenow", value: value) } -} - -extension AriaValueNowAttribute where Self: EmptyNode { - - internal func mutate(ariavaluenow value: AttributeData) -> Self { - return self.mutate(key: "aria-valuenow", value: value) - } -} - -/// The protocol provides the element with accessibility handler. -@_documentation(visibility: internal) -public protocol AriaValueTextAttribute: Attribute { - - /// The function represents the html-attribute 'aria-valuetext'. - /// - /// ```html - /// - /// ``` - func aria(valueText value: String) -> Self -} - -extension AriaValueTextAttribute where Self: ContentNode { internal func mutate(ariavaluetext value: AttributeData) -> Self { return self.mutate(key: "aria-valuetext", value: value) } } -extension AriaValueTextAttribute where Self: EmptyNode { +extension ValueAccessibilityAttribute where Self: EmptyNode { + + internal func mutate(ariavaluenow value: AttributeData) -> Self { + return self.mutate(key: "aria-valuenow", value: value) + } internal func mutate(ariavaluetext value: AttributeData) -> Self { return self.mutate(key: "aria-valuetext", value: value) diff --git a/Sources/HTMLKit/Abstraction/Elements/BodyElements.swift b/Sources/HTMLKit/Abstraction/Elements/BodyElements.swift index 56eefbf1..62618056 100644 --- a/Sources/HTMLKit/Abstraction/Elements/BodyElements.swift +++ b/Sources/HTMLKit/Abstraction/Elements/BodyElements.swift @@ -472,10 +472,15 @@ extension Article: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Article { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Article { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Article { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -492,50 +497,111 @@ extension Article: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Article { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Article { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Article { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Article { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Article { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Article { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Article { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Article { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Article { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Article { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Article { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Article { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Article { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Article { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Article { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Article { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Article { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Article { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Article { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Article { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Article { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Article { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Article { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Article { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -872,10 +938,15 @@ extension Section: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Section { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Section { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Section { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -892,50 +963,111 @@ extension Section: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Section { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Section { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Section { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Section { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Section { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Section { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Section { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Section { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Section { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Section { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Section { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Section { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Section { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Section { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Section { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Section { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Section { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Section { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Section { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Section { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Section { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Section { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Section { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Section { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -1274,10 +1406,15 @@ extension Navigation: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Navigation { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Navigation { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Navigation { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -1294,50 +1431,111 @@ extension Navigation: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Navigation { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Navigation { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Navigation { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Navigation { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Navigation { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Navigation { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Navigation { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Navigation { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Navigation { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Navigation { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Navigation { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Navigation { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Navigation { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Navigation { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Navigation { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Navigation { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Navigation { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Navigation { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Navigation { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Navigation { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Navigation { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Navigation { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Navigation { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Navigation { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -1672,10 +1870,15 @@ extension Aside: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Aside { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Aside { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Aside { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -1692,49 +1895,110 @@ extension Aside: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Aside { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Aside { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Aside { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Aside { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Aside { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Aside { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Aside { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Aside { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Aside { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Aside { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Aside { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Aside { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Aside { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Aside { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Aside { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Aside { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Aside { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Aside { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Aside { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Aside { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Aside { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + + public func accessibilityOwns(_ ids: [String]) -> Aside { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Aside { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } public func aria(relevant value: Values.Accessibility.Relevant) -> Aside { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) @@ -2067,10 +2331,15 @@ extension Heading1: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Heading1 { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Heading1 { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Heading1 { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -2087,50 +2356,111 @@ extension Heading1: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Heading1 { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Heading1 { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Heading1 { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Heading1 { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Heading1 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Heading1 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Heading1 { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Heading1 { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Heading1 { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Heading1 { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Heading1 { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Heading1 { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Heading1 { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Heading1 { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Heading1 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Heading1 { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Heading1 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Heading1 { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Heading1 { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Heading1 { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Heading1 { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Heading1 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Heading1 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Heading1 { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -2471,10 +2801,15 @@ extension Heading2: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Heading2 { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Heading2 { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Heading2 { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -2491,50 +2826,111 @@ extension Heading2: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Heading2 { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Heading2 { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Heading2 { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Heading2 { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Heading2 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Heading2 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Heading2 { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Heading2 { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Heading2 { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Heading2 { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Heading2 { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Heading2 { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Heading2 { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Heading2 { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Heading2 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Heading2 { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Heading2 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Heading2 { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Heading2 { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Heading2 { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Heading2 { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Heading2 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Heading2 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Heading2 { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -2875,10 +3271,15 @@ extension Heading3: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Heading3 { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Heading3 { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Heading3 { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -2895,50 +3296,111 @@ extension Heading3: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Heading3 { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Heading3 { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Heading3 { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Heading3 { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Heading3 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Heading3 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Heading3 { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Heading3 { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Heading3 { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Heading3 { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Heading3 { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Heading3 { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Heading3 { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Heading3 { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Heading3 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Heading3 { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Heading3 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Heading3 { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Heading3 { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Heading3 { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Heading3 { return mutate(ariaowns: .init(value, context: .tainted(.html))) } - + + public func accessibilityOwns(_ ids: [String]) -> Heading3 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Heading3 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Heading3 { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -3279,10 +3741,15 @@ extension Heading4: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Heading4 { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Heading4 { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Heading4 { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -3299,50 +3766,111 @@ extension Heading4: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Heading4 { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Heading4 { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Heading4 { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Heading4 { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Heading4 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Heading4 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Heading4 { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Heading4 { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Heading4 { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Heading4 { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Heading4 { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Heading4 { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Heading4 { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Heading4 { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Heading4 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Heading4 { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Heading4 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Heading4 { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Heading4 { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Heading4 { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Heading4 { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Heading4 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Heading4 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Heading4 { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -3683,10 +4211,15 @@ extension Heading5: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Heading5 { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Heading5 { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Heading5 { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -3703,50 +4236,111 @@ extension Heading5: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Heading5 { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Heading5 { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Heading5 { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Heading5 { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Heading5 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Heading5 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Heading5 { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Heading5 { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Heading5 { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Heading5 { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Heading5 { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Heading5 { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Heading5 { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Heading5 { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Heading5 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Heading5 { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Heading5 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Heading5 { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Heading5 { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Heading5 { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Heading5 { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Heading5 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Heading5 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Heading5 { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -4087,10 +4681,15 @@ extension Heading6: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Heading6 { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Heading6 { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Heading6 { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -4107,50 +4706,111 @@ extension Heading6: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Heading6 { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Heading6 { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Heading6 { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Heading6 { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Heading6 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Heading6 { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Heading6 { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Heading6 { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Heading6 { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Heading6 { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Heading6 { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Heading6 { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Heading6 { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Heading6 { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Heading6 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Heading6 { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Heading6 { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Heading6 { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Heading6 { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Heading6 { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Heading6 { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Heading6 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Heading6 { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Heading6 { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -4496,10 +5156,15 @@ extension HeadingGroup: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttri return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> HeadingGroup { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> HeadingGroup { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> HeadingGroup { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -4516,50 +5181,111 @@ extension HeadingGroup: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttri return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> HeadingGroup { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> HeadingGroup { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> HeadingGroup { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> HeadingGroup { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> HeadingGroup { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> HeadingGroup { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> HeadingGroup { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> HeadingGroup { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> HeadingGroup { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> HeadingGroup { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> HeadingGroup { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> HeadingGroup { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> HeadingGroup { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> HeadingGroup { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> HeadingGroup { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> HeadingGroup { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> HeadingGroup { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> HeadingGroup { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> HeadingGroup { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> HeadingGroup { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> HeadingGroup { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> HeadingGroup { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> HeadingGroup { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> HeadingGroup { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -4892,10 +5618,15 @@ extension Header: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Header { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Header { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Header { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -4912,50 +5643,111 @@ extension Header: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Header { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Header { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Header { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Header { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Header { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Header { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Header { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Header { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Header { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Header { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Header { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Header { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Header { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Header { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Header { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Header { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Header { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Header { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Header { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Header { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Header { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Header { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Header { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Header { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -5286,10 +6078,15 @@ extension Footer: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Footer { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Footer { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Footer { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -5306,50 +6103,111 @@ extension Footer: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Footer { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Footer { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Footer { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Footer { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Footer { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Footer { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Footer { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Footer { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Footer { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Footer { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Footer { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Footer { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Footer { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Footer { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Footer { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Footer { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Footer { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Footer { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Footer { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Footer { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Footer { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Footer { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Footer { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Footer { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -5687,10 +6545,15 @@ extension Address: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Address { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Address { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Address { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -5707,48 +6570,109 @@ extension Address: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Address { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Address { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Address { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Address { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Address { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Address { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Address { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Address { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Address { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Address { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Address { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Address { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Address { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Address { return mutate(arialabel: .init(value, context: .tainted(.html))) } - public func aria(labeledBy value: String) -> Address { - return mutate(arialabeledby: .init(value, context: .tainted(.html))) + public func accessibilityLabel(_ value: String) -> Address { + return mutate(arialabel: .init(value, context: .tainted(.html))) } - public func aria(live value: Values.Accessibility.Live) -> Address { - return mutate(arialive: .init(value.rawValue, context: .trusted)) + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Address { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) } - public func aria(owns value: String) -> Address { - return mutate(ariaowns: .init(value, context: .tainted(.html))) + public func accessibilityLabel(verbatim value: String) -> Address { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func aria(labeledBy value: String) -> Address { + return mutate(arialabeledby: .init(value, context: .tainted(.html))) + } + + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") + public func aria(live value: Values.Accessibility.Live) -> Address { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Address { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") + public func aria(owns value: String) -> Address { + return mutate(ariaowns: .init(value, context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: [String]) -> Address { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Address { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) } public func aria(relevant value: Values.Accessibility.Relevant) -> Address { @@ -5827,8 +6751,8 @@ public struct Paragraph: ContentNode, HtmlElement, BodyElement, FormElement, Fig } } -extension Paragraph: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { - +extension Paragraph: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, RequiredAccessibilityAttribute { + public func accessKey(_ value: Character) -> Paragraph { return mutate(accesskey: .init("\(value)", context: .trusted)) } @@ -6082,10 +7006,15 @@ extension Paragraph: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Paragraph { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Paragraph { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Paragraph { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -6102,50 +7031,111 @@ extension Paragraph: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Paragraph { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Paragraph { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Paragraph { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Paragraph { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Paragraph { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Paragraph { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Paragraph { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Paragraph { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Paragraph { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Paragraph { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Paragraph { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Paragraph { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Paragraph { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Paragraph { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Paragraph { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Paragraph { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Paragraph { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Paragraph { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Paragraph { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Paragraph { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Paragraph { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Paragraph { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Paragraph { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Paragraph { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -6153,6 +7143,10 @@ extension Paragraph: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut public func aria(roleDescription value: String) -> Paragraph { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + + public func accessibilityRequired(_ value: Bool = true) -> Paragraph { + return mutate(ariarequired: .init(value, context: .trusted)) + } } extension Paragraph: Localizable { @@ -6477,10 +7471,15 @@ extension HorizontalRule: GlobalAttributes, GlobalEventAttributes, GlobalAriaAtt return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> HorizontalRule { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> HorizontalRule { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> HorizontalRule { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -6497,50 +7496,111 @@ extension HorizontalRule: GlobalAttributes, GlobalEventAttributes, GlobalAriaAtt return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> HorizontalRule { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> HorizontalRule { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> HorizontalRule { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> HorizontalRule { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> HorizontalRule { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> HorizontalRule { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> HorizontalRule { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> HorizontalRule { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> HorizontalRule { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> HorizontalRule { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> HorizontalRule { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> HorizontalRule { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> HorizontalRule { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> HorizontalRule { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> HorizontalRule { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> HorizontalRule { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> HorizontalRule { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> HorizontalRule { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> HorizontalRule { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> HorizontalRule { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> HorizontalRule { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> HorizontalRule { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> HorizontalRule { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> HorizontalRule { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -6878,10 +7938,15 @@ extension PreformattedText: GlobalAttributes, GlobalEventAttributes, GlobalAriaA return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> PreformattedText { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> PreformattedText { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> PreformattedText { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -6898,50 +7963,111 @@ extension PreformattedText: GlobalAttributes, GlobalEventAttributes, GlobalAriaA return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> PreformattedText { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> PreformattedText { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> PreformattedText { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> PreformattedText { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> PreformattedText { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> PreformattedText { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> PreformattedText { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> PreformattedText { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> PreformattedText { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> PreformattedText { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> PreformattedText { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> PreformattedText { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> PreformattedText { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> PreformattedText { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> PreformattedText { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> PreformattedText { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> PreformattedText { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> PreformattedText { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> PreformattedText { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> PreformattedText { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> PreformattedText { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> PreformattedText { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> PreformattedText { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> PreformattedText { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -7277,10 +8403,15 @@ extension Blockquote: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Blockquote { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Blockquote { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Blockquote { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -7297,50 +8428,111 @@ extension Blockquote: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Blockquote { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Blockquote { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Blockquote { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Blockquote { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Blockquote { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Blockquote { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Blockquote { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Blockquote { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Blockquote { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Blockquote { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Blockquote { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Blockquote { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Blockquote { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Blockquote { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Blockquote { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Blockquote { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Blockquote { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Blockquote { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Blockquote { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Blockquote { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Blockquote { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Blockquote { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Blockquote { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Blockquote { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -7431,7 +8623,7 @@ public struct OrderedList: ContentNode, HtmlElement, BodyElement, FormElement, F } } -extension OrderedList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, ReversedAttribute, StartAttribute, TypeAttribute { +extension OrderedList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, ReversedAttribute, StartAttribute, TypeAttribute, OrientationAccessibilityAttribute { public func accessKey(_ value: Character) -> OrderedList { return mutate(accesskey: .init("\(value)", context: .trusted)) @@ -7698,10 +8890,15 @@ extension OrderedList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> OrderedList { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> OrderedList { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> OrderedList { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -7718,50 +8915,111 @@ extension OrderedList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> OrderedList { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> OrderedList { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> OrderedList { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> OrderedList { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> OrderedList { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> OrderedList { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> OrderedList { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> OrderedList { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> OrderedList { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> OrderedList { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> OrderedList { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> OrderedList { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> OrderedList { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> OrderedList { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> OrderedList { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> OrderedList { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> OrderedList { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> OrderedList { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> OrderedList { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> OrderedList { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> OrderedList { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> OrderedList { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> OrderedList { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> OrderedList { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -7769,6 +9027,10 @@ extension OrderedList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib public func aria(roleDescription value: String) -> OrderedList { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + + public func accessibilityOrientation(_ value: Values.Accessibility.Orientation) -> OrderedList { + return mutate(ariaorientation: .init(value.rawValue, context: .trusted)) + } } /// An element that represents a unordered list. @@ -7843,7 +9105,7 @@ public struct UnorderedList: ContentNode, HtmlElement, BodyElement, FormElement, } } -extension UnorderedList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { +extension UnorderedList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, OrientationAccessibilityAttribute, MultiselectAccessibilityAttribute { public func accessKey(_ value: Character) -> UnorderedList { return mutate(accesskey: .init("\(value)", context: .trusted)) @@ -8098,10 +9360,15 @@ extension UnorderedList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttr return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> UnorderedList { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> UnorderedList { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> UnorderedList { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -8118,50 +9385,111 @@ extension UnorderedList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttr return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> UnorderedList { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> UnorderedList { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> UnorderedList { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> UnorderedList { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> UnorderedList { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> UnorderedList { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> UnorderedList { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> UnorderedList { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> UnorderedList { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> UnorderedList { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> UnorderedList { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> UnorderedList { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> UnorderedList { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> UnorderedList { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> UnorderedList { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> UnorderedList { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> UnorderedList { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> UnorderedList { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> UnorderedList { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> UnorderedList { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> UnorderedList { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> UnorderedList { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> UnorderedList { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> UnorderedList { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -8169,6 +9497,14 @@ extension UnorderedList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttr public func aria(roleDescription value: String) -> UnorderedList { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + + public func accessibilityOrientation(_ value: Values.Accessibility.Orientation) -> UnorderedList { + return mutate(ariaorientation: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityMultiselect(_ value: Bool = true) -> UnorderedList { + return mutate(ariamultiselectable: .init(value, context: .trusted)) + } } /// An element that represents an action menu. @@ -8810,10 +10146,15 @@ extension DescriptionList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAt return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> DescriptionList { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> DescriptionList { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> DescriptionList { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -8830,50 +10171,111 @@ extension DescriptionList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAt return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> DescriptionList { return mutate(ariadisabled: .init(value, context: .trusted)) } - public func aria(errorMessage value: String) -> DescriptionList { + public func accessibilityDisabled(_ value: Bool = true) -> DescriptionList { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") + public func aria(errorMessage value: String) -> DescriptionList { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> DescriptionList { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> DescriptionList { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> DescriptionList { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> DescriptionList { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> DescriptionList { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> DescriptionList { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> DescriptionList { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> DescriptionList { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> DescriptionList { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> DescriptionList { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> DescriptionList { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> DescriptionList { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> DescriptionList { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> DescriptionList { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> DescriptionList { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> DescriptionList { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> DescriptionList { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> DescriptionList { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> DescriptionList { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> DescriptionList { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> DescriptionList { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -9210,10 +10612,15 @@ extension Figure: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Figure { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Figure { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Figure { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -9230,50 +10637,111 @@ extension Figure: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Figure { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Figure { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Figure { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Figure { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Figure { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Figure { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Figure { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Figure { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Figure { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Figure { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Figure { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Figure { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Figure { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Figure { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Figure { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Figure { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Figure { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Figure { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Figure { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Figure { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Figure { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Figure { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Figure { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Figure { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -9651,10 +11119,15 @@ extension Anchor: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Anchor { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Anchor { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Anchor { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -9671,50 +11144,111 @@ extension Anchor: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Anchor { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Anchor { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Anchor { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Anchor { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Anchor { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Anchor { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Anchor { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Anchor { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Anchor { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Anchor { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Anchor { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Anchor { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Anchor { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Anchor { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Anchor { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Anchor { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Anchor { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Anchor { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Anchor { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Anchor { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Anchor { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Anchor { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Anchor { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Anchor { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -10059,10 +11593,15 @@ extension Emphasize: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Emphasize { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Emphasize { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Emphasize { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -10079,50 +11618,111 @@ extension Emphasize: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Emphasize { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Emphasize { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Emphasize { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Emphasize { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Emphasize { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Emphasize { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Emphasize { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Emphasize { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Emphasize { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Emphasize { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Emphasize { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Emphasize { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Emphasize { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Emphasize { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Emphasize { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Emphasize { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Emphasize { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Emphasize { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Emphasize { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Emphasize { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Emphasize { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Emphasize { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Emphasize { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Emphasize { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -10456,10 +12056,15 @@ extension Strong: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Strong { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Strong { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Strong { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -10476,50 +12081,111 @@ extension Strong: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Strong { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Strong { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Strong { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Strong { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Strong { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Strong { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Strong { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Strong { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Strong { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Strong { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Strong { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Strong { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Strong { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Strong { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Strong { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Strong { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Strong { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Strong { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Strong { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Strong { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Strong { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Strong { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Strong { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Strong { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -10853,10 +12519,15 @@ extension Small: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Small { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Small { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Small { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -10873,50 +12544,111 @@ extension Small: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Small { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Small { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Small { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Small { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Small { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Small { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Small { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Small { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Small { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Small { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Small { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Small { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Small { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Small { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Small { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Small { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Small { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Small { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Small { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Small { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Small { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Small { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Small { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Small { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -11597,10 +13329,15 @@ extension Main: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Main { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Main { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Main { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -11617,55 +13354,116 @@ extension Main: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Main { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Main { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Main { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Main { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Main { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Main { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Main { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Main { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Main { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Main { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Main { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Main { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Main { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Main { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Main { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Main { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Main { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Main { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Main { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Main { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Main { return mutate(ariaowns: .init(value, context: .tainted(.html))) } - public func aria(relevant value: Values.Accessibility.Relevant) -> Main { - return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) + public func accessibilityOwns(_ ids: [String]) -> Main { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) } - public func aria(roleDescription value: String) -> Main { + public func accessibilityOwns(_ ids: String...) -> Main { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func aria(relevant value: Values.Accessibility.Relevant) -> Main { + return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) + } + + public func aria(roleDescription value: String) -> Main { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } } @@ -12043,8 +13841,8 @@ public struct Division: ContentNode, HtmlElement, BodyElement, FormElement, Figu } } -extension Division: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { - +extension Division: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, OrientationAccessibilityAttribute, RequiredAccessibilityAttribute, ReadOnlyAccessibilityAttribute, ModalAccessibilityAttribute, LevelAccessibilityAttribute, HintAccessibilityAttribute, PositionAccessibilityAttribute, MultilineAccessibilityAttribute, MultiselectAccessibilityAttribute, RowIndexAccessibilityAttribute, RowCountAccessibilityAttribute, ColumnIndexAccessibilityAttribute, ColumnCountAccessibilityAttribute, RowSpanAccessibilityAttribute, ColumnSpanAccessibilityAttribute, MaximumValueAccessibilityAttribute, MinimumValueAccessibilityAttribute, ValueAccessibilityAttribute { + public func accessKey(_ value: Character) -> Division { return mutate(accesskey: .init("\(value)", context: .trusted)) } @@ -12298,10 +14096,15 @@ extension Division: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Division { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Division { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Division { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -12318,50 +14121,111 @@ extension Division: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Division { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Division { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Division { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Division { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Division { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Division { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Division { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Division { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Division { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Division { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Division { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Division { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Division { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Division { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Division { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Division { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Division { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Division { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Division { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Division { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Division { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Division { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Division { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Division { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -12369,6 +14233,97 @@ extension Division: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute public func aria(roleDescription value: String) -> Division { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + + public func accessibilityOrientation(_ value: Values.Accessibility.Orientation) -> Division { + return mutate(ariaorientation: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityRequired(_ value: Bool = true) -> Division { + return mutate(ariarequired: .init(value, context: .trusted)) + } + + public func accessibilityReadonly(_ value: Bool = true) -> Division { + return mutate(ariareadonly: .init(value, context: .trusted)) + } + + public func accessibilityModal(_ value: Bool = true) -> Division { + return mutate(ariamodal: .init(value, context: .trusted)) + } + + public func accessibilityLevel(_ value: Int) -> Division { + return mutate(arialevel: .init(value, context: .trusted)) + } + + @_disfavoredOverload + public func accessibilityHint(_ value: String) -> Division { + return mutate(ariaplaceholder: .init(value, context: .tainted(.html))) + } + + public func accessibilityHint(_ localized: LocalizedStringKey, tableName: String? = nil) -> Division { + return mutate(ariaplaceholder: .init(LocalizedString(key: localized, table: tableName), context: .tainted(.html))) + } + + public func accessibilityHint(verbatim value: String) -> Division { + return mutate(ariaplaceholder: .init(value, context: .tainted(.html))) + } + + public func accessibilityPosition(_ index: Int, in size: Int) -> Division { + return mutate(ariaposinset: .init(index, context: .trusted)).mutate(ariasetsize: .init(size, context: .trusted)) + } + + public func accessibilityMultiline(_ value: Bool = true) -> Division { + return mutate(ariamultiline: .init(value, context: .trusted)) + } + + public func accessibilityMultiselect(_ value: Bool = true) -> Division { + return mutate(ariamultiselectable: .init(value, context: .trusted)) + } + + public func accessibilityRowIndex(_ value: Int) -> Division { + return mutate(ariarowindex: .init(value, context: .trusted)) + } + + public func accessibilityRowCount(_ value: Int) -> Division { + return mutate(ariarowcount: .init(value, context: .trusted)) + } + + public func accessibilityColumnIndex(_ value: Int) -> Division { + return mutate(ariacolindex: .init(value, context: .trusted)) + } + + public func accessibilityColumnCount(_ value: Int) -> Division { + return mutate(ariacolcount: .init(value, context: .trusted)) + } + + public func accessibilityRowSpan(_ value: Int) -> Division { + return mutate(ariarowspan: .init(value, context: .trusted)) + } + + public func accessibilityColumnSpan(_ value: Int) -> Division { + return mutate(ariacolspan: .init(value, context: .trusted)) + } + + public func accessibilityMaximumValue(_ value: Float) -> Division { + return mutate(ariavaluemax: .init(value, context: .trusted)) + } + + public func accessibilityMinimumValue(_ value: Float) -> Division { + return mutate(ariavaluemin: .init(value, context: .trusted)) + } + + @_disfavoredOverload + public func accessibilityValue(_ value: Float, description text: String? = nil) -> Division { + + if let text = text { + return mutate(ariavaluenow: .init(value, context: .trusted)).mutate(ariavaluetext: .init(text, context: .tainted(.html))) + } + + return mutate(ariavaluenow: .init(value, context: .trusted)) + } + + public func accessibilityValue(_ value: Float, description localizedKey: LocalizedStringKey, tableName: String?) -> Division { + return mutate(ariavaluenow: .init(value, context: .trusted)).mutate(ariavaluetext: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } } /// An element that represents a term definition. @@ -12698,10 +14653,15 @@ extension Definition: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Definition { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Definition { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Definition { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -12718,50 +14678,111 @@ extension Definition: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Definition { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Definition { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Definition { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Definition { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Definition { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Definition { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Definition { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Definition { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Definition { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Definition { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Definition { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Definition { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Definition { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Definition { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Definition { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Definition { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Definition { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Definition { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Definition { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Definition { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Definition { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Definition { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Definition { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Definition { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -13096,10 +15117,15 @@ extension Cite: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Cite { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Cite { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Cite { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -13116,50 +15142,111 @@ extension Cite: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Cite { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Cite { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Cite { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Cite { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Cite { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Cite { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Cite { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Cite { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Cite { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Cite { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Cite { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Cite { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Cite { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Cite { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Cite { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Cite { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Cite { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Cite { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Cite { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Cite { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Cite { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Cite { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Cite { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Cite { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -13497,10 +15584,15 @@ extension ShortQuote: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> ShortQuote { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> ShortQuote { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> ShortQuote { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -13517,50 +15609,111 @@ extension ShortQuote: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> ShortQuote { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> ShortQuote { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> ShortQuote { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> ShortQuote { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> ShortQuote { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> ShortQuote { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> ShortQuote { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> ShortQuote { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> ShortQuote { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> ShortQuote { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> ShortQuote { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> ShortQuote { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> ShortQuote { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> ShortQuote { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> ShortQuote { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> ShortQuote { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> ShortQuote { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> ShortQuote { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> ShortQuote { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> ShortQuote { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> ShortQuote { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> ShortQuote { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> ShortQuote { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> ShortQuote { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -13895,10 +16048,15 @@ extension Abbreviation: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttri return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Abbreviation { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Abbreviation { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Abbreviation { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -13915,50 +16073,111 @@ extension Abbreviation: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttri return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Abbreviation { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Abbreviation { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Abbreviation { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Abbreviation { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Abbreviation { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Abbreviation { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Abbreviation { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Abbreviation { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Abbreviation { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Abbreviation { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Abbreviation { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Abbreviation { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Abbreviation { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Abbreviation { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Abbreviation { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Abbreviation { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Abbreviation { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Abbreviation { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Abbreviation { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Abbreviation { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Abbreviation { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Abbreviation { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Abbreviation { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Abbreviation { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -14293,10 +16512,15 @@ extension Ruby: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Ruby { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Ruby { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Ruby { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -14313,50 +16537,111 @@ extension Ruby: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Ruby { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Ruby { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Ruby { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Ruby { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Ruby { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Ruby { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Ruby { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Ruby { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Ruby { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Ruby { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } - public func aria(keyShortcuts value: String) -> Ruby { - return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Ruby { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Ruby { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + + public func aria(keyShortcuts value: String) -> Ruby { + return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Ruby { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Ruby { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Ruby { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Ruby { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Ruby { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Ruby { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Ruby { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Ruby { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Ruby { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Ruby { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Ruby { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -14706,10 +16991,15 @@ extension Data: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, V return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Data { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Data { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Data { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -14726,50 +17016,111 @@ extension Data: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, V return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Data { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Data { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Data { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Data { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Data { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Data { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Data { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Data { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Data { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Data { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Data { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Data { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Data { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Data { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Data { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Data { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Data { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Data { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Data { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Data { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Data { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Data { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Data { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Data { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -15109,10 +17460,15 @@ extension Time: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, D return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Time { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Time { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Time { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -15129,50 +17485,111 @@ extension Time: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, D return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Time { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Time { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Time { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Time { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Time { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Time { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Time { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Time { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Time { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Time { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Time { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Time { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Time { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Time { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Time { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Time { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Time { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Time { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Time { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Time { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Time { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Time { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Time { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Time { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -15508,10 +17925,15 @@ extension Code: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Code { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Code { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Code { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -15528,50 +17950,111 @@ extension Code: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Code { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Code { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Code { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Code { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Code { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Code { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Code { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Code { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Code { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Code { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Code { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Code { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Code { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Code { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Code { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Code { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Code { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Code { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Code { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Code { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Code { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Code { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Code { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Code { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -15907,10 +18390,15 @@ extension Variable: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Variable { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Variable { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Variable { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -15927,50 +18415,111 @@ extension Variable: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Variable { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Variable { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Variable { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Variable { return mutate(ariaflowto: .init(value, context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: [String]) -> Variable { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Variable { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) } public func aria(hasPopup value: Values.Accessibility.Popup) -> Variable { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Variable { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Variable { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Variable { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Variable { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Variable { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Variable { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Variable { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Variable { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Variable { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Variable { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Variable { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Variable { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Variable { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Variable { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Variable { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Variable { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Variable { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -16302,10 +18851,15 @@ extension SampleOutput: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttri return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> SampleOutput { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> SampleOutput { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> SampleOutput { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -16322,50 +18876,111 @@ extension SampleOutput: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttri return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> SampleOutput { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> SampleOutput { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> SampleOutput { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> SampleOutput { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> SampleOutput { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> SampleOutput { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> SampleOutput { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> SampleOutput { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> SampleOutput { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> SampleOutput { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> SampleOutput { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> SampleOutput { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> SampleOutput { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> SampleOutput { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> SampleOutput { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> SampleOutput { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> SampleOutput { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> SampleOutput { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> SampleOutput { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> SampleOutput { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> SampleOutput { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> SampleOutput { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> SampleOutput { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> SampleOutput { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -16700,11 +19315,16 @@ extension KeyboardInput: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttr public func aria(atomic value: Bool) -> KeyboardInput { return mutate(ariaatomic: .init(value, context: .trusted)) } - + + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> KeyboardInput { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> KeyboardInput { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> KeyboardInput { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -16721,50 +19341,111 @@ extension KeyboardInput: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttr return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> KeyboardInput { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> KeyboardInput { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> KeyboardInput { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> KeyboardInput { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> KeyboardInput { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> KeyboardInput { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> KeyboardInput { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> KeyboardInput { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> KeyboardInput { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> KeyboardInput { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> KeyboardInput { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> KeyboardInput { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> KeyboardInput { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> KeyboardInput { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> KeyboardInput { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> KeyboardInput { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> KeyboardInput { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> KeyboardInput { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> KeyboardInput { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> KeyboardInput { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> KeyboardInput { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> KeyboardInput { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> KeyboardInput { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> KeyboardInput { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -17099,10 +19780,15 @@ extension Subscript: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Subscript { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Subscript { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Subscript { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -17119,50 +19805,111 @@ extension Subscript: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Subscript { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Subscript { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Subscript { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Subscript { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Subscript { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Subscript { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Subscript { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Subscript { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Subscript { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Subscript { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Subscript { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Subscript { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Subscript { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Subscript { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Subscript { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Subscript { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Subscript { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Subscript { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Subscript { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Subscript { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Subscript { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Subscript { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Subscript { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Subscript { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -17498,10 +20245,15 @@ extension Superscript: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Superscript { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Superscript { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Superscript { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -17518,50 +20270,111 @@ extension Superscript: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Superscript { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Superscript { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Superscript { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Superscript { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Superscript { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Superscript { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Superscript { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Superscript { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Superscript { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Superscript { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Superscript { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Superscript { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Superscript { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Superscript { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Superscript { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Superscript { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Superscript { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Superscript { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Superscript { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Superscript { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Superscript { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Superscript { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Superscript { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Superscript { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -17897,10 +20710,15 @@ extension Italic: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Italic { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Italic { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Italic { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -17917,50 +20735,111 @@ extension Italic: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Italic { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Italic { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Italic { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Italic { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Italic { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Italic { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Italic { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Italic { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Italic { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Italic { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Italic { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Italic { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Italic { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Italic { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Italic { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Italic { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Italic { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Italic { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Italic { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Italic { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Italic { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Italic { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Italic { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Italic { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -18305,10 +21184,15 @@ extension Bold: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Bold { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Bold { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Bold { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -18325,50 +21209,111 @@ extension Bold: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Bold { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Bold { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Bold { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Bold { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Bold { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Bold { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Bold { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Bold { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Bold { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Bold { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Bold { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Bold { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Bold { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Bold { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Bold { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Bold { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Bold { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Bold { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Bold { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Bold { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Bold { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Bold { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Bold { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Bold { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -18713,10 +21658,15 @@ extension Underline: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Underline { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Underline { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Underline { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -18733,50 +21683,111 @@ extension Underline: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Underline { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Underline { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Underline { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Underline { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Underline { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Underline { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Underline { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Underline { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Underline { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Underline { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Underline { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Underline { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Underline { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Underline { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Underline { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Underline { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Underline { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Underline { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Underline { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Underline { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Underline { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Underline { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Underline { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Underline { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -19121,10 +22132,15 @@ extension Mark: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Mark { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Mark { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Mark { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -19141,50 +22157,111 @@ extension Mark: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Mark { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Mark { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Mark { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Mark { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Mark { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Mark { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Mark { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Mark { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Mark { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Mark { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Mark { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Mark { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Mark { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Mark { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Mark { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Mark { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Mark { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Mark { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Mark { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Mark { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Mark { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Mark { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Mark { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Mark { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -19520,10 +22597,15 @@ extension Bdi: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Bdi { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Bdi { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Bdi { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -19540,50 +22622,111 @@ extension Bdi: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Bdi { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Bdi { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Bdi { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Bdi { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Bdi { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Bdi { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Bdi { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Bdi { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Bdi { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Bdi { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Bdi { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Bdi { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Bdi { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Bdi { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Bdi { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Bdi { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Bdi { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Bdi { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Bdi { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Bdi { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Bdi { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Bdi { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Bdi { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Bdi { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -19907,10 +23050,15 @@ extension Bdo: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Bdo { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Bdo { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Bdo { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -19927,35 +23075,82 @@ extension Bdo: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Bdo { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Bdo { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Bdo { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Bdo { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Bdo { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Bdo { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Bdo { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Bdo { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Bdo { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Bdo { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } - public func aria(keyShortcuts value: String) -> Bdo { - return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Bdo { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Bdo { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + + public func aria(keyShortcuts value: String) -> Bdo { + return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) + } + + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") + public func aria(label value: String) -> Bdo { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ value: String) -> Bdo { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Bdo { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) } - public func aria(label value: String) -> Bdo { + public func accessibilityLabel(verbatim value: String) -> Bdo { return mutate(arialabel: .init(value, context: .tainted(.html))) } @@ -19963,14 +23158,28 @@ extension Bdo: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Bdo { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Bdo { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Bdo { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Bdo { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Bdo { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Bdo { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -20047,7 +23256,7 @@ public struct Span: ContentNode, HtmlElement, BodyElement, FormElement, FigureEl } } -extension Span: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { +extension Span: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, OrientationAccessibilityAttribute, RequiredAccessibilityAttribute, ReadOnlyAccessibilityAttribute { public func accessKey(_ value: Character) -> Span { return mutate(accesskey: .init("\(value)", context: .trusted)) @@ -20302,10 +23511,15 @@ extension Span: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Span { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Span { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Span { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -20322,50 +23536,111 @@ extension Span: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Span { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Span { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Span { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Span { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Span { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Span { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Span { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Span { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Span { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Span { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Span { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Span { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Span { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Span { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Span { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Span { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Span { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Span { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Span { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Span { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Span { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Span { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Span { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Span { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -20373,6 +23648,18 @@ extension Span: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes { public func aria(roleDescription value: String) -> Span { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + + public func accessibilityOrientation(_ value: Values.Accessibility.Orientation) -> Span { + return mutate(ariaorientation: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityRequired(_ value: Bool = true) -> Span { + return mutate(ariarequired: .init(value, context: .trusted)) + } + + public func accessibilityReadonly(_ value: Bool = true) -> Span { + return mutate(ariareadonly: .init(value, context: .trusted)) + } } /// An element that represents a line break. @@ -20682,10 +23969,15 @@ extension LineBreak: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> LineBreak { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> LineBreak { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> LineBreak { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -20702,50 +23994,111 @@ extension LineBreak: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> LineBreak { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> LineBreak { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> LineBreak { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> LineBreak { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> LineBreak { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> LineBreak { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> LineBreak { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> LineBreak { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> LineBreak { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> LineBreak { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> LineBreak { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> LineBreak { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> LineBreak { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> LineBreak { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> LineBreak { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> LineBreak { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> LineBreak { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> LineBreak { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> LineBreak { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> LineBreak { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> LineBreak { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> LineBreak { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> LineBreak { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> LineBreak { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -21066,10 +24419,15 @@ extension WordBreak: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> WordBreak { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> WordBreak { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> WordBreak { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -21086,50 +24444,111 @@ extension WordBreak: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> WordBreak { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> WordBreak { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> WordBreak { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> WordBreak { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> WordBreak { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> WordBreak { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> WordBreak { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> WordBreak { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> WordBreak { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> WordBreak { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> WordBreak { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> WordBreak { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> WordBreak { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> WordBreak { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> WordBreak { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> WordBreak { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> WordBreak { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> WordBreak { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> WordBreak { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> WordBreak { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> WordBreak { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> WordBreak { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> WordBreak { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> WordBreak { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -21469,10 +24888,15 @@ extension InsertedText: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttri return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> InsertedText { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> InsertedText { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> InsertedText { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -21489,49 +24913,110 @@ extension InsertedText: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttri return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> InsertedText { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> InsertedText { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> InsertedText { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> InsertedText { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> InsertedText { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> InsertedText { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> InsertedText { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> InsertedText { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> InsertedText { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> InsertedText { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> InsertedText { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> InsertedText { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> InsertedText { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> InsertedText { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> InsertedText { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> InsertedText { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> InsertedText { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> InsertedText { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> InsertedText { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> InsertedText { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> InsertedText { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + + public func accessibilityOwns(_ ids: [String]) -> InsertedText { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> InsertedText { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } public func aria(relevant value: Values.Accessibility.Relevant) -> InsertedText { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) @@ -21872,10 +25357,15 @@ extension DeletedText: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> DeletedText { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> DeletedText { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> DeletedText { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -21892,50 +25382,111 @@ extension DeletedText: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> DeletedText { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> DeletedText { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> DeletedText { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> DeletedText { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> DeletedText { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> DeletedText { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> DeletedText { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> DeletedText { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> DeletedText { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> DeletedText { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> DeletedText { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> DeletedText { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> DeletedText { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> DeletedText { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> DeletedText { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> DeletedText { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> DeletedText { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> DeletedText { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> DeletedText { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> DeletedText { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> DeletedText { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> DeletedText { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> DeletedText { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> DeletedText { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -22657,10 +26208,15 @@ extension Image: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Image { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Image { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Image { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -22677,50 +26233,111 @@ extension Image: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Image { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Image { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Image { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Image { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Image { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Image { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Image { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Image { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Image { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Image { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Image { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Image { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Image { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Image { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Image { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Image { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Image { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Image { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Image { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Image { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Image { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Image { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Image { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Image { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -23097,10 +26714,15 @@ extension InlineFrame: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> InlineFrame { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> InlineFrame { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> InlineFrame { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -23117,50 +26739,111 @@ extension InlineFrame: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> InlineFrame { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> InlineFrame { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> InlineFrame { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> InlineFrame { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> InlineFrame { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> InlineFrame { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> InlineFrame { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } - + + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> InlineFrame { return mutate(ariahidden: .init(value, context: .trusted)) } - public func aria(invalid value: Values.Accessibility.Invalid) -> InlineFrame { + public func accessibilityHidden(_ value: Bool = true) -> InlineFrame { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") + public func aria(invalid value: Values.Accessibility.Invalid) -> InlineFrame { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> InlineFrame { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> InlineFrame { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> InlineFrame { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> InlineFrame { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> InlineFrame { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> InlineFrame { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> InlineFrame { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> InlineFrame { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> InlineFrame { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> InlineFrame { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> InlineFrame { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> InlineFrame { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> InlineFrame { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> InlineFrame { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -23499,10 +27182,15 @@ extension Embed: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Embed { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Embed { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Embed { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -23519,50 +27207,111 @@ extension Embed: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Embed { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Embed { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Embed { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Embed { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Embed { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Embed { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Embed { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Embed { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Embed { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Embed { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Embed { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Embed { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Embed { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Embed { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Embed { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Embed { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Embed { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Embed { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Embed { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Embed { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Embed { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Embed { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Embed { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Embed { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -23919,10 +27668,15 @@ extension Object: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Object { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Object { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Object { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -23939,50 +27693,111 @@ extension Object: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Object { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Object { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Object { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Object { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Object { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Object { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Object { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Object { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Object { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Object { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Object { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Object { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Object { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Object { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Object { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Object { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Object { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Object { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Object { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Object { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Object { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Object { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Object { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Object { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -24375,10 +28190,15 @@ extension Video: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Video { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Video { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Video { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -24395,50 +28215,111 @@ extension Video: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Video { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Video { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Video { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Video { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Video { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Video { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Video { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Video { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Video { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Video { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Video { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Video { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Video { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Video { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Video { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Video { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Video { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Video { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Video { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Video { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Video { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Video { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Video { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Video { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -24814,10 +28695,15 @@ extension Audio: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Audio { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Audio { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Audio { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -24834,50 +28720,111 @@ extension Audio: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Audio { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Audio { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Audio { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Audio { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Audio { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Audio { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Audio { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Audio { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Audio { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Audio { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Audio { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Audio { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Audio { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Audio { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Audio { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Audio { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Audio { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Audio { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Audio { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Audio { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Audio { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Audio { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Audio { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Audio { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -25586,10 +29533,15 @@ extension Form: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, A return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Form { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Form { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Form { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -25606,50 +29558,111 @@ extension Form: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, A return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Form { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Form { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Form { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Form { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Form { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Form { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Form { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Form { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Form { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Form { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Form { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Form { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Form { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Form { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Form { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Form { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Form { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Form { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Form { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Form { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Form { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Form { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Form { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Form { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -25988,10 +30001,15 @@ extension DataList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> DataList { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> DataList { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> DataList { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -26008,50 +30026,111 @@ extension DataList: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> DataList { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> DataList { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> DataList { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> DataList { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> DataList { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> DataList { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> DataList { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> DataList { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> DataList { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> DataList { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> DataList { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> DataList { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> DataList { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> DataList { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> DataList { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> DataList { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> DataList { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> DataList { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> DataList { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> DataList { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> DataList { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> DataList { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> DataList { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> DataList { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -26397,10 +30476,15 @@ extension Output: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Output { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Output { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Output { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -26417,50 +30501,111 @@ extension Output: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Output { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Output { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Output { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } - public func aria(flowTo value: String) -> Output { - return mutate(ariaflowto: .init(value, context: .tainted(.html))) + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") + public func aria(flowTo value: String) -> Output { + return mutate(ariaflowto: .init(value, context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: [String]) -> Output { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Output { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) } public func aria(hasPopup value: Values.Accessibility.Popup) -> Output { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Output { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Output { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Output { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Output { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Output { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Output { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Output { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Output { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Output { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Output { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Output { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Output { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Output { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Output { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Output { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Output { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Output { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -26811,10 +30956,15 @@ extension Progress: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Progress { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Progress { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Progress { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -26831,50 +30981,111 @@ extension Progress: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Progress { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Progress { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Progress { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Progress { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Progress { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Progress { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Progress { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Progress { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Progress { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Progress { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Progress { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Progress { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Progress { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Progress { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Progress { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Progress { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Progress { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Progress { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Progress { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Progress { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Progress { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Progress { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Progress { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Progress { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -27243,6 +31454,7 @@ extension Meter: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Meter { return mutate(ariabusy: .init(value, context: .trusted)) } @@ -27259,54 +31471,119 @@ extension Meter: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadescribedby: .init(value, context: .tainted(.html))) } + public func accessibilityBusy(_ value: Bool = true) -> Meter { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(details value: String) -> Meter { return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Meter { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Meter { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Meter { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Meter { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Meter { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Meter { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Meter { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Meter { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Meter { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Meter { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Meter { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Meter { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Meter { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Meter { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Meter { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Meter { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Meter { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Meter { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Meter { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Meter { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Meter { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Meter { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Meter { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Meter { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -27666,10 +31943,15 @@ extension Details: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Details { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Details { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Details { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -27686,50 +31968,111 @@ extension Details: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Details { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Details { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Details { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Details { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Details { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Details { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Details { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Details { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Details { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Details { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Details { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Details { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Details { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Details { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Details { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Details { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Details { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Details { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Details { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Details { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Details { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Details { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Details { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Details { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -28085,10 +32428,15 @@ extension Dialog: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Dialog { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Dialog { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Dialog { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -28105,50 +32453,111 @@ extension Dialog: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Dialog { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Dialog { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Dialog { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Dialog { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Dialog { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Dialog { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Dialog { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Dialog { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Dialog { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Dialog { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Dialog { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Dialog { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Dialog { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Dialog { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Dialog { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Dialog { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Dialog { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Dialog { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Dialog { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Dialog { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Dialog { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Dialog { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Dialog { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Dialog { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -29498,10 +33907,15 @@ extension Canvas: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Canvas { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Canvas { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Canvas { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -29518,50 +33932,111 @@ extension Canvas: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Canvas { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Canvas { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Canvas { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Canvas { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Canvas { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Canvas { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Canvas { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Canvas { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Canvas { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Canvas { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Canvas { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Canvas { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Canvas { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Canvas { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Canvas { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Canvas { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Canvas { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Canvas { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Canvas { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Canvas { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Canvas { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Canvas { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Canvas { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Canvas { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -29645,7 +34120,7 @@ public struct Table: ContentNode, HtmlElement, BodyElement, FormElement, FigureE } } -extension Table: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, WidthAttribute, HeightAttribute { +extension Table: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, WidthAttribute, HeightAttribute, RowCountAccessibilityAttribute, ColumnCountAccessibilityAttribute { public func accessKey(_ value: Character) -> Table { return mutate(accesskey: .init("\(value)", context: .trusted)) @@ -29908,10 +34383,15 @@ extension Table: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Table { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Table { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Table { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -29928,50 +34408,111 @@ extension Table: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Table { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Table { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Table { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Table { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Table { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Table { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Table { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Table { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Table { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Table { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Table { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Table { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Table { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Table { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Table { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Table { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Table { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Table { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Table { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Table { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Table { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Table { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Table { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Table { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -29979,6 +34520,14 @@ extension Table: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, public func aria(roleDescription value: String) -> Table { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + + public func accessibilityRowCount(_ value: Int) -> Table { + return mutate(ariarowcount: .init(value, context: .trusted)) + } + + public func accessibilityColumnCount(_ value: Int) -> Table { + return mutate(ariacolcount: .init(value, context: .trusted)) + } } /// An element that represents a vector graphic. diff --git a/Sources/HTMLKit/Abstraction/Elements/DefinitionElements.swift b/Sources/HTMLKit/Abstraction/Elements/DefinitionElements.swift index 5f3b0de4..28f72d4b 100644 --- a/Sources/HTMLKit/Abstraction/Elements/DefinitionElements.swift +++ b/Sources/HTMLKit/Abstraction/Elements/DefinitionElements.swift @@ -336,10 +336,15 @@ extension TermName: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> TermName { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> TermName { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> TermName { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -356,50 +361,111 @@ extension TermName: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> TermName { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> TermName { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> TermName { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> TermName { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> TermName { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> TermName { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> TermName { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> TermName { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> TermName { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> TermName { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> TermName { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> TermName { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> TermName { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> TermName { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> TermName { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> TermName { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> TermName { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> TermName { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> TermName { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> TermName { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> TermName { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> TermName { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> TermName { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> TermName { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -736,10 +802,15 @@ extension TermDefinition: GlobalAttributes, GlobalEventAttributes, GlobalAriaAtt return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> TermDefinition { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> TermDefinition { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> TermDefinition { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -756,50 +827,111 @@ extension TermDefinition: GlobalAttributes, GlobalEventAttributes, GlobalAriaAtt return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> TermDefinition { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> TermDefinition { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> TermDefinition { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> TermDefinition { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> TermDefinition { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> TermDefinition { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> TermDefinition { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> TermDefinition { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> TermDefinition { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> TermDefinition { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> TermDefinition { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> TermDefinition { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> TermDefinition { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> TermDefinition { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> TermDefinition { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> TermDefinition { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> TermDefinition { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> TermDefinition { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> TermDefinition { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> TermDefinition { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> TermDefinition { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> TermDefinition { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> TermDefinition { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> TermDefinition { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } diff --git a/Sources/HTMLKit/Abstraction/Elements/FigureElements.swift b/Sources/HTMLKit/Abstraction/Elements/FigureElements.swift index 34effaf5..4562d601 100644 --- a/Sources/HTMLKit/Abstraction/Elements/FigureElements.swift +++ b/Sources/HTMLKit/Abstraction/Elements/FigureElements.swift @@ -332,10 +332,15 @@ extension FigureCaption: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttr return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> FigureCaption { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> FigureCaption { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> FigureCaption { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -352,50 +357,111 @@ extension FigureCaption: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttr return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> FigureCaption { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> FigureCaption { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> FigureCaption { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> FigureCaption { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> FigureCaption { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> FigureCaption { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> FigureCaption { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> FigureCaption { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> FigureCaption { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> FigureCaption { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> FigureCaption { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Figcaption { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> FigureCaption { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> FigureCaption { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> FigureCaption { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> FigureCaption { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> FigureCaption { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> FigureCaption { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> FigureCaption { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> FigureCaption { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> FigureCaption { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> FigureCaption { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> FigureCaption { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> FigureCaption { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } diff --git a/Sources/HTMLKit/Abstraction/Elements/FormElements.swift b/Sources/HTMLKit/Abstraction/Elements/FormElements.swift index 71f72edd..6a0ac56e 100644 --- a/Sources/HTMLKit/Abstraction/Elements/FormElements.swift +++ b/Sources/HTMLKit/Abstraction/Elements/FormElements.swift @@ -839,10 +839,15 @@ extension Label: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Label { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Label { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Label { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -859,50 +864,111 @@ extension Label: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Label { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Label { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Label { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Label { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Label { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Label { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Label { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Label { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Label { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Label { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Label { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Label { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Label { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Label { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Label { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Label { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Label { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Label { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Label { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Label { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Label { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Label { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Label { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Label { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -1713,10 +1779,15 @@ extension TextArea: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> TextArea { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> TextArea { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> TextArea { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -1733,50 +1804,111 @@ extension TextArea: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> TextArea { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> TextArea { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> TextArea { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> TextArea { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> TextArea { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> TextArea { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> TextArea { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> TextArea { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> TextArea { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> TextArea { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> TextArea { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> TextArea { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> TextArea { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> TextArea { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> TextArea { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> TextArea { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> TextArea { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> TextArea { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> TextArea { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> TextArea { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> TextArea { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> TextArea { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> TextArea { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> TextArea { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -2165,10 +2297,15 @@ extension Button: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Button { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Button { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Button { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -2185,50 +2322,111 @@ extension Button: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Button { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Button { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Button { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Button { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Button { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Button { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Button { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Button { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Button { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Button { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Button { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Button { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Button { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Button { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Button { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Button { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Button { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Button { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Button { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Button { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Button { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Button { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Button { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Button { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -2596,9 +2794,14 @@ extension Fieldset: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Fieldset { return mutate(ariabusy: .init(value, context: .trusted)) } + + public func accessibilityBusy(_ value: Bool = true) -> Fieldset { + return mutate(ariabusy: .init(value, context: .trusted)) + } public func aria(controls value: String) -> Fieldset { return mutate(ariacontrols: .init(value, context: .tainted(.html))) @@ -2616,50 +2819,111 @@ extension Fieldset: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Fieldset { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Fieldset { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Fieldset { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Fieldset { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Fieldset { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Fieldset { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Fieldset { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Fieldset { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Fieldset { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Fieldset { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Fieldset { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Fieldset { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Fieldset { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Fieldset { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Fieldset { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Fieldset { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Fieldset { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Fieldset { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Fieldset { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Fieldset { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Fieldset { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Fieldset { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Fieldset { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Fieldset { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } diff --git a/Sources/HTMLKit/Abstraction/Elements/HtmlElements.swift b/Sources/HTMLKit/Abstraction/Elements/HtmlElements.swift index 067bca1b..a2d6c4c0 100644 --- a/Sources/HTMLKit/Abstraction/Elements/HtmlElements.swift +++ b/Sources/HTMLKit/Abstraction/Elements/HtmlElements.swift @@ -651,10 +651,15 @@ extension Body: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, W return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Body { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Body { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Body { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -671,50 +676,111 @@ extension Body: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, W return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Body { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Body { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Body { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Body { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Body { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Body { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Body { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Body { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Body { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Body { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Body { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Body { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Body { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Body { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Body { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Body { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Body { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Body { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Body { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Body { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Body { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Body { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Body { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Body { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } diff --git a/Sources/HTMLKit/Abstraction/Elements/InputElements.swift b/Sources/HTMLKit/Abstraction/Elements/InputElements.swift index 8060efbf..fa17d622 100644 --- a/Sources/HTMLKit/Abstraction/Elements/InputElements.swift +++ b/Sources/HTMLKit/Abstraction/Elements/InputElements.swift @@ -360,10 +360,15 @@ extension OptionGroup: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> OptionGroup { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> OptionGroup { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> OptionGroup { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -380,50 +385,111 @@ extension OptionGroup: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttrib return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> OptionGroup { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> OptionGroup { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> OptionGroup { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> OptionGroup { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> OptionGroup { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> OptionGroup { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> OptionGroup { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> OptionGroup { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> OptionGroup { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> OptionGroup { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> OptionGroup { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> OptionGroup { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> OptionGroup { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> OptionGroup { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> OptionGroup { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> OptionGroup { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> OptionGroup { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> OptionGroup { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> OptionGroup { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> OptionGroup { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> OptionGroup { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> OptionGroup { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> OptionGroup { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> OptionGroup { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -802,10 +868,15 @@ extension Option: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Option { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Option { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Option { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -822,50 +893,111 @@ extension Option: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Option { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Option { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Option { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Option { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Option { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Option { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Option { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Option { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Option { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Option { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Option { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Option { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Option { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Option { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Option { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Option { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Option { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Option { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Option { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Option { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Option { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Option { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Option { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Option { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -1210,10 +1342,15 @@ extension Legend: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Legend { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Legend { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Legend { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -1230,50 +1367,111 @@ extension Legend: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Legend { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Legend { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Legend { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Legend { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Legend { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Legend { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Legend { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Legend { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Legend { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Legend { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Legend { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Legend { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Legend { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Legend { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Legend { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Legend { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Legend { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Legend { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Legend { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Legend { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Legend { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Legend { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Legend { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Legend { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -1610,10 +1808,15 @@ extension Summary: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Summary { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Summary { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Summary { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -1630,50 +1833,111 @@ extension Summary: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Summary { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Summary { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Summary { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Summary { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Summary { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Summary { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Summary { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Summary { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Summary { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Summary { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Summary { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Summary { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Summary { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Summary { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Summary { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Summary { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Summary { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Summary { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Summary { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Summary { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Summary { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Summary { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Summary { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Summary { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } diff --git a/Sources/HTMLKit/Abstraction/Elements/ListElements.swift b/Sources/HTMLKit/Abstraction/Elements/ListElements.swift index 1bd72a4b..97c97b7c 100644 --- a/Sources/HTMLKit/Abstraction/Elements/ListElements.swift +++ b/Sources/HTMLKit/Abstraction/Elements/ListElements.swift @@ -77,7 +77,7 @@ public struct ListItem: ContentNode, ListElement { } } -extension ListItem: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, ValueAttribute { +extension ListItem: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, ValueAttribute, RequiredAccessibilityAttribute, PositionAccessibilityAttribute { public func accessKey(_ value: Character) -> ListItem { return mutate(accesskey: .init("\(value)", context: .trusted)) @@ -345,10 +345,15 @@ extension ListItem: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> ListItem { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> ListItem { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> ListItem { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -365,50 +370,111 @@ extension ListItem: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> ListItem { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> ListItem { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> ListItem { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> ListItem { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> ListItem { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> ListItem { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> ListItem { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> ListItem { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> ListItem { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> ListItem { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> ListItem { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> ListItem { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> ListItem { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> ListItem { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> ListItem { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> ListItem { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> ListItem { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> ListItem { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> ListItem { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> ListItem { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> ListItem { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> ListItem { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> ListItem { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> ListItem { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -416,4 +482,12 @@ extension ListItem: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute public func aria(roleDescription value: String) -> ListItem { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + + public func accessibilityRequired(_ value: Bool = true) -> ListItem { + return mutate(ariarequired: .init(value, context: .trusted)) + } + + public func accessibilityPosition(_ index: Int, in size: Int) -> ListItem { + return mutate(ariaposinset: .init(index, context: .trusted)).mutate(ariasetsize: .init(size, context: .trusted)) + } } diff --git a/Sources/HTMLKit/Abstraction/Elements/MapElements.swift b/Sources/HTMLKit/Abstraction/Elements/MapElements.swift index 7686fee1..5446b99e 100644 --- a/Sources/HTMLKit/Abstraction/Elements/MapElements.swift +++ b/Sources/HTMLKit/Abstraction/Elements/MapElements.swift @@ -375,10 +375,15 @@ extension Area: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, A return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Area { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Area { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Area { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -395,50 +400,111 @@ extension Area: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, A return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Area { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Area { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Area { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Area { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Area { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Area { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Area { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Area { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Area { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Area { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Area { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Area { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Area { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Area { return mutate(arialabel: .init(value, context: .tainted(.html))) } + + public func accessibilityLabel(_ value: String) -> Area { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Area { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Area { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } public func aria(labeledBy value: String) -> Area { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Area { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Area { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Area { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Area { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Area { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Area { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } diff --git a/Sources/HTMLKit/Abstraction/Elements/RubyElements.swift b/Sources/HTMLKit/Abstraction/Elements/RubyElements.swift index 1cb16d45..24ce4087 100644 --- a/Sources/HTMLKit/Abstraction/Elements/RubyElements.swift +++ b/Sources/HTMLKit/Abstraction/Elements/RubyElements.swift @@ -334,10 +334,15 @@ extension RubyText: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> RubyText { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> RubyText { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> RubyText { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -354,50 +359,111 @@ extension RubyText: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> RubyText { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> RubyText { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> RubyText { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> RubyText { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> RubyText { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> RubyText { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> RubyText { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> RubyText { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> RubyText { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> RubyText { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> RubyText { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> RubyText { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> RubyText { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> RubyText { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> RubyText { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> RubyText { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> RubyText { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> RubyText { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> RubyText { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> RubyText { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> RubyText { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> RubyText { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> RubyText { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> RubyText { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -739,10 +805,15 @@ extension RubyPronunciation: GlobalAttributes, GlobalEventAttributes, GlobalAria return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> RubyPronunciation { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> RubyPronunciation { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> RubyPronunciation { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -759,50 +830,111 @@ extension RubyPronunciation: GlobalAttributes, GlobalEventAttributes, GlobalAria return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> RubyPronunciation { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> RubyPronunciation { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> RubyPronunciation { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> RubyPronunciation { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> RubyPronunciation { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> RubyPronunciation { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> RubyPronunciation { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> RubyPronunciation { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> RubyPronunciation { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> RubyPronunciation { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> RubyPronunciation { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> RubyPronunciation { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> RubyPronunciation { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> RubyPronunciation { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> RubyPronunciation { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> RubyPronunciation { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> RubyPronunciation { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> RubyPronunciation { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> RubyPronunciation { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> RubyPronunciation { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> RubyPronunciation { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> RubyPronunciation { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> RubyPronunciation { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> RubyPronunciation { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } diff --git a/Sources/HTMLKit/Abstraction/Elements/TableElements.swift b/Sources/HTMLKit/Abstraction/Elements/TableElements.swift index 417d1454..b845969d 100644 --- a/Sources/HTMLKit/Abstraction/Elements/TableElements.swift +++ b/Sources/HTMLKit/Abstraction/Elements/TableElements.swift @@ -357,10 +357,15 @@ extension Caption: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> Caption { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> Caption { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> Caption { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -377,50 +382,111 @@ extension Caption: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> Caption { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> Caption { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> Caption { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> Caption { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> Caption { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> Caption { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> Caption { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> Caption { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> Caption { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> Caption { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> Caption { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Caption { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> Caption { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> Caption { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> Caption { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> Caption { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> Caption { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> Caption { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> Caption { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> Caption { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> Caption { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> Caption { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> Caption { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> Caption { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -1410,10 +1476,15 @@ extension TableBody: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> TableBody { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> TableBody { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> TableBody { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -1430,50 +1501,111 @@ extension TableBody: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> TableBody { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> TableBody { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> TableBody { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> TableBody { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> TableBody { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> TableBody { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> TableBody { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> TableBody { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> TableBody { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> TableBody { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> TableBody { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> TableBody { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> TableBody { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> TableBody { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> TableBody { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> TableBody { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> TableBody { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> TableBody { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> TableBody { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> TableBody { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> TableBody { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> TableBody { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> TableBody { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> TableBody { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -1826,10 +1958,15 @@ extension TableHead: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> TableHead { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> TableHead { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> TableHead { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -1846,50 +1983,111 @@ extension TableHead: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> TableHead { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> TableHead { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> TableHead { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> TableHead { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> TableHead { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> TableHead { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> TableHead { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> TableHead { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> TableHead { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> TableHead { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> TableHead { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> TableHead { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> TableHead { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> TableHead { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> TableHead { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> TableHead { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> TableHead { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> TableHead { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> TableHead { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> TableHead { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> TableHead { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> TableHead { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> TableHead { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> TableHead { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -2234,10 +2432,15 @@ extension TableFoot: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> TableFoot { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> TableFoot { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> TableFoot { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -2254,50 +2457,111 @@ extension TableFoot: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribut return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> TableFoot { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> TableFoot { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> TableFoot { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> TableFoot { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> TableFoot { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> TableFoot { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> TableFoot { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> TableFoot { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> TableFoot { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> TableFoot { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> TableFoot { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> TableFoot { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> TableFoot { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> TableFoot { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> TableFoot { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> TableFoot { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> TableFoot { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> TableFoot { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> TableFoot { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> TableFoot { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> TableFoot { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> TableFoot { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> TableFoot { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> TableFoot { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -2381,7 +2645,7 @@ public struct TableRow: ContentNode, TableElement { } } -extension TableRow: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, WidthAttribute, HeightAttribute { +extension TableRow: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, WidthAttribute, HeightAttribute, RowIndexAccessibilityAttribute, ColumnIndexAccessibilityAttribute { public func accessKey(_ value: Character) -> TableRow { return mutate(accesskey: .init("\(value)", context: .trusted)) @@ -2644,10 +2908,15 @@ extension TableRow: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> TableRow { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> TableRow { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> TableRow { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -2664,50 +2933,111 @@ extension TableRow: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> TableRow { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> TableRow { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> TableRow { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> TableRow { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> TableRow { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> TableRow { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> TableRow { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> TableRow { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> TableRow { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> TableRow { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> TableRow { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> TableRow { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> TableRow { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> TableRow { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> TableRow { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> TableRow { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> TableRow { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> TableRow { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> TableRow { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> TableRow { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> TableRow { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> TableRow { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> TableRow { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> TableRow { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -2715,6 +3045,14 @@ extension TableRow: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute public func aria(roleDescription value: String) -> TableRow { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + + public func accessibilityRowIndex(_ value: Int) -> TableRow { + return mutate(ariarowindex: .init(value, context: .trusted)) + } + + public func accessibilityColumnIndex(_ value: Int) -> TableRow { + return mutate(ariacolindex: .init(value, context: .trusted)) + } } /// An element that represents a table cell. @@ -2788,7 +3126,7 @@ public struct DataCell: ContentNode, TableElement { } } -extension DataCell: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, ColumnSpanAttribute, RowSpanAttribute, HeadersAttribute { +extension DataCell: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, ColumnSpanAttribute, RowSpanAttribute, HeadersAttribute, RowSpanAccessibilityAttribute, ColumnSpanAccessibilityAttribute { public func accessKey(_ value: Character) -> DataCell { return mutate(accesskey: .init("\(value)", context: .trusted)) @@ -3060,10 +3398,15 @@ extension DataCell: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> DataCell { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> DataCell { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> DataCell { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -3080,50 +3423,111 @@ extension DataCell: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> DataCell { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> DataCell { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> DataCell { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> DataCell { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> DataCell { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> DataCell { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> DataCell { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> DataCell { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> DataCell { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> DataCell { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> DataCell { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> DataCell { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> DataCell { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> DataCell { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> DataCell { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> DataCell { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> DataCell { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> DataCell { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> DataCell { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> DataCell { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> DataCell { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> DataCell { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> DataCell { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> DataCell { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -3131,6 +3535,14 @@ extension DataCell: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute public func aria(roleDescription value: String) -> DataCell { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + + public func accessibilityRowSpan(_ value: Int) -> DataCell { + return mutate(ariarowspan: .init(value, context: .trusted)) + } + + public func accessibilityColumnSpan(_ value: Int) -> DataCell { + return mutate(ariacolspan: .init(value, context: .trusted)) + } } /// An element that represents a table cell. @@ -3204,7 +3616,7 @@ public struct HeaderCell: ContentNode, TableElement { } } -extension HeaderCell: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, ColumnSpanAttribute, RowSpanAttribute, HeadersAttribute, ScopeAttribute { +extension HeaderCell: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, ColumnSpanAttribute, RowSpanAttribute, HeadersAttribute, ScopeAttribute, ColumnIndexAccessibilityAttribute { public func accessKey(_ value: Character) -> HeaderCell { return mutate(accesskey: .init("\(value)", context: .trusted)) @@ -3479,10 +3891,15 @@ extension HeaderCell: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu return mutate(ariaatomic: .init(value, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.") public func aria(busy value: Bool) -> HeaderCell { return mutate(ariabusy: .init(value, context: .trusted)) } + public func accessibilityBusy(_ value: Bool = true) -> HeaderCell { + return mutate(ariabusy: .init(value, context: .trusted)) + } + public func aria(controls value: String) -> HeaderCell { return mutate(ariacontrols: .init(value, context: .tainted(.html))) } @@ -3499,50 +3916,111 @@ extension HeaderCell: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu return mutate(ariadetails: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.") public func aria(disabled value: Bool) -> HeaderCell { return mutate(ariadisabled: .init(value, context: .trusted)) } + public func accessibilityDisabled(_ value: Bool = true) -> HeaderCell { + return mutate(ariadisabled: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(errorMessage value: String) -> HeaderCell { return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityFlowTo(_:) modifier instead.") public func aria(flowTo value: String) -> HeaderCell { return mutate(ariaflowto: .init(value, context: .tainted(.html))) } + public func accessibilityFlowTo(_ ids: [String]) -> HeaderCell { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityFlowTo(_ ids: String...) -> HeaderCell { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(hasPopup value: Values.Accessibility.Popup) -> HeaderCell { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } + @available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.") public func aria(hidden value: Bool) -> HeaderCell { return mutate(ariahidden: .init(value, context: .trusted)) } + public func accessibilityHidden(_ value: Bool = true) -> HeaderCell { + return mutate(ariahidden: .init(value, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") public func aria(invalid value: Values.Accessibility.Invalid) -> HeaderCell { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + public func accessibilityInvalid(_ value: Values.Accessibility.Invalid) -> HeaderCell { + return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) + } + + public func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> HeaderCell { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + public func aria(keyShortcuts value: String) -> HeaderCell { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.") public func aria(label value: String) -> HeaderCell { return mutate(arialabel: .init(value, context: .tainted(.html))) } + public func accessibilityLabel(_ value: String) -> HeaderCell { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + + public func accessibilityLabel(_ localizedKey: LocalizedStringKey, tableName: String? = nil) -> HeaderCell { + return mutate(arialabel: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + + public func accessibilityLabel(verbatim value: String) -> HeaderCell { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } + public func aria(labeledBy value: String) -> HeaderCell { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } + @available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.") public func aria(live value: Values.Accessibility.Live) -> HeaderCell { return mutate(arialive: .init(value.rawValue, context: .trusted)) } + public func accessibilityLive(_ value: Values.Accessibility.Live) -> HeaderCell { + return mutate(arialive: .init(value.rawValue, context: .trusted)) + } + + @available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.") public func aria(owns value: String) -> HeaderCell { return mutate(ariaowns: .init(value, context: .tainted(.html))) } + public func accessibilityOwns(_ ids: [String]) -> HeaderCell { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + public func accessibilityOwns(_ ids: String...) -> HeaderCell { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + public func aria(relevant value: Values.Accessibility.Relevant) -> HeaderCell { return mutate(ariarelevant: .init(value.rawValue, context: .trusted)) } @@ -3550,6 +4028,10 @@ extension HeaderCell: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribu public func aria(roleDescription value: String) -> HeaderCell { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + + public func accessibilityColumnIndex(_ value: Int) -> HeaderCell { + return mutate(ariacolindex: .init(value, context: .trusted)) + } } extension HeaderCell: Localizable { diff --git a/Sources/HTMLKit/Abstraction/Tokens/ValueTokens.swift b/Sources/HTMLKit/Abstraction/Tokens/ValueTokens.swift index 962dd2ef..58a246b1 100644 --- a/Sources/HTMLKit/Abstraction/Tokens/ValueTokens.swift +++ b/Sources/HTMLKit/Abstraction/Tokens/ValueTokens.swift @@ -1631,15 +1631,18 @@ public enum Values { /// An indicator of an input validation. /// /// ```swift - /// Input() - /// .aria(invalid: .true) + /// Division { + /// } + /// .accessibilityInvalid(.grammar) /// ``` public enum Invalid: String { /// Indicates that there are no detected errors. + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") case `false` /// Indicates that errors were detected. + @available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.") case `true` /// Indicates that a grammatical error was deteced. diff --git a/Tests/HTMLKitTests/AttributesTests.swift b/Tests/HTMLKitTests/AttributesTests.swift index 0869b63d..8a4dfe87 100644 --- a/Tests/HTMLKitTests/AttributesTests.swift +++ b/Tests/HTMLKitTests/AttributesTests.swift @@ -15,7 +15,7 @@ final class AttributesTests: XCTestCase { @ContentBuilder var body: Content } - typealias AllAttributes = AccessKeyAttribute & AcceptAttribute & ActionAttribute & AlternateAttribute & AsynchronouslyAttribute & AutocapitalizeAttribute & AutocompleteAttribute & AutofocusAttribute & AutoplayAttribute & CharsetAttribute & CheckedAttribute & CiteAttribute & ClassAttribute & ColumnsAttribute & ColumnSpanAttribute & ContentAttribute & EditAttribute & ControlsAttribute & CoordinatesAttribute & DataAttribute & DateTimeAttribute & DefaultAttribute & DeferAttribute & DirectionAttribute & DisabledAttribute & DownloadAttribute & DragAttribute & EncodingAttribute & EnterKeyAttribute & ForAttribute & FormAttribute & FormActionAttribute & EquivalentAttribute & HeadersAttribute & HeightAttribute & HiddenAttribute & HighAttribute & ReferenceAttribute & ReferenceLanguageAttribute & IdentifierAttribute & IsMapAttribute & InputModeAttribute & IsAttribute & ItemAttribute & ItemPropertyAttribute & KindAttribute & LabelAttribute & LanguageAttribute & ListAttribute & LoopAttribute & LowAttribute & MaximumValueAttribute & MaximumLengthAttribute & MediaAttribute & MethodAttribute & MinimumValueAttribute & MinimumLengthAttribute & MultipleAttribute & MutedAttribute & NameAttribute & NonceAttribute & NoValidateAttribute & OpenAttribute & OptimumAttribute & PatternAttribute & PartAttribute & PingAttribute & PlaceholderAttribute & PosterAttribute & PreloadAttribute & ReadOnlyAttribute & ReferrerPolicyAttribute & RelationshipAttribute & RequiredAttribute & ReversedAttribute & RoleAttribute & RowsAttribute & RowSpanAttribute & SandboxAttribute & ScopeAttribute & ShapeAttribute & SizeAttribute & SizesAttribute & SlotAttribute & SpanAttribute & SpellCheckAttribute & SourceAttribute & StartAttribute & StepAttribute & StyleAttribute & TabulatorAttribute & TargetAttribute & TitleAttribute & TranslateAttribute & TypeAttribute & ValueAttribute & WidthAttribute & WrapAttribute & PropertyAttribute & SelectedAttribute & WindowEventAttribute & FocusEventAttribute & PointerEventAttribute & MouseEventAttribute & WheelEventAttribute & InputEventAttribute & KeyboardEventAttribute & DragEventAttribute & ClipboardEventAttribute & SelectionEventAttribute & MediaEventAttribute & FormEventAttribute & DetailEventAttribute & AriaAtomicAttribute & AriaBusyAttribute & AriaControlsAttribute & AriaCurrentAttribute & AriaDescribedAttribute & AriaDetailsAttribute & AriaDisabledAttribute & AriaErrorMessageAttribute & AriaFlowToAttribute & AriaPopupAttribute & AriaHiddenAttribute & AriaInvalidAttribute & AriaShortcutsAttribute & AriaLabelAttribute & AriaLabeledAttribute & AriaLiveAttribute & AriaOwnsAttribute & AriaRelevantAttribute & AriaRoleDescriptionAttribute & DrawAttribute & FillAttribute & FillOpacityAttribute & StrokeAttribute & StrokeWidthAttribute & StrokeOpacityAttribute & StrokeLineCapAttribute & StrokeLineJoinAttribute & RadiusAttribute & PositionPointAttribute & RadiusPointAttribute & CenterPointAttribute & ViewBoxAttribute & NamespaceAttribute & PointsAttribute & ShadowRootModeAttribute & InertAttribute & FetchPriorityAttribute & LoadingAttribute & SourceSetAttribute & DecodingAttribute & BlockingAttribute & PopoverAttribute & PopoverTargetAttribute & PopoverActionAttribute & UseMapAttribute & PlaysInlineAttribute & IntegrityAttribute & AsAttribute & CrossOriginAttribute & SourceLanguageAttribute & SourceDocumentAttribute + typealias AllAttributes = AccessKeyAttribute & AcceptAttribute & ActionAttribute & AlternateAttribute & AsynchronouslyAttribute & AutocapitalizeAttribute & AutocompleteAttribute & AutofocusAttribute & AutoplayAttribute & CharsetAttribute & CheckedAttribute & CiteAttribute & ClassAttribute & ColumnsAttribute & ColumnSpanAttribute & ContentAttribute & EditAttribute & ControlsAttribute & CoordinatesAttribute & DataAttribute & DateTimeAttribute & DefaultAttribute & DeferAttribute & DirectionAttribute & DisabledAttribute & DownloadAttribute & DragAttribute & EncodingAttribute & EnterKeyAttribute & ForAttribute & FormAttribute & FormActionAttribute & EquivalentAttribute & HeadersAttribute & HeightAttribute & HiddenAttribute & HighAttribute & ReferenceAttribute & ReferenceLanguageAttribute & IdentifierAttribute & IsMapAttribute & InputModeAttribute & IsAttribute & ItemAttribute & ItemPropertyAttribute & KindAttribute & LabelAttribute & LanguageAttribute & ListAttribute & LoopAttribute & LowAttribute & MaximumValueAttribute & MaximumLengthAttribute & MediaAttribute & MethodAttribute & MinimumValueAttribute & MinimumLengthAttribute & MultipleAttribute & MutedAttribute & NameAttribute & NonceAttribute & NoValidateAttribute & OpenAttribute & OptimumAttribute & PatternAttribute & PartAttribute & PingAttribute & PlaceholderAttribute & PosterAttribute & PreloadAttribute & ReadOnlyAttribute & ReferrerPolicyAttribute & RelationshipAttribute & RequiredAttribute & ReversedAttribute & RoleAttribute & RowsAttribute & RowSpanAttribute & SandboxAttribute & ScopeAttribute & ShapeAttribute & SizeAttribute & SizesAttribute & SlotAttribute & SpanAttribute & SpellCheckAttribute & SourceAttribute & StartAttribute & StepAttribute & StyleAttribute & TabulatorAttribute & TargetAttribute & TitleAttribute & TranslateAttribute & TypeAttribute & ValueAttribute & WidthAttribute & WrapAttribute & PropertyAttribute & SelectedAttribute & WindowEventAttribute & FocusEventAttribute & PointerEventAttribute & MouseEventAttribute & WheelEventAttribute & InputEventAttribute & KeyboardEventAttribute & DragEventAttribute & ClipboardEventAttribute & SelectionEventAttribute & MediaEventAttribute & FormEventAttribute & DetailEventAttribute & AriaAtomicAttribute & BusyAccessibilityAttribute & AriaControlsAttribute & AriaCurrentAttribute & AriaDescribedAttribute & AriaDetailsAttribute & DisabledAccessibilityAttribute & FlowAccessibilityAttribute & AriaPopupAttribute & HiddenAccessibilityAttribute & InvalidAccessibilityAttribute & AriaShortcutsAttribute & LabelAccessibilityAttribute & AriaLabeledAttribute & LiveAccessibilityAttribute & OwnsAccessibilityAttribute & MultilineAccessibilityAttribute & RowIndexAccessibilityAttribute & AriaRelevantAttribute & AriaRoleDescriptionAttribute & SortAccessibilityAttribute & OrientationAccessibilityAttribute & RequiredAccessibilityAttribute & ReadOnlyAccessibilityAttribute & ModalAccessibilityAttribute & LevelAccessibilityAttribute & HintAccessibilityAttribute & PositionAccessibilityAttribute & MultiselectAccessibilityAttribute & RowCountAccessibilityAttribute & ColumnIndexAccessibilityAttribute & ColumnCountAccessibilityAttribute & RowSpanAccessibilityAttribute & ColumnSpanAccessibilityAttribute & MaximumValueAccessibilityAttribute & MinimumValueAccessibilityAttribute & ValueAccessibilityAttribute & DrawAttribute & FillAttribute & FillOpacityAttribute & StrokeAttribute & StrokeWidthAttribute & StrokeOpacityAttribute & StrokeLineCapAttribute & StrokeLineJoinAttribute & RadiusAttribute & PositionPointAttribute & RadiusPointAttribute & CenterPointAttribute & ViewBoxAttribute & NamespaceAttribute & PointsAttribute & ShadowRootModeAttribute & InertAttribute & FetchPriorityAttribute & LoadingAttribute & SourceSetAttribute & DecodingAttribute & BlockingAttribute & PopoverAttribute & PopoverTargetAttribute & PopoverActionAttribute & UseMapAttribute & PlaysInlineAttribute & IntegrityAttribute & AsAttribute & CrossOriginAttribute & SourceLanguageAttribute & SourceDocumentAttribute struct Tag: ContentNode, GlobalElement, AllAttributes { @@ -936,7 +936,7 @@ final class AttributesTests: XCTestCase { return mutate(ariaatomic: .init(value, context: .trusted)) } - func aria(busy value: Bool) -> Tag { + func accessibilityBusy(_ value: Bool = true) -> Tag { return mutate(ariabusy: .init(value, context: .trusted)) } @@ -956,35 +956,52 @@ final class AttributesTests: XCTestCase { return mutate(ariadetails: .init(value, context: .tainted(.html))) } - func aria(disabled value: Bool) -> Tag { + func accessibilityDisabled(_ value: Bool = true) -> Tag { return mutate(ariadisabled: .init(value, context: .trusted)) } - func aria(errorMessage value: String) -> Tag { - return mutate(ariaerrormessage: .init(value, context: .tainted(.html))) + func accessibilityFlowTo(_ ids: [String]) -> Tag { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) } - func aria(flowTo value: String) -> Tag { - return mutate(ariaflowto: .init(value, context: .tainted(.html))) + func accessibilityFlowTo(_ ids: String...) -> Tag { + return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) } func aria(hasPopup value: Values.Accessibility.Popup) -> Tag { return mutate(ariahaspopup: .init(value.rawValue, context: .trusted)) } - func aria(hidden value: Bool) -> Tag { + func accessibilityHidden(_ value: Bool = true) -> Tag { return mutate(ariahidden: .init(value, context: .trusted)) } - func aria(invalid value: Values.Accessibility.Invalid) -> Tag { + func accessibilityInvalid(_ value: HTMLKit.Values.Accessibility.Invalid) -> Tag { return mutate(ariainvalid: .init(value.rawValue, context: .trusted)) } + func accessibilityInvalid(_ value: Bool = true, message id: String? = nil) -> Tag { + + if let id = id { + return mutate(ariainvalid: .init(value, context: .trusted)).mutate(ariaerrormessage: .init(id, context: .tainted(.html))) + } + + return mutate(ariainvalid: .init(value, context: .trusted)) + } + func aria(keyShortcuts value: String) -> Tag { return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html))) } + + func accessibilityLabel(_ value: String) -> Tag { + return mutate(arialabel: .init(value, context: .tainted(.html))) + } - func aria(label value: String) -> Tag { + func accessibilityLabel(_ localized: LocalizedStringKey, tableName: String? = nil) -> Tag { + return mutate(arialabel: .init(LocalizedString(key: localized, table: tableName), context: .tainted(.html))) + } + + func accessibilityLabel(verbatim value: String) -> Tag { return mutate(arialabel: .init(value, context: .tainted(.html))) } @@ -992,12 +1009,16 @@ final class AttributesTests: XCTestCase { return mutate(arialabeledby: .init(value, context: .tainted(.html))) } - func aria(live value: Values.Accessibility.Live) -> Tag { + func accessibilityLive(_ value: Values.Accessibility.Live) -> Tag { return mutate(arialive: .init(value.rawValue, context: .trusted)) } - func aria(owns value: String) -> Tag { - return mutate(ariaowns: .init(value, context: .tainted(.html))) + func accessibilityOwns(_ ids: [String]) -> Tag { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) + } + + func accessibilityOwns(_ ids: String...) -> Tag { + return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html))) } func aria(relevant value: Values.Accessibility.Relevant) -> Tag { @@ -1008,6 +1029,101 @@ final class AttributesTests: XCTestCase { return mutate(ariaroledescription: .init(value, context: .tainted(.html))) } + func accessibilitySort(_ value: Values.Accessibility.Sort) -> Tag { + return mutate(ariasort: .init(value.rawValue, context: .trusted)) + } + + func accessibilityOrientation(_ value: Values.Accessibility.Orientation) -> Tag { + return mutate(ariaorientation: .init(value.rawValue, context: .trusted)) + } + + func accessibilityRequired(_ value: Bool = true) -> Tag { + return mutate(ariarequired: .init(value, context: .trusted)) + } + + func accessibilityReadonly(_ value: Bool = true) -> Tag { + return mutate(ariareadonly: .init(value, context: .trusted)) + } + + func accessibilityModal(_ value: Bool = true) -> Tag { + return mutate(ariamodal: .init(value, context: .trusted)) + } + + func accessibilityLevel(_ value: Int) -> Tag { + return mutate(arialevel: .init(value, context: .trusted)) + } + + @_disfavoredOverload + func accessibilityHint(_ value: String) -> Tag { + return mutate(ariaplaceholder: .init(value, context: .tainted(.html))) + } + + func accessibilityHint(_ localized: LocalizedStringKey, tableName: String? = nil) -> Tag { + return mutate(ariaplaceholder: .init(LocalizedString(key: localized, table: tableName), context: .tainted(.html))) + } + + func accessibilityHint(verbatim value: String) -> Tag { + return mutate(ariaplaceholder: .init(value, context: .tainted(.html))) + } + + func accessibilityPosition(_ index: Int, in size: Int) -> Tag { + return mutate(ariaposinset: .init(index, context: .trusted)).mutate(ariasetsize: .init(size, context: .trusted)) + } + + func accessibilityMultiline(_ value: Bool = true) -> Tag { + return mutate(ariamultiline: .init(value, context: .trusted)) + } + + func accessibilityMultiselect(_ value: Bool = true) -> Tag { + return mutate(ariamultiselectable: .init(value, context: .trusted)) + } + + func accessibilityRowIndex(_ value: Int) -> Tag { + return mutate(ariarowindex: .init(value, context: .trusted)) + } + + func accessibilityRowCount(_ value: Int) -> Tag { + return mutate(ariarowcount: .init(value, context: .trusted)) + } + + func accessibilityColumnIndex(_ value: Int) -> Tag { + return mutate(ariacolindex: .init(value, context: .trusted)) + } + + func accessibilityColumnCount(_ value: Int) -> Tag { + return mutate(ariacolcount: .init(value, context: .trusted)) + } + + func accessibilityRowSpan(_ value: Int) -> Tag { + return mutate(ariarowspan: .init(value, context: .trusted)) + } + + func accessibilityColumnSpan(_ value: Int) -> Tag { + return mutate(ariacolspan: .init(value, context: .trusted)) + } + + func accessibilityMaximumValue(_ value: Float) -> Tag { + return mutate(ariavaluemax: .init(value, context: .trusted)) + } + + func accessibilityMinimumValue(_ value: Float) -> Tag { + return mutate(ariavaluemin: .init(value, context: .trusted)) + } + + @_disfavoredOverload + func accessibilityValue(_ value: Float, description text: String? = nil) -> Tag { + + if let text = text { + return mutate(ariavaluenow: .init(value, context: .trusted)).mutate(ariavaluetext: .init(text, context: .tainted(.html))) + } + + return mutate(ariavaluenow: .init(value, context: .trusted)) + } + + func accessibilityValue(_ value: Float, description localizedKey: LocalizedStringKey, tableName: String? = nil) -> Tag { + return mutate(ariavaluenow: .init(value, context: .trusted)).mutate(ariavaluetext: .init(LocalizedString(key: localizedKey, table: tableName), context: .tainted(.html))) + } + func shadowRootMode(_ value: Values.Shadow.Mode) -> Tag { return mutate(shadowrootmode: .init(value.rawValue, context: .trusted)) } @@ -2775,14 +2891,18 @@ final class AttributesTests: XCTestCase { ) } - func testBusyAriaAttribute() throws { + func testBusyAccessibilityAttribute() throws { let view = TestView { - Tag {}.aria(busy: true) + Tag {}.accessibilityBusy() + Tag {}.accessibilityBusy(false) + Tag {}.accessibilityBusy(true) } XCTAssertEqual(try renderer.render(view: view), """ + \ + \ """ ) @@ -2840,41 +2960,36 @@ final class AttributesTests: XCTestCase { ) } - func testDisabledAriaAttribute() throws { + func testDisabledAccessibilityAttribute() throws { let view = TestView { - Tag {}.aria(disabled: true) + Tag {}.accessibilityDisabled() + Tag {}.accessibilityDisabled(false) + Tag {}.accessibilityDisabled(true) } XCTAssertEqual(try renderer.render(view: view), """ + \ + \ """ ) } - func testErrorMessageAriaAttribute() throws { + func testFlowAccessibilityAttribute() throws { let view = TestView { - Tag {}.aria(errorMessage: "error") + Tag {}.accessibilityFlowTo("id") + Tag {}.accessibilityFlowTo("id", "id") + Tag {}.accessibilityFlowTo(["id", "id"]) } XCTAssertEqual(try renderer.render(view: view), """ - - """ - ) - } - - func testFlowToAriaAttribute() throws { - - let view = TestView { - Tag {}.aria(flowTo: "flow") - } - - XCTAssertEqual(try renderer.render(view: view), - """ - + \ + \ + """ ) } @@ -2892,28 +3007,40 @@ final class AttributesTests: XCTestCase { ) } - func testHiddenAriaAttribute() throws { + func testHiddenAccessibilityAttribute() throws { let view = TestView { - Tag {}.aria(hidden: true) + Tag {}.accessibilityHidden() + Tag {}.accessibilityHidden(false) + Tag {}.accessibilityHidden(true) } XCTAssertEqual(try renderer.render(view: view), """ + \ + \ """ ) } - func testInvalidAriaAttribute() throws { + func testInvalidAccessibilityAttribute() throws { let view = TestView { - Tag {}.aria(invalid: .grammar) + Tag {}.accessibilityInvalid(.grammar) + Tag {}.accessibilityInvalid(.spelling) + Tag {}.accessibilityInvalid() + Tag {}.accessibilityInvalid(false) + Tag {}.accessibilityInvalid(message: "id") } XCTAssertEqual(try renderer.render(view: view), """ - + \ + \ + \ + \ + """ ) } @@ -2931,10 +3058,10 @@ final class AttributesTests: XCTestCase { ) } - func testLabelAriaAttribute() throws { + func testLabelAccessibilityAttribute() throws { let view = TestView { - Tag {}.aria(label: "label") + Tag {}.accessibilityLabel("label") } XCTAssertEqual(try renderer.render(view: view), @@ -2960,12 +3087,16 @@ final class AttributesTests: XCTestCase { func testLiveAriaAttribute() throws { let view = TestView { - Tag {}.aria(live: .polite) + Tag {}.accessibilityLive(.polite) + Tag {}.accessibilityLive(.assertive) + Tag {}.accessibilityLive(.off) } XCTAssertEqual(try renderer.render(view: view), """ - + \ + \ + """ ) } @@ -2973,12 +3104,16 @@ final class AttributesTests: XCTestCase { func testOwnsAriaAttribute() throws { let view = TestView { - Tag {}.aria(owns: "live") + Tag {}.accessibilityOwns("id") + Tag {}.accessibilityOwns("id", "id") + Tag {}.accessibilityOwns(["id", "id"]) } XCTAssertEqual(try renderer.render(view: view), """ - + \ + \ + """ ) } @@ -3009,6 +3144,279 @@ final class AttributesTests: XCTestCase { ) } + func testSortAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilitySort(.ascending) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testOrientationAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityOrientation(.horizontal) + Tag {}.accessibilityOrientation(.vertical) + Tag {}.accessibilityOrientation(.undefined) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + \ + \ + + """ + ) + } + + func testRequiredAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityRequired() + Tag {}.accessibilityRequired(false) + Tag {}.accessibilityRequired(true) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + \ + \ + + """ + ) + } + + func testReadOnlyAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityReadonly() + Tag {}.accessibilityReadonly(false) + Tag {}.accessibilityReadonly(true) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + \ + \ + + """ + ) + } + + func testModalAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityModal() + Tag {}.accessibilityModal(false) + Tag {}.accessibilityModal(true) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + \ + \ + + """ + ) + } + + func testLevelAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityLevel(2) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testHintAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityHint("Lorem ipsum...") + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testPositionAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityPosition(5, in: 10) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testMultilineAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityMultiline() + Tag {}.accessibilityMultiline(false) + Tag {}.accessibilityMultiline(true) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + \ + \ + + """ + ) + } + + func testMultiselectAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityMultiselect() + Tag {}.accessibilityMultiselect(false) + Tag {}.accessibilityMultiselect(true) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + \ + \ + + """ + ) + } + + func testRowIndexAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityRowIndex(10) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testRowCountAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityRowCount(10) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testColumnIndexAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityColumnIndex(10) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testColumnCountAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityColumnCount(10) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testRowSpanAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityRowSpan(10) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testColumnSpanAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityColumnSpan(10) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testMaximumValueAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityMaximumValue(10.0) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testMinimumValueAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityMinimumValue(10.0) + } + + XCTAssertEqual(try renderer.render(view: view), + """ + + """ + ) + } + + func testValueAccessibilityAttribute() throws { + + let view = TestView { + Tag {}.accessibilityValue(20.0) + Tag {}.accessibilityValue(20.0, description: "Twenty point zero") + } + + XCTAssertEqual(try renderer.render(view: view), + """ + \ + + """ + ) + } + func testDrawAttribute() throws { let view = TestView {