fix(service-providers): correctly dispose loopback recording (#1909)

* fix(service-providers): correctly dispose loopback recording * fix(flat-components): fix top bar double click handling
netless-io · May 4, 2023 · 63d5470 · 63d5470
1 parent c5141d7
commit 63d5470
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 21 deletions.
diff --git a/packages/flat-components/src/components/ClassroomPage/TopBar/index.tsx b/packages/flat-components/src/components/ClassroomPage/TopBar/index.tsx
@@ -1,6 +1,6 @@
 import "./style.less";
 
-import React, { FC, ReactNode } from "react";
+import React, { FC, ReactNode, useCallback, useRef } from "react";
 import classNames from "classnames";
 import {
     WindowsSystemBtn,
@@ -33,23 +33,37 @@ export const TopBar: FC<TopBarProps> = ({
     hiddenMaximizeBtn,
     onClickWindowsSystemBtn,
     onDoubleClick,
-}) => (
-    <div
-        className={classNames("topbar-box", { showWindowsSystemBtn })}
-        onDoubleClick={onDoubleClick}
-    >
-        <div className="topbar-content-left">{left}</div>
-        <div className="topbar-content-center">{center}</div>
-        <div className="topbar-content-right">
-            {right}
-            {showWindowsSystemBtn && onClickWindowsSystemBtn && (
-                <>
-                    <WindowsSystemBtn
-                        hiddenMaximizeBtn={hiddenMaximizeBtn}
-                        onClickWindowsSystemBtn={onClickWindowsSystemBtn}
-                    />
-                </>
-            )}
+}) => {
+    const ref = useRef<HTMLDivElement>(null);
+
+    const onDoubleClickSelf = useCallback(
+        (ev: React.MouseEvent): void => {
+            if (onDoubleClick && ref.current && ref.current.contains(ev.target as Node)) {
+                onDoubleClick && onDoubleClick();
+            }
+        },
+        [onDoubleClick],
+    );
+
+    return (
+        <div
+            ref={ref}
+            className={classNames("topbar-box", { showWindowsSystemBtn })}
+            onDoubleClick={onDoubleClickSelf}
+        >
+            <div className="topbar-content-left">{left}</div>
+            <div className="topbar-content-center">{center}</div>
+            <div className="topbar-content-right">
+                {right}
+                {showWindowsSystemBtn && onClickWindowsSystemBtn && (
+                    <>
+                        <WindowsSystemBtn
+                            hiddenMaximizeBtn={hiddenMaximizeBtn}
+                            onClickWindowsSystemBtn={onClickWindowsSystemBtn}
+                        />
+                    </>
+                )}
+            </div>
         </div>
-    </div>
-);
+    );
+};
diff --git a/service-providers/agora-rtc/agora-rtc-electron/src/rtc-share-screen.ts b/service-providers/agora-rtc/agora-rtc-electron/src/rtc-share-screen.ts
@@ -251,8 +251,10 @@ export class AgoraRTCElectronShareScreen extends IServiceShareScreen {
         this._lastEnabled = false;
 
         this._pTogglingShareScreen = new Promise<void>(resolve => {
-            this.client.enableLoopbackRecording(false);
             this._delegateLocalAudio(false);
+            this.client.adjustRecordingSignalVolume(100);
+            this.client.adjustLoopbackRecordingSignalVolume(0);
+            this.client.enableLoopbackRecording(false);
             this.client.stopScreenCapture2();
             this.client.once("videoSourceLeaveChannel", () => {
                 this.client.videoSourceRelease();