Merge branch 'master' of github.com:kossel/collapse

react-component · Apr 2, 2018 · 7fbf41e · 7fbf41e
2 parents 657c991 + a31144c
commit 7fbf41e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/examples/simple.js b/examples/simple.js
@@ -15,21 +15,13 @@ function random() {
 }
 
 class Test extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = this.getInitialState();
-    ['onChange', 'setActivityKey', 'reRender', 'toggle'].map(fn => this[fn] = this[fn].bind(this));
+  state = {
+    time: random(),
+    accordion: false,
+    activeKey: ['4'],
   }
 
-  getInitialState() {
-    return {
-      time: random(),
-      accordion: false,
-      activeKey: ['4'],
-    };
-  }
-
-  onChange(activeKey) {
+  onChange = (activeKey) => {
     this.setState({
       activeKey,
     });
@@ -71,19 +63,19 @@ class Test extends React.Component {
     return items;
   }
 
-  setActivityKey() {
+  setActivityKey = () => {
     this.setState({
       activeKey: ['2'],
     });
   }
 
-  reRender() {
+  reRender = () => {
     this.setState({
       time: random(),
     });
   }
 
-  toggle() {
+  toggle = () => {
     this.setState({
       accordion: !this.state.accordion,
     });

diff --git a/src/Panel.jsx b/src/Panel.jsx
@@ -5,19 +5,13 @@ import PanelContent from './PanelContent';
 import Animate from 'rc-animate';
 
 class CollapsePanel extends Component {
-  constructor(props) {
-    super(props);
-    this.handleItemClick = this.handleItemClick.bind(this);
-    this.handleKeyPress = this.handleKeyPress.bind(this);
-  }
-
-  handleItemClick() {
+  handleItemClick = () => {
     if (this.props.onItemClick) {
       this.props.onItemClick();
     }
   }
 
-  handleKeyPress(e) {
+  handleKeyPress = (e) => {
     e.preventDefault();
     if (e.charCode === 13 || e.charCode === 32) {
       this.handleItemClick();