[fix] Don't select locked shapes on pointer up (#2069)

This PR fixes a bug where a locked shape could be selected when clicking
the shape's label.

### Change Type

- [x] `patch` — Bug fix

### Test Plan

1. Place a no-fill geo shape
2. Lock the shape
3. Click on the middle of the shape (its label)
4. It should not be selected (previously it would be)

1. Place a no-fill shape in a frame
2. Lock the shape
3. Click on the middle of the shape or the edge of the shape
4. It should not be selected (previously it would be)

- [x] Unit Tests

### Release Notes

- Fix bug where locked shape could be selected by clicking on its label
This commit is contained in:
Steve Ruiz 2023-10-13 12:18:15 +01:00 committed by GitHub
parent 3a2598748c
commit 01d46bbe22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 2 deletions

View file

@ -9,6 +9,7 @@ export function selectOnCanvasPointerUp(editor: Editor) {
margin: HIT_TEST_MARGIN / editor.zoomLevel, margin: HIT_TEST_MARGIN / editor.zoomLevel,
hitLabels: true, hitLabels: true,
renderingOnly: true, renderingOnly: true,
filter: (shape) => !shape.isLocked,
}) })
// Note at the start: if we select a shape that is inside of a group, // Note at the start: if we select a shape that is inside of a group,

View file

@ -208,6 +208,25 @@ describe('when shape is hollow', () => {
expect(editor.selectedShapeIds).toEqual([ids.box1]) expect(editor.selectedShapeIds).toEqual([ids.box1])
}) })
it('missed on the label when the shape is locked', () => {
editor.updateShape({ id: ids.box1, type: 'geo', isLocked: true })
editor.pointerMove(-100, -100)
expect(editor.hoveredShapeId).toBe(null)
expect(editor.selectedShapeIds).toEqual([])
editor.pointerMove(50, 50)
// no hover over label...
expect(editor.hoveredShapeId).toBe(null)
expect(editor.selectedShapeIds).toEqual([])
editor.pointerDown()
// will select on pointer up
expect(editor.hoveredShapeId).toBe(null)
expect(editor.selectedShapeIds).toEqual([])
// selects on pointer up
editor.pointerUp()
expect(editor.hoveredShapeId).toBe(null)
expect(editor.selectedShapeIds).toEqual([])
})
it('hits on pointer down over shape margin (inside)', () => { it('hits on pointer down over shape margin (inside)', () => {
editor.pointerMove(96, 50) editor.pointerMove(96, 50)
expect(editor.hoveredShapeId).toBe(box1.id) expect(editor.hoveredShapeId).toBe(box1.id)
@ -460,9 +479,44 @@ describe('when shape is inside of a frame', () => {
it('misses on pointer down over shape, misses on pointer up', () => { it('misses on pointer down over shape, misses on pointer up', () => {
editor.pointerMove(50, 50) editor.pointerMove(50, 50)
expect(editor.hoveredShapeId).toBe(null) expect(editor.hoveredShapeId).toBe(null)
editor.pointerDown() // inside of box1 editor.pointerDown() // inside of box1 (which is empty)
expect(editor.selectedShapeIds).toEqual([]) expect(editor.selectedShapeIds).toEqual([])
editor.pointerUp() editor.pointerUp() // does not select because inside of hollow shape
expect(editor.selectedShapeIds).toEqual([])
})
it('misses on pointer down over shape, hit on pointer up on the edge', () => {
editor.pointerMove(25, 25)
editor.pointerDown() // on the edge of box1 (which is empty)
expect(editor.selectedShapeIds).toEqual([ids.box1])
editor.pointerUp() // does not select because inside of hollow shape
expect(editor.selectedShapeIds).toEqual([ids.box1])
})
it('misses on pointer down over shape, misses on pointer up on the edge when locked', () => {
editor.updateShape({ id: ids.box1, type: 'geo', isLocked: true })
editor.pointerMove(25, 25)
editor.pointerDown() // on the edge of box1 (which is empty)
expect(editor.selectedShapeIds).toEqual([])
editor.pointerUp() // does not select because inside of hollow shape
expect(editor.selectedShapeIds).toEqual([])
})
it('misses on pointer down over shape, misses on pointer up when locked', () => {
editor.updateShape({ id: ids.box1, type: 'geo', isLocked: true })
editor.pointerMove(50, 50)
editor.pointerDown() // on the edge of box1 (which is empty)
expect(editor.selectedShapeIds).toEqual([])
editor.pointerUp() // does not select because inside of hollow shape
expect(editor.selectedShapeIds).toEqual([])
})
it('misses on pointer down over shape label, misses on pointer up when locked', () => {
editor.updateShape({ id: ids.box1, type: 'geo', isLocked: true })
editor.pointerMove(75, 75)
editor.pointerDown() // on the edge of box1 (which is empty)
expect(editor.selectedShapeIds).toEqual([])
editor.pointerUp() // does not select because inside of hollow shape
expect(editor.selectedShapeIds).toEqual([]) expect(editor.selectedShapeIds).toEqual([])
}) })