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

Adjust ruler marker resize for spanning elements #6703

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Adjust ruler marker resize for spanning elements #6703

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
055942a
adjust resize for spanning elements
ruggi Dec 5, 2024
b969144
Merge branch 'master' into feat/ruler-marker-resize-spans
ruggi Dec 5, 2024
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
180 changes: 180 additions & 0 deletions .../canvas/canvas-strategies/strategies/grid-resize-element-ruler-strategy.spec.browser2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
} from '../../../../utils/utils.test-utils'
import {
RulerMarkerColumnEndTestId,
RulerMarkerColumnStartTestId,
RulerMarkerRowEndTestId,
RulerMarkerRowStartTestId,
} from '../../controls/grid-controls'
Expand Down Expand Up @@ -155,6 +156,127 @@ describe('grid resize element ruler strategy', () => {
expect(element.style.gridColumn).toBe('span 2')
expect(element.style.gridRow).toBe('auto')
})

describe('spans', () => {
it('can resize a flow spanning element (start, from the right)', async () => {
const renderResult = await renderTestEditorWithCode(
ProjectCodeWithSpans,
'await-first-dom-report',
)

await selectComponentsForTest(renderResult, [EP.fromString('sb/grid/flow1')])

const control = await renderResult.renderedDOM.findByTestId(RulerMarkerColumnEndTestId)
const controlRect = control.getBoundingClientRect()
const startPoint = { x: controlRect.x + 5, y: controlRect.y + 5 }
const endPoint = { x: controlRect.x + 200, y: controlRect.y + 5 }
await mouseDownAtPoint(control, startPoint)
await mouseMoveToPoint(control, endPoint)
await mouseUpAtPoint(control, endPoint)

const element = await renderResult.renderedDOM.findByTestId('flow1')
expect(element.style.gridColumn).toBe('span 3')
expect(element.style.gridRow).toBe('auto')
})

it('can resize a flow spanning element (start, from the left)', async () => {
const renderResult = await renderTestEditorWithCode(
ProjectCodeWithSpans,
'await-first-dom-report',
)

await selectComponentsForTest(renderResult, [EP.fromString('sb/grid/flow1')])

const control = await renderResult.renderedDOM.findByTestId(RulerMarkerColumnStartTestId)
const controlRect = control.getBoundingClientRect()
const startPoint = { x: controlRect.x + 5, y: controlRect.y + 5 }
const endPoint = { x: controlRect.x + 200, y: controlRect.y + 5 }
await mouseDownAtPoint(control, startPoint)
await mouseMoveToPoint(control, endPoint)
await mouseUpAtPoint(control, endPoint)

const element = await renderResult.renderedDOM.findByTestId('flow1')
expect(element.style.gridColumn).toBe('')
expect(element.style.gridColumnStart).toBe('')
expect(element.style.gridColumnEnd).toBe('3')
expect(element.style.gridRow).toBe('auto')
})

it('can resize a flow spanning element (end)', async () => {
const renderResult = await renderTestEditorWithCode(
ProjectCodeWithSpans,
'await-first-dom-report',
)

await selectComponentsForTest(renderResult, [EP.fromString('sb/grid/flow2')])

// expand to the right
{
const control = await renderResult.renderedDOM.findByTestId(RulerMarkerColumnEndTestId)
const controlRect = control.getBoundingClientRect()
const startPoint = { x: controlRect.x + 5, y: controlRect.y + 5 }
const endPoint = { x: controlRect.x + 200, y: controlRect.y + 5 }
await mouseDownAtPoint(control, startPoint)
await mouseMoveToPoint(control, endPoint)
await mouseUpAtPoint(control, endPoint)

const element = await renderResult.renderedDOM.findByTestId('flow2')
expect(element.style.gridColumn).toBe('2 / span 3')
expect(element.style.gridRow).toBe('auto')
}

// shrink from the left
{
const control = await renderResult.renderedDOM.findByTestId(RulerMarkerColumnStartTestId)
const controlRect = control.getBoundingClientRect()
const startPoint = { x: controlRect.x + 5, y: controlRect.y + 5 }
const endPoint = { x: controlRect.x + 200, y: controlRect.y + 5 }
await mouseDownAtPoint(control, startPoint)
await mouseMoveToPoint(control, endPoint)
await mouseUpAtPoint(control, endPoint)

const element = await renderResult.renderedDOM.findByTestId('flow2')
expect(element.style.gridColumn).toBe('3 / span 2')
expect(element.style.gridRow).toBe('auto')
}

// expand back from the left
{
const control = await renderResult.renderedDOM.findByTestId(RulerMarkerColumnStartTestId)
const controlRect = control.getBoundingClientRect()
const startPoint = { x: controlRect.x + 5, y: controlRect.y + 5 }
const endPoint = { x: controlRect.x - 400, y: controlRect.y + 5 }
await mouseDownAtPoint(control, startPoint)
await mouseMoveToPoint(control, endPoint)
await mouseUpAtPoint(control, endPoint)

const element = await renderResult.renderedDOM.findByTestId('flow2')
expect(element.style.gridColumn).toBe('1 / span 4')
expect(element.style.gridRow).toBe('auto')
}
})

it('can resize a pinned spanning element', async () => {
const renderResult = await renderTestEditorWithCode(
ProjectCodeWithSpans,
'await-first-dom-report',
)

await selectComponentsForTest(renderResult, [EP.fromString('sb/grid/pinned')])

const control = await renderResult.renderedDOM.findByTestId(RulerMarkerColumnEndTestId)
const controlRect = control.getBoundingClientRect()
const startPoint = { x: controlRect.x + 5, y: controlRect.y + 5 }
const endPoint = { x: controlRect.x + 200, y: controlRect.y + 5 }
await mouseDownAtPoint(control, startPoint)
await mouseMoveToPoint(control, endPoint)
await mouseUpAtPoint(control, endPoint)

const element = await renderResult.renderedDOM.findByTestId('pinned')
expect(element.style.gridColumn).toBe('2 / span 3')
expect(element.style.gridRow).toBe('3')
})
})
})

