From dc3ca46b7eb9b2a99a499cd0afebfcee96bb08cb Mon Sep 17 00:00:00 2001
From: Christoph Knittel <ck@cca.io>
Date: Fri, 5 Aug 2022 21:06:15 +0700
Subject: [PATCH] Get rid of @string/@int for polyvars

---
 src/apis/Alert.res                          |  15 +-
 src/apis/Style.res                          | 319 ++++++------------
 src/apis/Style.resi                         | 347 +++++++-------------
 src/components/ActivityIndicator.res        |  16 +-
 src/components/DatePickerIOS.res            |  45 +--
 src/components/DrawerLayoutAndroid.res      |  37 +--
 src/components/FlatList.res                 |  23 +-
 src/components/Image.res                    |  15 +-
 src/components/KeyboardAvoidingView.res     |  16 +-
 src/components/MaskedViewIOS.res            |  16 +-
 src/components/Modal.bs.js                  |   3 -
 src/components/Modal.res                    |  10 +-
 src/components/Pressable.res                |   8 +-
 src/components/ProgressBarAndroid.res       |  16 +-
 src/components/ProgressViewIOS.res          |  16 +-
 src/components/RefreshControl.res           |  16 +-
 src/components/SafeAreaView.res             |  16 +-
 src/components/ScrollView.res               |  29 +-
 src/components/SectionList.res              |  23 +-
 src/components/SegmentedControlIOS.res      |  16 +-
 src/components/Slider.res                   |  16 +-
 src/components/SnapshotViewIOS.res          |  16 +-
 src/components/StatusBar.res                |  23 +-
 src/components/Switch.res                   |  16 +-
 src/components/TextInput.res                |  97 +++---
 src/components/TouchableHighlight.res       |   8 +-
 src/components/TouchableNativeFeedback.res  |   8 +-
 src/components/TouchableOpacity.res         |   8 +-
 src/components/TouchableWithoutFeedback.res |   8 +-
 src/components/View.res                     |  30 +-
 src/components/VirtualizedList.res          |  23 +-
 src/components/VirtualizedSectionList.res   |  23 +-
 src/types/FontVariant.bs.js                 |   1 -
 src/types/FontVariant.res                   |  16 -
 src/types/FontVariant.resi                  |  16 -
 src/types/Modal_Orientation.bs.js           |   1 -
 src/types/Modal_Orientation.res             |  16 -
 src/types/Modal_Orientation.resi            |  16 -
 38 files changed, 390 insertions(+), 954 deletions(-)
 delete mode 100644 src/types/FontVariant.bs.js
 delete mode 100644 src/types/FontVariant.res
 delete mode 100644 src/types/FontVariant.resi
 delete mode 100644 src/types/Modal_Orientation.bs.js
 delete mode 100644 src/types/Modal_Orientation.res
 delete mode 100644 src/types/Modal_Orientation.resi

diff --git a/src/apis/Alert.res b/src/apis/Alert.res
index 11bc70368..e7a752242 100644
--- a/src/apis/Alert.res
+++ b/src/apis/Alert.res
@@ -19,6 +19,13 @@ external alert: (
   unit,
 ) => unit = "alert"
 
