Skip to content

Commit ccb62b6

Browse files
committed
fix conflicts with update react 17
2 parents 637894b + b4590bc commit ccb62b6

File tree

37 files changed

+10598
-11014
lines changed

37 files changed

+10598
-11014
lines changed

.babelrc

+4-15
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,13 @@
55
"browsers": ["last 2 versions", "safari >= 7"]
66
}
77
}],
8-
"@babel/preset-react",
8+
["@babel/preset-react", {
9+
"runtime": "automatic"
10+
}],
911
"@babel/preset-typescript"
1012
],
1113
"plugins": [
1214
"@babel/plugin-proposal-class-properties",
13-
"@babel/plugin-proposal-object-rest-spread",
14-
["module-resolver", {
15-
"root": ["./src"],
16-
"alias": {
17-
"@config": "./src/config",
18-
"@constants": "./src/constants.js",
19-
"@assets": "./assets",
20-
"@tests-mocks": "./mocks",
21-
"@actions": "./src/store/actions",
22-
"@utils": "./src/utils",
23-
"@messagesComponents": "./src/components/Widget/components/Conversation/components/Messages/components",
24-
"@quickButtonsComponents": "./src/components/Widget/components/Conversation/components/QuickButtons/components"
25-
}
26-
}]
15+
"@babel/plugin-proposal-object-rest-spread"
2716
]
2817
}

.eslintrc

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"extends": "wolox",
33
"rules": {
4-
"import/order": "off"
4+
"import/order": "off",
5+
"react/jsx-uses-react": "off",
6+
"react/react-in-jsx-scope": "off"
57
}
68
}

README.md

-22
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,6 @@
44

55
[![FEArmy](./assets/FEA_open_source_sm.png)](https://github.com/orgs/Wolox/teams/front-end-army/members)
66

7-
## Sponsors
8-
9-
<div>
10-
<br/>
11-
<p align="center">
12-
<a href="https://getstream.io/chat/?utm_source=github&utm_medium=react-chat-widget&utm_campaign=sponsorship" target="_blank">
13-
<img src="https://i.imgur.com/oU7XYkk.png">
14-
</a>
15-
</p>
16-
<br>
17-
<div>
18-
<p align="center">
19-
A scalable <a href="https://getstream.io/chat/?utm_source=github&utm_medium=react-chat-widget&utm_campaign=sponsorship" target="_blank">Chat API/Server</a> written in Go
20-
</p>
21-
</div>
22-
<div>
23-
<p align="center">
24-
<a href="https://getstream.io/chat/get_started/?utm_source=github&utm_medium=react-chat-widget&utm_campaign=sponsorship" target="_blank">API Tour</a> | <a href="https://github.com/getstream/stream-sdks?utm_source=github&utm_medium=react-chat-widget&utm_campaign=sponsorship" target="_blank">SDKs</a> | <a href="https://getstream.io/chat/docs/?utm_source=github&utm_medium=react-chat-widget&utm_campaign=sponsorship" target="_blank">Docs</a>
25-
</p>
26-
</div>
27-
</div>
28-
297
## Features
308

319
- Plain text message UI

dev/App.tsx

+10-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { Component } from 'react';
1+
import { Component } from 'react';
22

33
import { Widget, addResponseMessage, setQuickButtons, toggleMsgLoader, addLinkSnippet } from '../index';
44
import { addUserMessage } from '..';
@@ -38,18 +38,15 @@ export default class App extends Component {
3838

3939
render() {
4040
return (
41-
<div>
42-
<button style={{position: 'absolute', right: 40, bottom: 150}}>test</button>
43-
<Widget
44-
title="Bienvenido"
45-
subtitle="Asistente virtual"
46-
senderPlaceHolder="Escribe aquí ..."
47-
handleNewUserMessage={this.handleNewUserMessage}
48-
handleQuickButtonClicked={this.handleQuickButtonClicked}
49-
imagePreview
50-
handleSubmit={this.handleSubmit}
51-
/>
52-
</div>
41+
<Widget
42+
title="Bienvenido"
43+
subtitle="Asistente virtual"
44+
senderPlaceHolder="Escribe aquí ..."
45+
handleNewUserMessage={this.handleNewUserMessage}
46+
handleQuickButtonClicked={this.handleQuickButtonClicked}
47+
imagePreview
48+
handleSubmit={this.handleSubmit}
49+
/>
5350
);
5451
}
5552
}

dev/main.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as React from 'react';
21
import * as ReactDOM from 'react-dom';
32

43
import App from './App';

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
setQuickButtons,
1313
deleteMessages,
1414
markAllAsRead,
15-
setBadgeCount,
15+
setBadgeCount
1616
} from './src/store/dispatcher';
1717

1818
export {

0 commit comments

Comments
 (0)