Skip to content

Commit 2f10aa6

Browse files
authored
Merge branch 'master' into update-on-props-change
2 parents 5c4e125 + 8405ced commit 2f10aa6

File tree

7 files changed

+1864
-1911
lines changed

7 files changed

+1864
-1911
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [1.2.0] - 2019-??-??
8+
### Added
9+
- Added missing methods to typescript defs [\#11](https://github.com/gitbrent/bootstrap-switch-button-react/issue/11) ([evark](https://github.com/evark))
10+
711
## [1.1.0] - 2019-07-29
812
### Added
913
- Added new typescript defs (`bootstrap-switch-button-react.d.ts`)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![MIT License](https://img.shields.io/github/license/gitbrent/bootstrap-switch-button-react.svg)](https://github.com/gitbrent/bootstrap-switch-button-react/blob/master/LICENSE) [![Dependency Status](https://david-dm.org/gitbrent/bootstrap-switch-button-react/status.svg)](https://david-dm.org/gitbrent/bootstrap-switch-button-react) [![Known Vulnerabilities](https://snyk.io/test/npm/bootstrap-switch-button-react/badge.svg)](https://snyk.io/test/npm/bootstrap-switch-button-react) [![npm downloads](https://img.shields.io/npm/dm/bootstrap-switch-button-react.svg)](https://www.npmjs.com/package/bootstrap-switch-button-react)
1+
[![MIT License](https://img.shields.io/github/license/gitbrent/bootstrap-switch-button-react.svg)](https://github.com/gitbrent/bootstrap-switch-button-react/blob/master/LICENSE) [![Dependency Status](https://david-dm.org/gitbrent/bootstrap-switch-button-react/status.svg)](https://david-dm.org/gitbrent/bootstrap-switch-button-react) [![Known Vulnerabilities](https://snyk.io/test/npm/bootstrap-switch-button-react/badge.svg)](https://snyk.io/test/npm/bootstrap-switch-button-react) [![Package Quality](https://npm.packagequality.com/shield/bootstrap-switch-button-react.svg)](https://packagequality.com/#?package=bootstrap-switch-button-react) [![npm downloads](https://img.shields.io/npm/dm/bootstrap-switch-button-react.svg)](https://www.npmjs.com/package/bootstrap-switch-button-react)
22

33
# Bootstrap Switch Button for React
44

docs/package-lock.json

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

docs/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-switch-button-react-test",
3-
"version": "1.0.0-beta.11",
3+
"version": "1.2.0",
44
"license": "MIT",
55
"repository": {
66
"type": "git",
@@ -15,27 +15,27 @@
1515
"build": "webpack -p"
1616
},
1717
"dependencies": {
18-
"@babel/core": "^7.4.0",
19-
"@babel/preset-env": "^7.3.4",
20-
"@babel/preset-react": "^7.0.0",
18+
"@babel/core": "^7.6.4",
19+
"@babel/preset-env": "^7.6.3",
20+
"@babel/preset-react": "^7.6.3",
2121
"css-loader": "^2.1.1",
22-
"react": "^16.7.0",
22+
"react": "^16.11.0",
2323
"style-loader": "^0.23.1",
24-
"webpack": "^4.12.0",
25-
"webpack-dev-server": "^3.2.1"
24+
"webpack": "^4.41.2",
25+
"webpack-dev-server": "^3.9.0"
2626
},
2727
"devDependencies": {
28-
"@babel/plugin-proposal-class-properties": "^7.4.0",
29-
"@types/react": "^16.8.10",
28+
"@babel/plugin-proposal-class-properties": "^7.5.5",
29+
"@types/react": "^16.9.9",
3030
"babel-cli": "^6.26.0",
31-
"babel-loader": "^8.0.5",
31+
"babel-loader": "^8.0.6",
3232
"babel-plugin-transform-object-rest-spread": "^6.26.0",
3333
"babel-plugin-transform-react-jsx": "^6.24.1",
34-
"clean-webpack-plugin": "^2.0.1",
34+
"clean-webpack-plugin": "^2.0.2",
3535
"html-webpack-plugin": "^3.2.0",
36-
"react-dom": "^16.8.6",
37-
"ts-loader": "^5.3.3",
38-
"typescript": "^3.4.1",
39-
"webpack-cli": "^3.3.0"
36+
"react-dom": "^16.11.0",
37+
"ts-loader": "^5.4.5",
38+
"typescript": "^3.6.4",
39+
"webpack-cli": "^3.3.9"
4040
}
4141
}

lib/bootstrap-switch-button-react.d.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@ interface BootstrapSwitchButtonProps {
2626
*/
2727
onChange?: (checked: boolean) => void;
2828
checked?: boolean;
29+
disabled?: boolean;
2930
onlabel?: string;
3031
offlabel?: string;
31-
offstyle?: Colors | ColorsOutline;
3232
onstyle?: Colors | ColorsOutline;
33+
offstyle?: Colors | ColorsOutline;
34+
size?: "xs" | "sm" | "lg";
3335
style?: string;
36+
width?: number;
37+
height?: number;
3438
}
3539

3640
declare class BootstrapSwitchButton extends React.Component<

0 commit comments

Comments
 (0)