diff --git a/projects/solidify-frontend/src/lib/select/presentationals/abstract-multi-select/abstract-multi-select.presentational.scss b/projects/solidify-frontend/src/lib/select/presentationals/abstract-multi-select/abstract-multi-select.presentational.scss index de3a448a2c1daaf28b679605ed5933e2253b13ff..1d89f3097c030ca4b223051f98ed6c4b4b287c78 100644 --- a/projects/solidify-frontend/src/lib/select/presentationals/abstract-multi-select/abstract-multi-select.presentational.scss +++ b/projects/solidify-frontend/src/lib/select/presentationals/abstract-multi-select/abstract-multi-select.presentational.scss @@ -53,11 +53,11 @@ margin: 5px 0; } - //.label { - // max-width: 150px; - // padding-right: 5px; - // @include truncate-with-ellipsis; - //} + .label { + max-width: 150px; + padding-right: 5px; + @include truncate-with-ellipsis; + } input { cursor: pointer; diff --git a/projects/solidify-frontend/src/lib/select/presentationals/abstract-multi-select/abstract-multi-select.presentational.ts b/projects/solidify-frontend/src/lib/select/presentationals/abstract-multi-select/abstract-multi-select.presentational.ts index afa731ffdc9d9d73370b791f3fe81e504f821372..a30095c861a285de1ce1f59faf0005db0ced6824 100644 --- a/projects/solidify-frontend/src/lib/select/presentationals/abstract-multi-select/abstract-multi-select.presentational.ts +++ b/projects/solidify-frontend/src/lib/select/presentationals/abstract-multi-select/abstract-multi-select.presentational.ts @@ -83,7 +83,6 @@ import { import {ExtendEnum} from "../../../core/types/extend-enum.type"; import {ClipboardUtil} from "../../../core/utils/clipboard.util"; import {ObservableUtil} from "../../../core/utils/observable.util"; -import {StringUtil} from "../../../core/utils/string.util"; import {LabelTranslateInterface} from "../../../label-translate-interface.model"; import {MultiSelectContentPresentational} from "../multi-select-content/multi-select-content.presentational"; import {MultiSelectDefaultValueContentPresentational} from "../multi-select-default-value-content/multi-select-default-value-content.presentational"; @@ -413,18 +412,6 @@ export abstract class AbstractMultiSelectPresentational<TResource extends BaseRe return this.selectedItems.findIndex(s => s[this.valueKey] === item[this.valueKey]); } - getTooltip(value: TResource): string { - let extraInfo = StringUtil.stringEmpty; - if (!isNullOrUndefined(this.extraInfoLabelKey) && !isNullOrUndefined(value[this.extraInfoLabelKey])) { - extraInfo = " - " + value[this.extraInfoLabelKey]; - } - let label = this.labelCallback(value); - if (this.translateLabel) { - label = this._translateService.instant(label); - } - return label + extraInfo; - } - navigateTo(event: Event, value: TResource): void { if (isNotNullNorUndefined(event)) { event.stopPropagation(); diff --git a/projects/solidify-frontend/src/lib/select/presentationals/multi-select/multi-select.presentational.html b/projects/solidify-frontend/src/lib/select/presentationals/multi-select/multi-select.presentational.html index a99f916676a1290fa23e9b93725ee411f15cf5b7..a1e0815b633b3c857df81738694532805ffb8f1d 100644 --- a/projects/solidify-frontend/src/lib/select/presentationals/multi-select/multi-select.presentational.html +++ b/projects/solidify-frontend/src/lib/select/presentationals/multi-select/multi-select.presentational.html @@ -36,8 +36,7 @@ [editable]="false" class="chip" > - <span [matTooltipShowDelay]="500" - [matTooltip]="getTooltip(value)" + <span solidifyTooltipOnEllipsis class="label" > <ng-template [ngIf]="translateLabel" diff --git a/projects/solidify-frontend/src/lib/select/presentationals/searchable-multi-select/searchable-multi-select.presentational.html b/projects/solidify-frontend/src/lib/select/presentationals/searchable-multi-select/searchable-multi-select.presentational.html index a83af0f3ffde09161161d44756a1b932f681ca1b..24299dd1467197232cd91add22a24c149f096ba6 100644 --- a/projects/solidify-frontend/src/lib/select/presentationals/searchable-multi-select/searchable-multi-select.presentational.html +++ b/projects/solidify-frontend/src/lib/select/presentationals/searchable-multi-select/searchable-multi-select.presentational.html @@ -41,20 +41,18 @@ (removed)="remove(value)" > <span class="label" - [matTooltipShowDelay]="500" - [matTooltip]="getTooltip(value)" - [matTooltipDisabled]="(overlayComponent | isNotNullNorUndefined)" + solidifyTooltipOnEllipsis [class.disable-pointer-event]="(overlayComponent | isNotNullNorUndefined)" > - <ng-template [ngIf]="translateLabel" - [ngIfElse]="noTranslate" - > - <span [innerHTML]="labelCallback(value) | translate"></span> - </ng-template> - <ng-template #noTranslate> - <span [innerHTML]="labelCallback(value)"></span> - </ng-template> - </span> + <ng-template [ngIf]="translateLabel" + [ngIfElse]="noTranslate" + > + <span [innerHTML]="labelCallback(value) | translate"></span> + </ng-template> + <ng-template #noTranslate> + <span [innerHTML]="labelCallback(value)"></span> + </ng-template> + </span> <ng-template [ngIf]="defaultValueToHighlight | isNonEmptyArray"> <span *ngIf="isADefaultValue(value[valueKey])" class="is-default"