Multiplayer shadows

editor/liveblocks.config.ts

@@ -1,8 +1,8 @@
-import { LiveObject } from '@liveblocks/client'
-import { createClient } from '@liveblocks/client'
+import { LiveObject, createClient } from '@liveblocks/client'
 import { createRoomContext } from '@liveblocks/react'
-import type { CanvasVector, WindowPoint } from './src/core/shared/math-utils'
 import { getProjectID } from './src/common/env-vars'
+import type { ActiveFrameAction } from './src/components/canvas/commands/set-active-frames-command'
+import type { CanvasRectangle, CanvasVector, WindowPoint } from './src/core/shared/math-utils'
 import { projectIdToRoomId } from './src/core/shared/multiplayer'
 
 export const liveblocksThrottle = 100 // ms
@@ -19,9 +19,16 @@ export type Presence = {
   cursor: WindowPoint | null
   canvasScale: number | null
   canvasOffset: CanvasVector | null
+  activeFrames?: PresenceActiveFrame[]
   following: string | null
 }
 
+export type PresenceActiveFrame = {
+  action: ActiveFrameAction
+  frame: CanvasRectangle
+  source: CanvasRectangle
+}
+
 export function initialPresence(): Presence {
   return {
     cursor: null,

editor/src/components/canvas/canvas-strategies/strategies/absolute-resize-bounding-box-strategy.tsx

@@ -27,6 +27,7 @@ import { EdgePositionLeft, EdgePositionTop, EdgePositionTopLeft } from '../../ca
 import { isEdgePositionEqualTo } from '../../canvas-utils'
 import { pushIntendedBoundsAndUpdateGroups } from '../../commands/push-intended-bounds-and-update-groups-command'
 import { queueTrueUpElement } from '../../commands/queue-true-up-command'
+import { activeFrameTargetRect, setActiveFrames } from '../../commands/set-active-frames-command'
 import { setCursorCommand } from '../../commands/set-cursor-command'
 import { setElementsToRerenderCommand } from '../../commands/set-elements-to-rerender-command'
 import { setSnappingGuidelines } from '../../commands/set-snapping-guidelines-command'
@@ -263,6 +264,13 @@ export function absoluteResizeBoundingBoxStrategy(
                   'starting-metadata',
                 ),
                 queueTrueUpElement(childGroups.map(trueUpGroupElementChanged)),
+                setActiveFrames([
+                  {
+                    action: 'resize',
+                    target: activeFrameTargetRect(newFrame),
+                    source: originalBoundingBox,
+                  },
+                ]),
               ]
             })
 

editor/src/components/canvas/canvas-strategies/strategies/reorder-utils.ts

