Improve live selections

Author: CompuIves

packages/app/src/app/index.js

@@ -51,7 +51,9 @@ window.__isTouch = !matchMedia('(pointer:fine)').matches;
 
 const overmind = createOvermind(config, {
   devtools:
-    (window.opener && window.opener !== window) || !window.chrome
+    (window.opener && window.opener !== window) ||
+    !window.chrome ||
+    location.search.includes('noDevtools')
       ? false
       : 'localhost:3031',
   name:

packages/app/src/app/overmind/namespaces/live/actions.ts

@@ -144,6 +144,21 @@ export const applyTransformation: AsyncAction<{
   }
 };
 
+export const sendCurrentSelection: Action = ({ state, effects }) => {
+  if (!state.live.roomInfo) {
+    return;
+  }
+
+  if (state.live.isCurrentEditor) {
+    const { liveUserId } = state.live;
+    effects.live.sendUserSelection(
+      state.editor.currentModuleShortid,
+      liveUserId,
+      state.live.currentSelection
+    );
+  }
+};
+
 export const onSelectionChanged: Action<any> = (
   { state, effects },
   selection
@@ -158,6 +173,8 @@ export const onSelectionChanged: Action<any> = (
     if (!moduleShortid || !liveUserId) {
       return;
     }
+
+    state.live.currentSelection = selection;
     const userIndex = state.live.roomInfo.users.findIndex(
       u => u.id === liveUserId
     );

packages/app/src/app/overmind/namespaces/live/internalActions.ts

@@ -20,12 +20,11 @@ export const clearUserSelections: Action<string | null> = (
     const roomInfo = state.live.roomInfo!;
     const userIndex = roomInfo.users.findIndex(u => u.id === userId);
 
+    effects.vscode.clearUserSelections(userId);
     if (userIndex > -1) {
       const user = roomInfo.users[userIndex];
       if (user) {
         user.selection = null;
-
-        effects.vscode.clearUserSelections(userId);
       }
     }
   };

packages/app/src/app/overmind/namespaces/live/liveMessageOperators.ts

@@ -71,6 +71,10 @@ export const onUserEntered: Operator<LiveMessage<{
     );
   }
 
+  // Send our own selections to everyone, just to let the others know where
+  // we are
+  actions.live.sendCurrentSelection();
+
   if (data.joined_user_id === state.live.liveUserId) {
     return;
   }
@@ -101,9 +105,7 @@ export const onUserLeft: Operator<LiveMessage<{
 
     if (user && user.id !== state.live.liveUserId) {
       effects.notificationToast.add({
-        message: user
-          ? `${user.username} left the live session.`
-          : 'Someone left the live session',
+        message: `${user.username} left the live session.`,
         status: NotificationStatus.NOTICE,
       });
     }

packages/app/src/app/overmind/namespaces/live/state.ts

@@ -1,4 +1,8 @@
-import { LiveUser, RoomInfo } from '@codesandbox/common/lib/types';
+import {
+  LiveUser,
+  RoomInfo,
+  UserSelection,
+} from '@codesandbox/common/lib/types';
 import { Derive } from 'app/overmind';
 
 type State = {
@@ -11,6 +15,7 @@ type State = {
   followingUserId: string | null;
   liveUserId: string | null;
   roomInfo: RoomInfo | null;
+  currentSelection: UserSelection | null;
   liveUser: Derive<State, LiveUser | null>;
   isEditor: Derive<State, (liveUserId: string) => boolean>;
   isCurrentEditor: Derive<State, boolean>;
@@ -33,6 +38,7 @@ export const state: State = {
   error: null,
   liveUserId: null,
   roomInfo: null,
+  currentSelection: null,
   liveUser: currentState =>
     currentState.roomInfo?.users.find(u => u.id === currentState.liveUserId) ||
     null,