diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.ts
index 8be21045..ed9aac99 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.ts
@@ -1,6 +1,4 @@
-import { Component, HostListener, OnDestroy, OnInit, Output, EventEmitter, ViewChild, AfterViewInit } from '@angular/core';
-import { MatMenuTrigger } from '@angular/material/menu';
-import { MatSelect } from '@angular/material/select';
+import { Component, HostListener, OnDestroy, OnInit, Output, EventEmitter } from '@angular/core';
import { Subscription } from 'rxjs';
import { CustomDevice } from '../../models/device.model';
@@ -22,16 +20,7 @@ import { ParticipantService } from '../../services/participant/participant.servi
templateUrl: './pre-join.component.html',
styleUrls: ['./pre-join.component.css']
})
-export class PreJoinComponent implements OnInit, OnDestroy, AfterViewInit {
- /**
- * @ignore
- */
- @ViewChild(MatMenuTrigger) public menuTrigger: MatMenuTrigger;
- /**
- * @ignore
- */
- @ViewChild(MatSelect) matSelect: MatSelect;
-
+export class PreJoinComponent implements OnInit, OnDestroy {
@Output() onJoinButtonClicked = new EventEmitter
();
cameras: CustomDevice[];
microphones: CustomDevice[];
@@ -88,17 +77,6 @@ export class PreJoinComponent implements OnInit, OnDestroy, AfterViewInit {
this.isLoading = false;
}
- ngAfterViewInit() {
- // Some devices as iPhone do not show the menu panels correctly
- // Updating the container where the panel is added fix the problem.
- this.menuTrigger?.menuOpened.subscribe(() => {
- this.cdkSrv.setSelector('#prejoin-container');
- });
- this.matSelect?.openedChange.subscribe(() => {
- this.cdkSrv.setSelector('#prejoin-container');
- });
- }
-
async ngOnDestroy() {
this.cdkSrv.setSelector('body');
if (this.localParticipantSubscription) this.localParticipantSubscription.unsubscribe();
@@ -108,6 +86,12 @@ export class PreJoinComponent implements OnInit, OnDestroy, AfterViewInit {
this.panelService.closePanel();
}
+ onDeviceSelectorClicked() {
+ // Some devices as iPhone do not show the menu panels correctly
+ // Updating the container where the panel is added fix the problem.
+ this.cdkSrv.setSelector('#prejoin-container');
+ }
+
joinSession() {
this.onJoinButtonClicked.emit();
this.panelService.closePanel();
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/audio-devices/audio-devices.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/audio-devices/audio-devices.component.html
index c5522572..a74486b8 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/audio-devices/audio-devices.component.html
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/audio-devices/audio-devices.component.html
@@ -16,6 +16,7 @@
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/audio-devices/audio-devices.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/audio-devices/audio-devices.component.ts
index c60254ee..bd8fc39d 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/audio-devices/audio-devices.component.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/audio-devices/audio-devices.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { EventEmitter, Component, OnDestroy, OnInit, Output } from '@angular/core';
import { PublisherProperties } from 'openvidu-browser';
import { DeviceService } from '../../../services/device/device.service';
import { OpenViduService } from '../../../services/openvidu/openvidu.service';
@@ -18,6 +18,7 @@ import { VideoType } from '../../../models/video-type.model';
styleUrls: ['./audio-devices.component.css']
})
export class AudioDevicesComponent implements OnInit, OnDestroy {
+ @Output() onDeviceSelectorClicked = new EventEmitter();
hasAudioDevices: boolean;
isAudioMuted: boolean;
microphoneSelected: CustomDevice;
@@ -28,7 +29,7 @@ export class AudioDevicesComponent implements OnInit, OnDestroy {
private openviduService: OpenViduService,
private deviceSrv: DeviceService,
private storageSrv: StorageService,
- protected participantService: ParticipantService
+ private participantService: ParticipantService
) {}
async ngOnInit() {
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/lang-selector/lang-selector.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/lang-selector/lang-selector.component.ts
index 9e0302d0..602c5c24 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/lang-selector/lang-selector.component.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/lang-selector/lang-selector.component.ts
@@ -1,16 +1,32 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, OnInit, Output, ViewChild,EventEmitter } from '@angular/core';
+import { MatMenuTrigger } from '@angular/material/menu';
+import { MatSelect } from '@angular/material/select';
import { StorageService } from '../../../services/storage/storage.service';
import { TranslateService } from '../../../services/translate/translate.service';
+/**
+ * @internal
+ */
@Component({
selector: 'ov-lang-selector',
templateUrl: './lang-selector.component.html',
styleUrls: ['./lang-selector.component.css']
})
-export class LangSelectorComponent implements OnInit {
+export class LangSelectorComponent implements OnInit, AfterViewInit {
+ @Output() onLangSelectorClicked = new EventEmitter();
langSelected: { name: string; ISO: string };
languages: { name: string; ISO: string }[] = [];
+ /**
+ * @ignore
+ */
+ @ViewChild(MatMenuTrigger) public menuTrigger: MatMenuTrigger;
+
+ /**
+ * @ignore
+ */
+ @ViewChild(MatSelect) matSelect: MatSelect;
+
constructor(private translateService: TranslateService, private storageSrv: StorageService) {}
ngOnInit(): void {
@@ -18,6 +34,15 @@ export class LangSelectorComponent implements OnInit {
this.langSelected = this.translateService.getLangSelected();
}
+ ngAfterViewInit() {
+ this.menuTrigger?.menuOpened.subscribe(() => {
+ this.onLangSelectorClicked.emit();
+ });
+ this.matSelect?.openedChange.subscribe(() => {
+ this.onLangSelectorClicked.emit();
+ });
+ }
+
onLangSelected(lang: string) {
this.translateService.setLanguage(lang);
this.storageSrv.setLang(lang);
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/video-devices/video-devices.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/video-devices/video-devices.component.html
index ecb5b231..e2e3cb13 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/video-devices/video-devices.component.html
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/video-devices/video-devices.component.html
@@ -14,6 +14,7 @@
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/video-devices/video-devices.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/video-devices/video-devices.component.ts
index 87543f25..5c7c0f82 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/video-devices/video-devices.component.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/video-devices/video-devices.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy, Output, EventEmitter } from '@angular/core';
import { PublisherProperties } from 'openvidu-browser';
import { Subscription } from 'rxjs';
import { CustomDevice } from '../../../models/device.model';
@@ -21,6 +21,8 @@ import { VirtualBackgroundService } from '../../../services/virtual-background/v
styleUrls: ['./video-devices.component.css']
})
export class VideoDevicesComponent implements OnInit, OnDestroy {
+ @Output() onDeviceSelectorClicked = new EventEmitter();
+
videoMuteChanging: boolean;
isVideoMuted: boolean;
cameraSelected: CustomDevice;