-
- search
-
-
-
-
+
![]()
-
- {{ item?.entry.name }}
-
-
-
- {{item?.entry.createdByUser.displayName}}
+
+ {{ item?.entry.name }}
+
+
+
+
+ {{item?.entry.createdByUser.displayName}}
active',
animate('300ms cubic-bezier(0.55, 0, 0.55, 0.2)')),
transition('active => inactive',
animate('300ms cubic-bezier(0.55, 0, 0.55, 0.2)'))
])
- ]
+ ],
+ encapsulation: ViewEncapsulation.None,
+ host: { class: 'adf-search-control' }
})
export class SearchControlComponent implements OnInit, OnDestroy {
@@ -77,7 +79,7 @@ export class SearchControlComponent implements OnInit, OnDestroy {
private focusSubject = new Subject();
constructor(public authService: AuthenticationService,
- private thumbnailService: ThumbnailService) {
+ private thumbnailService: ThumbnailService) {
this.toggleSearch.asObservable().debounceTime(100).subscribe(() => {
if (this.expandable) {
@@ -96,8 +98,15 @@ export class SearchControlComponent implements OnInit, OnDestroy {
}
ngOnDestroy(): void {
- this.focusSubject.unsubscribe();
- this.toggleSearch.unsubscribe();
+ if (this.focusSubject) {
+ this.focusSubject.unsubscribe();
+ this.focusSubject = null;
+ }
+
+ if (this.toggleSearch) {
+ this.toggleSearch.unsubscribe();
+ this.toggleSearch = null;
+ }
}
isLoggedIn(): boolean {
@@ -118,55 +127,57 @@ export class SearchControlComponent implements OnInit, OnDestroy {
}
getMimeTypeIcon(node: MinimalNodeEntity): string {
- let mimeType;
+ let mimeType;
- if (node.entry.content && node.entry.content.mimeType) {
- mimeType = node.entry.content.mimeType;
- }
- if (node.entry.isFolder) {
- mimeType = 'folder';
- }
+ if (node.entry.content && node.entry.content.mimeType) {
+ mimeType = node.entry.content.mimeType;
+ }
+ if (node.entry.isFolder) {
+ mimeType = 'folder';
+ }
- return this.thumbnailService.getMimeTypeIcon(mimeType);
- }
+ return this.thumbnailService.getMimeTypeIcon(mimeType);
+ }
- isSearchBarActive() {
- return this.subscriptAnimationState === 'active' && this.liveSearchEnabled;
- }
+ isSearchBarActive() {
+ return this.subscriptAnimationState === 'active' && this.liveSearchEnabled;
+ }
- toggleSearchBar() {
- this.toggleSearch.next();
- }
+ toggleSearchBar() {
+ if (this.toggleSearch) {
+ this.toggleSearch.next();
+ }
+ }
- elementClicked(item: any) {
- if (item.entry) {
- this.optionClicked.next(item);
- this.toggleSearchBar();
- }
- }
+ elementClicked(item: any) {
+ if (item.entry) {
+ this.optionClicked.next(item);
+ this.toggleSearchBar();
+ }
+ }
- onFocus($event): void {
- this.focusSubject.next($event);
- }
+ onFocus($event): void {
+ this.focusSubject.next($event);
+ }
- onBlur($event): void {
- this.focusSubject.next($event);
- }
+ onBlur($event): void {
+ this.focusSubject.next($event);
+ }
- activateToolbar($event) {
- if ( !this.isSearchBarActive() ) {
- this.toggleSearchBar();
- }
- }
+ activateToolbar($event) {
+ if (!this.isSearchBarActive()) {
+ this.toggleSearchBar();
+ }
+ }
- private setupFocusEventHandlers() {
- let focusEvents: Observable = this.focusSubject.asObservable()
- .distinctUntilChanged().debounceTime(50);
- focusEvents.filter(($event: any) => {
- return this.isSearchBarActive() && ($event.type === 'blur' || $event.type === 'focusout');
- }).subscribe(() => {
- this.toggleSearchBar();
- });
- }
+ private setupFocusEventHandlers() {
+ let focusEvents: Observable = this.focusSubject.asObservable()
+ .distinctUntilChanged().debounceTime(50);
+ focusEvents.filter(($event: any) => {
+ return this.isSearchBarActive() && ($event.type === 'blur' || $event.type === 'focusout');
+ }).subscribe(() => {
+ this.toggleSearchBar();
+ });
+ }
}
diff --git a/lib/content-services/search/components/search-trigger.directive.ts b/lib/content-services/search/components/search-trigger.directive.ts
index 0b0fcb22cd..9eb94c13e5 100644
--- a/lib/content-services/search/components/search-trigger.directive.ts
+++ b/lib/content-services/search/components/search-trigger.directive.ts
@@ -79,7 +79,10 @@ export class SearchTriggerDirective implements ControlValueAccessor, OnDestroy {
@Optional() @Inject(DOCUMENT) private document: any) { }
ngOnDestroy() {
- this.escapeEventStream.unsubscribe();
+ if (this.escapeEventStream) {
+ this.escapeEventStream.unsubscribe();
+ this.escapeEventStream = null;
+ }
if ( this.closingActionsSubscription ) {
this.closingActionsSubscription.unsubscribe();
}