Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 0 additions & 25 deletions Sources/HTMLKit/Abstraction/Elements/BasicElements.swift
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,6 @@ extension Html: GlobalContentAttributes, GlobalEventAttributes {
public func `class`(_ names: String...) -> Html {
return mutate(class: .init(EnumeratedList(values: names, separator: " "), context: .tainted(.html)))
}

@available(*, unavailable, message: "Use the editable(_:) modifier instead.")
public func isEditable(_ value: Bool) -> Html {
return mutate(contenteditable: .init(value, context: .trusted))
}

public func editable(_ value: Bool = true) -> Html {
return mutate(contenteditable: .init(value, context: .trusted))
Expand All @@ -167,20 +162,10 @@ extension Html: GlobalContentAttributes, GlobalEventAttributes {
public func direction(_ value: Values.Direction) -> Html {
return mutate(dir: .init(value.rawValue, context: .trusted))
}

@available(*, unavailable, message: "Use the draggable(_:) modifier instead.")
public func isDraggable(_ value: Bool) -> Html {
return mutate(draggable: .init(value, context: .trusted))
}

public func draggable(_ value: Bool = true) -> Html {
return mutate(draggable: .init(value, context: .trusted))
}

@available(*, unavailable, message: "Use the enterKey(_:) modifier instead.")
public func enterKeyHint(_ value: Values.Hint) -> Html {
return mutate(enterkeyhint: .init(value.rawValue, context: .trusted))
}

public func enterKey(_ value: Values.Hint) -> Html {
return mutate(enterkeyhint: .init(value.rawValue, context: .trusted))
Expand Down Expand Up @@ -270,11 +255,6 @@ extension Html: GlobalContentAttributes, GlobalEventAttributes {
public func role(_ values: Values.Role...) -> Html {
return mutate(role: .init(EnumeratedList(values: values, separator: " "), context: .trusted))
}

@available(*, unavailable, message: "Use the spellcheck(_:) modifier instead.")
public func hasSpellCheck(_ value: Bool) -> Html {
return mutate(spellcheck: .init(value, context: .trusted))
}

public func spellcheck(_ value: Bool = true) -> Html {
return mutate(spellcheck: .init(value, context: .trusted))
Expand All @@ -301,11 +281,6 @@ extension Html: GlobalContentAttributes, GlobalEventAttributes {
return mutate(title: .init(value, context: .tainted(.html)))
}

@available(*, unavailable, message: "Use the translate(_:) modifier instead.")
public func translate(_ value: Values.Decision) -> Html {
return mutate(translate: .init(value.rawValue, context: .trusted))
}

public func translate(_ value: Bool = true) -> Html {

if value {
Expand Down
4,518 changes: 1,274 additions & 3,244 deletions Sources/HTMLKit/Abstraction/Elements/BodyElements.swift

Large diffs are not rendered by default.

128 changes: 39 additions & 89 deletions Sources/HTMLKit/Abstraction/Elements/DefinitionElements.swift

Large diffs are not rendered by default.

63 changes: 19 additions & 44 deletions Sources/HTMLKit/Abstraction/Elements/FigureElements.swift
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,6 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
public func `class`(_ names: String...) -> FigureCaption {
return mutate(class: .init(EnumeratedList(values: names, separator: " "), context: .tainted(.html)))
}

@available(*, unavailable, message: "Use the editable(_:) modifier instead.")
public func isEditable(_ value: Bool) -> FigureCaption {
return mutate(contenteditable: .init(value, context: .trusted))
}

public func editable(_ value: Bool = true) -> FigureCaption {
return mutate(contenteditable: .init(value, context: .trusted))
Expand All @@ -111,20 +106,10 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
public func direction(_ value: Values.Direction) -> FigureCaption {
return mutate(dir: .init(value.rawValue, context: .trusted))
}

@available(*, unavailable, message: "Use the draggable(_:) modifier instead.")
public func isDraggable(_ value: Bool) -> FigureCaption {
return mutate(draggable: .init(value, context: .trusted))
}

public func draggable(_ value: Bool = true) -> FigureCaption {
return mutate(draggable: .init(value, context: .trusted))
}

@available(*, unavailable, message: "Use the enterKey(_:) modifier instead.")
public func enterKeyHint(_ value: Values.Hint) -> FigureCaption {
return mutate(enterkeyhint: .init(value.rawValue, context: .trusted))
}

public func enterKey(_ value: Values.Hint) -> FigureCaption {
return mutate(enterkeyhint: .init(value.rawValue, context: .trusted))
Expand Down Expand Up @@ -214,11 +199,6 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
public func role(_ values: Values.Role...) -> FigureCaption {
return mutate(role: .init(EnumeratedList(values: values, separator: " "), context: .trusted))
}

@available(*, unavailable, message: "Use the spellcheck(_:) modifier instead.")
public func hasSpellCheck(_ value: Bool) -> FigureCaption {
return mutate(spellcheck: .init(value, context: .trusted))
}

public func spellcheck(_ value: Bool = true) -> FigureCaption {
return mutate(spellcheck: .init(value, context: .trusted))
Expand All @@ -245,11 +225,6 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(title: .init(value, context: .tainted(.html)))
}

@available(*, unavailable, message: "Use the translate(_:) modifier instead.")
public func translate(_ value: Values.Decision) -> FigureCaption {
return mutate(translate: .init(value.rawValue, context: .trusted))
}

public func translate(_ value: Bool = true) -> FigureCaption {

if value {
Expand Down Expand Up @@ -316,7 +291,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(key: event.rawValue, value: .init(value, context: .tainted(.js)))
}

@available(*, deprecated, message: "Use the accessibilityAtomic(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityAtomic(_:) modifier instead.")
public func aria(atomic value: Bool) -> FigureCaption {
return mutate(ariaatomic: .init(value, context: .trusted))
}
Expand All @@ -325,7 +300,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariaatomic: .init(value, context: .trusted))
}

@available(*, deprecated, message: "Use the accessibilityBusy(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityBusy(_:) modifier instead.")
public func aria(busy value: Bool) -> FigureCaption {
return mutate(ariabusy: .init(value, context: .trusted))
}
Expand All @@ -334,7 +309,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariabusy: .init(value, context: .trusted))
}

@available(*, deprecated, message: "Use the accessibilityControls(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityControls(_:) modifier instead.")
public func aria(controls value: String) -> FigureCaption {
return mutate(ariacontrols: .init(value, context: .tainted(.html)))
}
Expand All @@ -347,7 +322,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariacontrols: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html)))
}

@available(*, deprecated, message: "Use the accessibilityCurrent(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityCurrent(_:) modifier instead.")
public func aria(current value: Values.Accessibility.Current) -> FigureCaption {
return mutate(ariacurrent: .init(value.rawValue, context: .trusted))
}
Expand All @@ -360,7 +335,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariacurrent: .init(value, context: .trusted))
}

@available(*, deprecated, message: "Use the accessibilityDescriptions(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityDescriptions(_:) modifier instead.")
public func aria(describedBy value: String) -> FigureCaption {
return mutate(ariadescribedby: .init(value, context: .tainted(.html)))
}
Expand All @@ -373,7 +348,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariadescribedby: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html)))
}

