Skip to content

Commit c09f24b

Browse files
Update to v0.14.0-rc3 (#177)
* Update packages.dhall to prepare-0.14 bootstrap * Update CI to use v0.14.0-rc3 PS release * Fix proxy and # Type usage * Add compiler-suggested kind signatures * Concretize kinds to Type for React classes
1 parent e9e801a commit c09f24b

File tree

4 files changed

+58
-53
lines changed

4 files changed

+58
-53
lines changed

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515

1616
- name: Set up PureScript toolchain
1717
uses: purescript-contrib/setup-purescript@main
18+
with:
19+
purescript: "0.14.0-rc3"
1820

1921
- name: Cache PureScript dependencies
2022
uses: actions/cache@v2

packages.dhall

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
let upstream =
2-
https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201007/packages.dhall sha256:35633f6f591b94d216392c9e0500207bb1fec42dd355f4fecdfd186956567b6b
2+
https://raw.githubusercontent.com/purescript/package-sets/prepare-0.14/src/packages.dhall
33

44
in upstream

src/React.purs

+5-3
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,17 @@ type ReactClassConstructor props state r =
170170
ReactThis props state ->
171171
Effect (Record r)
172172

173-
class ReactComponentSpec props state snapshot (given :: # Type) (spec :: # Type)
173+
class ReactComponentSpec :: Type -> Type -> Type -> Row Type -> Row Type -> Constraint
174+
class ReactComponentSpec props state snapshot (given :: Row Type) (spec :: Row Type)
174175

175176
instance reactComponentSpec ::
176177
( Row.Union given (ReactSpecAll props state ReactUnusedSnapshot) spec
177178
, Row.Nub spec (ReactSpecAll props state snapshot)
178179
) =>
179180
ReactComponentSpec props state snapshot given spec
180181

181-
class ReactPureComponentSpec props state snapshot (given :: # Type) (spec :: # Type)
182+
class ReactPureComponentSpec :: Type -> Type -> Type -> Row Type -> Row Type -> Constraint
183+
class ReactPureComponentSpec props state snapshot (given :: Row Type) (spec :: Row Type)
182184

183185
instance reactPureComponentSpec ::
184186
( Row.Union given (ReactSpecPure props state ReactUnusedSnapshot) spec
@@ -331,7 +333,7 @@ foreign import forceUpdateWithCallback :: forall props state.
331333
Effect Unit ->
332334
Effect Unit
333335

334-
class ReactPropFields (required :: # Type) (given :: # Type)
336+
class ReactPropFields (required :: Row Type) (given :: Row Type)
335337

336338
type ReservedReactPropFields r =
337339
( key :: String

src/React/SyntheticEvent.purs

+50-49
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ module React.SyntheticEvent
9393

9494
import Prelude
9595

96-
import Data.Symbol (class IsSymbol, SProxy(..), reflectSymbol)
96+
import Data.Symbol (class IsSymbol, reflectSymbol)
9797
import Effect (Effect)
9898
import Prim.Row as Row
99+
import Type.Proxy (Proxy(..))
99100

100101
type SyntheticEvent
101102
= SyntheticEvent_ (SyntheticEvent' ())
@@ -133,7 +134,7 @@ type SyntheticUIEvent
133134
type SyntheticWheelEvent
134135
= SyntheticEvent_ (SyntheticWheelEvent' (SyntheticMouseEvent' (SyntheticEvent' ())))
135136

136-
foreign import data SyntheticEvent_ :: # Type -> Type
137+
foreign import data SyntheticEvent_ :: Row Type -> Type
137138

138139
foreign import data NativeEventTarget :: Type
139140

@@ -249,139 +250,139 @@ type SyntheticWheelEvent' r
249250
)
250251

251252
bubbles :: forall r. SyntheticEvent_ (bubbles :: Boolean | r) -> Effect Boolean
252-
bubbles = get (SProxy :: SProxy "bubbles")
253+
bubbles = get (Proxy :: Proxy "bubbles")
253254

254255
cancelable :: forall r. SyntheticEvent_ (cancelable :: Boolean | r) -> Effect Boolean
255-
cancelable = get (SProxy :: SProxy "cancelable")
256+
cancelable = get (Proxy :: Proxy "cancelable")
256257

257258
currentTarget :: forall r. SyntheticEvent_ (currentTarget :: NativeEventTarget | r) -> Effect NativeEventTarget
258-
currentTarget = get (SProxy :: SProxy "currentTarget")
259+
currentTarget = get (Proxy :: Proxy "currentTarget")
259260

260261
defaultPrevented :: forall r. SyntheticEvent_ (defaultPrevented :: Boolean | r) -> Effect Boolean
261-
defaultPrevented = get (SProxy :: SProxy "defaultPrevented")
262+
defaultPrevented = get (Proxy :: Proxy "defaultPrevented")
262263

263264
eventPhase :: forall r. SyntheticEvent_ (eventPhase :: Number | r) -> Effect Number
264-
eventPhase = get (SProxy :: SProxy "eventPhase")
265+
eventPhase = get (Proxy :: Proxy "eventPhase")
265266

266267
isTrusted :: forall r. SyntheticEvent_ (isTrusted :: Boolean | r) -> Effect Boolean
267-
isTrusted = get (SProxy :: SProxy "isTrusted")
268+
isTrusted = get (Proxy :: Proxy "isTrusted")
268269

269270
nativeEvent :: forall r. SyntheticEvent_ (nativeEvent :: NativeEvent | r) -> Effect NativeEvent
270-
nativeEvent = get (SProxy :: SProxy "nativeEvent")
271+
nativeEvent = get (Proxy :: Proxy "nativeEvent")
271272

272273
target :: forall r. SyntheticEvent_ (target :: NativeEventTarget | r) -> Effect NativeEventTarget
273-
target = get (SProxy :: SProxy "target")
274+
target = get (Proxy :: Proxy "target")
274275

275276
timeStamp :: forall r. SyntheticEvent_ (timeStamp :: Number | r) -> Effect Number
276-
timeStamp = get (SProxy :: SProxy "timeStamp")
277+
timeStamp = get (Proxy :: Proxy "timeStamp")
277278

278279
type_ :: forall r. SyntheticEvent_ (type :: String | r) -> Effect String
279-
type_ = get (SProxy :: SProxy "type")
280+
type_ = get (Proxy :: Proxy "type")
280281

281282
animationName :: forall r. SyntheticEvent_ (animationName :: String | r) -> Effect String
282-
animationName = get (SProxy :: SProxy "animationName")
283+
animationName = get (Proxy :: Proxy "animationName")
283284

284285
clipboardData :: forall r. SyntheticEvent_ (clipboardData :: NativeDataTransfer | r) -> Effect NativeDataTransfer
285-
clipboardData = get (SProxy :: SProxy "clipboardData")
286+
clipboardData = get (Proxy :: Proxy "clipboardData")
286287

287288
data_ :: forall r. SyntheticEvent_ (data :: String | r) -> Effect String
288-
data_ = get (SProxy :: SProxy "data")
289+
data_ = get (Proxy :: Proxy "data")
289290

290291
relatedTarget :: forall r. SyntheticEvent_ (relatedTarget :: NativeEventTarget | r) -> Effect NativeEventTarget
291-
relatedTarget = get (SProxy :: SProxy "relatedTarget")
292+
relatedTarget = get (Proxy :: Proxy "relatedTarget")
292293

293294
charCode :: forall r. SyntheticEvent_ (charCode :: Int | r) -> Effect Int
294-
charCode = get (SProxy :: SProxy "charCode")
295+
charCode = get (Proxy :: Proxy "charCode")
295296

296297
key :: forall r. SyntheticEvent_ (key :: String | r) -> Effect String
297-
key = get (SProxy :: SProxy "key")
298+
key = get (Proxy :: Proxy "key")
298299

299300
keyCode :: forall r. SyntheticEvent_ (keyCode :: Number | r) -> Effect Number
300-
keyCode = get (SProxy :: SProxy "keyCode")
301+
keyCode = get (Proxy :: Proxy "keyCode")
301302

302303
locale :: forall r. SyntheticEvent_ (locale :: String | r) -> Effect String
303-
locale = get (SProxy :: SProxy "locale")
304+
locale = get (Proxy :: Proxy "locale")
304305

305306
location :: forall r. SyntheticEvent_ (location :: Number | r) -> Effect Number
306-
location = get (SProxy :: SProxy "location")
307+
location = get (Proxy :: Proxy "location")
307308

308309
repeat :: forall r. SyntheticEvent_ (repeat :: Boolean | r) -> Effect Boolean
309-
repeat = get (SProxy :: SProxy "repeat")
310+
repeat = get (Proxy :: Proxy "repeat")
310311

311312
which :: forall r. SyntheticEvent_ (which :: Number | r) -> Effect Number
312-
which = get (SProxy :: SProxy "which")
313+
which = get (Proxy :: Proxy "which")
313314

314315
button :: forall r. SyntheticEvent_ (button :: Number | r) -> Effect Number
315-
button = get (SProxy :: SProxy "button")
316+
button = get (Proxy :: Proxy "button")
316317

317318
buttons :: forall r. SyntheticEvent_ (buttons :: Number | r) -> Effect Number
318-
buttons = get (SProxy :: SProxy "buttons")
319+
buttons = get (Proxy :: Proxy "buttons")
319320

320321
clientX :: forall r. SyntheticEvent_ (clientX :: Number | r) -> Effect Number
321-
clientX = get (SProxy :: SProxy "clientX")
322+
clientX = get (Proxy :: Proxy "clientX")
322323

323324
clientY :: forall r. SyntheticEvent_ (clientY :: Number | r) -> Effect Number
324-
clientY = get (SProxy :: SProxy "clientY")
325+
clientY = get (Proxy :: Proxy "clientY")
325326

326327
pageX :: forall r. SyntheticEvent_ (pageX :: Number | r) -> Effect Number
327-
pageX = get (SProxy :: SProxy "pageX")
328+
pageX = get (Proxy :: Proxy "pageX")
328329

329330
pageY :: forall r. SyntheticEvent_ (pageY :: Number | r) -> Effect Number
330-
pageY = get (SProxy :: SProxy "pageY")
331+
pageY = get (Proxy :: Proxy "pageY")
331332

332333
screenX :: forall r. SyntheticEvent_ (screenX :: Number | r) -> Effect Number
333-
screenX = get (SProxy :: SProxy "screenX")
334+
screenX = get (Proxy :: Proxy "screenX")
334335

335336
screenY :: forall r. SyntheticEvent_ (screenY :: Number | r) -> Effect Number
336-
screenY = get (SProxy :: SProxy "screenY")
337+
screenY = get (Proxy :: Proxy "screenY")
337338

338339
changedTouches :: forall r. SyntheticEvent_ (changedTouches :: NativeTouchList | r) -> Effect NativeTouchList
339-
changedTouches = get (SProxy :: SProxy "changedTouches")
340+
changedTouches = get (Proxy :: Proxy "changedTouches")
340341

341342
targetTouches :: forall r. SyntheticEvent_ (targetTouches :: NativeTouchList | r) -> Effect NativeTouchList
342-
targetTouches = get (SProxy :: SProxy "targetTouches")
343+
targetTouches = get (Proxy :: Proxy "targetTouches")
343344

344345
touches :: forall r. SyntheticEvent_ (touches :: NativeTouchList | r) -> Effect NativeTouchList
345-
touches = get (SProxy :: SProxy "touches")
346+
touches = get (Proxy :: Proxy "touches")
346347

347348
altKey :: forall r. SyntheticEvent_ (altKey :: Boolean | r) -> Effect Boolean
348-
altKey = get (SProxy :: SProxy "altKey")
349+
altKey = get (Proxy :: Proxy "altKey")
349350

350351
ctrlKey :: forall r. SyntheticEvent_ (ctrlKey :: Boolean | r) -> Effect Boolean
351-
ctrlKey = get (SProxy :: SProxy "ctrlKey")
352+
ctrlKey = get (Proxy :: Proxy "ctrlKey")
352353

353354
metaKey :: forall r. SyntheticEvent_ (metaKey :: Boolean | r) -> Effect Boolean
354-
metaKey = get (SProxy :: SProxy "metaKey")
355+
metaKey = get (Proxy :: Proxy "metaKey")
355356

356357
shiftKey :: forall r. SyntheticEvent_ (shiftKey :: Boolean | r) -> Effect Boolean
357-
shiftKey = get (SProxy :: SProxy "shiftKey")
358+
shiftKey = get (Proxy :: Proxy "shiftKey")
358359

359360
propertyName :: forall r. SyntheticEvent_ (propertyName :: String | r) -> Effect String
360-
propertyName = get (SProxy :: SProxy "propertyName")
361+
propertyName = get (Proxy :: Proxy "propertyName")
361362

362363
pseudoElement :: forall r. SyntheticEvent_ (pseudoElement :: String | r) -> Effect String
363-
pseudoElement = get (SProxy :: SProxy "pseudoElement")
364+
pseudoElement = get (Proxy :: Proxy "pseudoElement")
364365

365366
elapsedTime :: forall r. SyntheticEvent_ (elapsedTime :: Number | r) -> Effect Number
366-
elapsedTime = get (SProxy :: SProxy "elapsedTime")
367+
elapsedTime = get (Proxy :: Proxy "elapsedTime")
367368

368369
detail :: forall r. SyntheticEvent_ (detail :: Number | r) -> Effect Number
369-
detail = get (SProxy :: SProxy "detail")
370+
detail = get (Proxy :: Proxy "detail")
370371

371372
view :: forall r. SyntheticEvent_ (view :: NativeAbstractView | r) -> Effect NativeAbstractView
372-
view = get (SProxy :: SProxy "view")
373+
view = get (Proxy :: Proxy "view")
373374

374375
deltaMode :: forall r. SyntheticEvent_ (deltaMode :: Number | r) -> Effect Number
375-
deltaMode = get (SProxy :: SProxy "deltaMode")
376+
deltaMode = get (Proxy :: Proxy "deltaMode")
376377

377378
deltaX :: forall r. SyntheticEvent_ (deltaX :: Number | r) -> Effect Number
378-
deltaX = get (SProxy :: SProxy "deltaX")
379+
deltaX = get (Proxy :: Proxy "deltaX")
379380

380381
deltaY :: forall r. SyntheticEvent_ (deltaY :: Number | r) -> Effect Number
381-
deltaY = get (SProxy :: SProxy "deltaY")
382+
deltaY = get (Proxy :: Proxy "deltaY")
382383

383384
deltaZ :: forall r. SyntheticEvent_ (deltaZ :: Number | r) -> Effect Number
384-
deltaZ = get (SProxy :: SProxy "deltaZ")
385+
deltaZ = get (Proxy :: Proxy "deltaZ")
385386

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

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

398399
get
399-
:: forall l r s a
400+
:: forall l r s a proxy
400401
. Row.Cons l a r s
401402
=> IsSymbol l
402-
=> SProxy l
403+
=> proxy l
403404
-> SyntheticEvent_ s
404405
-> Effect a
405406
get l r = unsafeGet (reflectSymbol l) r

0 commit comments

Comments
 (0)