Skip to content

Revise accessibility attributes #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mattesmohr wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

Revise accessibility attributes #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bf49892
Revise the sort attribute
mattesmohr Feb 15, 2026
b9d63f0
Revise the flow attribute
mattesmohr Feb 16, 2026
9d7697d
Revise the label attribute
mattesmohr Feb 18, 2026
e8bc4c6
Revise the orientation attribute
mattesmohr Feb 18, 2026
9d01d39
Revise the required attribute
mattesmohr Feb 19, 2026
7a05471
Revise the readonly attribute
mattesmohr Feb 19, 2026
724fcb5
Revise the modal attribute
mattesmohr Feb 20, 2026
0d58b39
Revise the level attribute
mattesmohr Feb 20, 2026
02530a4
Revise the hidden attribute
mattesmohr Feb 20, 2026
08d1f24
Revise the live attribute
mattesmohr Feb 23, 2026
533b1a8
Revise the hint attribute
mattesmohr Feb 24, 2026
35e6939
Revise the disabled attribute
mattesmohr Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
373 changes: 274 additions & 99 deletions Sources/HTMLKit/Abstraction/Attributes/AriaAttributes.swift
View file
Open in desktop

Large diffs are not rendered by default.

2,560 changes: 2,548 additions & 12 deletions Sources/HTMLKit/Abstraction/Elements/BodyElements.swift
View file
Open in desktop

Large diffs are not rendered by default.

74 changes: 74 additions & 0 deletions Sources/HTMLKit/Abstraction/Elements/DefinitionElements.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,26 +356,45 @@ 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))
}

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))
}

public func aria(invalid value: Values.Accessibility.Invalid) -> TermName {
return mutate(ariainvalid: .init(value.rawValue, context: .trusted))
}
Expand All @@ -384,18 +403,36 @@ extension TermName: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttribute
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))
}

public func aria(owns value: String) -> TermName {
return mutate(ariaowns: .init(value, context: .tainted(.html)))
}
Expand Down Expand Up @@ -756,26 +793,45 @@ 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))
}

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))
}

public func aria(invalid value: Values.Accessibility.Invalid) -> TermDefinition {
return mutate(ariainvalid: .init(value.rawValue, context: .trusted))
}
Expand All @@ -784,18 +840,36 @@ extension TermDefinition: GlobalAttributes, GlobalEventAttributes, GlobalAriaAtt
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))
}

public func aria(owns value: String) -> TermDefinition {
return mutate(ariaowns: .init(value, context: .tainted(.html)))
}
Expand Down
37 changes: 37 additions & 0 deletions Sources/HTMLKit/Abstraction/Elements/FigureElements.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,26 +352,45 @@ 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))
}

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))
}

public func aria(invalid value: Values.Accessibility.Invalid) -> FigureCaption {
return mutate(ariainvalid: .init(value.rawValue, context: .trusted))
}
Expand All @@ -380,18 +399,36 @@ extension FigureCaption: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttr
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))
}

public func aria(owns value: String) -> FigureCaption {
return mutate(ariaowns: .init(value, context: .tainted(.html)))
}
Expand Down
Loading