@available(*, deprecated, message: "Use the accessibilityDetail(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityDetail(_:) modifier instead.")
public func aria(details value: String) -> FigureCaption {
return mutate(ariadetails: .init(value, context: .tainted(.html)))
}
Expand All @@ -382,7 +357,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariadetails: .init(id, context: .tainted(.html)))
}

@available(*, deprecated, message: "Use the accessibilityDisabled(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityDisabled(_:) modifier instead.")
public func aria(disabled value: Bool) -> FigureCaption {
return mutate(ariadisabled: .init(value, context: .trusted))
}
Expand All @@ -392,12 +367,12 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariadisabled: .init(value, context: .trusted))
}

@available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.")
@available(*, unavailable, 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 accessibilityFlow(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityFlow(_:) modifier instead.")
public func aria(flowTo value: String) -> FigureCaption {
return mutate(ariaflowto: .init(value, context: .tainted(.html)))
}
Expand All @@ -410,7 +385,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariaflowto: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html)))
}

@available(*, deprecated, message: "Use the accessibilityPopup(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityPopup(_:) modifier instead.")
public func aria(hasPopup value: Values.Accessibility.Popup) -> FigureCaption {
return mutate(ariahaspopup: .init(value.rawValue, context: .trusted))
}
Expand All @@ -420,7 +395,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariahaspopup: .init(value.rawValue, context: .trusted))
}

