Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(channel-web): carousel after reopening chat #12449

Merged
merged 2 commits into from
Feb 8, 2023
Merged

fix(channel-web): carousel after reopening chat #12449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a8291e
fix(channel-web): carousel after reopening chat
davidvitora Jan 6, 2023
f844b70
Merge branch 'master' of github.com:botpress/botpress into dv_fix_car…
davidvitora Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion modules/channel-web/assets/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,11 @@ body {

.bpw-bubble-carousel {
background: none;
border: 0px;
padding: 0px;
margin: 10px 0;
width: 100%;
text-align: left;
width: 250px; /* Magic number so that it fits properly in the web */
}

.bpw-bubble-file {
Expand Down
2 changes: 1 addition & 1 deletion modules/channel-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"react-linkify": "^0.2.2",
"react-scroll-to-bottom": "^4.2.0",
"react-select": "^2.4.2",
"react-slick": "^0.24.0",
"react-slick": "0.29.0",
"slick-carousel": "^1.8.1",
"snarkdown": "^1.2.2",
"uuid": "^3.1.0"
Expand Down
17 changes: 15 additions & 2 deletions modules/channel-web/src/views/lite/components/messages/renderer/Carousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ import '../../../../../../assets/slick/slick-theme.css'
import '../../../../../../assets/slick/slick.css'
import { Renderer } from '../../../typings'

const CarouselSkeleton = () => {
const common = { width: '100%', borderRadius: 5, padding: 10 }
const button = { height: 30, backgroundColor: '#ecebeb', marginTop: 10, ...common }
return (
<div className="bpw-carousel-skeleton" style={{ height: 380, backgroundColor: '#f3f3f3', ...common }}>
<div style={{ height: 280, backgroundColor: '#ecebeb', ...common }} />
<div style={button} />
<div style={button} />
</div>
)
}

export class Carousel extends React.Component<ICarouselProps, ICarouselState> {
private ref

Expand All @@ -14,7 +26,8 @@ export class Carousel extends React.Component<ICarouselProps, ICarouselState> {
}

componentDidMount() {
this.setState({ adjustedWidth: this.ref.offsetWidth - window.innerWidth })
// Delay this to avoid incorrect values when closing-opening the webchat
setTimeout(() => this.setState({ adjustedWidth: this.ref.offsetWidth - window.innerWidth }), 300)
}

renderCarousel() {
Expand Down Expand Up @@ -51,7 +64,7 @@ export class Carousel extends React.Component<ICarouselProps, ICarouselState> {
render() {
return (
<div ref={el => (this.ref = el)} style={{ width: '100%', ...this.props.style }}>
{this.state.adjustedWidth && this.renderCarousel()}
{(this.state.adjustedWidth && this.renderCarousel()) || <CarouselSkeleton />}
</div>
)
}
Expand Down
8 changes: 4 additions & 4 deletions modules/channel-web/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,10 +1252,10 @@ react-select@^2.4.2:
react-input-autosize "^2.2.1"
react-transition-group "^2.2.1"

react-slick@^0.24.0:
version "0.24.0"
resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.24.0.tgz#1a4e078a82de4e9458255d9ce26aa6f3b17b168b"
integrity sha512-Pvo0B74ohumQdYOf0qP+pdQpj9iUbAav7+2qiF3uTc5XeQp/Y/cnIeDBM2tB3txthfSe05jKIqLMJTS6qVvt5g==
react-slick@0.29.0:
version "0.29.0"
resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.29.0.tgz#0bed5ea42bf75a23d40c0259b828ed27627b51bb"
integrity sha512-TGdOKE+ZkJHHeC4aaoH85m8RnFyWqdqRfAGkhd6dirmATXMZWAxOpTLmw2Ll/jPTQ3eEG7ercFr/sbzdeYCJXA==
dependencies:
classnames "^2.2.5"
enquire.js "^2.1.6"
Expand Down