Skip to content

Commit 540d82a

Browse files
committed
Merge branch 'master' of github.com:jakezatecky/react-checkbox-tree into master
# Conflicts: # package.json
2 parents 98e00ae + c17fb7b commit 540d82a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: node_js
22
node_js:
3-
- '8'
43
- '10'
54
- '12'
5+
- '13'
66
before_script:
77
# Remove ./node_modules/.bin from PATH so node-which doesn't replace Unix which and cause RVM to barf. See https://github.com/travis-ci/travis-ci/issues/5092
88
- PATH=${PATH//:\.\/node_modules\/\.bin/}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
143143
| Property | Type | Description | Default |
144144
| -------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------- | ----------- |
145145
| `nodes` | array | **Required**. Specifies the tree nodes and their children. | |
146-
| `checkModel` | bool | Specifies which checked nodes should be stored in the `checked` array. Accepts `'leaf'` or `'all'`. | `'leaf'` |
146+
| `checkModel` | string | Specifies which checked nodes should be stored in the `checked` array. Accepts `'leaf'` or `'all'`. | `'leaf'` |
147147
| `checked` | array | An array of checked node values. | `[]` |
148148
| `disabled` | bool | If true, the component will be disabled and nodes cannot be checked. | `false` |
149149
| `expandDisabled` | bool | If true, the ability to expand nodes will be disabled. | `false` |

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
"gulp-mocha": "^7.0.0",
5858
"gulp-sass": "^4.1.0",
5959
"gulp-stylelint": "^13.0.0",
60-
"jsdom": "^15.0.0",
61-
"mocha": "^6.0.0",
60+
"jsdom": "^16.0.1",
61+
"mocha": "^7.0.1",
6262
"react": "^16.0.0",
6363
"react-dom": "^16.0.0",
6464
"react-test-renderer": "^16.0.0",
@@ -71,7 +71,7 @@
7171
"dependencies": {
7272
"classnames": "^2.2.5",
7373
"lodash": "^4.17.10",
74-
"nanoid": "^2.0.0",
74+
"nanoid": "^3.0.0",
7575
"prop-types": "^15.5.8"
7676
}
7777
}

src/js/CheckboxTree.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import classNames from 'classnames';
22
import isEqual from 'lodash/isEqual';
3-
import nanoid from 'nanoid';
3+
import { nanoid } from 'nanoid';
44
import PropTypes from 'prop-types';
55
import React from 'react';
66

0 commit comments

Comments
 (0)