Skip to content

Commit 362566d

Browse files
committed
resolve merge conflicts
1 parent 2b28635 commit 362566d

File tree

1 file changed

+1
-53
lines changed

1 file changed

+1
-53
lines changed

src/index.js

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7,67 +7,15 @@ import CheckboxGroup from './checkboxGroup';
77
import Toggle from './toggle';
88
import RadioButtonGroup from './radioButtonGroup';
99
import TextInput from './textInput';
10-
11-
export default {
12-
Button,
13-
Card,
14-
Checkbox,
15-
CheckboxGroup,
16-
RadioButtonGroup,
17-
Toggle,
18-
TextInput
19-
};
2010
import Snackbar from './snackbar';
2111

22-
import React from 'react';
23-
import ReactDOM from 'react-dom';
24-
2512
export default {
2613
Button,
2714
Card,
2815
Checkbox,
2916
CheckboxGroup,
3017
RadioButtonGroup,
3118
Toggle,
19+
TextInput,
3220
Snackbar,
3321
};
34-
35-
import theme from './theme.scss';
36-
37-
class SnackDisplay extends React.Component {
38-
constructor(props) {
39-
super(props);
40-
this.state = {
41-
showSnackbar: false,
42-
showTopSnackbar: false,
43-
showIndefiniteSnackbar: false,
44-
}
45-
}
46-
47-
openBottomSnackbar = () => {
48-
this.setState({
49-
showSnackbar: !this.state.showSnackbar
50-
});
51-
}
52-
53-
openTopSnackbar = () => {
54-
this.setState({
55-
showTopSnackbar: !this.state.showTopSnackbar
56-
});
57-
}
58-
59-
openIndefiniteSnackbar = () => {
60-
this.setState({
61-
showIndefiniteSnackbar: !this.state.showIndefiniteSnackbar
62-
});
63-
}
64-
65-
66-
handleSnackClose = () => {
67-
this.setState({
68-
showSnackbar: false,
69-
showTopSnackbar: false,
70-
});
71-
}
72-
73-
// ReactDOM.render(<RadioDisplay />, document.getElementById('index'));

0 commit comments

Comments
 (0)