@@ -4,7 +4,7 @@ import { MetadataUtils } from '../../../../core/model/element-metadata-utils'
 import type { CanvasVector } from '../../../../core/shared/math-utils'
 import {
   canvasRectangle,
-  CanvasRectangle,
+  canvasRectangleOrZeroRect,
   isInfinityRectangle,
   offsetPoint,
   rectContainsPoint,
@@ -20,13 +20,10 @@ import type {
   InteractionCanvasState,
   StrategyApplicationResult,
 } from '../canvas-strategy-types'
-import {
-  emptyStrategyApplicationResult,
-  getTargetPathsFromInteractionTarget,
-  strategyApplicationResult,
-} from '../canvas-strategy-types'
+import { emptyStrategyApplicationResult, strategyApplicationResult } from '../canvas-strategy-types'
 import type { InteractionSession } from '../interaction-state'
 import type { ElementInstanceMetadataMap } from '../../../../core/shared/element-template'
+import { activeFrameTargetRect, setActiveFrames } from '../../commands/set-active-frames-command'
 
 export function isReorderAllowed(siblings: Array<ElementPath>): boolean {
   return siblings.every((sibling) => !isRootOfGeneratedElement(sibling))
@@ -81,12 +78,26 @@ export function applyReorderCommon(
       isValidTarget,
     )
 
+    const sourceFrame = canvasRectangleOrZeroRect(
+      MetadataUtils.getFrameInCanvasCoords(target, canvasState.startingMetadata) ?? null,
+    )
     const newIndexFound = newIndex > -1
     const newResultOrLastIndex = newIndexFound ? newIndex : lastReorderIdx
+    const targetFrame = canvasRectangleOrZeroRect(
+      newResultOrLastIndex > -1
+        ? MetadataUtils.getFrameInCanvasCoords(
+            siblings[newResultOrLastIndex],
+            canvasState.startingMetadata,
+          )
+        : sourceFrame,
+    )
 
     if (newResultOrLastIndex === unpatchedIndex) {
       return strategyApplicationResult(
         [
+          setActiveFrames([
+            { action: 'reorder', target: activeFrameTargetRect(targetFrame), source: sourceFrame },
+          ]),
           updateHighlightedViews('mid-interaction', []),
           setElementsToRerenderCommand(siblings),
           setCursorCommand(CSSCursor.Move),
@@ -98,6 +109,9 @@ export function applyReorderCommon(
     } else {
       return strategyApplicationResult(
         [
+          setActiveFrames([
+            { action: 'reorder', target: activeFrameTargetRect(targetFrame), source: sourceFrame },
+          ]),
           reorderElement('always', target, absolute(newResultOrLastIndex)),
           setElementsToRerenderCommand(siblings),
           updateHighlightedViews('mid-interaction', []),

editor/src/components/canvas/canvas-strategies/strategies/set-border-radius-strategy.tsx

@@ -16,6 +16,7 @@ import {
 } from '../../../../core/shared/element-template'
 import type { CanvasPoint, CanvasVector, Size } from '../../../../core/shared/math-utils'
 import {
+  canvasRectangleOrZeroRect,
   canvasVector,
   clamp,
   product,
@@ -75,6 +76,7 @@ import { withUnderlyingTarget } from '../../../editor/store/editor-state'
 import type { ProjectContentTreeRoot } from '../../../assets'
 import { getModifiableJSXAttributeAtPath } from '../../../../core/shared/jsx-attributes'
 import { showToastCommand } from '../../commands/show-toast-command'
+import { activeFrameTargetPath, setActiveFrames } from '../../commands/set-active-frames-command'
 
 export const SetBorderRadiusStrategyId = 'SET_BORDER_RADIUS_STRATEGY'
 
@@ -157,6 +159,15 @@ export const setBorderRadiusStrategy: CanvasStrategyFactory = (
         ...commands(selectedElement),
         ...getAddOverflowHiddenCommands(selectedElement, canvasState.projectContents),
         setElementsToRerenderCommand(selectedElements),
+        setActiveFrames(
+          selectedElements.map((path) => ({
+            action: 'set-radius',
+            target: activeFrameTargetPath(path),
+            source: canvasRectangleOrZeroRect(
+              MetadataUtils.getFrameInCanvasCoords(path, canvasState.startingMetadata),
+            ),
+          })),
+        ),
       ]),
   }
 }

editor/src/components/canvas/canvas-strategies/strategies/set-flex-gap-strategy.tsx

@@ -1,7 +1,11 @@
 import { styleStringInArray } from '../../../../utils/common-constants'
 import { MetadataUtils } from '../../../../core/model/element-metadata-utils'
 import type { CanvasVector } from '../../../../core/shared/math-utils'
-import { canvasPoint, canvasVector } from '../../../../core/shared/math-utils'
+import {
+  canvasPoint,
+  canvasRectangleOrZeroRect,
+  canvasVector,
+} from '../../../../core/shared/math-utils'
 import { optionalMap } from '../../../../core/shared/optional-utils'
 import { assertNever } from '../../../../core/shared/utils'
 import type { Modifiers } from '../../../../utils/modifiers'
@@ -38,6 +42,7 @@ import {
 import type { InteractionSession } from '../interaction-state'
 import { areAllSiblingsInOneDimensionFlexOrFlow } from './flow-reorder-helpers'
 import { colorTheme } from '../../../../uuiui'
+import { activeFrameTargetPath, setActiveFrames } from '../../commands/set-active-frames-command'
 
 export const SetFlexGapStrategyId = 'SET_FLEX_GAP_STRATEGY'
 
@@ -170,6 +175,15 @@ export const setFlexGapStrategy: CanvasStrategyFactory = (
         ),
         setCursorCommand(cursorFromFlexDirection(flexGap.direction)),
         setElementsToRerenderCommand([...selectedElements, ...children]),
+        setActiveFrames([
+          {
+            action: 'set-gap',
+            target: activeFrameTargetPath(selectedElement),
+            source: canvasRectangleOrZeroRect(
+              MetadataUtils.getFrameInCanvasCoords(selectedElement, canvasState.startingMetadata),
+            ),
+          },
+        ]),
       ])
     },
   }

editor/src/components/canvas/canvas-strategies/strategies/set-padding-strategy.tsx

@@ -48,6 +48,7 @@ import { flattenSelection, getMultiselectBounds } from './shared-move-strategies
 import type { CanvasPoint, CanvasVector } from '../../../../core/shared/math-utils'
 import {
   canvasPoint,
+  canvasRectangleOrZeroRect,
   canvasVector,
   isInfinityRectangle,
   roundTo,
@@ -76,6 +77,7 @@ import {
   adjustCssLengthProperties,
 } from '../../commands/adjust-css-length-command'
 import type { ElementPathTrees } from '../../../../core/shared/element-path-tree'
+import { activeFrameTargetPath, setActiveFrames } from '../../commands/set-active-frames-command'
 
 const StylePaddingProp = stylePropPathMappingFn('padding', styleStringInArray)
 const IndividualPaddingProps: Array<CSSPaddingKey> = [
@@ -257,6 +259,15 @@ export const setPaddingStrategy: CanvasStrategyFactory = (canvasState, interacti
               value,
             ),
           ),
+          setActiveFrames(
+            selectedElements.map((path) => ({
+              action: 'set-padding',
+              target: activeFrameTargetPath(path),
+              source: canvasRectangleOrZeroRect(
+                MetadataUtils.getFrameInCanvasCoords(path, canvasState.startingMetadata),
+              ),
+            })),
+          ),
         ])
       }
 
@@ -273,6 +284,15 @@ export const setPaddingStrategy: CanvasStrategyFactory = (canvasState, interacti
             ]),
           ),
           setProperty('always', selectedElement, StylePaddingProp, paddingString),
