Skip to content

Commit f288d0c

Browse files
Merge pull request #57 from Detaysoft/next
Next 0.9.0
2 parents aaf0613 + a6bc168 commit f288d0c

8 files changed

Lines changed: 16 additions & 19 deletions

File tree

example/App.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,10 @@ export class App extends Component {
100100
data: {
101101
uri: `data:image/png;base64,${this.photo(150)}`,
102102
status: {
103-
click: false,
104-
loading: 0,
103+
click: true,
104+
loading: .5,
105105
},
106+
size: "100MB",
106107
width: 300,
107108
height: 300,
108109
latitude: '37.773972',

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-chat-elements",
3-
"version": "0.8.2",
3+
"version": "0.9.0",
44
"description": "Reactjs chat components",
55
"author": "Avare Kodcu <abdurrahmaneker58@gmail.com>",
66
"main": "dist/main.js",
@@ -21,8 +21,8 @@
2121
"isomorphic-style-loader": "^2.0.0",
2222
"lorem-ipsum": "^1.0.4",
2323
"nwb": "^0.18.10",
24-
"react": "^15.6.1",
25-
"react-dom": "^15.6.1",
24+
"react": "^16.3.0",
25+
"react-dom": "^16.3.0",
2626
"react-scripts": "^1.0.10",
2727
"react-test-renderer": "^15.6.1",
2828
"webpack-node-externals": "^1.6.0"
@@ -60,7 +60,7 @@
6060
"classnames": "^2.2.5",
6161
"moment": "^2.18.1",
6262
"react-icons": "^2.2.5",
63-
"react-progressbar.js": "^0.2.0",
63+
"react-progress-bar.js": "^0.2.3",
6464
"react-spinkit": "^3.0.0"
6565
}
6666
}

src/FileMessage/FileMessage.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,6 @@
5454

5555
.rce-mbox-file--loading {
5656
font-size: 15px;
57+
width: 40px;
58+
height: 40px;
5759
}

src/FileMessage/FileMessage.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import './FileMessage.css';
44
import FaCloudDownload from 'react-icons/lib/fa/cloud-download';
55
import FaFile from 'react-icons/lib/fa/file';
66

7-
const ProgressBar = require('react-progressbar.js');
7+
const ProgressBar = require('react-progress-bar.js');
88
const Circle = ProgressBar.Circle;
99

1010
export class FileMessage extends Component {
@@ -66,10 +66,6 @@ export class FileMessage extends Component {
6666
progress={this.props.data.status.loading}
6767
options={progressOptions}
6868
initialAnimate={true}
69-
containerStyle={{
70-
width: '40px',
71-
height: '40px',
72-
}}
7369
containerClassName={'rce-mbox-file--loading'} />
7470
}
7571
</div>

src/MessageBox/MessageBox.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class MessageBox extends Component {
6666

6767
{
6868
(this.props.title || this.props.avatar) &&
69-
<p
69+
<div
7070
style={this.props.titleColor && { color: this.props.titleColor }}
7171
onClick={this.props.onTitleClick}
7272
className={classNames('rce-mbox-title', {
@@ -81,7 +81,7 @@ export class MessageBox extends Component {
8181
this.props.title &&
8282
<span>{this.props.title}</span>
8383
}
84-
</p>
84+
</div>
8585
}
8686

8787
{

src/PhotoMessage/PhotoMessage.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
.rce-mbox-photo--img__block-item {
4040
margin: auto;
4141
cursor: pointer;
42+
width: 100px;
43+
height: 100px;
4244
}
4345

4446
.rce-mbox-photo--download {

src/PhotoMessage/PhotoMessage.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import './PhotoMessage.css';
44

55
import FaCloudDownload from 'react-icons/lib/fa/cloud-download';
66

7-
const ProgressBar = require('react-progressbar.js');
7+
const ProgressBar = require('react-progress-bar.js');
88
const Circle = ProgressBar.Circle;
99

1010
export class PhotoMessage extends Component {
@@ -54,10 +54,6 @@ export class PhotoMessage extends Component {
5454
progress={this.props.data.status.loading}
5555
options={progressOptions}
5656
initialAnimate={true}
57-
containerStyle={{
58-
width: '100px',
59-
height: '100px',
60-
}}
6157
containerClassName={'rce-mbox-photo--img__block-item'} />
6258
}
6359
</div>

src/SpotifyMessage/SpotifyMessage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class SpotifyMessage extends Component {
3030
width={this.props.width}
3131
height={this.props.height}
3232
frameBorder="0"
33-
allowTransparency="true"></iframe>
33+
allowtransparency="true"></iframe>
3434
</div>
3535
);
3636
}

0 commit comments

Comments
 (0)