diff --git a/addons/mail/static/src/components/chatter/chatter.xml b/addons/mail/static/src/components/chatter/chatter.xml index 7ddb0a95f24..0a88f510846 100644 --- a/addons/mail/static/src/components/chatter/chatter.xml +++ b/addons/mail/static/src/components/chatter/chatter.xml @@ -15,7 +15,6 @@ classNameObj="{ 'o-bordered': chatter.hasExternalBorder }" localId="chatter.composerView.localId" hasMentionSuggestionsBelowPosition="true" - isCompact="false" isExpandable="true" /> diff --git a/addons/mail/static/src/components/composer/composer.js b/addons/mail/static/src/components/composer/composer.js index 844ab8ee5ea..5c0e44e719f 100644 --- a/addons/mail/static/src/components/composer/composer.js +++ b/addons/mail/static/src/components/composer/composer.js @@ -47,7 +47,7 @@ export class Composer extends Component { this.props.hasThreadTyping || this.composerView.composer.attachments.length > 0 || this.composerView.messageViewInEditing || - !this.props.isCompact + !this.composerView.isCompact ); } @@ -197,7 +197,6 @@ Object.assign(Composer, { hasSendButton: true, hasThreadName: false, hasThreadTyping: false, - isCompact: true, isExpandable: false, }, props: { @@ -234,10 +233,6 @@ Object.assign(Composer, { type: Boolean, optional: true, }, - isCompact: { - type: Boolean, - optional: true, - }, isExpandable: { type: Boolean, optional: true, diff --git a/addons/mail/static/src/components/composer/composer.xml b/addons/mail/static/src/components/composer/composer.xml index a22feb149ca..0a0b8018011 100644 --- a/addons/mail/static/src/components/composer/composer.xml +++ b/addons/mail/static/src/components/composer/composer.xml @@ -9,7 +9,7 @@ 'o-has-footer': hasFooter, 'o-has-header': hasHeader, 'o-is-in-thread-view': composerView and composerView.threadView, - 'o-is-compact': props.isCompact, + 'o-is-compact': composerView and composerView.isCompact, 'o-messaging-in-editing': composerView and composerView.messageViewInEditing, }" t-attf-class="{{ className }}" @@ -65,33 +65,32 @@
-
+
- +
-
+
-
+
- + @@ -141,12 +140,12 @@ -
+
diff --git a/addons/mail/static/src/components/composer_text_input/composer_text_input.js b/addons/mail/static/src/components/composer_text_input/composer_text_input.js index b9abc199fd7..54b11e02343 100644 --- a/addons/mail/static/src/components/composer_text_input/composer_text_input.js +++ b/addons/mail/static/src/components/composer_text_input/composer_text_input.js @@ -386,7 +386,6 @@ Object.assign(ComposerTextInput, { type: Boolean, optional: true, }, - isCompact: Boolean, onComposerTextInputSendShortcut: { type: Function, optional: true, diff --git a/addons/mail/static/src/components/composer_text_input/composer_text_input.xml b/addons/mail/static/src/components/composer_text_input/composer_text_input.xml index a70210d65dc..99bb1510e15 100644 --- a/addons/mail/static/src/components/composer_text_input/composer_text_input.xml +++ b/addons/mail/static/src/components/composer_text_input/composer_text_input.xml @@ -10,13 +10,13 @@ isBelow="props.hasMentionSuggestionsBelowPosition" /> -