+          setActiveFrames(
+            selectedElements.map((path) => ({
+              action: 'set-padding',
+              target: activeFrameTargetPath(path),
+              source: canvasRectangleOrZeroRect(
+                MetadataUtils.getFrameInCanvasCoords(path, canvasState.startingMetadata),
+              ),
+            })),
+          ),
         ])
       }
 
@@ -291,6 +311,15 @@ export const setPaddingStrategy: CanvasStrategyFactory = (canvasState, interacti
             value,
           ),
         ),
+        setActiveFrames(
+          selectedElements.map((path) => ({
+            action: 'set-padding',
+            target: activeFrameTargetPath(path),
+            source: canvasRectangleOrZeroRect(
+              MetadataUtils.getFrameInCanvasCoords(path, canvasState.startingMetadata),
+            ),
+          })),
+        ),
       ])
     },
   }

editor/src/components/canvas/canvas-strategies/strategies/shared-move-strategies-helpers.ts

@@ -19,6 +19,7 @@ import type {
 } from '../../../../core/shared/math-utils'
 import {
   boundingRectangleArray,
+  canvasRectangleOrZeroRect,
   canvasRectangleToLocalRectangle,
   canvasVector,
   nullIfInfinity,
@@ -70,6 +71,7 @@ import {
   setCssLengthProperty,
   setValueKeepingOriginalUnit,
 } from '../../commands/set-css-length-command'
+import { activeFrameTargetRect, setActiveFrames } from '../../commands/set-active-frames-command'
 
 export interface MoveCommandsOptions {
   ignoreLocalFrame?: boolean
@@ -134,6 +136,15 @@ export function applyMoveCommon(
         updateHighlightedViews('mid-interaction', []),
         setElementsToRerenderCommand(targets),
         setCursorCommand(CSSCursor.Select),
+        setActiveFrames(
+          commandsForSelectedElements.intendedBounds.map((b) => ({
+            action: 'move', // TODO this could also show "duplicate" when applicable
+            target: activeFrameTargetRect(b.frame),
+            source: canvasRectangleOrZeroRect(
+              MetadataUtils.getFrameInCanvasCoords(b.target, canvasState.startingMetadata),
+            ),
+          })),
+        ),
       ])
     } else {
       const constrainedDragAxis =
@@ -171,6 +182,15 @@ export function applyMoveCommon(
         ),
         setElementsToRerenderCommand([...targets, ...targetsForSnapping]),
         setCursorCommand(CSSCursor.Select),
+        setActiveFrames(
+          commandsForSelectedElements.intendedBounds.map((b) => ({
+            action: 'move', // TODO this could also show "duplicate" when applicable
+            target: activeFrameTargetRect(b.frame),
+            source: canvasRectangleOrZeroRect(
+              MetadataUtils.getFrameInCanvasCoords(b.target, canvasState.startingMetadata),
+            ),
+          })),
+        ),
       ])
     }
   } else {

editor/src/components/canvas/commands/commands.ts

@@ -85,6 +85,7 @@ import type { PushIntendedBoundsAndUpdateGroups } from './push-intended-bounds-a
 import { runPushIntendedBoundsAndUpdateGroups } from './push-intended-bounds-and-update-groups-command'
 import type { PushIntendedBoundsAndUpdateHuggingElements } from './push-intended-bounds-and-update-hugging-elements-command'
 import { runPushIntendedBoundsAndUpdateHuggingElements } from './push-intended-bounds-and-update-hugging-elements-command'
+import { runSetActiveFrames, type SetActiveFrames } from './set-active-frames-command'
 
 export interface CommandFunctionResult {
   editorStatePatches: Array<EditorStatePatch>
@@ -137,6 +138,7 @@ export type CanvasCommand =
   | DeleteElement
   | WrapInContainerCommand
   | QueueTrueUpElement
+  | SetActiveFrames
 
 export function runCanvasCommand(
   editorState: EditorState,
@@ -219,6 +221,8 @@ export function runCanvasCommand(
       return runWrapInContainerCommand(editorState, command)
     case 'QUEUE_TRUE_UP_ELEMENT':
       return runQueueTrueUpElement(editorState, command)
+    case 'SET_ACTIVE_FRAMES':
+      return runSetActiveFrames(editorState, command)
     default:
       const _exhaustiveCheck: never = command
       throw new Error(`Unhandled canvas command ${JSON.stringify(command)}`)