@available(*, deprecated, message: "Use the accessibilityHidden(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityHidden(_:) modifier instead.")
public func aria(hidden value: Bool) -> FigureCaption {
return mutate(ariahidden: .init(value, context: .trusted))
}
Expand All @@ -429,7 +404,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariahidden: .init(value, context: .trusted))
}

@available(*, deprecated, message: "Use the accessibilityInvalid(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityInvalid(_:) modifier instead.")
public func aria(invalid value: Values.Accessibility.Invalid) -> FigureCaption {
return mutate(ariainvalid: .init(value.rawValue, context: .trusted))
}
Expand All @@ -449,7 +424,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariainvalid: .init(value, context: .trusted))
}

@available(*, deprecated, message: "Use the accessibilityShortcuts(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityShortcuts(_:) modifier instead.")
public func aria(keyShortcuts value: String) -> FigureCaption {
return mutate(ariakeyshortcuts: .init(value, context: .tainted(.html)))
}
Expand All @@ -462,7 +437,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariakeyshortcuts: .init(EnumeratedList(values: values, separator: " "), context: .trusted))
}

@available(*, deprecated, message: "Use the accessibilityLabel(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityLabel(_:) modifier instead.")
public func aria(label value: String) -> FigureCaption {
return mutate(arialabel: .init(value, context: .tainted(.html)))
}
Expand All @@ -480,7 +455,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(arialabel: .init(value, context: .tainted(.html)))
}

@available(*, deprecated, message: "Use the accessibilityLabels(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityLabels(_:) modifier instead.")
public func aria(labeledBy value: String) -> FigureCaption {
return mutate(arialabeledby: .init(value, context: .tainted(.html)))
}
Expand All @@ -493,7 +468,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(arialabeledby: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html)))
}

@available(*, deprecated, message: "Use the accessibilityLive(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityLive(_:) modifier instead.")
public func aria(live value: Values.Accessibility.Live) -> FigureCaption {
return mutate(arialive: .init(value.rawValue, context: .trusted))
}
Expand All @@ -502,7 +477,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(arialive: .init(value.rawValue, context: .trusted))
}

@available(*, deprecated, message: "Use the accessibilityOwns(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityOwns(_:) modifier instead.")
public func aria(owns value: String) -> FigureCaption {
return mutate(ariaowns: .init(value, context: .tainted(.html)))
}
Expand All @@ -515,7 +490,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariaowns: .init(EnumeratedList(values: ids, separator: " "), context: .tainted(.html)))
}

@available(*, deprecated, message: "Use the accessibilityRelevant(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityRelevant(_:) modifier instead.")
public func aria(relevant value: Values.Accessibility.Relevant) -> FigureCaption {
return mutate(ariarelevant: .init(value.rawValue, context: .trusted))
}
Expand All @@ -528,7 +503,7 @@ extension FigureCaption: GlobalContentAttributes, GlobalEventAttributes, GlobalA
return mutate(ariarelevant: .init(EnumeratedList(values: values, separator: " "), context: .trusted))
}

@available(*, deprecated, message: "Use the accessibilityRoleDescription(_:) modifier instead.")
@available(*, unavailable, message: "Use the accessibilityRoleDescription(_:) modifier instead.")
public func aria(roleDescription value: String) -> FigureCaption {
return mutate(ariaroledescription: .init(value, context: .tainted(.html)))
}
Expand Down
Loading
Loading