[IMP] mail: remove isActive from ComposerSuggestionView
Part of task-2741982 Part-of: odoo/odoo#95341
This commit is contained in:
+1
-1
@@ -37,7 +37,7 @@ export class ComposerSuggestionView extends Component {
|
||||
if (
|
||||
this.root.el &&
|
||||
this.composerSuggestionView.composerViewOwner.hasToScrollToActiveSuggestionView &&
|
||||
this.composerSuggestionView.isActive
|
||||
this.composerSuggestionView.composerViewOwnerAsActiveSuggestionView
|
||||
) {
|
||||
this.root.el.scrollIntoView({
|
||||
block: 'center',
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
<t t-name="mail.ComposerSuggestionView" owl="1">
|
||||
<t t-if="composerSuggestionView">
|
||||
<a class="o_ComposerSuggestionView dropdown-item d-flex w-100 py-2 px-4" t-att-class="{ 'active bg-300': composerSuggestionView.isActive }" t-attf-class="{{ className }}" href="#" t-att-title="composerSuggestionView.title" role="menuitem" t-on-click="composerSuggestionView.onClick" t-ref="root">
|
||||
<a class="o_ComposerSuggestionView dropdown-item d-flex w-100 py-2 px-4" t-att-class="{ 'active bg-300': composerSuggestionView.composerViewOwnerAsActiveSuggestionView }" t-attf-class="{{ className }}" href="#" t-att-title="composerSuggestionView.title" role="menuitem" t-on-click="composerSuggestionView.onClick" t-ref="root">
|
||||
<t t-if="composerSuggestionView.suggestable.cannedResponse">
|
||||
<strong class="o_ComposerSuggestionView_part1 flex-shrink-0 mw-100 pe-2 text-truncate"><t t-esc="composerSuggestionView.suggestable.cannedResponse.source"/></strong>
|
||||
<em class="o_ComposerSuggestionView_part2 text-600 text-truncate"><t t-esc="composerSuggestionView.suggestable.cannedResponse.substitution"/></em>
|
||||
|
||||
@@ -38,19 +38,6 @@ registerModel({
|
||||
}
|
||||
return clear();
|
||||
},
|
||||
/**
|
||||
* @private
|
||||
* @returns {boolean|FieldCommand}
|
||||
*/
|
||||
_computeIsActive() {
|
||||
if (this.composerSuggestionListViewOwnerAsMainSuggestion && this === this.composerSuggestionListViewOwnerAsMainSuggestion.composerViewOwner.activeSuggestionView) {
|
||||
return true;
|
||||
}
|
||||
if (this.composerSuggestionListViewOwnerAsExtraSuggestion && this === this.composerSuggestionListViewOwnerAsExtraSuggestion.composerViewOwner.activeSuggestionView) {
|
||||
return true;
|
||||
}
|
||||
return clear();
|
||||
},
|
||||
/**
|
||||
* @private
|
||||
* @returns {string}
|
||||
@@ -104,6 +91,9 @@ registerModel({
|
||||
compute: '_computeComposerViewOwner',
|
||||
required: true,
|
||||
}),
|
||||
composerViewOwnerAsActiveSuggestionView: one('ComposerView', {
|
||||
inverse: 'activeSuggestionView',
|
||||
}),
|
||||
composerSuggestionListViewOwnerAsExtraSuggestion: one('ComposerSuggestionListView', {
|
||||
inverse: 'extraSuggestionViews',
|
||||
readonly: true,
|
||||
@@ -112,10 +102,6 @@ registerModel({
|
||||
inverse: 'mainSuggestionViews',
|
||||
readonly: true,
|
||||
}),
|
||||
isActive: attr({
|
||||
compute: '_computeIsActive',
|
||||
default: false,
|
||||
}),
|
||||
/**
|
||||
* The text that identifies this suggestion in a mention.
|
||||
*/
|
||||
|
||||
@@ -1407,6 +1407,7 @@ registerModel({
|
||||
*/
|
||||
activeSuggestionView: one('ComposerSuggestionView', {
|
||||
compute: '_computeActiveSuggestionView',
|
||||
inverse: 'composerViewOwnerAsActiveSuggestionView',
|
||||
}),
|
||||
/**
|
||||
* Determines the attachment list that will be used to display the attachments.
|
||||
|
||||
Reference in New Issue
Block a user