Merge pull request #161 from teatimegames/section-list-scrollview-props

Expose more of ScrollView's props on SectionList

Author: arnarthor

lib/js/src/components/sectionList.js

@@ -136,6 +136,12 @@ let renderAccessoryView =
  section: jsSectionToSection(jsRenderAccessory##section),
  });
 
+[@bs.deriving jsConverter]
+type keyboardDismissMode = [ | `none | `interactive | `onDrag];
+
+[@bs.deriving jsConverter]
+type keyboardShouldPersistTaps = [ | `always | `never | `handled];
+
 let make:
  (
  ~sections: sections('item),
@@ -161,6 +167,18 @@ let make:
  ~renderSectionHeader: renderAccessoryView('item)=?,
  ~renderSectionFooter: renderAccessoryView('item)=?,
  ~stickySectionHeadersEnabled: bool=?,
+ ~keyboardDismissMode: keyboardDismissMode=?,
+ ~keyboardShouldPersistTaps: keyboardShouldPersistTaps=?,
+ ~showsHorizontalScrollIndicator: bool=?,
+ ~showsVerticalScrollIndicator: bool=?,
+ ~getItemLayout: (option(array('item)), int) =>
+ {
+ .
+ "length": int,
+ "offset": int,
+ "index": int,
+ }
+ =?,
  array(ReasonReact.reactElement)
  ) =>
  ReasonReact.component(
@@ -187,6 +205,11 @@ let make:
  ~renderSectionHeader=?,
  ~renderSectionFooter=?,
  ~stickySectionHeadersEnabled=?,
+ ~keyboardDismissMode=?,
+ ~keyboardShouldPersistTaps=?,
+ ~showsHorizontalScrollIndicator=?,
+ ~showsVerticalScrollIndicator=?,
+ ~getItemLayout=?,
  _children,
  ) =>
  ReasonReact.wrapJsForReason(
@@ -217,7 +240,32 @@ let make:
  fromOption(
  UtilsRN.optBoolToOptJsBoolean(stickySectionHeadersEnabled),
  ),
+ "keyboardDismissMode":
+ fromOption(
+ keyboardDismissMode
+ |> UtilsRN.option_map(keyboardDismissModeToJs),
+ ),
+ "keyboardShouldPersistTaps":
+ fromOption(
+ keyboardShouldPersistTaps
+ |> UtilsRN.option_map(keyboardShouldPersistTapsToJs),
+ ),
+ "showsHorizontalScrollIndicator":
+ fromOption(
+ UtilsRN.optBoolToOptJsBoolean(showsHorizontalScrollIndicator),
+ ),
+ "showsVerticalScrollIndicator":
+ fromOption(
+ UtilsRN.optBoolToOptJsBoolean(showsVerticalScrollIndicator),
+ ),
+ "getItemLayout":
+ fromOption(
+ UtilsRN.option_map(
+ (f, data, index) => f(Js.Undefined.toOption(data), index),
+ getItemLayout,
+ ),
+ ),
  }
  ),
  _children,
- );
+ );

lib/js/src/datePickerAndroid.js

@@ -2,12 +2,16 @@ type renderBag('item) = {
  item: 'item,
  index: int,
  section: section('item),
- separators: {. "highlight": unit => unit, "unhighlight": unit => unit}
+ separators: {
+ .
+ "highlight": unit => unit,
+ "unhighlight": unit => unit,
+ },
 }
 and section('item) = {
  data: array('item),
  key: option(string),
- renderItem: option((renderBag('item) => ReasonReact.reactElement))
+ renderItem: option(renderBag('item) => ReasonReact.reactElement),
 };
 
 let section:
@@ -25,7 +29,7 @@ type separatorProps('item) = {
  leadingSection: option(section('item)),
  section: section('item),
  trailingItem: option('item),
- trailingSection: option(section('item))
+ trailingSection: option(section('item)),
 };
 
 type sections('item);
@@ -34,27 +38,30 @@ let sections: array(section('item)) => sections('item);
 
 type renderItem('item);
 
-let renderItem: (renderBag('item) => ReasonReact.reactElement) => renderItem('item);
+let renderItem:
+ (renderBag('item) => ReasonReact.reactElement) => renderItem('item);
 
 type separatorComponent('item);
 
 let separatorComponent:
- (separatorProps('item) => ReasonReact.reactElement) => separatorComponent('item);
+ (separatorProps('item) => ReasonReact.reactElement) =>
+ separatorComponent('item);
 
 type renderAccessory('item) = {section: section('item)};
 
 type renderAccessoryView('item);
 
 let renderAccessoryView:
- (renderAccessory('item) => ReasonReact.reactElement) => renderAccessoryView('item);
+ (renderAccessory('item) => ReasonReact.reactElement) =>
+ renderAccessoryView('item);
 
 type viewToken('item) = {
  .
  "index": Js.undefined(int),
  "isViewable": Js.boolean,
  "item": 'item,
  "key": string,
- "section": section('item)
+ "section": section('item),
 };
 
 let make:
@@ -74,14 +81,23 @@ let make:
  ~onViewableItemsChanged: {
  .
  "changed": array(viewToken('item)),
- "viewableItems": array(viewToken('item))
+ "viewableItems": array(viewToken('item)),
  }
  =?,
  ~onRefresh: unit => unit=?,
  ~refreshing: bool=?,
  ~renderSectionHeader: renderAccessoryView('item)=?,
  ~renderSectionFooter: renderAccessoryView('item)=?,
  ~stickySectionHeadersEnabled: bool=?,
+ ~keyboardDismissMode: [ | `none | `interactive | `onDrag]=?,
+ ~keyboardShouldPersistTaps: [ | `always | `never | `handled]=?,
+ ~showsHorizontalScrollIndicator: bool=?,
+ ~showsVerticalScrollIndicator: bool=?,
+ ~getItemLayout: (option(array('item)), int) => {. "length": int, "offset": int, "index": int}=?,
  array(ReasonReact.reactElement)
  ) =>
- ReasonReact.component(ReasonReact.stateless, ReasonReact.noRetainedProps, unit);
+ ReasonReact.component(
+ ReasonReact.stateless,
+ ReasonReact.noRetainedProps,
+ unit,
+ );

src/components/sectionList.re

@@ -52,8 +52,8 @@ external _open : optsJs => Js.Promise.t(responseJs) = "open";
 let open_ = (~date: Js.Date.t, ~minDate=?, ~maxDate=?, ~mode=Default, ()) =>
  _open({
  "date": date,
- "minDate": Js.Nullable.from_opt(minDate),
- "maxDate": Js.Nullable.from_opt(maxDate),
+ "minDate": Js.Nullable.fromOption(minDate),
+ "maxDate": Js.Nullable.fromOption(maxDate),
  "mode":
  switch (mode) {
  | Default => "default"
@@ -63,4 +63,4 @@ let open_ = (~date: Js.Date.t, ~minDate=?, ~maxDate=?, ~mode=Default, ()) =>
  })
  |> Js.Promise.then_((resp: responseJs) =>
  resp |> action |> Js.Promise.resolve
- );
+ );