Merge branch 'master' into master

Curiousite · web-flow · commit dd1b42932a46 · 2019-12-04T00:30:39.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -65,6 +65,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -  `component`: Updated timer to use functional component, by [@spyip](https://github.com/spyip) in PR [#2546](https://github.com/microsoft/BotFramework-WebChat/pull/2546)
 -  Fixes [#2651](https://github.com/microsoft/BotFramework-WebChat/issues/2651). Add `ends-with` string module to ES5 bundle, by [@corinagum](https://github.com/corinagum) in PR [#2654](https://github.com/microsoft/BotFramework-WebChat/pull/2654)
 -  Fixes [#2655](https://github.com/microsoft/BotFramework-WebChat/issues/2655). Fix Racecondition in connectivity status, by [@curiousite](https://github.com/Curiousite) in PR [#2656](https://github.com/microsoft/BotFramework-WebChat/pull/2656)
+-  Fixes [#2658](https://github.com/microsoft/BotFramework-WebChat/issues/2658). Fix rendering of markdown images in IE11, by [@corinagum](https://github.com/corinagum) in PR [#2659](https://github.com/microsoft/BotFramework-WebChat/pull/2659)
 
 ### Changed
 
diff --git a/packages/component/src/Styles/StyleSet/TextContent.js b/packages/component/src/Styles/StyleSet/TextContent.js
@@ -1,6 +1,6 @@
 /* eslint no-magic-numbers: "off" */
 
-export default function createTextContentStyle({ bubbleMinHeight, primaryFont, paddingRegular }) {
+export default function createTextContentStyle({ bubbleMaxWidth, bubbleMinHeight, primaryFont, paddingRegular }) {
   return {
     fontFamily: primaryFont,
     margin: 0,
@@ -17,7 +17,8 @@ export default function createTextContentStyle({ bubbleMinHeight, primaryFont, p
 
     '&.markdown': {
       '& img': {
-        maxWidth: '100%'
+        maxWidth: bubbleMaxWidth,
+        width: '100%'
       },
 
       '& pre': {
