Skip to content

Commit

Permalink
react-film@1.1.2 and react-scroll-to-bottom@1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
compulim committed Jan 22, 2019
1 parent 0dffd85 commit fc659f4
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- `playground`: Bumps to [`react-scripts@2.1.1`](https://npmjs.com/package/react-scripts/), in PR [#1535](https://github.com/Microsoft/BotFramework-WebChat/pull/1535)
- `*`: Bump to [`adaptivecards@1.1.2`](https://npmjs.com/package/adaptivecards/), in [#1558](https://github.com/Microsoft/BotFramework-WebChat/pull/1558)
- `core`: Fix [#1344](https://github.com/Microsoft/BotFramework-WebChat/issues/1344). Use random user ID if not specified, by [@compulim](https://github.com/compulim) in PR [#1612](https://github.com/Microsoft/BotFramework-WebChat/pull/1612)
- `component`: Bump to [`react-film@1.1.2`](https://npmjs.com/package/react-film/) and [`react-scroll-to-bottom@1.3.0`](https://npmjs.com/package/react-scroll-to-bottom/), by [@compulim](https://github.com/compulim), in PR [#XXX](https://github.com/Microsoft/BotFramework-WebChat/pull/XXX)

### Fixed
- Fix [#1360](https://github.com/Microsoft/BotFramework-WebChat/issues/1360). Added `roles` to components of Web Chat, by [@corinagum](https://github.com/corinagum) in PR [#1462](https://github.com/Microsoft/BotFramework-WebChat/pull/1462)
Expand Down
18 changes: 9 additions & 9 deletions packages/component/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@
"glamor": "^2.20.40",
"memoize-one": "^3.1.1",
"react-dictate-button": "^1.1.3",
"react-film": "^1.1.1",
"react-film": "~1.1.2",
"react-redux": "^5.0.7",
"react-say": "^1.1.1",
"react-scroll-to-bottom": "^1.2.0",
"react-scroll-to-bottom": "~1.3.0",
"redux": "^4.0.0",
"sanitize-html": "^1.18.2",
"simple-update-in": "^1.3.0"
Expand Down
5 changes: 2 additions & 3 deletions packages/component/src/Activity/ScrollToEndButton.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {
FunctionContext as ScrollToBottomFunctionContext,
StateContext as ScrollToBottomStateContext
} from 'react-scroll-to-bottom';

Expand All @@ -11,7 +10,7 @@ import Localize from '../Localization/Localize';

const ScrollToEndButton = connectToWebChat(
({ scrollToEnd, styleSet }) => ({ scrollToEnd, styleSet })
)(({ children, className, scrollToEnd, styleSet }) =>
)(({ className, scrollToEnd, styleSet }) =>
<button
className={ classNames(
styleSet.scrollToEndButton + '',
Expand All @@ -25,5 +24,5 @@ const ScrollToEndButton = connectToWebChat(

export default props =>
<ScrollToBottomStateContext.Consumer>
{ ({ animating, atEnd }) => !animating && !atEnd && <ScrollToEndButton { ...props } /> }
{ ({ sticky }) => !sticky && <ScrollToEndButton { ...props } /> }
</ScrollToBottomStateContext.Consumer>
2 changes: 1 addition & 1 deletion packages/component/src/Composer.js
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ class Composer extends React.Component {
const ConnectedComposer = connect(
({ referenceGrammarID }) => ({ referenceGrammarID })
)(props =>
<ScrollToBottomComposer threshold={ 40 }>
<ScrollToBottomComposer>
<ScrollToBottomFunctionContext.Consumer>
{ ({ scrollToEnd }) =>
<Composer
Expand Down

0 comments on commit fc659f4

Please sign in to comment.