+type type_ = [
+  | #default
+  | #"plain-text"
+  | #"secure-text"
+  | #"login-password"
+]
+
 @scope("Alert") @module("react-native")
 external prompt: (
   ~title: string,
@@ -28,13 +35,7 @@ external prompt: (
     | #callback(string => unit)
     | #buttons(array<button>)
   ]=?,
-  ~type_: @string
-  [
-    | #default
-    | @as("plain-text") #plainText
-    | @as("secure-text") #secureText
-    | @as("login-password") #loginPassword
-  ]=?,
+  ~type_: type_=?,
   ~defaultValue: string=?,
   ~keyboardType: string=?,
   unit,
diff --git a/src/apis/Style.res b/src/apis/Style.res
index 6061e86e5..0c175a9aa 100644
--- a/src/apis/Style.res
+++ b/src/apis/Style.res
@@ -51,10 +51,39 @@ type resizeMode = [#cover | #contain | #stretch | #repeat | #center]
 
 type fontStyle = [#normal | #italic]
 
+type fontWeight = [
+  | #normal
+  | #bold
+  | #100
+  | #200
+  | #300
+  | #400
+  | #500
+  | #600
+  | #700
+  | #800
+  | #900
+]
+
+type fontVariant = [
+  | #"small-caps"
+  | #"oldstyle-nums"
+  | #"lining-nums"
+  | #"tabular-nums"
+  | #"proportional-nums"
+]
+
 type textAlign = [#auto | #left | #right | #center | #justify]
 
 type textAlignVertical = [#auto | #top | #bottom | #center]
 
+type textDecorationLine = [
+  | #none
+  | #underline
+  | #"line-through"
+  | #"underline line-through"
+]
+
 type textDecorationStyle = [#solid | #double | #dotted | #dashed]
 
 type textTransform = [#none | #uppercase | #lowercase | #capitalize]
@@ -73,6 +102,50 @@ type flexWrap = [#wrap | #nowrap]
 
 type position = [#absolute | #relative]
 
+type alignContent = [
+  | #"flex-start"
+  | #"flex-end"
+  | #center
+  | #stretch
+  | #"space-around"
+  | #"space-between"
+]
+
+type alignItems = [
+  | #"flex-start"
+  | #"flex-end"
+  | #center
+  | #stretch
+  | #baseline
+]
+
+type alignSelf = [
+  | #auto
+  | #"flex-start"
+  | #"flex-end"
+  | #center
+  | #stretch
+  | #baseline
+]
+
+type direction = [#inherit | #ltr | #rtl]
+
+type flexDirection = [
+  | #row
+  | #"row-reverse"
+  | #column
+  | #"column-reverse"
+]
+
+type justifyContent = [
+  | #"flex-start"
+  | #"flex-end"
+  | #center
+  | #"space-around"
+  | #"space-between"
+  | #"space-evenly"
+]
+
 // Styles are documented here
 // https://github.com/facebook/react-native/blob/master/Libraries/StyleSheet/StyleSheetTypes.js
 
@@ -103,34 +176,15 @@ style: (
   ~fontFamily: string=?,
   ~fontSize: float=?,
   ~fontStyle: fontStyle=?,
-  ~fontVariant: array<FontVariant.t>=?,
-  ~fontWeight: @string
-  [
-    | #normal
-    | #bold
-    | @as("100") #_100
-    | @as("200") #_200
-    | @as("300") #_300
-    | @as("400") #_400
-    | @as("500") #_500
-    | @as("600") #_600
-    | @as("700") #_700
-    | @as("800") #_800
-    | @as("900") #_900
-  ]=?,
+  ~fontVariant: array<fontVariant>=?,
+  ~fontWeight: fontWeight=?,
   ~includeFontPadding: bool=?,
   ~letterSpacing: float=?,
   ~lineHeight: float=?,
   ~textAlign: textAlign=?,
   ~textAlignVertical: textAlignVertical=?,
   ~textDecorationColor: Color.t=?,
-  ~textDecorationLine: @string
-  [
-    | #none
-    | #underline
-    | @as("line-through") #lineThrough
-    | @as("underline line-through") #underlineLineThrough
-  ]=?,
+  ~textDecorationLine: textDecorationLine=?,
   ~textDecorationStyle: textDecorationStyle=?,
   ~textShadowColor: Color.t=?,
   ~textShadowOffset: offset=?,
@@ -174,32 +228,9 @@ style: (
   ~shadowOpacity: float=?,
   ~shadowRadius: float=?,
   // Layout Style Props (https://reactnative.dev/docs/layout-props)
-  ~alignContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-  ]=?,
-  ~alignItems: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
-  ~alignSelf: @string
-  [
-    | #auto
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
+  ~alignContent: alignContent=?,
+  ~alignItems: alignItems=?,
+  ~alignSelf: alignSelf=?,
   ~aspectRatio: float=?,
   // border*Width are commented because already in view styles props (see explanation at the top)
   // ~borderBottomWidth: float=?,
@@ -210,31 +241,17 @@ style: (
   // ~borderTopWidth: float=?,
   // ~borderWidth: float=?,
   ~bottom: size=?,
-  ~direction: @string [@as("inherit") #inherit_ | #ltr | #rtl]=?,
+  ~direction: direction=?,
   ~display: display=?,
   ~_end: size=?,
   ~flex: float=?,
   ~flexBasis: margin=?,
-  ~flexDirection: @string
-  [
-    | #row
-    | @as("row-reverse") #rowReverse
-    | #column
-    | @as("column-reverse") #columnReverse
-  ]=?,
+  ~flexDirection: flexDirection=?,
   ~flexGrow: float=?,
   ~flexShrink: float=?,
   ~flexWrap: flexWrap=?,
   ~height: size=?,
-  ~justifyContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-    | @as("space-evenly") #spaceEvenly
-  ]=?,
+  ~justifyContent: justifyContent=?,
   ~left: size=?,
   ~margin: margin=?,
   ~marginBottom: margin=?,
@@ -309,32 +326,9 @@ viewStyle: (
   ~shadowOpacity: float=?,
   ~shadowRadius: float=?,
   // Layout Style Props (https://reactnative.dev/docs/layout-props)
-  ~alignContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-  ]=?,
-  ~alignItems: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
-  ~alignSelf: @string
-  [
-    | #auto
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
+  ~alignContent: alignContent=?,
+  ~alignItems: alignItems=?,
+  ~alignSelf: alignSelf=?,
   ~aspectRatio: float=?,
   // border*Width are commented because already in view styles props (see explanation at the top)
   // ~borderBottomWidth: float=?,
@@ -345,31 +339,17 @@ viewStyle: (
   // ~borderTopWidth: float=?,
   // ~borderWidth: float=?,
   ~bottom: size=?,
-  ~direction: @string [@as("inherit") #inherit_ | #ltr | #rtl]=?,
+  ~direction: direction=?,
   ~display: display=?,
   ~_end: size=?,
   ~flex: float=?,
   ~flexBasis: margin=?,
-  ~flexDirection: @string
-  [
-    | #row
-    | @as("row-reverse") #rowReverse
-    | #column
-    | @as("column-reverse") #columnReverse
-  ]=?,
+  ~flexDirection: flexDirection=?,
   ~flexGrow: float=?,
   ~flexShrink: float=?,
   ~flexWrap: flexWrap=?,
   ~height: size=?,
-  ~justifyContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-    | @as("space-evenly") #spaceEvenly
-  ]=?,
+  ~justifyContent: justifyContent=?,
   ~left: size=?,
   ~margin: margin=?,
   ~marginBottom: margin=?,
@@ -411,34 +391,15 @@ textStyle: (
   ~fontFamily: string=?,
   ~fontSize: float=?,
   ~fontStyle: fontStyle=?,
-  ~fontVariant: array<FontVariant.t>=?,
-  ~fontWeight: @string
-  [
-    | #normal
-    | #bold
-    | @as("100") #_100
-    | @as("200") #_200
-    | @as("300") #_300
-    | @as("400") #_400
-    | @as("500") #_500
-    | @as("600") #_600
-    | @as("700") #_700
-    | @as("800") #_800
-    | @as("900") #_900
-  ]=?,
+  ~fontVariant: array<fontVariant>=?,
+  ~fontWeight: fontWeight=?,
   ~includeFontPadding: bool=?,
   ~letterSpacing: float=?,
   ~lineHeight: float=?,
   ~textAlign: textAlign=?,
   ~textAlignVertical: textAlignVertical=?,
   ~textDecorationColor: Color.t=?,
-  ~textDecorationLine: @string
-  [
-    | #none
-    | #underline
-    | @as("line-through") #lineThrough
-    | @as("underline line-through") #underlineLineThrough
-  ]=?,
+  ~textDecorationLine: textDecorationLine=?,
   ~textDecorationStyle: textDecorationStyle=?,
   ~textShadowColor: Color.t=?,
   ~textShadowOffset: offset=?,
@@ -482,32 +443,9 @@ textStyle: (
   ~shadowOpacity: float=?,
   ~shadowRadius: float=?,
   // Layout Style Props (https://reactnative.dev/docs/layout-props)
-  ~alignContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-  ]=?,
-  ~alignItems: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
-  ~alignSelf: @string
-  [
-    | #auto
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
+  ~alignContent: alignContent=?,
+  ~alignItems: alignItems=?,
+  ~alignSelf: alignSelf=?,
   ~aspectRatio: float=?,
   // border*Width are commented because already in view styles props (see explanation at the top)
   // ~borderBottomWidth: float=?,
@@ -518,31 +456,17 @@ textStyle: (
   // ~borderTopWidth: float=?,
   // ~borderWidth: float=?,
   ~bottom: size=?,
-  ~direction: @string [@as("inherit") #inherit_ | #ltr | #rtl]=?,
+  ~direction: direction=?,
   ~display: display=?,
   ~_end: size=?,
   ~flex: float=?,
   ~flexBasis: margin=?,
-  ~flexDirection: @string
-  [
-    | #row
-    | @as("row-reverse") #rowReverse
-    | #column
-    | @as("column-reverse") #columnReverse
-  ]=?,
+  ~flexDirection: flexDirection=?,
   ~flexGrow: float=?,
   ~flexShrink: float=?,
   ~flexWrap: flexWrap=?,
   ~height: size=?,
-  ~justifyContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-    | @as("space-evenly") #spaceEvenly
-  ]=?,
+  ~justifyContent: justifyContent=?,
   ~left: size=?,
   ~margin: margin=?,
   ~marginBottom: margin=?,
@@ -620,32 +544,9 @@ imageStyle: (
   ~shadowOpacity: float=?,
   ~shadowRadius: float=?,
   // Layout Style Props (https://reactnative.dev/docs/layout-props)
-  ~alignContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-  ]=?,
-  ~alignItems: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
-  ~alignSelf: @string
-  [
-    | #auto
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
+  ~alignContent: alignContent=?,
+  ~alignItems: alignItems=?,
+  ~alignSelf: alignSelf=?,
   ~aspectRatio: float=?,
   // border*Width are commented because already in view styles props (see explanation at the top)
   // ~borderBottomWidth: float=?,
@@ -656,31 +557,17 @@ imageStyle: (
   // ~borderTopWidth: float=?,
   // ~borderWidth: float=?,
   ~bottom: size=?,
-  ~direction: @string [@as("inherit") #inherit_ | #ltr | #rtl]=?,
+  ~direction: direction=?,
   ~display: display=?,
   ~_end: size=?,
   ~flex: float=?,
   ~flexBasis: margin=?,
-  ~flexDirection: @string
-  [
-    | #row
-    | @as("row-reverse") #rowReverse
-    | #column
-    | @as("column-reverse") #columnReverse
-  ]=?,
+  ~flexDirection: flexDirection=?,
   ~flexGrow: float=?,
   ~flexShrink: float=?,
   ~flexWrap: flexWrap=?,
   ~height: size=?,
-  ~justifyContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-    | @as("space-evenly") #spaceEvenly
-  ]=?,
+  ~justifyContent: justifyContent=?,
   ~left: size=?,
   ~margin: margin=?,
   ~marginBottom: margin=?,
diff --git a/src/apis/Style.resi b/src/apis/Style.resi
index 2963065ec..977f4534b 100644
--- a/src/apis/Style.resi
+++ b/src/apis/Style.resi
@@ -48,10 +48,39 @@ type resizeMode = [#cover | #contain | #stretch | #repeat | #center]
 
 type fontStyle = [#normal | #italic]
 
+type fontWeight = [
+  | #normal
+  | #bold
+  | #100
+  | #200
+  | #300
+  | #400
+  | #500
+  | #600
+  | #700
+  | #800
+  | #900
+]
+
+type fontVariant = [
+  | #"small-caps"
+  | #"oldstyle-nums"
+  | #"lining-nums"
+  | #"tabular-nums"
+  | #"proportional-nums"
+]
+
 type textAlign = [#auto | #left | #right | #center | #justify]
 
 type textAlignVertical = [#auto | #top | #bottom | #center]
 
+type textDecorationLine = [
+  | #none
+  | #underline
+  | #"line-through"
+  | #"underline line-through"
+]
+
 type textDecorationStyle = [#solid | #double | #dotted | #dashed]
 
 type textTransform = [#none | #uppercase | #lowercase | #capitalize]
@@ -70,6 +99,50 @@ type flexWrap = [#wrap | #nowrap]
 
 type position = [#absolute | #relative]
 
+type alignContent = [
+  | #"flex-start"
+  | #"flex-end"
+  | #center
+  | #stretch
+  | #"space-around"
+  | #"space-between"
+]
+
+type alignItems = [
+  | #"flex-start"
+  | #"flex-end"
+  | #center
+  | #stretch
+  | #baseline
+]
+
+type alignSelf = [
+  | #auto
+  | #"flex-start"
+  | #"flex-end"
+  | #center
+  | #stretch
+  | #baseline
+]
+
+type direction = [#inherit | #ltr | #rtl]
+
+type flexDirection = [
+  | #row
+  | #"row-reverse"
+  | #column
+  | #"column-reverse"
+]
+
+type justifyContent = [
+  | #"flex-start"
+  | #"flex-end"
+  | #center
+  | #"space-around"
+  | #"space-between"
+  | #"space-evenly"
+]
+
 // Styles are documented here
 // https://github.com/facebook/react-native/blob/master/Libraries/StyleSheet/StyleSheetTypes.js
 
@@ -89,9 +162,8 @@ external // Dangerous Imprecise Style
 // - shadow style
 // - layout style
 
-// *Comment below is supposed to be after the first ( below but refmt move it here*
-// Image Style Props (https://reactnative.dev/docs/image-style-props)
 style: (
+  // Image Style Props (https://reactnative.dev/docs/image-style-props)
   ~resizeMode: resizeMode=?,
   ~overlayColor: Color.t=?,
   ~tintColor: Color.t=?,
@@ -100,34 +172,15 @@ style: (
   ~fontFamily: string=?,
   ~fontSize: float=?,
   ~fontStyle: fontStyle=?,
-  ~fontVariant: array<FontVariant.t>=?,
-  ~fontWeight: @string
-  [
-    | #normal
-    | #bold
-    | @as("100") #_100
-    | @as("200") #_200
-    | @as("300") #_300
-    | @as("400") #_400
-    | @as("500") #_500
-    | @as("600") #_600
-    | @as("700") #_700
-    | @as("800") #_800
-    | @as("900") #_900
-  ]=?,
+  ~fontVariant: array<fontVariant>=?,
+  ~fontWeight: fontWeight=?,
   ~includeFontPadding: bool=?,
   ~letterSpacing: float=?,
   ~lineHeight: float=?,
   ~textAlign: textAlign=?,
   ~textAlignVertical: textAlignVertical=?,
   ~textDecorationColor: Color.t=?,
-  ~textDecorationLine: @string
-  [
-    | #none
-    | #underline
-    | @as("line-through") #lineThrough
-    | @as("underline line-through") #underlineLineThrough
-  ]=?,
+  ~textDecorationLine: textDecorationLine=?,
   ~textDecorationStyle: textDecorationStyle=?,
   ~textShadowColor: Color.t=?,
   ~textShadowOffset: offset=?,
@@ -171,67 +224,30 @@ style: (
   ~shadowOpacity: float=?,
   ~shadowRadius: float=?,
   // Layout Style Props (https://reactnative.dev/docs/layout-props)
-  ~alignContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-  ]=?,
-  ~alignItems: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
-  ~alignSelf: @string
-  [
-    | #auto
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
+  ~alignContent: alignContent=?,
+  ~alignItems: alignItems=?,
+  ~alignSelf: alignSelf=?,
   ~aspectRatio: float=?,
   // border*Width are commented because already in view styles props (see explanation at the top)
-  ~bottom: // ~borderBottomWidth: float=?,
+  // ~borderBottomWidth: float=?,
   // ~borderEndWidth: float=?,
   // ~borderLeftWidth: float=?,
   // ~borderRightWidth: float=?,
   // ~borderStartWidth: float=?,
   // ~borderTopWidth: float=?,
   // ~borderWidth: float=?,
-  size=?,
-  ~direction: @string [@as("inherit") #inherit_ | #ltr | #rtl]=?,
+  ~bottom: size=?,
+  ~direction: direction=?,
   ~display: display=?,
   ~_end: size=?,
   ~flex: float=?,
   ~flexBasis: margin=?,
-  ~flexDirection: @string
-  [
-    | #row
-    | @as("row-reverse") #rowReverse
-    | #column
-    | @as("column-reverse") #columnReverse
-  ]=?,
+  ~flexDirection: flexDirection=?,
   ~flexGrow: float=?,
   ~flexShrink: float=?,
   ~flexWrap: flexWrap=?,
   ~height: size=?,
-  ~justifyContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-    | @as("space-evenly") #spaceEvenly
-  ]=?,
+  ~justifyContent: justifyContent=?,
   ~left: size=?,
   ~margin: margin=?,
   ~marginBottom: margin=?,
@@ -267,9 +283,8 @@ style: (
 
 // ____ViewStyleProp_Internal
 @obj
-external // *Comment below is supposed to be after the first ( below but refmt move it here*
-// View styles https://reactnative.dev/docs/view-style-props
-viewStyle: (
+external viewStyle: (
+  // View styles https://reactnative.dev/docs/view-style-props
   ~backfaceVisibility: backfaceVisibility=?,
   ~backgroundColor: Color.t=?,
   ~borderBottomColor: Color.t=?,
@@ -306,67 +321,30 @@ viewStyle: (
   ~shadowOpacity: float=?,
   ~shadowRadius: float=?,
   // Layout Style Props (https://reactnative.dev/docs/layout-props)
-  ~alignContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-  ]=?,
-  ~alignItems: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
-  ~alignSelf: @string
-  [
-    | #auto
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
+  ~alignContent: alignContent=?,
+  ~alignItems: alignItems=?,
+  ~alignSelf: alignSelf=?,
   ~aspectRatio: float=?,
   // border*Width are commented because already in view styles props (see explanation at the top)
-  ~bottom: // ~borderBottomWidth: float=?,
+  // ~borderBottomWidth: float=?,
   // ~borderEndWidth: float=?,
   // ~borderLeftWidth: float=?,
   // ~borderRightWidth: float=?,
   // ~borderStartWidth: float=?,
   // ~borderTopWidth: float=?,
   // ~borderWidth: float=?,
-  size=?,
-  ~direction: @string [@as("inherit") #inherit_ | #ltr | #rtl]=?,
+  ~bottom: size=?,
+  ~direction: direction=?,
   ~display: display=?,
   ~_end: size=?,
   ~flex: float=?,
   ~flexBasis: margin=?,
-  ~flexDirection: @string
-  [
-    | #row
-    | @as("row-reverse") #rowReverse
-    | #column
-    | @as("column-reverse") #columnReverse
-  ]=?,
+  ~flexDirection: flexDirection=?,
   ~flexGrow: float=?,
   ~flexShrink: float=?,
   ~flexWrap: flexWrap=?,
   ~height: size=?,
-  ~justifyContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-    | @as("space-evenly") #spaceEvenly
-  ]=?,
+  ~justifyContent: justifyContent=?,
   ~left: size=?,
   ~margin: margin=?,
   ~marginBottom: margin=?,
@@ -402,40 +380,21 @@ viewStyle: (
 
 // ____TextStyleProp_Internal
 @obj
-external // Text Style Props (https://reactnative.dev/docs/text-style-props)
-textStyle: (
+external textStyle: (
+  // Text Style Props (https://reactnative.dev/docs/text-style-props)
   ~color: Color.t=?,
   ~fontFamily: string=?,
   ~fontSize: float=?,
   ~fontStyle: fontStyle=?,
-  ~fontVariant: array<FontVariant.t>=?,
-  ~fontWeight: @string
-  [
-    | #normal
-    | #bold
-    | @as("100") #_100
-    | @as("200") #_200
-    | @as("300") #_300
-    | @as("400") #_400
-    | @as("500") #_500
-    | @as("600") #_600
-    | @as("700") #_700
-    | @as("800") #_800
-    | @as("900") #_900
-  ]=?,
+  ~fontVariant: array<fontVariant>=?,
+  ~fontWeight: fontWeight=?,
   ~includeFontPadding: bool=?,
   ~letterSpacing: float=?,
   ~lineHeight: float=?,
   ~textAlign: textAlign=?,
   ~textAlignVertical: textAlignVertical=?,
   ~textDecorationColor: Color.t=?,
-  ~textDecorationLine: @string
-  [
-    | #none
-    | #underline
-    | @as("line-through") #lineThrough
-    | @as("underline line-through") #underlineLineThrough
-  ]=?,
+  ~textDecorationLine: textDecorationLine=?,
   ~textDecorationStyle: textDecorationStyle=?,
   ~textShadowColor: Color.t=?,
   ~textShadowOffset: offset=?,
@@ -479,67 +438,30 @@ textStyle: (
   ~shadowOpacity: float=?,
   ~shadowRadius: float=?,
   // Layout Style Props (https://reactnative.dev/docs/layout-props)
-  ~alignContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-  ]=?,
-  ~alignItems: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
-  ~alignSelf: @string
-  [
-    | #auto
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
+  ~alignContent: alignContent=?,
+  ~alignItems: alignItems=?,
+  ~alignSelf: alignSelf=?,
   ~aspectRatio: float=?,
   // border*Width are commented because already in view styles props (see explanation at the top)
-  ~bottom: // ~borderBottomWidth: float=?,
+  // ~borderBottomWidth: float=?,
   // ~borderEndWidth: float=?,
   // ~borderLeftWidth: float=?,
   // ~borderRightWidth: float=?,
   // ~borderStartWidth: float=?,
   // ~borderTopWidth: float=?,
   // ~borderWidth: float=?,
-  size=?,
-  ~direction: @string [@as("inherit") #inherit_ | #ltr | #rtl]=?,
+  ~bottom: size=?,
+  ~direction: direction=?,
   ~display: display=?,
   ~_end: size=?,
   ~flex: float=?,
   ~flexBasis: margin=?,
-  ~flexDirection: @string
-  [
-    | #row
-    | @as("row-reverse") #rowReverse
-    | #column
-    | @as("column-reverse") #columnReverse
-  ]=?,
+  ~flexDirection: flexDirection=?,
   ~flexGrow: float=?,
   ~flexShrink: float=?,
   ~flexWrap: flexWrap=?,
   ~height: size=?,
-  ~justifyContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-    | @as("space-evenly") #spaceEvenly
-  ]=?,
+  ~justifyContent: justifyContent=?,
   ~left: size=?,
   ~margin: margin=?,
   ~marginBottom: margin=?,
@@ -617,67 +539,30 @@ imageStyle: (
   ~shadowOpacity: float=?,
   ~shadowRadius: float=?,
   // Layout Style Props (https://reactnative.dev/docs/layout-props)
-  ~alignContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-  ]=?,
-  ~alignItems: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
-  ~alignSelf: @string
-  [
-    | #auto
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | #stretch
-    | #baseline
-  ]=?,
+  ~alignContent: alignContent=?,
+  ~alignItems: alignItems=?,
+  ~alignSelf: alignSelf=?,
   ~aspectRatio: float=?,
   // border*Width are commented because already in view styles props (see explanation at the top)
-  ~bottom: // ~borderBottomWidth: float=?,
+  // ~borderBottomWidth: float=?,
   // ~borderEndWidth: float=?,
   // ~borderLeftWidth: float=?,
   // ~borderRightWidth: float=?,
   // ~borderStartWidth: float=?,
   // ~borderTopWidth: float=?,
   // ~borderWidth: float=?,
-  size=?,
-  ~direction: @string [@as("inherit") #inherit_ | #ltr | #rtl]=?,
+  ~bottom: size=?,
+  ~direction: direction=?,
   ~display: display=?,
   ~_end: size=?,
   ~flex: float=?,
   ~flexBasis: margin=?,
-  ~flexDirection: @string
-  [
-    | #row
-    | @as("row-reverse") #rowReverse
-    | #column
-    | @as("column-reverse") #columnReverse
-  ]=?,
+  ~flexDirection: flexDirection=?,
   ~flexGrow: float=?,
   ~flexShrink: float=?,
   ~flexWrap: flexWrap=?,
   ~height: size=?,
-  ~justifyContent: @string
-  [
-    | @as("flex-start") #flexStart
-    | @as("flex-end") #flexEnd
-    | #center
-    | @as("space-around") #spaceAround
-    | @as("space-between") #spaceBetween
-    | @as("space-evenly") #spaceEvenly
-  ]=?,
+  ~justifyContent: justifyContent=?,
   ~left: size=?,
   ~margin: margin=?,
   ~marginBottom: margin=?,
diff --git a/src/components/ActivityIndicator.res b/src/components/ActivityIndicator.res
index dfe176f03..05b9d1b2f 100644
--- a/src/components/ActivityIndicator.res
+++ b/src/components/ActivityIndicator.res
@@ -26,13 +26,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -53,13 +47,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/DatePickerIOS.res b/src/components/DatePickerIOS.res
index e3eec462d..142e25ba8 100644
--- a/src/components/DatePickerIOS.res
+++ b/src/components/DatePickerIOS.res
@@ -3,6 +3,20 @@
 
 type localeId = string
 
+type minuteInterval = [
+  | #1
+  | #2
+  | #3
+  | #4
+  | #5
+  | #6
+  | #10
+  | #12
+  | #15
+  | #20
+  | #30
+]
+
 type mode = [#date | #time | #datetime]
 
 @react.component @module("react-native")
@@ -11,20 +25,7 @@ external make: (
   ~onDateChange: Js.Date.t => unit,
   ~maximumDate: Js.Date.t=?,
   ~minimumDate: Js.Date.t=?,
-  ~minuteInterval: @int
-  [
-    | @as(1) #_1
-    | @as(2) #_2
-    | @as(3) #_3
-    | @as(4) #_4
-    | @as(5) #_5
-    | @as(6) #_6
-    | @as(10) #_10
-    | @as(12) #_12
-    | @as(15) #_15
-    | @as(20) #_20
-    | @as(30) #_30
-  ]=?,
+  ~minuteInterval: minuteInterval=?,
   ~mode: mode=?,
   ~locale: localeId=?,
   ~timeZoneOffsetInMinutes: int=?,
@@ -44,13 +45,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -71,13 +66,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/DrawerLayoutAndroid.res b/src/components/DrawerLayoutAndroid.res
index f6717e978..e3302337b 100644
--- a/src/components/DrawerLayoutAndroid.res
+++ b/src/components/DrawerLayoutAndroid.res
@@ -10,27 +10,30 @@ module DrawerSlideEvent = {
 
 type drawerSlideEvent = DrawerSlideEvent.t
 
-type drawerPosition = [#left | #right]
-
 type t
 
 type androidInteractionState = [#idle | #dragging | #settling]
 
+type drawerLockMode = [
+  | #unlocked
+  | #"locked-closed"
+  | #"locked-open"
+]
+
+type drawerPosition = [#left | #right]
+
+type keyboardDismissMode = [#none | #"on-drag"]
+
 @react.component @module("react-native")
 external make: (
   ~ref: ref=?,
   // DrawerLayoutAndroid props
   ~renderNavigationView: unit => React.element,
   ~onDrawerClose: unit => unit=?,
+  ~drawerLockMode: drawerLockMode=?,
   ~drawerPosition: drawerPosition=?,
   ~drawerWidth: float=?,
-  ~keyboardDismissMode: @string [#none | @as("on-drag") #onDrag]=?,
-  ~drawerLockMode: @string
-  [
-    | @as("unlocked") #unlocked
-    | @as("locked-closed") #lockedClosed
-    | @as("locked-open") #lockedOpen
-  ]=?,
+  ~keyboardDismissMode: keyboardDismissMode=?,
   ~onDrawerOpen: unit => unit=?,
   ~onDrawerSlide: drawerSlideEvent => unit=?,
   ~onDrawerStateChanged: androidInteractionState => unit=?,
@@ -52,13 +55,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -79,13 +76,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/FlatList.res b/src/components/FlatList.res
index 579765f23..319d8a0c6 100644
--- a/src/components/FlatList.res
+++ b/src/components/FlatList.res
@@ -65,12 +65,7 @@ external make: (
   ~fadingEdgeLength: float=?,
   ~horizontal: bool=?,
   ~indicatorStyle: ScrollView.indicatorStyle=?,
-  ~keyboardDismissMode: @string
-  [
-    | #none
-    | #interactive
-    | @as("on-drag") #onDrag
-  ]=?,
+  ~keyboardDismissMode: ScrollView.keyboardDismissMode=?,
   ~keyboardShouldPersistTaps: ScrollView.keyboardShouldPersistTaps=?,
   ~maximumZoomScale: float=?,
   ~minimumZoomScale: float=?,
@@ -117,13 +112,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -144,13 +133,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/Image.res b/src/components/Image.res
index 536a2862c..f2a3ce77f 100644
--- a/src/components/Image.res
+++ b/src/components/Image.res
@@ -1,5 +1,12 @@
 include NativeElement
 
+type cache = [
+  | #default
+  | #reload
+  | #"force-cache"
+  | #"only-if-cached"
+]
+
 type uriSource
 
 @obj
@@ -9,13 +16,7 @@ external uriSource: (
   ~method: string=?,
   ~headers: Js.Dict.t<string>=?,
   ~body: string=?,
-  ~cache: @string
-  [
-    | #default
-    | #reload
-    | @as("force-cache") #forceCache
-    | @as("only-if-cached") #onlyIfCached
-  ]=?,
+  ~cache: cache=?,
   ~scale: float=?,
   ~width: float=?,
   ~height: float=?,
diff --git a/src/components/KeyboardAvoidingView.res b/src/components/KeyboardAvoidingView.res
index 83af1cf4d..7665be5f6 100644
--- a/src/components/KeyboardAvoidingView.res
+++ b/src/components/KeyboardAvoidingView.res
@@ -26,13 +26,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -53,13 +47,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/MaskedViewIOS.res b/src/components/MaskedViewIOS.res
index 628741418..def36bb1d 100644
--- a/src/components/MaskedViewIOS.res
+++ b/src/components/MaskedViewIOS.res
@@ -21,13 +21,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -48,13 +42,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/Modal.bs.js b/src/components/Modal.bs.js
index 31f766aa2..173c3869d 100644
--- a/src/components/Modal.bs.js
+++ b/src/components/Modal.bs.js
@@ -7,8 +7,5 @@ Event$ReactNative.SyntheticEvent({});
 
 var OrientationChangeEvent = {};
 
-var Orientation;
-
-exports.Orientation = Orientation;
 exports.OrientationChangeEvent = OrientationChangeEvent;
 /*  Not a pure module */
diff --git a/src/components/Modal.res b/src/components/Modal.res
index 947fea47c..fd2228828 100644
--- a/src/components/Modal.res
+++ b/src/components/Modal.res
@@ -1,6 +1,12 @@
 include NativeElement
 
-module Orientation = Modal_Orientation
+type orientation = [
+  | #landscape
+  | #"landscape-left"
+  | #"landscape-right"
+  | #portrait
+  | #"portrait-upside-down"
+]
 
 type orientationChange = [#landscape | #portrait]
 
@@ -35,7 +41,7 @@ external make: (
   ~onShow: unit => unit=?,
   ~presentationStyle: presentationStyle=?,
   ~statusBarTranslucent: bool=?,
-  ~supportedOrientations: array<Orientation.t>=?,
+  ~supportedOrientations: array<orientation>=?,
   ~transparent: bool=?,
   ~visible: bool=?,
   ~children: React.element=?,
diff --git a/src/components/Pressable.res b/src/components/Pressable.res
index e9b084bd2..23951cc38 100644
--- a/src/components/Pressable.res
+++ b/src/components/Pressable.res
@@ -35,13 +35,7 @@ external make: (
   ~accessibilityViewIsModal: bool=?,
   ~accessible: bool=?,
   ~focusable: bool=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   // Pressable props
   ~android_disableSound: bool=?,
   ~android_ripple: rippleConfig=?,
diff --git a/src/components/ProgressBarAndroid.res b/src/components/ProgressBarAndroid.res
index 5a9f55ab6..78cf66660 100644
--- a/src/components/ProgressBarAndroid.res
+++ b/src/components/ProgressBarAndroid.res
@@ -35,13 +35,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -62,13 +56,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/ProgressViewIOS.res b/src/components/ProgressViewIOS.res
index b9c0be8b2..1554910e1 100644
--- a/src/components/ProgressViewIOS.res
+++ b/src/components/ProgressViewIOS.res
@@ -28,13 +28,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -55,13 +49,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/RefreshControl.res b/src/components/RefreshControl.res
index 4565bdce4..01be4b0a0 100644
--- a/src/components/RefreshControl.res
+++ b/src/components/RefreshControl.res
@@ -30,13 +30,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -57,13 +51,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/SafeAreaView.res b/src/components/SafeAreaView.res
index cfcc90e8b..0c50965b7 100644
--- a/src/components/SafeAreaView.res
+++ b/src/components/SafeAreaView.res
@@ -16,13 +16,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -43,13 +37,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/ScrollView.res b/src/components/ScrollView.res
index 52d0ddecd..496716798 100644
--- a/src/components/ScrollView.res
+++ b/src/components/ScrollView.res
@@ -14,6 +14,12 @@ type decelerationRate = [#fast | #normal]
 
 type indicatorStyle = [#default | #black | #white]
 
+type keyboardDismissMode = [
+  | #none
+  | #interactive
+  | #"on-drag"
+]
+
 type keyboardShouldPersistTaps = [#always | #never | #handled]
 
 type overScrollMode = [#always | #never | #auto]
@@ -41,12 +47,7 @@ external make: (
   ~fadingEdgeLength: float=?,
   ~horizontal: bool=?,
   ~indicatorStyle: indicatorStyle=?,
-  ~keyboardDismissMode: @string
-  [
-    | #none
-    | #interactive
-    | @as("on-drag") #onDrag
-  ]=?,
+  ~keyboardDismissMode: keyboardDismissMode=?,
   ~keyboardShouldPersistTaps: keyboardShouldPersistTaps=?,
   ~maximumZoomScale: float=?,
   ~minimumZoomScale: float=?,
@@ -93,13 +94,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -120,13 +115,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/SectionList.res b/src/components/SectionList.res
index 075f3583a..2e182950a 100644
--- a/src/components/SectionList.res
+++ b/src/components/SectionList.res
@@ -74,12 +74,7 @@ external make: (
   ~fadingEdgeLength: float=?,
   ~horizontal: bool=?,
   ~indicatorStyle: ScrollView.indicatorStyle=?,
-  ~keyboardDismissMode: @string
-  [
-    | #none
-    | #interactive
-    | @as("on-drag") #onDrag
-  ]=?,
+  ~keyboardDismissMode: ScrollView.keyboardDismissMode=?,
   ~keyboardShouldPersistTaps: ScrollView.keyboardShouldPersistTaps=?,
   ~maximumZoomScale: float=?,
   ~minimumZoomScale: float=?,
@@ -126,13 +121,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -153,13 +142,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/SegmentedControlIOS.res b/src/components/SegmentedControlIOS.res
index f09a4eb37..f7987cfbe 100644
--- a/src/components/SegmentedControlIOS.res
+++ b/src/components/SegmentedControlIOS.res
@@ -40,13 +40,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -67,13 +61,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/Slider.res b/src/components/Slider.res
index 96b394e5e..d609bc102 100644
--- a/src/components/Slider.res
+++ b/src/components/Slider.res
@@ -34,13 +34,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -61,13 +55,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/SnapshotViewIOS.res b/src/components/SnapshotViewIOS.res
index 8fa273c46..20c2a14e5 100644
--- a/src/components/SnapshotViewIOS.res
+++ b/src/components/SnapshotViewIOS.res
@@ -29,13 +29,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -56,13 +50,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/StatusBar.res b/src/components/StatusBar.res
index bc662541c..bb1b8b585 100644
--- a/src/components/StatusBar.res
+++ b/src/components/StatusBar.res
@@ -1,14 +1,15 @@
+type barStyle = [
+  | #default
+  | #"light-content"
+  | #"dark-content"
+]
+
 type showHideTransition = [#fade | #none | #slide]
 
 @react.component @module("react-native")
 external make: (
   ~animated: bool=?,
-  ~barStyle: @string
-  [
-    | #default
-    | @as("light-content") #lightContent
-    | @as("dark-content") #darkContent
-  ]=?,
+  ~barStyle: barStyle=?,
   ~hidden: bool=?,
   ~backgroundColor: string=?,
   ~translucent: bool=?,
@@ -20,15 +21,7 @@ external make: (
 external setHidden: (bool, showHideTransition) => unit = "setHidden"
 
 @module("react-native") @scope("StatusBar")
-external setBarStyle: (
-  @string
-  [
-    | #default
-    | @as("light-content") #lightContent
-    | @as("dark-content") #darkContent
-  ],
-  bool,
-) => unit = "setBarStyle"
+external setBarStyle: (barStyle, bool) => unit = "setBarStyle"
 
 @module("react-native") @scope("StatusBar")
 external setNetworkActivityIndicatorVisible: bool => unit = "setNetworkActivityIndicatorVisible"
diff --git a/src/components/Switch.res b/src/components/Switch.res
index 9a4afe85b..58a95f11a 100644
--- a/src/components/Switch.res
+++ b/src/components/Switch.res
@@ -30,13 +30,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -57,13 +51,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/TextInput.res b/src/components/TextInput.res
index df0f0befd..40e068fe8 100644
--- a/src/components/TextInput.res
+++ b/src/components/TextInput.res
@@ -136,6 +136,13 @@ type autoComplete = [
 
 type t
 
+type clearButtonMode = [
+  | #never
+  | #"while-editing"
+  | #"unless-editing"
+  | #always
+]
+
 type importantForAutofill = [
   | #auto
   | #no
@@ -146,6 +153,38 @@ type importantForAutofill = [
 
 type keyboardAppearance = [#default | #light | #dark]
 
+type keyboardType = [
+  | #default
+  | #"number-pad"
+  | #"decimal-pad"
+  | #numeric
+  | #"email-address"
+  | #"phone-pad"
+  | #"ascii-capable"
+  | #"numbers-and-punctuation"
+  | #url
+  | #"name-phone-pad"
+  | #twitter
+  | #"web-search"
+  | #"visible-password"
+]
+
+type returnKeyType = [
+  | #done
+  | #go
+  | #next
+  | #search
+  | #send
+  | #none
+  | #previous
+  | #default
+  | #"emergency-call"
+  | #google
+  | #join
+  | #route
+  | #yahoo
+]
+
 type textBreakStrategy = [#balanced | #highQuality | #simple]
 
 type textContentType = [
@@ -190,13 +229,7 @@ external make: (
   ~autoFocus: bool=?,
   ~blurOnSubmit: bool=?,
   ~caretHidden: bool=?,
-  ~clearButtonMode: @string
-  [
-    | #never
-    | @as("while-editing") #whileEditing
-    | @as("unless-editing") #unlessEditing
-    | #always
-  ]=?,
+  ~clearButtonMode: clearButtonMode=?,
   ~clearTextOnFocus: bool=?,
   ~contextMenuHidden: bool=?,
   ~defaultValue: string=?,
@@ -208,22 +241,7 @@ external make: (
   ~inlineImagePadding: float=?,
   ~inputAccessoryViewID: string=?,
   ~keyboardAppearance: keyboardAppearance=?,
-  ~keyboardType: @string
-  [
-    | #default
-    | @as("number-pad") #numberPad
-    | @as("decimal-pad") #decimalPad
-    | #numeric
-    | @as("email-address") #emailAddress
-    | @as("phone-pad") #phonePad
-    | @as("ascii-capable") #asciiCapable
-    | @as("numbers-and-punctuation") #numbersAndPunctuation
-    | #url
-    | @as("name-phone-pad") #namePhonePad
-    | #twitter
-    | @as("web-search") #webSearch
-    | @as("visible-password") #visiblePassword
-  ]=?,
+  ~keyboardType: keyboardType=?,
   ~maxFontSizeMultiplier: float=?,
   ~maxLength: int=?,
   ~multiline: bool=?,
@@ -243,22 +261,7 @@ external make: (
   ~placeholder: string=?,
   ~placeholderTextColor: Color.t=?,
   ~returnKeyLabel: string=?,
-  ~returnKeyType: @string
-  [
-    | @as("done") #done_
-    | #go
-    | #next
-    | #search
-    | #send
-    | #none
-    | #previous
-    | #default
-    | @as("emergency-call") #emergencyCall
-    | #google
-    | #join
-    | #route
-    | #yahoo
-  ]=?,
+  ~returnKeyType: returnKeyType=?,
   ~rejectResponderTermination: bool=?,
   ~scrollEnabled: bool=?,
   ~secureTextEntry: bool=?,
@@ -287,13 +290,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -314,13 +311,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/TouchableHighlight.res b/src/components/TouchableHighlight.res
index b72886c18..c2cc9d90b 100644
--- a/src/components/TouchableHighlight.res
+++ b/src/components/TouchableHighlight.res
@@ -28,13 +28,7 @@ external make: (
   ~delayPressOut: int=?,
   ~disabled: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~onLayout: Event.layoutEvent => unit=?,
   ~onLongPress: Event.pressEvent => unit=?,
   ~onPress: Event.pressEvent => unit=?,
diff --git a/src/components/TouchableNativeFeedback.res b/src/components/TouchableNativeFeedback.res
index 95fa6df88..0fefd0f04 100644
--- a/src/components/TouchableNativeFeedback.res
+++ b/src/components/TouchableNativeFeedback.res
@@ -39,13 +39,7 @@ external make: (
   ~delayPressOut: int=?,
   ~disabled: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~onLayout: Event.layoutEvent => unit=?,
   ~onLongPress: Event.pressEvent => unit=?,
   ~onPress: Event.pressEvent => unit=?,
diff --git a/src/components/TouchableOpacity.res b/src/components/TouchableOpacity.res
index b557153bc..59046a20c 100644
--- a/src/components/TouchableOpacity.res
+++ b/src/components/TouchableOpacity.res
@@ -25,13 +25,7 @@ external make: (
   ~delayPressOut: int=?,
   ~disabled: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~onLayout: Event.layoutEvent => unit=?,
   ~onLongPress: Event.pressEvent => unit=?,
   ~onPress: Event.pressEvent => unit=?,
diff --git a/src/components/TouchableWithoutFeedback.res b/src/components/TouchableWithoutFeedback.res
index c8832ee1c..b3f3e3a82 100644
--- a/src/components/TouchableWithoutFeedback.res
+++ b/src/components/TouchableWithoutFeedback.res
@@ -20,13 +20,7 @@ external make: (
   ~delayPressOut: int=?,
   ~disabled: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~onBlur: Event.targetEvent => unit=?,
   ~onFocus: Event.targetEvent => unit=?,
   ~onLayout: Event.layoutEvent => unit=?,
diff --git a/src/components/View.res b/src/components/View.res
index 11466fcee..e987d36ef 100644
--- a/src/components/View.res
+++ b/src/components/View.res
@@ -17,6 +17,20 @@ module View = {
   type edgeInsets = edgeInsets
 }
 
+type importantForAccessibility = [
+  | #auto
+  | #yes
+  | #no
+  | #"no-hide-descendants"
+]
+
+type pointerEvents = [
+  | #auto
+  | #none
+  | #"box-none"
+  | #"box-only"
+]
+
 @react.component @module("react-native")
 external make: (
   ~ref: ref=?,
@@ -39,13 +53,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -66,13 +74,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/VirtualizedList.res b/src/components/VirtualizedList.res
index 3af6c45be..d8bd17a51 100644
--- a/src/components/VirtualizedList.res
+++ b/src/components/VirtualizedList.res
@@ -113,12 +113,7 @@ external make: (
   ~fadingEdgeLength: float=?,
   ~horizontal: bool=?,
   ~indicatorStyle: ScrollView.indicatorStyle=?,
-  ~keyboardDismissMode: @string
-  [
-    | #none
-    | #interactive
-    | @as("on-drag") #onDrag
-  ]=?,
+  ~keyboardDismissMode: ScrollView.keyboardDismissMode=?,
   ~keyboardShouldPersistTaps: ScrollView.keyboardShouldPersistTaps=?,
   ~maximumZoomScale: float=?,
   ~minimumZoomScale: float=?,
@@ -165,13 +160,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -192,13 +181,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/components/VirtualizedSectionList.res b/src/components/VirtualizedSectionList.res
index c23bfb71c..a9066784c 100644
--- a/src/components/VirtualizedSectionList.res
+++ b/src/components/VirtualizedSectionList.res
@@ -109,12 +109,7 @@ external make: (
   ~fadingEdgeLength: float=?,
   ~horizontal: bool=?,
   ~indicatorStyle: ScrollView.indicatorStyle=?,
-  ~keyboardDismissMode: @string
-  [
-    | #none
-    | #interactive
-    | @as("on-drag") #onDrag
-  ]=?,
+  ~keyboardDismissMode: ScrollView.keyboardDismissMode=?,
   ~keyboardShouldPersistTaps: ScrollView.keyboardShouldPersistTaps=?,
   ~maximumZoomScale: float=?,
   ~minimumZoomScale: float=?,
@@ -161,13 +156,7 @@ external make: (
   ~accessible: bool=?,
   ~collapsable: bool=?,
   ~hitSlop: View.edgeInsets=?,
-  ~importantForAccessibility: @string
-  [
-    | #auto
-    | #yes
-    | #no
-    | @as("no-hide-descendants") #noHideDescendants
-  ]=?,
+  ~importantForAccessibility: View.importantForAccessibility=?,
   ~nativeID: string=?,
   ~needsOffscreenAlphaCompositing: bool=?,
   ~onAccessibilityAction: Accessibility.actionEvent => unit=?,
@@ -188,13 +177,7 @@ external make: (
   ~onResponderTerminationRequest: Event.pressEvent => bool=?,
   ~onStartShouldSetResponder: Event.pressEvent => bool=?,
   ~onStartShouldSetResponderCapture: Event.pressEvent => bool=?,
-  ~pointerEvents: @string
-  [
-    | #auto
-    | #none
-    | @as("box-none") #boxNone
-    | @as("box-only") #boxOnly
-  ]=?,
+  ~pointerEvents: View.pointerEvents=?,
   ~removeClippedSubviews: bool=?,
   ~renderToHardwareTextureAndroid: bool=?,
   ~shouldRasterizeIOS: bool=?,
diff --git a/src/types/FontVariant.bs.js b/src/types/FontVariant.bs.js
deleted file mode 100644
index ae1b9f17e..000000000
--- a/src/types/FontVariant.bs.js
+++ /dev/null
@@ -1 +0,0 @@
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/src/types/FontVariant.res b/src/types/FontVariant.res
deleted file mode 100644
index 26b4fefc8..000000000
--- a/src/types/FontVariant.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type t = string
-
-@inline
-let smallCaps = "small-caps"
-
-@inline
-let oldstyleNums = "oldstyle-nums"
-
-@inline
-let liningNums = "lining-nums"
-
-@inline
-let tabularNums = "tabular-nums"
-
-@inline
-let proportionalNums = "proportional-nums"
diff --git a/src/types/FontVariant.resi b/src/types/FontVariant.resi
deleted file mode 100644
index 701c07c2c..000000000
--- a/src/types/FontVariant.resi
+++ /dev/null
@@ -1,16 +0,0 @@
-type t
-
-@inline("small-caps")
-let smallCaps: t
-
-@inline("oldstyle-nums")
-let oldstyleNums: t
-
-@inline("lining-nums")
-let liningNums: t
-
-@inline("tabular-nums")
-let tabularNums: t
-
-@inline("proportional-nums")
-let proportionalNums: t
diff --git a/src/types/Modal_Orientation.bs.js b/src/types/Modal_Orientation.bs.js
deleted file mode 100644
index ae1b9f17e..000000000
--- a/src/types/Modal_Orientation.bs.js
+++ /dev/null
@@ -1 +0,0 @@
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/src/types/Modal_Orientation.res b/src/types/Modal_Orientation.res
deleted file mode 100644
index 88458f6ae..000000000
--- a/src/types/Modal_Orientation.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type t = string
-
-@inline
-let landscape = "landscape"
-
-@inline
-let landscapeLeft = "landscape-left"
-
-@inline
-let landscapeRight = "landscape-right"
-
-@inline
-let portrait = "portrait"
-
-@inline
-let portraitUpsideDown = "portrait-upside-down"
diff --git a/src/types/Modal_Orientation.resi b/src/types/Modal_Orientation.resi
deleted file mode 100644
index 1b0cf20ed..000000000
--- a/src/types/Modal_Orientation.resi
+++ /dev/null
@@ -1,16 +0,0 @@
-type t
-
-@inline("landscape")
-let landscape: t
-
-@inline("landscape-left")
-let landscapeLeft: t
-
-@inline("landscape-right")
-let landscapeRight: t
-
-@inline("portrait")
-let portrait: t
-
-@inline("portrait-upside-down")
-let portraitUpsideDown: t