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

Split grid move strategies #6606

Merged
merged 38 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
367e3c8
wip
ruggi Oct 30, 2024
1289a80
Merge branch 'master' into chore/split-grid-move-strats
ruggi Oct 30, 2024
6d278cc
change pinned
ruggi Oct 31, 2024
804a519
kill swap
ruggi Oct 31, 2024
2c28609
move type
ruggi Oct 31, 2024
70d64a6
don't highlight cell
ruggi Oct 31, 2024
1a6aa08
delete outdated test
ruggi Oct 31, 2024
808bfe6
make duplicate add extra commands
ruggi Oct 31, 2024
6be6712
rename
ruggi Oct 31, 2024
4b3dcd5
naming
ruggi Oct 31, 2024
5589a48
ocd line
ruggi Oct 31, 2024
318f34d
clean up a bit
ruggi Oct 31, 2024
620f1f7
factor out common
ruggi Oct 31, 2024
8bec702
remove dup
ruggi Oct 31, 2024
190b49f
fix/adjust tests
ruggi Oct 31, 2024
281c0c5
Merge branch 'master' into chore/split-grid-move-strats
ruggi Oct 31, 2024
630d901
remove debug
ruggi Oct 31, 2024
db0a2dd
adjust cell highlight
ruggi Oct 31, 2024
5ab990f
fix condition
ruggi Nov 4, 2024
ff543fc
remove unused
ruggi Nov 4, 2024
3204aac
move unused to only reorder
ruggi Nov 4, 2024
fc30eb8
rename
ruggi Nov 4, 2024
767d620
use parent container metadata
ruggi Nov 4, 2024
021fdcb
use string union
ruggi Nov 4, 2024
eacedf6
update usage
ruggi Nov 4, 2024
a8998b2
just set the root target to null
ruggi Nov 4, 2024
d9e9ab7
simplify strats (wip)
ruggi Nov 4, 2024
e6ebd71
add future comments
ruggi Nov 4, 2024
4735b29
take out absolute
ruggi Nov 4, 2024
5334de0
refactor
ruggi Nov 4, 2024
fd6a532
move helpers
ruggi Nov 4, 2024
c661d63
mark parentpath usages
ruggi Nov 4, 2024
4587edd
clean up
ruggi Nov 5, 2024
1fb8b2b
clean up
ruggi Nov 5, 2024
c67196a
Merge branch 'master' into chore/split-grid-move-strats
ruggi Nov 5, 2024
8efd023
update tests
ruggi Nov 5, 2024
cf84e12
fix spacing
ruggi Nov 5, 2024
945b36f
delete old test file
ruggi Nov 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react'
import { createSelector } from 'reselect'
import { mapDropNulls, pushUniquelyBy, sortBy } from '../../../core/shared/array-utils'
import type { ElementInstanceMetadataMap } from '../../../core/shared/element-template'
import { arrayEqualsByReference, assertNever } from '../../../core/shared/utils'
Expand Down Expand Up @@ -68,11 +67,10 @@ import type { InsertionSubject, InsertionSubjectWrapper } from '../../editor/edi
import { generateUidWithExistingComponents } from '../../../core/model/element-template-utils'
import { retargetStrategyToChildrenOfFragmentLikeElements } from './strategies/fragment-like-helpers'
import { MetadataUtils } from '../../../core/model/element-metadata-utils'
import { gridRearrangeMoveStrategy } from './strategies/grid-rearrange-move-strategy'
import { gridMoveRearrangeStrategy } from './strategies/grid-move-rearrange-strategy'
import { resizeGridStrategy } from './strategies/resize-grid-strategy'
import { rearrangeGridSwapStrategy } from './strategies/rearrange-grid-swap-strategy'
import { gridResizeElementStrategy } from './strategies/grid-resize-element-strategy'
import { gridRearrangeMoveDuplicateStrategy } from './strategies/grid-rearrange-move-duplicate-strategy'
import { gridMoveRearrangeDuplicateStrategy } from './strategies/grid-move-rearrange-duplicate-strategy'
import { setGridGapStrategy } from './strategies/set-grid-gap-strategy'
import type { CanvasCommand } from '../commands/commands'
import { foldAndApplyCommandsInner } from '../commands/commands'
Expand All @@ -89,6 +87,8 @@ import {
GridControls,
isGridControlsProps,
} from '../controls/grid-controls-for-strategies'
import { gridMoveReorderStrategy } from './strategies/grid-move-reorder-strategy'
import { gridMoveAbsoluteStrategy } from './strategies/grid-move-absolute'

export type CanvasStrategyFactory = (
canvasState: InteractionCanvasState,
Expand Down Expand Up @@ -116,10 +116,11 @@ const moveOrReorderStrategies: MetaCanvasStrategy = (
convertToAbsoluteAndMoveStrategy,
convertToAbsoluteAndMoveAndSetParentFixedStrategy,
reorderSliderStategy,
gridRearrangeMoveStrategy,
rearrangeGridSwapStrategy,
gridRearrangeMoveDuplicateStrategy,
gridMoveRearrangeStrategy,
gridMoveRearrangeDuplicateStrategy,
gridMoveReorderStrategy,
gridRearrangeResizeKeyboardStrategy,
gridMoveAbsoluteStrategy,
],
)
}
Expand Down
Loading
Loading