Skip to content

Commit 5c2e890

Browse files
authored
Fix react hook console errors (#2198)
* Not using logical OR to call _usePermissions * Change files
1 parent 6269de4 commit 5c2e890

4 files changed

Lines changed: 21 additions & 3 deletions

File tree

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix React hook order console errors for CameraButton.",
4+
"packageName": "@internal/react-components",
5+
"email": "miguelgamis@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix React hook order console errors for LocalDeviceSettings.",
4+
"packageName": "@internal/react-composites",
5+
"email": "miguelgamis@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

packages/react-components/src/components/CameraButton.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,9 @@ export const CameraButton = (props: CameraButtonProps): JSX.Element => {
150150

151151
let disabled = props.disabled || waitForCamera;
152152
/* @conditional-compile-remove(rooms) */
153-
disabled = disabled || !_usePermissions().cameraButton;
153+
const permissions = _usePermissions();
154+
/* @conditional-compile-remove(rooms) */
155+
disabled = disabled || !permissions.cameraButton;
154156

155157
const onRenderCameraOnIcon = (): JSX.Element => (
156158
<HighContrastAwareIcon disabled={disabled} iconName="ControlButtonCameraOn" />

packages/react-composites/src/composites/CallComposite/components/LocalDeviceSettings.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@ export const LocalDeviceSettings = (props: LocalDeviceSettingsType): JSX.Element
9393
let isSelectCamEnabled = props.cameraPermissionGranted;
9494
let isSelectMicEnabled = props.microphonePermissionGranted;
9595
/* @conditional-compile-remove(rooms) */
96-
isSelectCamEnabled = isSelectCamEnabled && _usePermissions().cameraButton;
96+
const permissions = _usePermissions();
9797
/* @conditional-compile-remove(rooms) */
98-
isSelectMicEnabled = isSelectMicEnabled && _usePermissions().microphoneButton;
98+
isSelectCamEnabled = isSelectCamEnabled && permissions.cameraButton;
99+
/* @conditional-compile-remove(rooms) */
100+
isSelectMicEnabled = isSelectMicEnabled && permissions.microphoneButton;
99101

100102
// TODO: speaker permission is tied to microphone permission (when you request 'audio' permission using the SDK) its
101103
// actually granting access to query both microphone and speaker. However the browser popup asks you explicity for

0 commit comments

Comments
 (0)