Fixes to get namespaces working internally at @viskahq

Author: arnarthor

bsconfig.json

@@ -1,5 +1,5 @@
 {
- "name": "react-native",
+ "name": "bs-react-native",
  "bsc-flags": ["-bs-super-errors"],
  "reason": {"react-jsx": 2},
  "refmt": 3,
@@ -11,7 +11,6 @@
  "subdirs": [
  {
  "dir": "components",
- "subdirs": [{"dir": "private", "public": []}],
  },
  {
  "dir": "private",

src/private/animatedRe.re renamed to src/animatedRe.re

@@ -29,7 +29,7 @@ module Animations = {
  ) =>
  config =
  "";
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"]
+ [@bs.module "react-native"] [@bs.scope "Animated"]
  external _decay : (Val.t, config) => CompositeAnimation.t =
  "decay";
  let animate =
@@ -75,7 +75,7 @@ module Animations = {
  };
  external toValueRaw : Val.rawJsType => toValue = "%identity";
  external toValueAnimatedRe : Val.t => toValue = "%identity";
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"]
+ [@bs.module "react-native"] [@bs.scope "Animated"]
  external _spring : (Val.t, config) => CompositeAnimation.t =
  "spring";
  let animate =
@@ -140,7 +140,7 @@ module Animations = {
  "";
  external toValueRaw : Val.rawJsType => toValue = "%identity";
  external toValueAnimatedRe : Val.t => toValue = "%identity";
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"]
+ [@bs.module "react-native"] [@bs.scope "Animated"]
  external _timing : (Val.t, config) => CompositeAnimation.t =
  "timing";
  let animate =
@@ -177,10 +177,10 @@ module Animations = {
 };
 
 module ValueOperations = (Val: Value) => {
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"] external add : (Val.t, Val.t) => Val.t = "";
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"] external divide : (Val.t, Val.t) => Val.t =
+ [@bs.module "react-native"] [@bs.scope "Animated"] external add : (Val.t, Val.t) => Val.t = "";
+ [@bs.module "react-native"] [@bs.scope "Animated"] external divide : (Val.t, Val.t) => Val.t =
  "";
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"] external multiply : (Val.t, Val.t) => Val.t =
+ [@bs.module "react-native"] [@bs.scope "Animated"] external multiply : (Val.t, Val.t) => Val.t =
  "";
  module Timing = Animations.Timing(Val);
  module Spring = Animations.Spring(Val);
@@ -246,7 +246,7 @@ module Interpolation = {
 module Value = {
  type t;
  type callback = float => unit;
- [@bs.new] [@bs.scope "AnimatedRe"] [@bs.module "react-native"] external create : float => t =
+ [@bs.new] [@bs.scope "Animated"] [@bs.module "react-native"] external create : float => t =
  "Value";
  [@bs.send] external setValue : (t, float) => unit = "setValue";
  [@bs.send] external setOffset : (t, float) => unit = "setOffset";
@@ -291,8 +291,8 @@ module Value = {
  [@bs.send] external animate : (t, Animation.t, Animation.endCallback) => unit = "animate";
  [@bs.send] external stopTracking : t => unit = "stopTracking";
  [@bs.send] external track : t => unit = "track";
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"] external modulo : (t, float) => t = "";
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"] external diffClamp : (t, float, float) => t =
+ [@bs.module "react-native"] [@bs.scope "Animated"] external modulo : (t, float) => t = "";
+ [@bs.module "react-native"] [@bs.scope "Animated"] external diffClamp : (t, float, float) => t =
  "";
  type value = t;
  include
@@ -310,7 +310,7 @@ module ValueXY = {
  type callback = jsValue => unit;
  type translateTransform = {. "translateX": Value.t, "translateY": Value.t};
  type layout = {. "left": Value.t, "top": Value.t};
- [@bs.new] [@bs.scope "AnimatedRe"] [@bs.module "react-native"] external _create : jsValue => t =
+ [@bs.new] [@bs.scope "Animated"] [@bs.module "react-native"] external _create : jsValue => t =
  "ValueXY";
  let create = (~x, ~y) => _create({"x": x, "y": y});
  [@bs.send] external _setValue : (t, jsValue) => unit = "setValue";
@@ -338,34 +338,38 @@ module ValueXY = {
  );
 };
 
-[@bs.module "react-native"] [@bs.scope "AnimatedRe"] external delay : float => CompositeAnimation.t =
+[@bs.module "react-native"] [@bs.scope "Animated"] external delay : float => CompositeAnimation.t =
  "";
 
-[@bs.module "react-native"] [@bs.scope "AnimatedRe"]
+[@bs.module "react-native"] [@bs.scope "Animated"]
 external sequence : array(CompositeAnimation.t) => CompositeAnimation.t =
  "";
 
-[@bs.module "react-native"] [@bs.scope "AnimatedRe"]
+[@bs.module "react-native"] [@bs.scope "Animated"]
 external parallel :
  (array(CompositeAnimation.t), {. "stopTogether": Js.boolean}) => CompositeAnimation.t =
  "";
 
-[@bs.module "react-native"] [@bs.scope "AnimatedRe"]
+[@bs.module "react-native"] [@bs.scope "Animated"]
 external stagger : (float, array(CompositeAnimation.t)) => CompositeAnimation.t =
  "";
 
-[@bs.module "react-native"] [@bs.scope "AnimatedRe"]
+[@bs.module "react-native"] [@bs.scope "Animated"]
 external _loop : (CompositeAnimation.t, {. "iterations": int}) => CompositeAnimation.t =
  "loop";
 
 type animatedEvent;
 
-[@bs.module "react-native"] [@bs.scope "AnimatedRe"]
+[@bs.module "react-native"] [@bs.scope "Animated"]
 external event : (array('a), 'b) => animatedEvent =
  "";
 
 let loop = (~iterations=(-1), ~animation, ()) => _loop(animation, {"iterations": iterations});
 
+[@bs.module "react-native"] [@bs.scope "Animated"]
+external createAnimatedComponent : ReasonReact.reactClass => ReasonReact.reactClass =
+ "";
+
 module Timing = Value.Timing;
 
 module TimingXY = ValueXY.Timing;

src/private/animatedRe.rei renamed to src/animatedRe.rei

@@ -216,6 +216,8 @@ let stagger: (float, array(CompositeAnimation.t)) => CompositeAnimation.t;
 
 let loop: (~iterations: int=?, ~animation: CompositeAnimation.t, unit) => CompositeAnimation.t;
 
+let createAnimatedComponent : ReasonReact.reactClass => ReasonReact.reactClass;
+
 module Timing = Value.Timing;
 
 module TimingXY = ValueXY.Timing;

src/components/private/animatedComponents.re renamed to src/components/animatedComponents.re

@@ -1,16 +1,16 @@
 module View =
  View.CreateComponent(
  {
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"] external view : ReasonReact.reactClass =
- "ViewRe";
+ [@bs.module "react-native"] [@bs.scope "Animated"] external view : ReasonReact.reactClass =
+ "View";
  let view = view;
  }
  );
 
 module Image =
  Image.CreateComponent(
  {
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"] external view : ReasonReact.reactClass =
+ [@bs.module "react-native"] [@bs.scope "Animated"] external view : ReasonReact.reactClass =
  "Image";
  let view = view;
  }
@@ -19,7 +19,7 @@ module Image =
 module Text =
  Text.CreateComponent(
  {
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"] external view : ReasonReact.reactClass =
+ [@bs.module "react-native"] [@bs.scope "Animated"] external view : ReasonReact.reactClass =
  "Text";
  let view = view;
  }
@@ -44,7 +44,7 @@ module ScrollView = {
  include
  ScrollView.CreateComponent(
  {
- [@bs.module "react-native"] [@bs.scope "AnimatedRe"] external view : ReasonReact.reactClass =
+ [@bs.module "react-native"] [@bs.scope "Animated"] external view : ReasonReact.reactClass =
  "ScrollView";
  let view = view;
  }

src/components/private/animatedComponents.rei renamed to src/components/animatedComponents.rei

@@ -125,7 +125,9 @@ let make =
  ~showsVerticalScrollIndicator=?,
  ~windowSize=?,
  ~maxToRenderPerBatch=?,
- ~viewabilityConfig=?
+ ~viewabilityConfig=?,
+ ~onScroll=?,
+ ~style=?
  ) =>
  ReasonReact.wrapJsForReason(
  ~reactClass=view,
@@ -178,7 +180,9 @@ let make =
  from_opt(UtilsRN.optBoolToOptJsBoolean(showsVerticalScrollIndicator)),
  "windowSize": from_opt(windowSize),
  "maxToRenderPerBatch": from_opt(maxToRenderPerBatch),
- "viewabilityConfig": from_opt(viewabilityConfig)
+ "viewabilityConfig": from_opt(viewabilityConfig),
+ "onScroll": from_opt(onScroll),
+ "style": from_opt(style)
  }
  )
  );

src/components/flatList.re

@@ -92,6 +92,8 @@ let make:
  ~windowSize: int=?,
  ~maxToRenderPerBatch: int=?,
  ~viewabilityConfig: Js.t({.})=?,
+ ~onScroll: RNEvent.NativeScrollEvent.t => unit=?,
+ ~style: Style.t=?,
  array(ReasonReact.reactElement)
  ) =>
  ReasonReact.component(ReasonReact.stateless, ReasonReact.noRetainedProps, unit);

src/components/flatList.rei

@@ -15,7 +15,7 @@ type style =
  | IntStyle(string, int)
  | FloatStyle(string, float)
  | ObjectStyle(string, Js.Dict.t(Js.Json.t))
- | AnimatedReStyle(
+ | AnimatedStyle(
  string,
  [ | `value(AnimatedRe.Value.t) | `interpolation(AnimatedRe.Interpolation.t)]
  );
@@ -42,9 +42,9 @@ let pctStyle = (key, value) => StringStyle(key, string_of_float(value) ++ "%");
 
 let objectStyle = (key, value) => ObjectStyle(key, value);
 
-let animatedStyle = (key, value) => AnimatedReStyle(key, `value(value));
+let animatedStyle = (key, value) => AnimatedStyle(key, `value(value));
 
-let interpolatedStyle = (key, value) => AnimatedReStyle(key, `interpolation(value));
+let interpolatedStyle = (key, value) => AnimatedStyle(key, `interpolation(value));
 
 let encodeStyle =
  fun
@@ -54,7 +54,7 @@ let encodeStyle =
  | FloatStyle(key, value) => (key, Encode.float(value))
  | StringStyle(key, value) => (key, Encode.string(value))
  | ObjectStyle(key, value) => (key, Encode.object_(value))
- | AnimatedReStyle(key, value) => (
+ | AnimatedStyle(key, value) => (
  key,
  switch value {
  | `value(x) => Encode.animatedValue(x)
@@ -121,7 +121,7 @@ let bottom = floatStyle("bottom");
 
 let bottomPct = pctStyle("bottom");
 
-let bottomAnimatedRe = animatedStyle("bottom");
+let bottomAnimated = animatedStyle("bottom");
 
 let bottomInterpolated = interpolatedStyle("bottom");
 
@@ -168,7 +168,7 @@ let height = floatStyle("height");
 
 let heightPct = pctStyle("height");
 
-let heightAnimatedRe = animatedStyle("height");
+let heightAnimated = animatedStyle("height");
 
 let heightInterpolated = interpolatedStyle("height");
 
@@ -189,7 +189,7 @@ let left = floatStyle("left");
 
 let leftPct = pctStyle("left");
 
-let leftAnimatedRe = animatedStyle("left");
+let leftAnimated = animatedStyle("left");
 
 let leftInterpolated = interpolatedStyle("left");
 
@@ -260,23 +260,23 @@ let right = floatStyle("right");
 
 let rightPct = pctStyle("right");
 
-let rightAnimatedRe = animatedStyle("right");
+let rightAnimated = animatedStyle("right");
 
 let rightInterpolated = interpolatedStyle("right");
 
 let top = floatStyle("top");
 
 let topPct = pctStyle("top");
 
-let topAnimatedRe = animatedStyle("top");
+let topAnimated = animatedStyle("top");
 
 let topInterpolated = interpolatedStyle("top");
 
 let width = floatStyle("width");
 
 let widthPct = pctStyle("width");
 
-let widthAnimatedRe = animatedStyle("width");
+let widthAnimated = animatedStyle("width");
 
 let widthInterpolated = interpolatedStyle("width");
 
@@ -381,7 +381,7 @@ let transform =
  UtilsRN.option_map(Encode.float, skewY)
  );
 
-let transformAnimatedRe =
+let transformAnimated =
  (
  ~perspective=?,
  ~rotate=?,
@@ -488,7 +488,7 @@ let opacity = floatStyle("opacity");
 
 let opacityInterpolated = interpolatedStyle("opacity");
 
-let opacityAnimatedRe = animatedStyle("opacity");
+let opacityAnimated = animatedStyle("opacity");
 
 let elevation = floatStyle("elevation");
 

src/style.re

@@ -45,7 +45,7 @@ let bottom: float => style;
 
 let bottomPct: float => style;
 
-let bottomAnimatedRe: AnimatedRe.Value.t => style;
+let bottomAnimated: AnimatedRe.Value.t => style;
 
 let bottomInterpolated: AnimatedRe.Interpolation.t => style;
 
@@ -69,7 +69,7 @@ let height: float => style;
 
 let heightPct: float => style;
 
-let heightAnimatedRe: AnimatedRe.Value.t => style;
+let heightAnimated: AnimatedRe.Value.t => style;
 
 let heightInterpolated: AnimatedRe.Interpolation.t => style;
 
@@ -80,7 +80,7 @@ let left: float => style;
 
 let leftPct: float => style;
 
-let leftAnimatedRe: AnimatedRe.Value.t => style;
+let leftAnimated: AnimatedRe.Value.t => style;
 
 let leftInterpolated: AnimatedRe.Interpolation.t => style;
 
@@ -136,23 +136,23 @@ let right: float => style;
 
 let rightPct: float => style;
 
-let rightAnimatedRe: AnimatedRe.Value.t => style;
+let rightAnimated: AnimatedRe.Value.t => style;
 
 let rightInterpolated: AnimatedRe.Interpolation.t => style;
 
 let top: float => style;
 
 let topPct: float => style;
 
-let topAnimatedRe: AnimatedRe.Value.t => style;
+let topAnimated: AnimatedRe.Value.t => style;
 
 let topInterpolated: AnimatedRe.Interpolation.t => style;
 
 let width: float => style;
 
 let widthPct: float => style;
 
-let widthAnimatedRe: AnimatedRe.Value.t => style;
+let widthAnimated: AnimatedRe.Value.t => style;
 
 let widthInterpolated: AnimatedRe.Interpolation.t => style;
 
@@ -193,7 +193,7 @@ let transform:
  ) =>
  style;
 
-let transformAnimatedRe:
+let transformAnimated:
  (
  ~perspective: AnimatedRe.Value.t=?,
  ~rotate: AnimatedRe.Value.t=?,
@@ -259,7 +259,7 @@ let borderStyle: [ | `solid | `dotted | `dashed] => style;
 
 let opacity: float => style;
 
-let opacityAnimatedRe: AnimatedRe.Value.t => style;
+let opacityAnimated: AnimatedRe.Value.t => style;
 
 let opacityInterpolated: AnimatedRe.Interpolation.t => style;