From a384ac4e44b9dd4811901e714cbb798ceed75b2d Mon Sep 17 00:00:00 2001
From: quentin <quentin.torck@aiso.com>
Date: Fri, 13 Mar 2020 14:27:43 +0100
Subject: [PATCH] fixe multi select
---
...earchable-multi-select-content.presentational.html | 1 -
...-searchable-multi-select-content.presentational.ts | 11 +++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.html b/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.html
index 77f6f697d..b8e360b56 100644
--- a/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.html
+++ b/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.html
@@ -1,7 +1,6 @@
<form [formGroup]="form"
[dlcmAutoScrollIntoView]="!navigationResId"
(keydown.tab)="closeByTab()"
- (keydown.enter)="select(getFocusedResource)"
(keydown.shift.tab)="closeByTab()">
<div class="input">
<mat-form-field class="form-field">
diff --git a/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.ts b/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.ts
index 50c073ba8..54d3ce1e0 100644
--- a/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.ts
+++ b/src/app/shared/components/presentationals/shared-searchable-multi-select-content/shared-searchable-multi-select-content.presentational.ts
@@ -16,6 +16,7 @@ import {
} from "rxjs";
import {
BaseResourceType,
+ isNotNullNorUndefined,
ObservableUtil,
ResourceStateModel,
} from "solidify-frontend";
@@ -44,11 +45,13 @@ export class SharedSearchableMultiSelectContentPresentational<TResource extends
}
select(value: TResource): void {
- if (this.isActive(value)) {
- this._valueRemovedBS.next(value);
- return;
+ if (isNotNullNorUndefined(value)) {
+ if (this.isActive(value)) {
+ this._valueRemovedBS.next(value);
+ return;
+ }
+ this._valueAddedBS.next(value);
}
- this._valueAddedBS.next(value);
}
}
--
GitLab