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.

Sign up for GitHub

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

More tolerant safe gaps #4262

Merged
merged 2 commits into from
Sep 29, 2023
Merged

More tolerant safe gaps #4262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5610a6
more tolerante safe gaps
ruggi Sep 28, 2023
f0b39c5
adjust test
ruggi Sep 28, 2023
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
22 changes: 13 additions & 9 deletions ...nvas/canvas-strategies/strategies/absolute-resize-bounding-box-strategy.spec.browser2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ import { isRight } from '../../../../core/shared/either'
import { ImmediateParentOutlinesTestId } from '../../controls/parent-outlines'
import { ImmediateParentBoundsTestId } from '../../controls/parent-bounds'
import { getResizeControl, resizeElement } from './absolute-resize.test-utils'
import { RESIZE_CONTROL_SAFE_GAP, SmallElementSize } from '../../controls/bounding-box-hooks'
import {
RESIZE_CONTROL_SAFE_GAP,
SafeGapSmallElementSize,
SmallElementSize,
} from '../../controls/bounding-box-hooks'

// no mouseup here! it starts the interaction and resizes with drag delta
async function startDragUsingActions(
Expand Down Expand Up @@ -2924,8 +2928,8 @@ describe('Absolute Resize Group-like behaviors', () => {
describe('Absolute Resize Control', () => {
describe('safe gap', () => {
it('Resize control is placed on small elements outside of the draggable frame area, with a safe gap', async () => {
const width = SmallElementSize
const height = SmallElementSize
const width = SafeGapSmallElementSize
const height = SafeGapSmallElementSize
const renderResult = await renderTestEditorWithCode(
makeTestProjectCodeWithSnippet(`
<div style={{ width: '100%', height: '100%' }} data-uid='aaa'>
Expand All @@ -2949,33 +2953,33 @@ describe('Absolute Resize Control', () => {
expect(resizeControlTop.style.top).toEqual('')
expect(resizeControlTop.style.left).toEqual('')
expect(resizeControlTop.style.width).toEqual(`${width + RESIZE_CONTROL_SAFE_GAP * 2}px`)
expect(resizeControlTop.style.height).toEqual('10px')
expect(resizeControlTop.style.height).toEqual('5px')

const resizeControlRight = renderResult.renderedDOM.getByTestId(
`resize-control-${EdgePositionRight.x}-${EdgePositionRight.y}`,
)
expect(resizeControlRight.style.transform).toEqual('translate(-5px, 0px)')
expect(resizeControlRight.style.transform).toEqual('translate(0px, 0px)')
expect(resizeControlRight.style.top).toEqual('')
expect(resizeControlRight.style.left).toEqual(`${width + RESIZE_CONTROL_SAFE_GAP * 2}px`)
expect(resizeControlRight.style.width).toEqual('10px')
expect(resizeControlRight.style.width).toEqual('5px')
expect(resizeControlRight.style.height).toEqual(`${height + RESIZE_CONTROL_SAFE_GAP * 2}px`)

const resizeControlBottom = renderResult.renderedDOM.getByTestId(
`resize-control-${EdgePositionBottom.x}-${EdgePositionBottom.y}`,
)
expect(resizeControlBottom.style.transform).toEqual('translate(0px, -5px)')
expect(resizeControlBottom.style.transform).toEqual('translate(0px, 0px)')
expect(resizeControlBottom.style.top).toEqual(`${height + RESIZE_CONTROL_SAFE_GAP * 2}px`)
expect(resizeControlBottom.style.left).toEqual('')
expect(resizeControlBottom.style.width).toEqual(`${width + RESIZE_CONTROL_SAFE_GAP * 2}px`)
expect(resizeControlBottom.style.height).toEqual('10px')
expect(resizeControlBottom.style.height).toEqual('5px')

const resizeControlLeft = renderResult.renderedDOM.getByTestId(
`resize-control-${EdgePositionLeft.x}-${EdgePositionLeft.y}`,
)
expect(resizeControlLeft.style.transform).toEqual('translate(-5px, 0px)')
expect(resizeControlLeft.style.top).toEqual('')
expect(resizeControlLeft.style.left).toEqual('')
expect(resizeControlLeft.style.width).toEqual('10px')
expect(resizeControlLeft.style.width).toEqual('5px')
expect(resizeControlLeft.style.height).toEqual(`${height + RESIZE_CONTROL_SAFE_GAP * 2}px`)
})
it("Doesn't show the safe gap during resize and mouse down", async () => {
Expand Down
5 changes: 3 additions & 2 deletions editor/src/components/canvas/controls/bounding-box-hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ export function useBoundingBox<T = HTMLDivElement>(
}

export const SmallElementSize = 20
export const RESIZE_CONTROL_SAFE_GAP = 6 // safe gap applied when the dimension of an element is smaller than SmallElementSize
export const SafeGapSmallElementSize = 12
export const RESIZE_CONTROL_SAFE_GAP = 4 // safe gap applied when the dimension of an element is smaller than SmallElementSize

function useBoundingBoxFromMetadataRef(
selectedElements: ReadonlyArray<ElementPath>,
Expand All @@ -60,7 +61,7 @@ function useBoundingBoxFromMetadataRef(

const shouldApplySafeGap = React.useCallback(
(dimension: number, scale: number): boolean => {
return isNotDuringInteraction && dimension <= SmallElementSize / scale
return isNotDuringInteraction && dimension <= SafeGapSmallElementSize / scale
},
[isNotDuringInteraction],
)
Expand Down
Loading