Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Duplicate cursor when alt is pressed #6115

Merged
merged 6 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { BakedInStoryboardUID } from '../../../core/model/scene-utils'
import * as EP from '../../../core/shared/element-path'
import { altModifier } from '../../../utils/modifiers'
import {
makeTestProjectCodeWithSnippet,
renderTestEditorWithCode,
TestAppUID,
TestSceneUID,
} from '../../canvas//ui-jsx.test-utils'
import { selectComponents } from '../../editor/actions/meta-actions'
import { keyDown } from '../event-helpers.test-utils'

describe('Canvas Controls', () => {
it('absolute children outline only included for non-group absolutely positioned elements', async () => {
Expand Down Expand Up @@ -106,3 +108,27 @@ describe('Canvas Controls', () => {
expect(possibleAbsoluteControlForDiv).not.toBeNull()
})
})

describe('Mouse Cursor', () => {
it('Uses the default cursor in select mode', async () => {
const renderResult = await renderTestEditorWithCode(
makeTestProjectCodeWithSnippet('<div/>'),
'await-first-dom-report',
)

const canvasControls = renderResult.renderedDOM.getByTestId('canvas-controls')

expect(canvasControls.style.cursor).toContain('cursor-default.png')
})
it('Uses the duplicate cursor in select mode when ALT is pressed', async () => {
const renderResult = await renderTestEditorWithCode(
makeTestProjectCodeWithSnippet('<div/>'),
'await-first-dom-report',
)

await keyDown('Alt', { modifiers: altModifier })
const canvasControls = renderResult.renderedDOM.getByTestId('canvas-controls')

expect(canvasControls.style.cursor).toContain('cursor-duplicate.png')
})
})
9 changes: 7 additions & 2 deletions editor/src/components/canvas/controls/new-canvas-controls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import type {
} from '../../editor/store/editor-state'
import { getMetadata } from '../../editor/store/editor-state'
import type { ElementPath, NodeModules } from '../../../core/shared/project-file-types'
import type { CanvasPositions, CSSCursor } from '../canvas-types'
import type { CanvasPositions } from '../canvas-types'
import { CSSCursor } from '../canvas-types'
import { HighlightControl } from './highlight-control'
import { Substores, useEditorState } from '../../editor/store/store-hook'
import type { ElementInstanceMetadataMap } from '../../../core/shared/element-template'
Expand Down Expand Up @@ -181,6 +182,9 @@ export const NewCanvasControls = React.memo((props: NewCanvasControlsProps) => {

const ref = React.useRef<HTMLDivElement | null>(null)

const altKeyPressed = canvasControlProps.keysPressed.alt ?? false
const selectModeCursor = altKeyPressed ? CSSCursor.Duplicate : props.cursor

if (isLiveMode(canvasControlProps.editorMode) && !canvasControlProps.keysPressed.cmd) {
return (
<div
Expand Down Expand Up @@ -219,6 +223,7 @@ export const NewCanvasControls = React.memo((props: NewCanvasControlsProps) => {
: ' canvas-controls '
}
id='canvas-controls'
data-testid='canvas-controls'
style={{
pointerEvents: 'initial',
position: 'absolute',
Expand All @@ -228,7 +233,7 @@ export const NewCanvasControls = React.memo((props: NewCanvasControlsProps) => {
width: `100%`,
height: `100%`,
zoom: canvasControlProps.scale >= 1 ? `${canvasControlProps.scale * 100}%` : 1,
cursor: props.cursor,
cursor: selectModeCursor,
visibility: canvasControlProps.canvasScrollAnimation ? 'hidden' : 'initial',
}}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Array [
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/div",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/Symbol(react.memo)()",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/Symbol(react.memo)()",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/div",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/div:data-testid='canvas-controls'",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/Symbol(react.memo)(MultiplayerPresence)",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/Symbol(react.memo)(MultiplayerWrapper)",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/UtopiaSpiedExoticType(Symbol(react.fragment))",
Expand Down Expand Up @@ -733,7 +733,7 @@ Array [
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/div",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/Symbol(react.memo)()",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/Symbol(react.memo)()",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/div",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/div:data-testid='canvas-controls'",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/Symbol(react.memo)(MultiplayerPresence)",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/Symbol(react.memo)(MultiplayerWrapper)",
"/UtopiaSpiedClass(EditorCanvas)/div/NewCanvasControls/UtopiaSpiedExoticType(Symbol(react.fragment))",
Expand Down
Loading