Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7966ab6

Browse files
authoredJun 13, 2018
Updates for 0.12.0 (#1)
* Updates for 0.12.0 * react-basic 1.0.0
1 parent 7fbb4ad commit 7966ab6

File tree

7 files changed

+297
-222
lines changed

7 files changed

+297
-222
lines changed
 

‎.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,3 @@ install:
99
script:
1010
- npx bower install
1111
- npm -s test
12-
13-
# after_success:
14-
# - >-
15-
# test $TRAVIS_TAG &&
16-
# echo $GITHUB_TOKEN | pulp login &&
17-
# echo y | pulp publish --no-push

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,5 +116,5 @@ moveItem fromIndex toIndex items =
116116
in
117117
take toIndex items'
118118
<> maybe [] pure item
119-
<> drop toIndex items'
119+
<> drop toIndex items'
120120
```

‎bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"url": "https://github.com/lumihq/purescript-react-dnd-basic.git"
88
},
99
"dependencies": {
10-
"purescript-prelude": "^3.3.0",
11-
"purescript-react-basic": "^0.10.0",
12-
"purescript-nullable": "^3.0.0",
13-
"purescript-promises": "^2.0.0"
10+
"purescript-prelude": "^4.0.0",
11+
"purescript-react-basic": "^1.0.0",
12+
"purescript-nullable": "^4.0.0",
13+
"purescript-promises": "^3.0.0"
1414
},
1515
"devDependencies": {
16-
"purescript-psci-support": "^3.0.0"
16+
"purescript-psci-support": "^4.0.0"
1717
}
1818
}

‎examples/basic/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"author": "",
77
"dependencies": {
88
"pulp": "^12.2.0",
9-
"react": "^16.2.0",
9+
"react": "^16.4.0",
1010
"react-dnd": "^2.6.0",
1111
"react-dnd-html5-backend": "^2.6.0",
12-
"react-dom": "^16.2.0"
12+
"react-dom": "^16.4.0"
1313
},
1414
"devDependencies": {
15-
"browserify": "^16.1.0"
15+
"browserify": "^16.2.2"
1616
}
1717
}

‎package-lock.json

Lines changed: 268 additions & 187 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
"devDependencies": {
2828
"bower": "^1.8.4",
2929
"pulp": "^12.2.0",
30-
"purescript": "^0.11.7"
30+
"purescript": "^0.12.0"
3131
},
3232
"dependencies": {
33-
"react": "^16.3.2",
33+
"react": "^16.4.0",
3434
"react-dnd": "^2.6.0",
3535
"react-dnd-html5-backend": "^2.6.0",
3636
"react-dnd-test-backend": "^3.0.2",
37-
"react-dom": "^16.3.2"
37+
"react-dom": "^16.4.0"
3838
}
3939
}

‎src/React/Basic/ReactDND.purs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ module React.Basic.ReactDND
1717

1818
import Prelude
1919

20-
import Control.Monad.Eff (Eff)
21-
import Control.Monad.Eff.Uncurried (mkEffFn1)
2220
import Data.Function.Uncurried (Fn2, mkFn1, runFn2)
2321
import Data.Maybe (Maybe)
2422
import Data.Nullable (Nullable, toMaybe, toNullable)
25-
import React.Basic (JSX, ReactComponent, ReactFX, createElement, stateless)
23+
import Effect (Effect)
24+
import Effect.Uncurried (mkEffectFn1)
25+
import React.Basic (JSX, ReactComponent, createElement, stateless)
2626

2727
data Backend
2828

@@ -70,17 +70,17 @@ type DragDropContextProps =
7070
}
7171

7272
type DragSourceProps item =
73-
{ beginDrag :: DragSourceCollectArgs item -> Eff (react :: ReactFX) item
74-
, endDrag :: DragSourceCollectArgs item -> Eff (react :: ReactFX) Unit
75-
, canDrag :: DragSourceCollectArgs item -> Eff (react :: ReactFX) Boolean
76-
, isDragging :: DragSourceCollectArgs item -> Eff (react :: ReactFX) Boolean
73+
{ beginDrag :: DragSourceCollectArgs item -> Effect item
74+
, endDrag :: DragSourceCollectArgs item -> Effect Unit
75+
, canDrag :: DragSourceCollectArgs item -> Effect Boolean
76+
, isDragging :: DragSourceCollectArgs item -> Effect Boolean
7777
, render :: DragSourceCollectArgs item -> JSX
7878
}
7979

8080
type DropTargetProps item =
81-
{ drop :: DropTargetCollectArgs item -> Eff (react :: ReactFX) (Maybe item)
82-
, hover :: DropTargetCollectArgs item -> Eff (react :: ReactFX) Unit
83-
, canDrop :: DropTargetCollectArgs item -> Eff (react :: ReactFX) Boolean
81+
{ drop :: DropTargetCollectArgs item -> Effect (Maybe item)
82+
, hover :: DropTargetCollectArgs item -> Effect Unit
83+
, canDrop :: DropTargetCollectArgs item -> Effect Boolean
8484
, render :: DropTargetCollectArgs item -> JSX
8585
}
8686

@@ -109,10 +109,10 @@ createDragDrop itemType =
109109
in stateless
110110
{ displayName: "DragSource"
111111
, render: \props -> createElement jsDragSource
112-
{ beginDrag: mkEffFn1 props.beginDrag
113-
, endDrag: mkEffFn1 props.endDrag
114-
, canDrag: mkEffFn1 props.canDrag
115-
, isDragging: mkEffFn1 props.isDragging
112+
{ beginDrag: mkEffectFn1 props.beginDrag
113+
, endDrag: mkEffectFn1 props.endDrag
114+
, canDrag: mkEffectFn1 props.canDrag
115+
, isDragging: mkEffectFn1 props.isDragging
116116
, render: mkFn1 props.render
117117
}
118118
}
@@ -122,9 +122,9 @@ createDragDrop itemType =
122122
in stateless
123123
{ displayName: "DropTarget"
124124
, render: \props -> createElement jsDropTarget
125-
{ drop: mkEffFn1 (map toNullable <<< props.drop)
126-
, hover: mkEffFn1 props.hover
127-
, canDrop: mkEffFn1 props.canDrop
125+
{ drop: mkEffectFn1 (map toNullable <<< props.drop)
126+
, hover: mkEffectFn1 props.hover
127+
, canDrop: mkEffectFn1 props.canDrop
128128
, render: mkFn1 props.render
129129
}
130130
}

0 commit comments

Comments
 (0)
Please sign in to comment.