Skip to content

Commit 2b65edc

Browse files
committed
Update to the latest specs
1 parent 109d052 commit 2b65edc

File tree

10 files changed

+1287
-483
lines changed

10 files changed

+1287
-483
lines changed

Patches/CSSOM.patch

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,9 @@
11
diff --git a/Sources/CSSOM/Generated.swift b/Sources/CSSOM/Generated.swift
2-
index b22e2a9..814ae93 100644
2+
index 16a452b..1242f02 100644
33
--- a/Sources/CSSOM/Generated.swift
44
+++ b/Sources/CSSOM/Generated.swift
5-
@@ -361,8 +361,14 @@ public class CSSColor: CSSColorValue {
6-
self.init(unsafelyWrapping: Self.constructor!.new(arguments: [_toJSValue(colorSpace), _toJSValue(channels), _toJSValue(alpha)]))
7-
}
8-
9-
+ @available(*, unavailable)
10-
+ override public var colorSpace: CSSKeywordValue {
11-
+ get { colorSpaceOrString.cssKeywordValue! }
12-
+ set { colorSpaceOrString = .cssKeywordValue(newValue) }
13-
+ }
14-
+
15-
@usableFromInline let _colorSpace: ReadWriteAttribute<CSSKeywordish>
16-
- @inlinable override public var colorSpace: CSSKeywordish {
17-
+ @inlinable public var colorSpaceOrString: CSSKeywordish {
18-
get { _colorSpace.wrappedValue }
19-
set { _colorSpace.wrappedValue = newValue }
20-
}
21-
@@ -390,7 +396,8 @@ public class CSSColorValue: CSSStyleValue {
22-
return this[Strings.to].function!(this: this, arguments: [_toJSValue(colorSpace)]).fromJSValue()!
5+
@@ -378,7 +378,8 @@ public class CSSColorValue: CSSStyleValue {
6+
super.init(unsafelyWrapping: jsObject)
237
}
248

259
- @inlinable override public class func parse(cssText: String) -> CSSColorValue_or_CSSStyleValue {
@@ -28,7 +12,7 @@ index b22e2a9..814ae93 100644
2812
let this = constructor!
2913
return this[Strings.parse].function!(this: this, arguments: [_toJSValue(cssText)]).fromJSValue()!
3014
}
31-
@@ -947,7 +954,7 @@ public class CSSNumericValue: CSSStyleValue {
15+
@@ -935,7 +936,7 @@ public class CSSNumericValue: CSSStyleValue {
3216
return this[Strings.type].function!(this: this, arguments: []).fromJSValue()!
3317
}
3418

Sources/CSSOM/Generated.swift

Lines changed: 83 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -361,17 +361,8 @@ public class CSSColor: CSSColorValue {
361361
self.init(unsafelyWrapping: Self.constructor!.new(arguments: [_toJSValue(colorSpace), _toJSValue(channels), _toJSValue(alpha)]))
362362
}
363363

364-
@available(*, unavailable)
365-
override public var colorSpace: CSSKeywordValue {
366-
get { colorSpaceOrString.cssKeywordValue! }
367-
set { colorSpaceOrString = .cssKeywordValue(newValue) }
368-
}
369-
370-
@usableFromInline let _colorSpace: ReadWriteAttribute<CSSKeywordish>
371-
@inlinable public var colorSpaceOrString: CSSKeywordish {
372-
get { _colorSpace.wrappedValue }
373-
set { _colorSpace.wrappedValue = newValue }
374-
}
364+
@ReadWriteAttribute
365+
public var colorSpace: CSSKeywordish
375366

376367
@ReadWriteAttribute
377368
public var channels: [CSSColorPercent]
@@ -384,18 +375,9 @@ public class CSSColorValue: CSSStyleValue {
384375
@inlinable override public class var constructor: JSFunction? { JSObject.global[Strings.CSSColorValue].function }
385376

386377
public required init(unsafelyWrapping jsObject: JSObject) {
387-
_colorSpace = ReadonlyAttribute(jsObject: jsObject, name: Strings.colorSpace)
388378
super.init(unsafelyWrapping: jsObject)
389379
}
390380

391-
@ReadonlyAttribute
392-
public var colorSpace: CSSKeywordValue
393-
394-
@inlinable public func to(colorSpace: CSSKeywordish) -> Self {
395-
let this = jsObject
396-
return this[Strings.to].function!(this: this, arguments: [_toJSValue(colorSpace)]).fromJSValue()!
397-
}
398-
399381
// returns CSSStyleValue | CSSColorValue
400382
@inlinable public class func parse(cssText: String) -> CSSStyleValue {
401383
let this = constructor!
@@ -1616,6 +1598,27 @@ public class CaretPosition: JSBridgedClass {
16161598
}
16171599
}
16181600

1601+
public class CheckVisibilityOptions: BridgedDictionary {
1602+
public convenience init(checkOpacity: Bool, checkVisibilityCSS: Bool) {
1603+
let object = JSObject.global[Strings.Object].function!.new()
1604+
object[Strings.checkOpacity] = _toJSValue(checkOpacity)
1605+
object[Strings.checkVisibilityCSS] = _toJSValue(checkVisibilityCSS)
1606+
self.init(unsafelyWrapping: object)
1607+
}
1608+
1609+
public required init(unsafelyWrapping object: JSObject) {
1610+
_checkOpacity = ReadWriteAttribute(jsObject: object, name: Strings.checkOpacity)
1611+
_checkVisibilityCSS = ReadWriteAttribute(jsObject: object, name: Strings.checkVisibilityCSS)
1612+
super.init(unsafelyWrapping: object)
1613+
}
1614+
1615+
@ReadWriteAttribute
1616+
public var checkOpacity: Bool
1617+
1618+
@ReadWriteAttribute
1619+
public var checkVisibilityCSS: Bool
1620+
}
1621+
16191622
public class ConvertCoordinateOptions: BridgedDictionary {
16201623
public convenience init(fromBox: CSSBoxType, toBox: CSSBoxType) {
16211624
let object = JSObject.global[Strings.Object].function!.new()
@@ -1677,18 +1680,6 @@ public extension GeometryUtils {
16771680
}
16781681
}
16791682

1680-
public class IsVisibleOptions: BridgedDictionary {
1681-
public convenience init() {
1682-
let object = JSObject.global[Strings.Object].function!.new()
1683-
1684-
self.init(unsafelyWrapping: object)
1685-
}
1686-
1687-
public required init(unsafelyWrapping object: JSObject) {
1688-
super.init(unsafelyWrapping: object)
1689-
}
1690-
}
1691-
16921683
public protocol LinkStyle: JSBridgedClass {}
16931684
public extension LinkStyle {
16941685
@inlinable var sheet: CSSStyleSheet? { jsObject[Strings.sheet].fromJSValue()! }
@@ -1838,6 +1829,7 @@ public class Screen: JSBridgedClass {
18381829

18391830
public enum ScrollBehavior: JSString, JSValueCompatible {
18401831
case auto = "auto"
1832+
case instant = "instant"
18411833
case smooth = "smooth"
18421834

18431835
@inlinable public static func construct(from jsValue: JSValue) -> Self? {
@@ -2058,6 +2050,54 @@ public class StyleSheetList: JSBridgedClass {
20582050
public typealias CSSColorPercent = CSSColorRGBComp
20592051
public typealias CSSColorNumber = CSSColorRGBComp
20602052
public typealias CSSColorAngle = CSSColorRGBComp
2053+
public class VisualViewport: EventTarget {
2054+
@inlinable override public class var constructor: JSFunction? { JSObject.global[Strings.VisualViewport].function }
2055+
2056+
public required init(unsafelyWrapping jsObject: JSObject) {
2057+
_offsetLeft = ReadonlyAttribute(jsObject: jsObject, name: Strings.offsetLeft)
2058+
_offsetTop = ReadonlyAttribute(jsObject: jsObject, name: Strings.offsetTop)
2059+
_pageLeft = ReadonlyAttribute(jsObject: jsObject, name: Strings.pageLeft)
2060+
_pageTop = ReadonlyAttribute(jsObject: jsObject, name: Strings.pageTop)
2061+
_width = ReadonlyAttribute(jsObject: jsObject, name: Strings.width)
2062+
_height = ReadonlyAttribute(jsObject: jsObject, name: Strings.height)
2063+
_scale = ReadonlyAttribute(jsObject: jsObject, name: Strings.scale)
2064+
_onresize = ClosureAttribute1Optional(jsObject: jsObject, name: Strings.onresize)
2065+
_onscroll = ClosureAttribute1Optional(jsObject: jsObject, name: Strings.onscroll)
2066+
_onscrollend = ClosureAttribute1Optional(jsObject: jsObject, name: Strings.onscrollend)
2067+
super.init(unsafelyWrapping: jsObject)
2068+
}
2069+
2070+
@ReadonlyAttribute
2071+
public var offsetLeft: Double
2072+
2073+
@ReadonlyAttribute
2074+
public var offsetTop: Double
2075+
2076+
@ReadonlyAttribute
2077+
public var pageLeft: Double
2078+
2079+
@ReadonlyAttribute
2080+
public var pageTop: Double
2081+
2082+
@ReadonlyAttribute
2083+
public var width: Double
2084+
2085+
@ReadonlyAttribute
2086+
public var height: Double
2087+
2088+
@ReadonlyAttribute
2089+
public var scale: Double
2090+
2091+
@ClosureAttribute1Optional
2092+
public var onresize: EventHandler
2093+
2094+
@ClosureAttribute1Optional
2095+
public var onscroll: EventHandler
2096+
2097+
@ClosureAttribute1Optional
2098+
public var onscrollend: EventHandler
2099+
}
2100+
20612101
@usableFromInline enum Strings {
20622102
@usableFromInline static let _self: JSString = "self"
20632103
@usableFromInline static let CSS: JSString = "CSS"
@@ -2118,6 +2158,7 @@ public typealias CSSColorAngle = CSSColorRGBComp
21182158
@usableFromInline static let StylePropertyMapReadOnly: JSString = "StylePropertyMapReadOnly"
21192159
@usableFromInline static let StyleSheet: JSString = "StyleSheet"
21202160
@usableFromInline static let StyleSheetList: JSString = "StyleSheetList"
2161+
@usableFromInline static let VisualViewport: JSString = "VisualViewport"
21212162
@usableFromInline static let a: JSString = "a"
21222163
@usableFromInline static let add: JSString = "add"
21232164
@usableFromInline static let addListener: JSString = "addListener"
@@ -2140,6 +2181,8 @@ public typealias CSSColorAngle = CSSColorRGBComp
21402181
@usableFromInline static let c: JSString = "c"
21412182
@usableFromInline static let ch: JSString = "ch"
21422183
@usableFromInline static let channels: JSString = "channels"
2184+
@usableFromInline static let checkOpacity: JSString = "checkOpacity"
2185+
@usableFromInline static let checkVisibilityCSS: JSString = "checkVisibilityCSS"
21432186
@usableFromInline static let clear: JSString = "clear"
21442187
@usableFromInline static let cm: JSString = "cm"
21452188
@usableFromInline static let colorDepth: JSString = "colorDepth"
@@ -2223,11 +2266,18 @@ public typealias CSSColorAngle = CSSColorRGBComp
22232266
@usableFromInline static let namespaceURI: JSString = "namespaceURI"
22242267
@usableFromInline static let number: JSString = "number"
22252268
@usableFromInline static let offset: JSString = "offset"
2269+
@usableFromInline static let offsetLeft: JSString = "offsetLeft"
22262270
@usableFromInline static let offsetNode: JSString = "offsetNode"
2271+
@usableFromInline static let offsetTop: JSString = "offsetTop"
22272272
@usableFromInline static let onchange: JSString = "onchange"
2273+
@usableFromInline static let onresize: JSString = "onresize"
2274+
@usableFromInline static let onscroll: JSString = "onscroll"
2275+
@usableFromInline static let onscrollend: JSString = "onscrollend"
22282276
@usableFromInline static let `operator`: JSString = "operator"
22292277
@usableFromInline static let ownerNode: JSString = "ownerNode"
22302278
@usableFromInline static let ownerRule: JSString = "ownerRule"
2279+
@usableFromInline static let pageLeft: JSString = "pageLeft"
2280+
@usableFromInline static let pageTop: JSString = "pageTop"
22312281
@usableFromInline static let parentRule: JSString = "parentRule"
22322282
@usableFromInline static let parentStyleSheet: JSString = "parentStyleSheet"
22332283
@usableFromInline static let parse: JSString = "parse"
@@ -2252,6 +2302,7 @@ public typealias CSSColorAngle = CSSColorRGBComp
22522302
@usableFromInline static let rlh: JSString = "rlh"
22532303
@usableFromInline static let rules: JSString = "rules"
22542304
@usableFromInline static let s: JSString = "s"
2305+
@usableFromInline static let scale: JSString = "scale"
22552306
@usableFromInline static let selectorText: JSString = "selectorText"
22562307
@usableFromInline static let set: JSString = "set"
22572308
@usableFromInline static let setProperty: JSString = "setProperty"

0 commit comments

Comments
 (0)