Skip to content

Commit c28567d

Browse files
authored
Merge branch 'master' into master
2 parents 1c4643d + 7ac63e2 commit c28567d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+9197
-3128
lines changed

Diff for: .babelrc

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
{
2-
"presets": ["es2015", "react"],
3-
"plugins": ["transform-object-rest-spread", "react-hot-loader/babel"]
2+
"presets": [
3+
["env", {
4+
"targets": {
5+
"browsers": ["last 2 versions", "ie >= 9"]
6+
}
7+
}],
8+
"react"
9+
],
10+
"plugins": [
11+
"transform-object-rest-spread",
12+
"react-hot-loader/babel"
13+
]
414
}

Diff for: .codeclimate.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
engines:
2+
eslint:
3+
enabled: true
4+
checks:
5+
import/extensions:
6+
enabled: false
7+
ratings:
8+
paths:
9+
- src/**
10+
- examples/**
11+
- "**.js"
12+
exclude_paths:
13+
- "**/*.test.js"
14+
- "node_modules/"
15+
- "__mocks__/"

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
node_modules
22
npm-debug.log
33
yarn.lock
4+
coverage
5+
cc-test-reporter
46

57
# Editor and other tmp files
68
*.swp

Diff for: .travis.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
language: node_js
2+
node_js:
3+
- "node"
4+
env:
5+
global:
6+
- CC_TEST_REPORTER_ID=d957b5ff2f78e200b7cfa4e294ac1fe52c823c7d7c327628f897271dc72a874e
7+
- GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
8+
before_script:
9+
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
10+
- chmod +x ./cc-test-reporter
11+
script:
12+
- npm test -- --coverage
13+
- if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi

Diff for: CHANGELOG.md

+101
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,107 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
<a name="1.3.1"></a>
6+
## [1.3.1](https://github.com/fritz-c/react-sortable-tree/compare/v1.3.0...v1.3.1) (2017-10-03)
7+
8+
9+
### Bug Fixes
10+
11+
* Allow react[@16](https://github.com/16) ([9a31a03](https://github.com/fritz-c/react-sortable-tree/commit/9a31a03))
12+
13+
14+
15+
<a name="1.3.0"></a>
16+
# [1.3.0](https://github.com/fritz-c/react-sortable-tree/compare/v1.2.2...v1.3.0) (2017-09-20)
17+
18+
19+
### Features
20+
21+
* Provide more row parameters in rowHeight callback ([1b88b18](https://github.com/fritz-c/react-sortable-tree/commit/1b88b18))
22+
23+
24+
25+
<a name="1.2.2"></a>
26+
## [1.2.2](https://github.com/fritz-c/react-sortable-tree/compare/v1.2.1...v1.2.2) (2017-09-12)
27+
28+
29+
### Bug Fixes
30+
31+
* Specify version of react-dnd-html5-backend to avoid invalid package installs ([a09b611](https://github.com/fritz-c/react-sortable-tree/commit/a09b611))
32+
33+
34+
35+
<a name="1.2.1"></a>
36+
## [1.2.1](https://github.com/fritz-c/react-sortable-tree/compare/v1.2.0...v1.2.1) (2017-09-06)
37+
38+
39+
### Bug Fixes
40+
41+
* Allow children function in default renderer ([6f1dcac](https://github.com/fritz-c/react-sortable-tree/commit/6f1dcac))
42+
43+
44+
45+
<a name="1.2.0"></a>
46+
# [1.2.0](https://github.com/fritz-c/react-sortable-tree/compare/v1.1.1...v1.2.0) (2017-08-12)
47+
48+
49+
### Features
50+
51+
* Add `shouldCopyOnOutsideDrop` prop to enable copying of nodes that leave the tree ([d6a9be9](https://github.com/fritz-c/react-sortable-tree/commit/d6a9be9))
52+
53+
54+
55+
<a name="1.1.1"></a>
56+
## [1.1.1](https://github.com/fritz-c/react-sortable-tree/compare/v1.1.0...v1.1.1) (2017-08-06)
57+
58+
59+
### Bug Fixes
60+
61+
* **tree-to-tree:** Fix node depth when dragging between trees ([323ccad](https://github.com/fritz-c/react-sortable-tree/commit/323ccad))
62+
63+
64+
65+
<a name="1.1.0"></a>
66+
# [1.1.0](https://github.com/fritz-c/react-sortable-tree/compare/v1.0.0...v1.1.0) (2017-08-05)
67+
68+
69+
### Features
70+
71+
* **node-renderer:** Make title and subtitle insertable via props ([fff72c6](https://github.com/fritz-c/react-sortable-tree/commit/fff72c6))
72+
73+
74+
75+
<a name="1.0.0"></a>
76+
# [1.0.0](https://github.com/fritz-c/react-sortable-tree/compare/v0.1.21...v1.0.0) (2017-08-05)
77+
78+
79+
### Bug Fixes
80+
81+
* External node offset was shifted ([d1ae0eb](https://github.com/fritz-c/react-sortable-tree/commit/d1ae0eb))
82+
83+
84+
### Code Refactoring
85+
86+
* get rid of `dndWrapExternalSource` api ([d103e9f](https://github.com/fritz-c/react-sortable-tree/commit/d103e9f))
87+
88+
89+
### Features
90+
91+
* **tree-to-tree:** Enable tree-to-tree drag-and-drop ([6986a23](https://github.com/fritz-c/react-sortable-tree/commit/6986a23))
92+
* Display droppable placeholder element when tree is empty ([2cd371c](https://github.com/fritz-c/react-sortable-tree/commit/2cd371c))
93+
* Add `prevPath` and `prevTreeIndex` to the `onMoveNode` callback ([6986a23](https://github.com/fritz-c/react-sortable-tree/commit/6986a23))
94+
95+
96+
### BREAKING CHANGES
97+
98+
* Trees that are empty now display a placeholder element
99+
in their place instead of being simply empty.
100+
* `dndWrapExternalSource` api no longer exists.
101+
You can achieve the same functionality and more with react-dnd
102+
APIs, as demonstrated in the storybook example.
103+
104+
105+
5106
<a name="0.1.21"></a>
6107
## [0.1.21](https://github.com/fritz-c/react-sortable-tree/compare/v0.1.20...v0.1.21) (2017-07-15)
7108

0 commit comments

Comments
 (0)