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

Modifiers for reparenting and convert to absolute strategies #6054

Merged
merged 22 commits into from
Jul 12, 2024
Merged

Modifiers for reparenting and convert to absolute strategies #6054

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
52a72d5
Modifiers for reparenting and convert to absolute strategies
gbalint Jul 9, 2024
e873451
Fix reparent test
gbalint Jul 10, 2024
ba3c012
Fix escape hatch test by adding ctrl modifier
gbalint Jul 10, 2024
ed3e2cf
Fix ancestor metastrategy tests
gbalint Jul 10, 2024
3e638d6
Insert strategies should allow reparenting by simulating cmd
gbalint Jul 10, 2024
c2114d8
More test fixes relying on reparent
gbalint Jul 10, 2024
28b0b37
Merge branch 'master' into feature/modifiers-for-reparent-and-convert…
gbalint Jul 10, 2024
c01d946
Fix redundant and faulty code
gbalint Jul 10, 2024
9142406
Escape hatch tests should use ctrl modifier
gbalint Jul 10, 2024
37a67bc
Fix space to force escape hatch
gbalint Jul 11, 2024
fbc03e4
Fix tests
gbalint Jul 11, 2024
5419678
More reparent test fixes
gbalint Jul 11, 2024
6aef4b1
Fix reparent in remix test
gbalint Jul 11, 2024
0cf11db
Disabling reparent into smaller test, and add cmd modifier to keypresses
gbalint Jul 11, 2024
fa0cef8
Reparent to flex test fixes
gbalint Jul 11, 2024
75be9f1
Fix double import
gbalint Jul 11, 2024
e04c147
More missing cmd modifiers in tests
gbalint Jul 11, 2024
8ffc7d1
CMD during mouse down selects the innermost child from current selection
gbalint Jul 11, 2024
3bf817f
Disabling outdated tests
gbalint Jul 11, 2024
2ee51dc
Revert accidental commit
gbalint Jul 11, 2024
4cec517
Remove unused wait imports
gbalint Jul 11, 2024
fd6912d
Extract magic number to const
gbalint Jul 11, 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
105 changes: 81 additions & 24 deletions ...as/canvas-strategies/strategies/absolute-flex-reparent-strategy-helpers.spec.browser2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,62 @@ async function dragElement(
const defaultMouseDownOffset = windowPoint({ x: 20, y: 20 })

describe('Unified Reparent Fitness Function Tests', () => {
it('if cmd is not pressed no reparent strategies have nonzero fitness', async () => {
const renderResult = await renderTestEditorWithCode(
makeTestProjectCodeWithSnippet(`
<div
style={{
backgroundColor: 'white',
position: 'absolute',
width: '100%',
height: '100%',
}}
data-uid='aaa'
>
<div
style={{
backgroundColor: '#aaaaaa33',
position: 'absolute',
left: 40,
top: 40,
width: 100,
height: 100,
}}
data-uid='bbb'
>
<div
style={{
backgroundColor: '#aaaaaa33',
position: 'absolute',
left: 0,
top: 0,
width: 200,
height: 200,
}}
data-uid='ccc'
data-testid='ccc'
/>
</div>
</div>
`),
'await-first-dom-report',
)

const dragDelta = windowPoint({ x: 120, y: 0 })

const targetPath = EP.appendNewElementPath(TestScenePath, ['aaa', 'bbb', 'ccc'])
await renderResult.dispatch([selectComponents([targetPath], false)], false)
await dragElement(renderResult, 'ccc', defaultMouseDownOffset, dragDelta, emptyModifiers, false)

const strategies = renderResult.getEditorState().strategyState.sortedApplicableStrategies

if (strategies == null) {
// here for type assertion
throw new Error('`strategies` should not be null')
}
expect(strategies[0].strategy.id.includes('REPARENT')).toBeFalsy()
})

it('if an element is larger than its parent, we still allow reparent to its grandparent, if the reparenting starts from the area of the original parent', async () => {
const renderResult = await renderTestEditorWithCode(
makeTestProjectCodeWithSnippet(`
Expand Down Expand Up @@ -110,7 +166,7 @@ describe('Unified Reparent Fitness Function Tests', () => {

const targetPath = EP.appendNewElementPath(TestScenePath, ['aaa', 'bbb', 'ccc'])
await renderResult.dispatch([selectComponents([targetPath], false)], false)
await dragElement(renderResult, 'ccc', defaultMouseDownOffset, dragDelta, emptyModifiers, true)
await dragElement(renderResult, 'ccc', defaultMouseDownOffset, dragDelta, cmdModifier, true)

await renderResult.getDispatchFollowUpActionsFinished()

Expand Down Expand Up @@ -198,7 +254,7 @@ describe('Unified Reparent Fitness Function Tests', () => {
const targetPath = EP.appendNewElementPath(TestScenePath, ['aaa', 'bbb', 'ccc'])
await renderResult.dispatch([selectComponents([targetPath], false)], false)

await dragElement(renderResult, 'ccc', defaultMouseDownOffset, dragDelta, emptyModifiers, true)
await dragElement(renderResult, 'ccc', defaultMouseDownOffset, dragDelta, cmdModifier, true)

await renderResult.getDispatchFollowUpActionsFinished()

Expand Down Expand Up @@ -291,7 +347,7 @@ describe('Unified Reparent Fitness Function Tests', () => {
'draggedElement',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
true,
)

Expand Down Expand Up @@ -486,7 +542,7 @@ describe('Unified Reparent Fitness Function Tests', () => {
'draggedElement',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
true,
)

Expand Down Expand Up @@ -582,7 +638,7 @@ describe('Unified Reparent Fitness Function Tests', () => {
'draggedElement',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
true,
)

Expand Down Expand Up @@ -949,7 +1005,7 @@ describe('Target parents with flow layout', () => {
'draggedElement',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
true,
)

Expand Down Expand Up @@ -1092,7 +1148,7 @@ describe('Target parents with flow layout', () => {
'draggedElement',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
true,
)

Expand Down Expand Up @@ -1200,7 +1256,7 @@ describe('Target parents with flow layout', () => {
'draggedElement',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
true,
)

Expand Down Expand Up @@ -1297,7 +1353,7 @@ describe('Target parents with flow layout', () => {
'draggedElement',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
true,
() => pressKey('2', { modifiers: cmdModifier }), // Switch to flow reparenting strategy
)
Expand Down Expand Up @@ -1423,7 +1479,7 @@ describe('Target parents with flow layout', () => {
'draggedElement',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
true,
() => pressKey('2', { modifiers: cmdModifier }), // Switch to flow reparenting strategy
)
Expand Down Expand Up @@ -1918,7 +1974,8 @@ describe('Target parent filtering', () => {
)
})

it('Dragging without cmd with cursor over the smaller element prevents reparenting into the larger element', async () => {
// now we need cmd for any kind of reparent, so this test is outdated
xit('Dragging without cmd with cursor over the smaller element prevents reparenting into the larger element', async () => {
const renderResult = await renderTestEditorWithCode(startingCode, 'await-first-dom-report')

const targetPath = EP.elementPath([[BakedInStoryboardUID, TestSceneUID, 'dragme']])
Expand All @@ -1929,7 +1986,7 @@ describe('Target parent filtering', () => {
// drag to the left so that the cursor is over the larger element
const dragDelta = windowPoint({ x: -10, y: -10 })

await dragElement(renderResult, 'dragme', mouseDownOffset, dragDelta, emptyModifiers, true)
await dragElement(renderResult, 'dragme', mouseDownOffset, dragDelta, cmdModifier, true)

await renderResult.getDispatchFollowUpActionsFinished()

Expand Down Expand Up @@ -2272,7 +2329,7 @@ describe('Reparent indicators', () => {
'seconddiv',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
false,
)

Expand Down Expand Up @@ -2318,7 +2375,7 @@ describe('Reparent indicators', () => {
'seconddiv',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
false,
)

Expand Down Expand Up @@ -2361,7 +2418,7 @@ describe('Reparent indicators', () => {
'seconddiv',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
false,
)

Expand Down Expand Up @@ -2404,7 +2461,7 @@ describe('Reparent indicators', () => {
'seconddiv',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
false,
)

Expand Down Expand Up @@ -2448,7 +2505,7 @@ describe('Reparent indicators', () => {
'absolutechild',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
false,
)

Expand Down Expand Up @@ -2492,7 +2549,7 @@ describe('Reparent indicators', () => {
'absolutechild',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
false,
)

Expand Down Expand Up @@ -2536,7 +2593,7 @@ describe('Reparent indicators', () => {
'absolutechild',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
false,
)

Expand Down Expand Up @@ -2580,7 +2637,7 @@ describe('Reparent indicators', () => {
'absolutechild',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
false,
)

Expand Down Expand Up @@ -2660,11 +2717,11 @@ describe('Reparent indicators', () => {
'absolutechild',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
false,
)

await pressKey('2') // Switch to flow reparenting strategy
await pressKey('2', { modifiers: cmdModifier }) // Switch to flow reparenting strategy

await renderResult.getDispatchFollowUpActionsFinished()

Expand Down Expand Up @@ -2758,11 +2815,11 @@ describe('Reparent indicators', () => {
'absolutechild',
defaultMouseDownOffset,
dragDelta,
emptyModifiers,
cmdModifier,
false,
)

await pressKey('2') // Switch to flow reparenting strategy
await pressKey('2', { modifiers: cmdModifier }) // Switch to flow reparenting strategy

await renderResult.getDispatchFollowUpActionsFinished()

Expand Down
Loading
Loading