const ProjectCode = `
Expand Down Expand Up @@ -232,3 +354,61 @@ export var storyboard = (
</Storyboard>
)
`

const ProjectCodeWithSpans = `
import * as React from 'react'
import { Storyboard } from 'utopia-api'

export var storyboard = (
<Storyboard data-uid='sb'>
<div
style={{
backgroundColor: '#aaaaaa33',
position: 'absolute',
left: 210,
top: 80,
width: 690,
height: 459,
display: 'grid',
gap: 10,
gridTemplateColumns: '1fr 1fr 1fr 1fr',
gridTemplateRows: '1fr 1fr 1fr 1fr',
}}
data-uid='grid'
data-testid='grid'
>
<div
style={{
backgroundColor: '#09f',
alignSelf: 'stretch',
justifySelf: 'stretch',
gridColumn: 'span 2',
}}
data-uid='flow1'
data-testid='flow1'
/>
<div
style={{
backgroundColor: '#f90',
alignSelf: 'stretch',
justifySelf: 'stretch',
gridColumn: '2 / span 2',
}}
data-uid='flow2'
data-testid='flow2'
/>
<div
style={{
backgroundColor: '#f09',
gridColumn: '2 / span 2',
gridRow: 3,
alignSelf: 'stretch',
justifySelf: 'stretch',
}}
data-uid='pinned'
data-testid='pinned'
/>
</div>
</Storyboard>
)
`
40 changes: 36 additions & 4 deletions .../src/components/canvas/canvas-strategies/strategies/grid-resize-element-ruler-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import type {
GridElementProperties,
GridPositionOrSpan,
} from '../../../../core/shared/element-template'
import { gridPositionValue, isGridPositionValue } from '../../../../core/shared/element-template'
import {
gridPositionValue,
isGridPositionValue,
isGridSpan,
} from '../../../../core/shared/element-template'
import type { CanvasPoint, CanvasRectangle, CanvasVector } from '../../../../core/shared/math-utils'
import { canvasRectangle, isInfinityRectangle } from '../../../../core/shared/math-utils'
import { assertNever } from '../../../../core/shared/utils'
Expand Down Expand Up @@ -160,8 +164,18 @@ export const gridResizeElementRulerStrategy: CanvasStrategyFactory = (
closestVertical,
)

const columnCount = getCellsCount(resizedProps.gridColumnStart, resizedProps.gridColumnEnd)
const rowCount = getCellsCount(resizedProps.gridRowStart, resizedProps.gridRowEnd)
const columnCount = getCellsCount(
resizedProps.gridColumnStart,
resizedProps.gridColumnEnd,
bounds.column,
bounds.width,
)
const rowCount = getCellsCount(
resizedProps.gridRowStart,
resizedProps.gridRowEnd,
bounds.row,
bounds.height,
)

const normalizedGridProps: GridElementProperties = {
gridColumnStart: normalizeGridElementPositionAfterResize(
Expand Down Expand Up @@ -295,12 +309,30 @@ function getResizedElementProperties(
function getCellsCount(
start: GridPositionOrSpan | null,
end: GridPositionOrSpan | null,
originalStart: number,
originalSize: number,
): number | null {
// start is a number
if (isGridPositionValue(start) && start.numericalPosition != null) {
// end is also a number, return the difference
if (isGridPositionValue(end) && end.numericalPosition != null) {
return end.numericalPosition - start.numericalPosition
}
return start.numericalPosition

// end is a discrete span, recalculate the size as a shrink or an expansion of the original size
if (isGridSpan(end) && end.type === 'SPAN_NUMERIC') {
return originalSize + (originalStart - start.numericalPosition)
}
}

// start is a discrete span
if (isGridSpan(start) && start.type === 'SPAN_NUMERIC') {
// end is a number, return the max between the span size and the start position
if (isGridPositionValue(end) && end.numericalPosition != null) {
return Math.max(end.numericalPosition, start.value) - 1
}
}

// nothing specific found, will be handled with a separate fallback
return null
}
Loading