Upgrade purescript-react to v8.0.0. Use the new ref api. (Fixed #26).

Author: ajnsit

lib/src/Concur/React/Props.js

@@ -9,31 +9,3 @@ exports.resetTargetValue = function(s) {
 };
 
 exports.emptyProp_ = {}
-
-exports.createRef = function() {
-  return (function() {
-    var x;
-    return [
-      function(cur) {
-        x=cur;
-      },
-      function() {
-        return x;
-      }
-    ];
-  })();
-};
-
-exports.refSetter = function(ref) {
-  return function(cur) {
-    return function() {
-      return ref[0](cur);
-    }
-  };
-};
-
-exports.refGetter_ = function(ref) {
-  return function() {
-    return ref[1]();
-  };
-};

lib/src/Concur/React/Props.purs

@@ -5,10 +5,9 @@ import Prelude
 import Concur.Core.Props (Props(..), filterProp)
 import Data.Array (concatMap, intercalate)
 import Data.Maybe (Maybe, maybe)
-import Data.Nullable (Nullable, toMaybe)
 import Effect (Effect)
 import Effect.Uncurried (mkEffectFn1)
-import React (ReactRef)
+import React.Ref as Ref
 import React.DOM.Props as P
 import React.SyntheticEvent
   ( SyntheticAnimationEvent
@@ -50,37 +49,6 @@ unsafeMkProp ::
   ReactProps b
 unsafeMkProp s v = PrimProp (P.unsafeMkProps s v)
 
-foreign import data RRef :: Type -> Type
-
-foreign import createRef :: forall a. Effect (RRef a)
-
-foreign import refSetter :: forall a. RRef a -> a -> Effect Unit
-
-foreign import refGetter_ :: forall a. RRef a -> Effect (Nullable a)
-
--- | `refGetter` will collapse nullable values
--- | So it will never return a `Just null`, only either `Nothing`, or `Just (notNull a)`
--- | So with `Nullable a`, it is easier, without loss of generality, to use `refNullableGetter`
-refGetter ::
-  forall a.
-  RRef a ->
-  Effect (Maybe a)
-refGetter rf = toMaybe <$> refGetter_ rf
-
-refNullableGetter :: forall a. RRef (Nullable a) -> Effect (Maybe a)
-refNullableGetter rf = (unsafeCoerce <<< toMaybe) <$> refGetter_ rf
-
--- | Use `refProp` to convert a `Handler` to a static prop
--- | The value returned by the handler is stored in the RRef passed
-refProp ::
-  forall a b.
-  RRef a ->
-  ReactProps a ->
-  ReactProps b
-refProp rref (PrimProp p) = PrimProp p
-
-refProp rref (Handler f) = PrimProp (f (refSetter rref))
-
 -- | Shortcut for the common case of a list of classes
 classList ::
   forall a.
@@ -986,8 +954,8 @@ onScrollCapture = Handler P.onScrollCapture
 onWheelCapture :: ReactProps SyntheticWheelEvent
 onWheelCapture = Handler P.onWheelCapture
 
-ref :: ReactProps (Nullable ReactRef)
-ref = Handler P.ref
+ref :: forall a. Ref.RefHandler Ref.NativeNode -> ReactProps a
+ref = PrimProp <<< P.ref
 
 suppressContentEditableWarning :: forall a. Boolean -> ReactProps a
 suppressContentEditableWarning = PrimProp <<< P.suppressContentEditableWarning

lib/src/Concur/React/Widgets.purs

@@ -9,6 +9,7 @@ import Concur.React.Props (ReactProps)
 import Concur.React.Props as P
 import Data.Maybe (Maybe(..))
 import Effect.Class (liftEffect)
+import React.Ref as Ref
 import Unsafe.Coerce (unsafeCoerce)
 
 -- | A Text input that returns its contents on enter
@@ -33,17 +34,17 @@ textInputWithButton ::
   (forall a. Array (ReactProps a)) ->
   Widget HTML String
 textInputWithButton val buttonlabel inpProps buttonProps = do
-  ref <- liftEffect P.createRef
+  ref <- liftEffect Ref.createNodeRef
   D.div'
     [ D.input $ inpProps <>
       [ P.unsafeTargetValue <$> P.onKeyEnter
       , P.defaultValue val
-      , P.refProp ref P.ref
+      , P.ref (Ref.fromRef ref)
       ]
     , D.text " "
     , do
       _ <- D.button (buttonProps <> [P.onClick]) [D.text buttonlabel]
-      mInput <- liftEffect $ P.refNullableGetter ref
+      mInput <- liftEffect (Ref.getCurrentRef ref)
       case mInput of
         Nothing -> pure val
         Just inp -> pure (unsafeCoerce inp).value

packages.dhall

@@ -114,7 +114,11 @@ let mkPackage =
 let upstream =
       https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20190818/packages.dhall sha256:c95c4a8b8033a48a350106b759179f68a695c7ea2208228c522866fd43814dc8
 
-let overrides = { concur-react = ./lib/spago.dhall as Location }
+let overrides =
+  { concur-react = ./lib/spago.dhall as Location
+  , react =
+      upstream.react // { version = "v8.0.0" }
+  }
 
 let additions = {=}