Skip to content

Update to v0.14.0-rc3 #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 5, 2020
Merged

Update to v0.14.0-rc3 #177

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c57dc7a
Update packages.dhall to prepare-0.14 bootstrap
JordanMartinez Dec 4, 2020
266400c
Update CI to use v0.14.0-rc3 PS release
JordanMartinez Dec 4, 2020
0a4ad88
Fix proxy and # Type usage
JordanMartinez Dec 4, 2020
629d3a2
Add compiler-suggested kind signatures
JordanMartinez Dec 4, 2020
69b8390
Concretize kinds to Type for React classes
JordanMartinez Dec 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:

- name: Set up PureScript toolchain
uses: purescript-contrib/setup-purescript@main
with:
purescript: "0.14.0-rc3"

- name: Cache PureScript dependencies
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion packages.dhall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let upstream =
https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201007/packages.dhall sha256:35633f6f591b94d216392c9e0500207bb1fec42dd355f4fecdfd186956567b6b
https://raw.githubusercontent.com/purescript/package-sets/prepare-0.14/src/packages.dhall

in upstream
8 changes: 5 additions & 3 deletions src/React.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,17 @@ type ReactClassConstructor props state r =
ReactThis props state ->
Effect (Record r)

class ReactComponentSpec props state snapshot (given :: # Type) (spec :: # Type)
class ReactComponentSpec :: forall k1 k2 k3. k1 -> k2 -> k3 -> Row Type -> Row Type -> Constraint
class ReactComponentSpec props state snapshot (given :: Row Type) (spec :: Row Type)

instance reactComponentSpec ::
( Row.Union given (ReactSpecAll props state ReactUnusedSnapshot) spec
, Row.Nub spec (ReactSpecAll props state snapshot)
) =>
ReactComponentSpec props state snapshot given spec

class ReactPureComponentSpec props state snapshot (given :: # Type) (spec :: # Type)
class ReactPureComponentSpec :: forall k1 k2 k3. k1 -> k2 -> k3 -> Row Type -> Row Type -> Constraint
class ReactPureComponentSpec props state snapshot (given :: Row Type) (spec :: Row Type)

instance reactPureComponentSpec ::
( Row.Union given (ReactSpecPure props state ReactUnusedSnapshot) spec
Expand Down Expand Up @@ -331,7 +333,7 @@ foreign import forceUpdateWithCallback :: forall props state.
Effect Unit ->
Effect Unit

class ReactPropFields (required :: # Type) (given :: # Type)
class ReactPropFields (required :: Row Type) (given :: Row Type)

type ReservedReactPropFields r =
( key :: String
Expand Down
99 changes: 50 additions & 49 deletions src/React/SyntheticEvent.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,10 @@ module React.SyntheticEvent

import Prelude

import Data.Symbol (class IsSymbol, SProxy(..), reflectSymbol)
import Data.Symbol (class IsSymbol, reflectSymbol)
import Effect (Effect)
import Prim.Row as Row
import Type.Proxy (Proxy(..))

type SyntheticEvent
= SyntheticEvent_ (SyntheticEvent' ())
Expand Down Expand Up @@ -133,7 +134,7 @@ type SyntheticUIEvent
type SyntheticWheelEvent
= SyntheticEvent_ (SyntheticWheelEvent' (SyntheticMouseEvent' (SyntheticEvent' ())))

foreign import data SyntheticEvent_ :: # Type -> Type
foreign import data SyntheticEvent_ :: Row Type -> Type

foreign import data NativeEventTarget :: Type

Expand Down Expand Up @@ -249,139 +250,139 @@ type SyntheticWheelEvent' r
)

bubbles :: forall r. SyntheticEvent_ (bubbles :: Boolean | r) -> Effect Boolean
bubbles = get (SProxy :: SProxy "bubbles")
bubbles = get (Proxy :: Proxy "bubbles")

cancelable :: forall r. SyntheticEvent_ (cancelable :: Boolean | r) -> Effect Boolean
cancelable = get (SProxy :: SProxy "cancelable")
cancelable = get (Proxy :: Proxy "cancelable")

currentTarget :: forall r. SyntheticEvent_ (currentTarget :: NativeEventTarget | r) -> Effect NativeEventTarget
currentTarget = get (SProxy :: SProxy "currentTarget")
currentTarget = get (Proxy :: Proxy "currentTarget")

defaultPrevented :: forall r. SyntheticEvent_ (defaultPrevented :: Boolean | r) -> Effect Boolean
defaultPrevented = get (SProxy :: SProxy "defaultPrevented")
defaultPrevented = get (Proxy :: Proxy "defaultPrevented")

eventPhase :: forall r. SyntheticEvent_ (eventPhase :: Number | r) -> Effect Number
eventPhase = get (SProxy :: SProxy "eventPhase")
eventPhase = get (Proxy :: Proxy "eventPhase")

isTrusted :: forall r. SyntheticEvent_ (isTrusted :: Boolean | r) -> Effect Boolean
isTrusted = get (SProxy :: SProxy "isTrusted")
isTrusted = get (Proxy :: Proxy "isTrusted")

nativeEvent :: forall r. SyntheticEvent_ (nativeEvent :: NativeEvent | r) -> Effect NativeEvent
nativeEvent = get (SProxy :: SProxy "nativeEvent")
nativeEvent = get (Proxy :: Proxy "nativeEvent")

target :: forall r. SyntheticEvent_ (target :: NativeEventTarget | r) -> Effect NativeEventTarget
target = get (SProxy :: SProxy "target")
target = get (Proxy :: Proxy "target")

timeStamp :: forall r. SyntheticEvent_ (timeStamp :: Number | r) -> Effect Number
timeStamp = get (SProxy :: SProxy "timeStamp")
timeStamp = get (Proxy :: Proxy "timeStamp")

type_ :: forall r. SyntheticEvent_ (type :: String | r) -> Effect String
type_ = get (SProxy :: SProxy "type")
type_ = get (Proxy :: Proxy "type")

animationName :: forall r. SyntheticEvent_ (animationName :: String | r) -> Effect String
animationName = get (SProxy :: SProxy "animationName")
animationName = get (Proxy :: Proxy "animationName")

clipboardData :: forall r. SyntheticEvent_ (clipboardData :: NativeDataTransfer | r) -> Effect NativeDataTransfer
clipboardData = get (SProxy :: SProxy "clipboardData")
clipboardData = get (Proxy :: Proxy "clipboardData")

data_ :: forall r. SyntheticEvent_ (data :: String | r) -> Effect String
data_ = get (SProxy :: SProxy "data")
data_ = get (Proxy :: Proxy "data")

relatedTarget :: forall r. SyntheticEvent_ (relatedTarget :: NativeEventTarget | r) -> Effect NativeEventTarget
relatedTarget = get (SProxy :: SProxy "relatedTarget")
relatedTarget = get (Proxy :: Proxy "relatedTarget")

charCode :: forall r. SyntheticEvent_ (charCode :: Int | r) -> Effect Int
charCode = get (SProxy :: SProxy "charCode")
charCode = get (Proxy :: Proxy "charCode")

key :: forall r. SyntheticEvent_ (key :: String | r) -> Effect String
key = get (SProxy :: SProxy "key")
key = get (Proxy :: Proxy "key")

keyCode :: forall r. SyntheticEvent_ (keyCode :: Number | r) -> Effect Number
keyCode = get (SProxy :: SProxy "keyCode")
keyCode = get (Proxy :: Proxy "keyCode")

locale :: forall r. SyntheticEvent_ (locale :: String | r) -> Effect String
locale = get (SProxy :: SProxy "locale")
locale = get (Proxy :: Proxy "locale")

location :: forall r. SyntheticEvent_ (location :: Number | r) -> Effect Number
location = get (SProxy :: SProxy "location")
location = get (Proxy :: Proxy "location")

repeat :: forall r. SyntheticEvent_ (repeat :: Boolean | r) -> Effect Boolean
repeat = get (SProxy :: SProxy "repeat")
repeat = get (Proxy :: Proxy "repeat")

which :: forall r. SyntheticEvent_ (which :: Number | r) -> Effect Number
which = get (SProxy :: SProxy "which")
which = get (Proxy :: Proxy "which")

button :: forall r. SyntheticEvent_ (button :: Number | r) -> Effect Number
button = get (SProxy :: SProxy "button")
button = get (Proxy :: Proxy "button")

buttons :: forall r. SyntheticEvent_ (buttons :: Number | r) -> Effect Number
buttons = get (SProxy :: SProxy "buttons")
buttons = get (Proxy :: Proxy "buttons")

clientX :: forall r. SyntheticEvent_ (clientX :: Number | r) -> Effect Number
clientX = get (SProxy :: SProxy "clientX")
clientX = get (Proxy :: Proxy "clientX")

clientY :: forall r. SyntheticEvent_ (clientY :: Number | r) -> Effect Number
clientY = get (SProxy :: SProxy "clientY")
clientY = get (Proxy :: Proxy "clientY")

pageX :: forall r. SyntheticEvent_ (pageX :: Number | r) -> Effect Number
pageX = get (SProxy :: SProxy "pageX")
pageX = get (Proxy :: Proxy "pageX")

pageY :: forall r. SyntheticEvent_ (pageY :: Number | r) -> Effect Number
pageY = get (SProxy :: SProxy "pageY")
pageY = get (Proxy :: Proxy "pageY")

screenX :: forall r. SyntheticEvent_ (screenX :: Number | r) -> Effect Number
screenX = get (SProxy :: SProxy "screenX")
screenX = get (Proxy :: Proxy "screenX")

screenY :: forall r. SyntheticEvent_ (screenY :: Number | r) -> Effect Number
screenY = get (SProxy :: SProxy "screenY")
screenY = get (Proxy :: Proxy "screenY")

changedTouches :: forall r. SyntheticEvent_ (changedTouches :: NativeTouchList | r) -> Effect NativeTouchList
changedTouches = get (SProxy :: SProxy "changedTouches")
changedTouches = get (Proxy :: Proxy "changedTouches")

targetTouches :: forall r. SyntheticEvent_ (targetTouches :: NativeTouchList | r) -> Effect NativeTouchList
targetTouches = get (SProxy :: SProxy "targetTouches")
targetTouches = get (Proxy :: Proxy "targetTouches")

touches :: forall r. SyntheticEvent_ (touches :: NativeTouchList | r) -> Effect NativeTouchList
touches = get (SProxy :: SProxy "touches")
touches = get (Proxy :: Proxy "touches")

altKey :: forall r. SyntheticEvent_ (altKey :: Boolean | r) -> Effect Boolean
altKey = get (SProxy :: SProxy "altKey")
altKey = get (Proxy :: Proxy "altKey")

ctrlKey :: forall r. SyntheticEvent_ (ctrlKey :: Boolean | r) -> Effect Boolean
ctrlKey = get (SProxy :: SProxy "ctrlKey")
ctrlKey = get (Proxy :: Proxy "ctrlKey")

metaKey :: forall r. SyntheticEvent_ (metaKey :: Boolean | r) -> Effect Boolean
metaKey = get (SProxy :: SProxy "metaKey")
metaKey = get (Proxy :: Proxy "metaKey")

shiftKey :: forall r. SyntheticEvent_ (shiftKey :: Boolean | r) -> Effect Boolean
shiftKey = get (SProxy :: SProxy "shiftKey")
shiftKey = get (Proxy :: Proxy "shiftKey")

propertyName :: forall r. SyntheticEvent_ (propertyName :: String | r) -> Effect String
propertyName = get (SProxy :: SProxy "propertyName")
propertyName = get (Proxy :: Proxy "propertyName")

pseudoElement :: forall r. SyntheticEvent_ (pseudoElement :: String | r) -> Effect String
pseudoElement = get (SProxy :: SProxy "pseudoElement")
pseudoElement = get (Proxy :: Proxy "pseudoElement")

elapsedTime :: forall r. SyntheticEvent_ (elapsedTime :: Number | r) -> Effect Number
elapsedTime = get (SProxy :: SProxy "elapsedTime")
elapsedTime = get (Proxy :: Proxy "elapsedTime")

detail :: forall r. SyntheticEvent_ (detail :: Number | r) -> Effect Number
detail = get (SProxy :: SProxy "detail")
detail = get (Proxy :: Proxy "detail")

view :: forall r. SyntheticEvent_ (view :: NativeAbstractView | r) -> Effect NativeAbstractView
view = get (SProxy :: SProxy "view")
view = get (Proxy :: Proxy "view")

deltaMode :: forall r. SyntheticEvent_ (deltaMode :: Number | r) -> Effect Number
deltaMode = get (SProxy :: SProxy "deltaMode")
deltaMode = get (Proxy :: Proxy "deltaMode")

deltaX :: forall r. SyntheticEvent_ (deltaX :: Number | r) -> Effect Number
deltaX = get (SProxy :: SProxy "deltaX")
deltaX = get (Proxy :: Proxy "deltaX")

deltaY :: forall r. SyntheticEvent_ (deltaY :: Number | r) -> Effect Number
deltaY = get (SProxy :: SProxy "deltaY")
deltaY = get (Proxy :: Proxy "deltaY")

deltaZ :: forall r. SyntheticEvent_ (deltaZ :: Number | r) -> Effect Number
deltaZ = get (SProxy :: SProxy "deltaZ")
deltaZ = get (Proxy :: Proxy "deltaZ")

foreign import preventDefault :: forall r. SyntheticEvent_ r -> Effect Unit

Expand All @@ -396,10 +397,10 @@ foreign import persist :: forall r. SyntheticEvent_ r -> Effect Unit
foreign import getModifierState :: forall r. String -> SyntheticEvent_ (getModifierState :: String -> Boolean | r) -> Effect Boolean

get
:: forall l r s a
:: forall l r s a proxy
. Row.Cons l a r s
=> IsSymbol l
=> SProxy l
=> proxy l
-> SyntheticEvent_ s
-> Effect a
get l r = unsafeGet (reflectSymbol l) r
Expand Down