pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: make only composer as fixed in chatter

Browse Source 
task-2282325

closes odoo/odoo#61077

X-original-commit: 9d90fd9a2a65ab1ff338bb109426ca93075937fa
Related: odoo/enterprise#14506
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
This commit is contained in:
Xavier Dubuc
2020-10-30 16:39:24 +00:00
parent 06ca3e8d0d
commit e0d849ba7c
8 changed files with 81 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/components/chatter/chatter.js
+15
View File
@@ -41,6 +41,10 @@ class Chatter extends Component {
* Reference of the composer. Useful to focus it.
*/
this._composerRef = useRef('composer');
/**
* Reference of the message list. Useful to trigger the scroll event on it.
*/
this._threadRef = useRef('thread');
}
mounted() {
@@ -103,6 +107,17 @@ class Chatter extends Component {
this.chatter.update({ isComposerVisible: false });
}
/**
* @private
* @param {MouseEvent} ev
*/
_onScrollPanelScroll(ev) {
if (!this._threadRef.comp) {
return;
}
this._threadRef.comp.onScroll(ev);
}
}
Object.assign(Chatter, {
addons/mail/static/src/components/chatter/chatter.scss
+4
View File
@@ -17,6 +17,10 @@
}
}
.o_Chatter_scrollPanel {
overflow-y: auto;
}
// ------------------------------------------------------------------
// Style
// ------------------------------------------------------------------
addons/mail/static/src/components/chatter/chatter.xml
+42 -38
View File
@@ -4,46 +4,50 @@
<t t-name="mail.Chatter" owl="1">
<div class="o_Chatter">
<t t-if="chatter">
<ChatterTopbar
class="o_Chatter_topbar"
chatterLocalId="chatter.localId"
/>
<t t-if="chatter.threadView and chatter.isComposerVisible">
<Composer
class="o_Chatter_composer"
t-att-class="{ 'o-bordered': chatter.hasExternalBorder }"
composerLocalId="chatter.thread.composer.localId"
hasFollowers="true"
hasMentionSuggestionsBelowPosition="true"
isCompact="false"
isExpandable="true"
textInputSendShortcuts="['ctrl-enter', 'meta-enter']"
t-on-o-message-posted="_onComposerMessagePosted"
t-ref="composer"
/>
</t>
<t t-if="chatter.isAttachmentBoxVisible">
<AttachmentBox
class="o_Chatter_attachmentBox"
threadLocalId="chatter.thread.localId"
/>
</t>
<t t-if="chatter.thread and chatter.hasActivities and chatter.thread.activities.length > 0">
<ActivityBox
class="o_Chatter_activityBox"
<div class="o_Chatter_fixedPanel">
<ChatterTopbar
class="o_Chatter_topbar"
chatterLocalId="chatter.localId"
/>
</t>
<t t-if="chatter.threadView">
<ThreadView
class="o_Chatter_thread"
hasComposer="false"
hasScrollAdjust="chatter.hasMessageListScrollAdjust"
order="'desc'"
threadViewLocalId="chatter.threadView.localId"
t-ref="thread"
/>
</t>
<t t-if="chatter.threadView and chatter.isComposerVisible">
<Composer
class="o_Chatter_composer"
t-att-class="{ 'o-bordered': chatter.hasExternalBorder }"
composerLocalId="chatter.thread.composer.localId"
hasFollowers="true"
hasMentionSuggestionsBelowPosition="true"
isCompact="false"
isExpandable="true"
textInputSendShortcuts="['ctrl-enter', 'meta-enter']"
t-on-o-message-posted="_onComposerMessagePosted"
t-ref="composer"
/>
</t>
</div>
<div class="o_Chatter_scrollPanel" t-on-scroll="_onScrollPanelScroll">
<t t-if="chatter.isAttachmentBoxVisible">
<AttachmentBox
class="o_Chatter_attachmentBox"
threadLocalId="chatter.thread.localId"
/>
</t>
<t t-if="chatter.thread and chatter.hasActivities and chatter.thread.activities.length > 0">
<ActivityBox
class="o_Chatter_activityBox"
chatterLocalId="chatter.localId"
/>
</t>
<t t-if="chatter.threadView">
<ThreadView
class="o_Chatter_thread"
hasComposer="false"
hasScrollAdjust="chatter.hasMessageListScrollAdjust"
order="'desc'"
threadViewLocalId="chatter.threadView.localId"
t-ref="thread"
/>
</t>
</div>
</t>
</div>
</t>
addons/mail/static/src/components/composer/composer.scss
+5
View File
@@ -40,6 +40,11 @@
&.o-composer-is-compact {
max-height: 100px;
}
&:not(.o-composer-is-compact) {
overflow-y: auto;
max-height: 300px;
}
}
.o_Composer_buttons {
addons/mail/static/src/components/composer_text_input/composer_text_input.scss
+1 -1
View File
@@ -27,6 +27,6 @@
&:not(.o-composer-is-compact) {
// Don't allow the input to take the whole height when it's not compact
// (like in chatter for example) but allow it to take some more place
max-height: 200px;
max-height: 150px;
}
}
addons/mail/static/src/components/message_list/message_list.js
+2 -2
View File
@@ -55,7 +55,7 @@ class MessageList extends Component {
* Snapshot computed during willPatch, which is used by patched.
*/
this._willPatchSnapshot = undefined;
this._onScroll = _.throttle(this._onScroll.bind(this), 100);
this.onScroll = _.throttle(this.onScroll.bind(this), 100);
}
mounted() {
@@ -560,7 +560,7 @@ class MessageList extends Component {
* @private
* @param {ScrollEvent} ev
*/
_onScroll(ev) {
onScroll(ev) {
if (!this.el) {
// could be unmounted in the meantime (due to throttled behavior)
return;
addons/mail/static/src/components/message_list/message_list.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<templates xml:space="preserve">
<t t-name="mail.MessageList" owl="1">
<div class="o_MessageList" t-att-class="{ 'o-empty': threadView and threadView.messages.length === 0, 'o-has-message-selection': props.selectedMessageLocalId }" t-on-scroll="_onScroll">
<div class="o_MessageList" t-att-class="{ 'o-empty': threadView and threadView.messages.length === 0, 'o-has-message-selection': props.selectedMessageLocalId }" t-on-scroll="onScroll">
<t t-if="threadView">
<!-- No result messages -->
<t t-if="threadView.nonEmptyMessages.length === 0">
addons/mail/static/src/components/thread_view/thread_view.js
+11
View File
@@ -85,6 +85,17 @@ class ThreadView extends Component {
return this._messageListRef.comp.getScrollTop();
}
/**
* @private
* @param {MouseEvent} ev
*/
onScroll(ev) {
if (!this._messageListRef.comp) {
return;
}
this._messageListRef.comp.onScroll(ev);
}
/**
* @returns {mail.thread_view}
*/