diff --git a/samples/react-bot-framework/README.md b/samples/react-bot-framework/README.md
index 7d7c3167a..e711ad620 100644
--- a/samples/react-bot-framework/README.md
+++ b/samples/react-bot-framework/README.md
@@ -1,10 +1,11 @@
# Microsoft Bot Framework Web Chat
## Summary
-A web part that acts as a web chat component for bot's built on the Microsoft Bot Framework using the Direct Line API. When sending messages
-the web part uses the username of the currently logged in user. The web part has settings for color for branding purposes.
-![bot framework client web part](./assets/bot-framework-webpart-preview.png)
+| Name | Image |Description |
+|:------------:|------------|------------|
+|Bot Framework v4 WebPart|![bot framework v3 web part](./assets/bot-frameworkv4-webpart-preview.png)|A web part that uses the [botframework-webchat module](https://www.npmjs.com/package/botframework-webchat) to create implement a React component to render the Bot Framework v4 webchat component. This web part is able to render Text and richt attachments (Images, Cards, Adaptive Cards, ...) and has settings for branding purposes.|
+|Bot Framework v3 WebPart|![bot framework v4 web part](./assets/bot-framework-webpart-preview.png)|A web part that acts as a web chat component for bot's built on the Microsoft Bot Framework using the DirectLine API. When sending messages the web part uses the username of the currently logged in user. The web part has settings for color for branding purposes.|
You can see this web part sample, including a sample VS 2015 bot application in practice from [PnP SPFx Special Interest Group recording](https://youtu.be/Tv03CU_PmVs?t=1329)
where sample was demonstrated.
@@ -21,17 +22,17 @@ where sample was demonstrated.
## Prerequisites
-> You need to have a bot created and registered using the Microsoft Bot Framework and registered to use the Direct Line Channel,
+> You need to have a bot created and registered using the Microsoft Bot Framework and registered to use the DirectLine Channel,
which will give you the secret needed when adding this web part to the page. For more information on creating a bot and registering
the channel you can see the official web site at [dev.botframework.com](http://dev.botframework.com), as well as various tutorials
-over at [www.garypretty.co.uk/category/microsoft-bot-framework/](http://www.garypretty.co.uk/category/microsoft-bot-framework/)
+over at [www.garypretty.co.uk/category/microsoft-bot-framework/](http://www.garypretty.co.uk/category/microsoft-bot-framework/) & [Stephan Bisser's blog](https://bisser.io)
See more details on how to create a bot from following locations.
* [Getting started with the Connector](https://docs.botframework.com/en-us/csharp/builder/sdkreference/gettingstarted.html) - MS Bot Framework documentation
* [Creating your first bot with the Microsoft Bot Framework – Part 1 – Build and test locally](http://www.garypretty.co.uk/2016/07/14/creating-your-first-bot-with-the-microsoft-bot-framework-part-1/) - [@GaryPretty](https://twitter.com/GaryPretty)
-* [Creating your first bot with the Microsoft Bot Framework – Part 2 – publishing and chatting through Skype](http://www.garypretty.co.uk/2016/07/16/creating-your-first-bot-with-the-microsoft-bot-framework-part-2/) - [@GaryPretty](https://twitter.com/GaryPretty)
-
+* [Creating your first bot with the Microsoft Bot Framework – Part 2 – publishing and chatting through Skype](http://www.garypretty.co.uk/2016/07/16/creating-your-first-bot-with-the-microsoft-bot-framework-part-2/)- [@GaryPretty](https://twitter.com/GaryPretty)
+* [Create a QnA Bot with Azure Bot Service v4](https://docs.microsoft.com/en-us/azure/cognitive-services/qnamaker/tutorials/create-qna-bot)
> Notice that you can find simplistic bot implemented with Visual Studio 2015 using the bot templates (Oct 2016)
under the [vs2015-bot-application](./vs2015-bot-application) folder. This is simplistic bot based on above blog posts, which responses random string back.
@@ -41,6 +42,7 @@ under the [vs2015-bot-application](./vs2015-bot-application) folder. This is sim
Solution|Author(s)
--------|---------
bot-framework | Gary Pretty ([@garypretty](http://www.twitter.com/garypretty), [garypretty.co.uk](www.garypretty.co.uk))
+|webpart v4| Stephan Bisser ([@stephanbisser](https://twitter.com/stephanbisser), [bisser.io](https://bisser.io))
## Version history
@@ -50,6 +52,7 @@ Version|Date|Comments
1.1|Jan 24th, 2017|Updated to RC0
1.2|Feb 23rd, 2017|Initial load bug fix
1.3|February 8, 2018|Updated to SPFx 1.7
+1.4|September 4, 2019|Added BotFramework webchat v4
## Disclaimer
@@ -65,27 +68,26 @@ Version|Date|Comments
- `tsd install`
- `gulp serve`
-- Register your bot in the Microsoft Bot Framework Portal, configure the Direct Line channel on the bot and obtain your Direct Line secret.
+- Register your bot in the Microsoft Bot Framework Portal, configure the DirectLine channel on the bot and obtain your DirectLine secret.
## Features
This Web Part illustrates the following concepts on top of the SharePoint Framework:
-- Connecting and communicating with a bot built on the Microsoft Bot Framework using the Direct Line Channel
+- Connecting and communicating with a bot built on the Microsoft Bot Framework using the DirectLine Channel
- Validating Property Pane Settings
- Office UI Fabric
- React
-When adding the web part to a page you need to obtain your Bot Direct Line Channel secret via the [Bot Framework Portal](http://dev.botframework.com).
-You then add this secret via the Property Pane of the web part. If there is an error initializing the Direct Line Client with the bot then they will
-be shown in the console within the browser.
+When adding the web part to a page you need to obtain your bot's DirectLine channel secret via the [Azure Portal](http://portal.azure.com).
+You then add this secret via the Property Pane of the web part. If there is an error initializing the DirectLine Client with the bot then they will be shown in the console within the browser.
-You can add Direct Line channel to bot from the bot details page under the "Add another channel" section
+You can add DirectLine channel to bot from the bot details page under the "Add another channel" section
-![bot framework client web part](./assets/add-another-channel.png)
+![bot framework client web part](./assets/bf-add-directline-channel.png)
After this, you can click Edit for the just added Channel to get the needed secret for the client side web part.
-![bot framework client web part](./assets/bot-framework-configure-direct-line-secret.png)
+![bot framework client web part](./assets/bf-configure-directline-secret.png)
Additional settings can be set to style the web part, including;
@@ -94,7 +96,6 @@ Additional settings can be set to style the web part, including;
- Placeholder text
- Foreground / background colors for messages, both from the user and from the bot
-Currently this web part only supports plain text conversations with a bot. Other message types,
-such as Rich Cards and Attachments are not supported, but are on the roadmap for a future update.
+Currently the [Bot Framework Webchat v3 web part](./src/webparts/botFrameworkChat) only supports plain text conversations with a bot. Other message types, such as Rich Cards and Attachments are not supported, so in order to use that, use the [Bot Framework Webchat v4 web part](./src/webparts/botFrameworkChatv4)
\ No newline at end of file
diff --git a/samples/react-bot-framework/assets/bf-add-directline-channel.png b/samples/react-bot-framework/assets/bf-add-directline-channel.png
new file mode 100644
index 000000000..77e34004f
Binary files /dev/null and b/samples/react-bot-framework/assets/bf-add-directline-channel.png differ
diff --git a/samples/react-bot-framework/assets/bf-configure-directline-secret.png b/samples/react-bot-framework/assets/bf-configure-directline-secret.png
new file mode 100644
index 000000000..79cca9d8b
Binary files /dev/null and b/samples/react-bot-framework/assets/bf-configure-directline-secret.png differ
diff --git a/samples/react-bot-framework/assets/bot-frameworkv4-webpart-preview.png b/samples/react-bot-framework/assets/bot-frameworkv4-webpart-preview.png
new file mode 100644
index 000000000..5d3d263c0
Binary files /dev/null and b/samples/react-bot-framework/assets/bot-frameworkv4-webpart-preview.png differ
diff --git a/samples/react-bot-framework/src/webparts/botFrameworkChatv4/components/BotFrameworkChatv4.tsx b/samples/react-bot-framework/src/webparts/botFrameworkChatv4/components/BotFrameworkChatv4.tsx
index affb5b65f..299308f93 100644
--- a/samples/react-bot-framework/src/webparts/botFrameworkChatv4/components/BotFrameworkChatv4.tsx
+++ b/samples/react-bot-framework/src/webparts/botFrameworkChatv4/components/BotFrameworkChatv4.tsx
@@ -37,9 +37,7 @@ export default class BotFrameworkChatv4 extends React.Component {
- //
-
+ public render(): React.ReactElement {
return (