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: closes chat emoji picker on body scroll #23362

Merged
merged 2 commits into from Sep 1, 2023
Merged

FIX: closes chat emoji picker on body scroll #23362

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
6893c49
FIX: closes chat emoji picker on body scroll
jjaffeux Aug 31, 2023
0548afa
linting
jjaffeux Aug 31, 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
26 changes: 26 additions & 0 deletions ...ents/chat-channel-message-emoji-picker.js → ...nts/chat-channel-message-emoji-picker.gjs
View file
Open in desktop
Expand Up @@ -3,13 +3,39 @@ import { action } from "@ember/object";
import { inject as service } from "@ember/service";
import { headerOffset } from "discourse/lib/offset-calculator";
import { createPopper } from "@popperjs/core";
import ChatEmojiPicker from "discourse/plugins/chat/discourse/components/chat-emoji-picker";
import { modifier } from "ember-modifier";

export default class ChatChannelMessageEmojiPicker extends Component {
<template>
{{! template-lint-disable modifier-name-case }}
<ChatEmojiPicker
@context="chat-channel-message"
@didInsert={{this.didInsert}}
@willDestroy={{this.willDestroy}}
@didSelectEmoji={{this.didSelectEmoji}}
@class="hidden"
{{this.listenToBodyScroll}}
/>
</template>

@service site;
@service chatEmojiPickerManager;

context = "chat-channel-message";

listenToBodyScroll = modifier(() => {
const handler = () => {
this.chatEmojiPickerManager.close();
};

document.addEventListener("scroll", handler);

return () => {
document.removeEventListener("scroll", handler);
};
});

@action
didSelectEmoji(emoji) {
this.chatEmojiPickerManager.picker?.didSelectEmoji(emoji);
Expand Down
7 changes: 0 additions & 7 deletions plugins/chat/assets/javascripts/discourse/components/chat-channel-message-emoji-picker.hbs
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.hbs
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@
{{will-destroy (if @willDestroy @willDestroy (noop))}}
{{will-destroy this.removeClickOutsideEventListener}}
{{on "keydown" this.trapKeyDownEvents}}
...attributes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this left over debugging code or some sort of magic I never learned about?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

made a topic about this

>
<div class="chat-emoji-picker__filter-container">
<DcFilterInput
Expand Down