only synchronize clipboards if data was or is going to be sent (#640)

gravitational · Mar 3, 2022 · c49a241 · c49a241
1 parent 5f8aef1
commit c49a241
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/packages/teleport/src/DesktopSession/useTdpClientCanvas.tsx b/packages/teleport/src/DesktopSession/useTdpClientCanvas.tsx
@@ -69,7 +69,7 @@ export default function useTdpClientCanvas(props: Props) {
 
   // Default TdpClientEvent.TDP_CLIPBOARD_DATA handler.
   const onClipboardData = (clipboardData: ClipboardData) => {
-    if (enableClipboardSharing && document.hasFocus()) {
+    if (enableClipboardSharing && document.hasFocus() && clipboardData.data) {
       navigator.clipboard.writeText(clipboardData.data);
     }
   };
@@ -142,9 +142,11 @@ export default function useTdpClientCanvas(props: Props) {
     // We must check that the DOM is focused or navigator.clipboard.readText throws an error.
     if (enableClipboardSharing && document.hasFocus()) {
       navigator.clipboard.readText().then(text => {
-        cli.sendClipboardData({
-          data: text,
-        });
+        if (text) {
+          cli.sendClipboardData({
+            data: text,
+          });
+        }
       });
     }
   };