Skip to content

Commit 8fff974

Browse files
committed
Revert "aria* type variables instead rewrite to res"
This reverts commit a6b136d.
1 parent a6b136d commit 8fff974

File tree

5 files changed

+19
-26
lines changed

5 files changed

+19
-26
lines changed

jscomp/main/builtin_cmi_datasets.ml

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

jscomp/others/jsxDOM.ml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ type domRef
2727

2828
(*
2929
This list isn't exhaustive. We'll add more as we go.
30-
'aria* type variables can be removed once we can rewrite *.ml libs to *res.
3130
*)
32-
type ('ariaCurrent, 'ariaInvalid, 'ariaHaspopup, 'ariaChecked, 'ariaPressed, 'loading) domProps = {
31+
type domProps = {
3332
(* V10 compiler will enable to change label declaration to `key?: string` *)
3433
key: string
3534
[@ns.optional];
@@ -40,17 +39,15 @@ type ('ariaCurrent, 'ariaInvalid, 'ariaHaspopup, 'ariaChecked, 'ariaPressed, 'lo
4039
(* accessibility *)
4140
(* https://www.w3.org/TR/wai-aria-1.1/ *)
4241
(* https://accessibilityresources.org/<aria-tag> is a great resource for these *)
43-
(* ariaCurrent: [`page | `step | `location | `date | `time | `_true | `_false] *)
44-
ariaCurrent: 'ariaCurrent
42+
ariaCurrent: [`page | `step | `location | `date | `time | `_true | `_false]
4543
[@ns.optional] [@bs.as "aria-current"];
4644
ariaDetails: string
4745
[@ns.optional] [@bs.as "aria-details"];
4846
ariaDisabled: bool
4947
[@ns.optional] [@bs.as "aria-disabled"];
5048
ariaHidden: bool
5149
[@ns.optional] [@bs.as "aria-hidden"];
52-
(* ariaInvalid: [`grammar | `spelling | `_true | `_false ] *)
53-
ariaInvalid: 'ariaInvalid
50+
ariaInvalid: [`grammar | `spelling | `_true| `_false]
5451
[@ns.optional] [@bs.as "aria-invalid"];
5552
ariaKeyshortcuts: string
5653
[@ns.optional] [@bs.as "aria-keyshortcuts"];
@@ -61,13 +58,11 @@ type ('ariaCurrent, 'ariaInvalid, 'ariaHaspopup, 'ariaChecked, 'ariaPressed, 'lo
6158
(* Widget Attributes *)
6259
ariaAutocomplete: [`inline | `list | `both | `none]
6360
[@ns.optional] [@bs.as "aria-autocomplete"];
64-
(* ariaChecked: [`_true | `_false | `mixed] https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate *)
65-
ariaChecked: 'ariaChecked
61+
ariaChecked: [`_true | `_false | `mixed] (* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate *)
6662
[@ns.optional] [@bs.as "aria-checked"];
6763
ariaExpanded: bool
6864
[@ns.optional] [@bs.as "aria-expanded"];
69-
(* ariaHaspopup: [`menu | `listbox | `tree | `grid | `dialog | `_true | `_false] *)
70-
ariaHaspopup: 'ariaHaspopup
65+
ariaHaspopup: [`menu | `listbox | `tree | `grid | `dialog | `_true | `_false]
7166
[@ns.optional] [@bs.as "aria-haspopup"];
7267
ariaLevel: int
7368
[@ns.optional] [@bs.as "aria-lavel"];
@@ -81,8 +76,7 @@ type ('ariaCurrent, 'ariaInvalid, 'ariaHaspopup, 'ariaChecked, 'ariaPressed, 'lo
8176
[@ns.optional] [@bs.as "aria-orientation"];
8277
ariaPlaceholder: string
8378
[@ns.optional] [@bs.as "aria-placeholder"];
84-
(* ariaPressed: [`_true | `_false| `mixed] https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate *)
85-
ariaPressed: 'ariaPressed
79+
ariaPressed: [`_true | `_false| `mixed] (* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate *)
8680
[@ns.optional] [@bs.as "aria-pressed"];
8781
ariaReadonly: bool
8882
[@ns.optional] [@bs.as "aria-readonly"];
@@ -281,8 +275,7 @@ type ('ariaCurrent, 'ariaInvalid, 'ariaHaspopup, 'ariaChecked, 'ariaPressed, 'lo
281275
[@ns.optional];
282276
list: string
283277
[@ns.optional];
284-
(* loading: [`_lazy | `eager] *)
285-
loading: 'loading
278+
loading: [`_lazy | `eager]
286279
[@ns.optional];
287280
loop: bool
288281
[@ns.optional];

lib/4.06.1/unstable/js_compiler.ml

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

lib/4.06.1/unstable/js_playground_compiler.ml

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

lib/4.06.1/whole_compiler.ml

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)