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

Reparent out of grid #6264

Merged
merged 5 commits into from
Aug 27, 2024
Merged

Reparent out of grid #6264

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85a2f70
reparent out of grid
ruggi Aug 27, 2024
0457a1b
undefined comparison
ruggi Aug 27, 2024
75c4f38
fix typo
ruggi Aug 27, 2024
aa41554
refactor for type check
ruggi Aug 27, 2024
05cfeea
fix order
ruggi Aug 27, 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
245 changes: 137 additions & 108 deletions editor/src/components/canvas/canvas-strategies/strategies/absolute-reparent-strategy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import type {
CanvasStrategy,
CustomStrategyState,
InteractionCanvasState,
InteractionLifecycle,
} from '../canvas-strategy-types'
import {
controlWithProps,
Expand Down Expand Up @@ -61,7 +62,6 @@ export function baseAbsoluteReparentStrategy(
return null
}

const dragInteractionData = interactionSession.interactionData // Why TypeScript?!
const filteredSelectedElements = flattenSelection(selectedElements)
const isApplicable = replaceFragmentLikePathsWithTheirChildrenRecursive(
canvasState.startingMetadata,
Expand Down Expand Up @@ -90,127 +90,156 @@ export function baseAbsoluteReparentStrategy(
category: 'modalities',
type: 'reparent-large',
},
controlsToRender: [
controlWithProps({
control: ParentOutlines,
props: { targetParent: reparentTarget.newParent.intendedParentPath },
key: 'parent-outlines-control',
show: 'visible-only-while-active',
}),
controlWithProps({
control: ParentBounds,
props: { targetParent: reparentTarget.newParent.intendedParentPath },
key: 'parent-bounds-control',
show: 'visible-only-while-active',
}),
controlWithProps({
control: ZeroSizedElementControls,
props: { showAllPossibleElements: true },
key: 'zero-size-control',
show: 'visible-only-while-active',
}),
],
controlsToRender: controlsForAbsoluteReparent(reparentTarget),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no logic changes here, just factored out the controls and the apply logic

fitness: shouldKeepMovingDraggedGroupChildren(
canvasState.startingMetadata,
selectedElements,
reparentTarget.newParent,
)
? 1
: fitness,
apply: (strategyLifecycle) => {
const { projectContents, nodeModules } = canvasState
const newParent = reparentTarget.newParent
return ifAllowedToReparent(
canvasState,
canvasState.startingMetadata,
filteredSelectedElements,
newParent.intendedParentPath,
() => {
if (dragInteractionData.drag == null) {
return emptyStrategyApplicationResult
}
apply: applyAbsoluteReparent(
canvasState,
interactionSession,
customStrategyState,
reparentTarget,
filteredSelectedElements,
),
}
}
}

const allowedToReparent = filteredSelectedElements.every((selectedElement) => {
return isAllowedToReparent(
canvasState.projectContents,
canvasState.startingMetadata,
selectedElement,
newParent.intendedParentPath,
)
})
export function controlsForAbsoluteReparent(reparentTarget: ReparentTarget) {
return [
controlWithProps({
control: ParentOutlines,
props: { targetParent: reparentTarget.newParent.intendedParentPath },
key: 'parent-outlines-control',
show: 'visible-only-while-active',
}),
controlWithProps({
control: ParentBounds,
props: { targetParent: reparentTarget.newParent.intendedParentPath },
key: 'parent-bounds-control',
show: 'visible-only-while-active',
}),
controlWithProps({
control: ZeroSizedElementControls,
props: { showAllPossibleElements: true },
key: 'zero-size-control',
show: 'visible-only-while-active',
}),
]
}

if (reparentTarget.shouldReparent && allowedToReparent) {
const commands = mapDropNulls(
(selectedElement) =>
createAbsoluteReparentAndOffsetCommands(
selectedElement,
newParent,
null,
canvasState.startingMetadata,
canvasState.startingElementPathTree,
canvasState.startingAllElementProps,
canvasState.builtInDependencies,
projectContents,
nodeModules,
'force-pins',
),
selectedElements,
)
export function applyAbsoluteReparent(
canvasState: InteractionCanvasState,
interactionSession: InteractionSession,
customStrategyState: CustomStrategyState,
reparentTarget: ReparentTarget,
selectedElements: ElementPath[],
) {
return (strategyLifecycle: InteractionLifecycle) => {
if (
selectedElements.length === 0 ||
interactionSession == null ||
interactionSession.interactionData.type !== 'DRAG'
) {
return emptyStrategyApplicationResult
}
const dragInteractionData = interactionSession.interactionData

const { projectContents, nodeModules } = canvasState
const newParent = reparentTarget.newParent
return ifAllowedToReparent(
canvasState,
canvasState.startingMetadata,
selectedElements,
newParent.intendedParentPath,
() => {
if (dragInteractionData.drag == null) {
return emptyStrategyApplicationResult
}

const allowedToReparent = selectedElements.every((selectedElement) => {
return isAllowedToReparent(
canvasState.projectContents,
canvasState.startingMetadata,
selectedElement,
newParent.intendedParentPath,
)
})

let newPaths: Array<ElementPath> = []
let updatedTargetPaths: UpdatedPathMap = {}
if (reparentTarget.shouldReparent && allowedToReparent) {
const commands = mapDropNulls(
(selectedElement) =>
createAbsoluteReparentAndOffsetCommands(
selectedElement,
newParent,
null,
canvasState.startingMetadata,
canvasState.startingElementPathTree,
canvasState.startingAllElementProps,
canvasState.builtInDependencies,
projectContents,
nodeModules,
'force-pins',
),
selectedElements,
)

let newPaths: Array<ElementPath> = []
let updatedTargetPaths: UpdatedPathMap = {}

commands.forEach((c) => {
newPaths.push(c.newPath)
updatedTargetPaths[EP.toString(c.oldPath)] = c.newPath
})
commands.forEach((c) => {
newPaths.push(c.newPath)
updatedTargetPaths[EP.toString(c.oldPath)] = c.newPath
})

const moveCommands =
absoluteMoveStrategy(
canvasState,
{
...interactionSession,
updatedTargetPaths: updatedTargetPaths,
},
{ ...defaultCustomStrategyState(), action: 'reparent' },
)?.strategy.apply(strategyLifecycle).commands ?? []
const moveCommands =
absoluteMoveStrategy(
canvasState,
{
...interactionSession,
updatedTargetPaths: updatedTargetPaths,
},
{ ...defaultCustomStrategyState(), action: 'reparent' },
)?.strategy.apply(strategyLifecycle).commands ?? []

const elementsToRerender = EP.uniqueElementPaths([
...customStrategyState.elementsToRerender,
...newPaths,
...newPaths.map(EP.parentPath),
...filteredSelectedElements.map(EP.parentPath),
])
return strategyApplicationResult(
[
...moveCommands,
...commands.flatMap((c) => c.commands),
updateSelectedViews('always', newPaths),
setElementsToRerenderCommand(elementsToRerender),
...maybeAddContainLayout(
canvasState.startingMetadata,
canvasState.startingAllElementProps,
canvasState.startingElementPathTree,
newParent.intendedParentPath,
),
setCursorCommand(CSSCursor.Reparent),
],
{
elementsToRerender,
},
)
} else {
const moveCommands =
absoluteMoveStrategy(canvasState, interactionSession, {
...defaultCustomStrategyState(),
action: 'reparent',
})?.strategy.apply(strategyLifecycle).commands ?? []
return strategyApplicationResult(moveCommands)
}
},
)
const elementsToRerender = EP.uniqueElementPaths([
...customStrategyState.elementsToRerender,
...newPaths,
...newPaths.map(EP.parentPath),
...selectedElements.map(EP.parentPath),
])
return strategyApplicationResult(
[
...moveCommands,
...commands.flatMap((c) => c.commands),
updateSelectedViews('always', newPaths),
setElementsToRerenderCommand(elementsToRerender),
...maybeAddContainLayout(
canvasState.startingMetadata,
canvasState.startingAllElementProps,
canvasState.startingElementPathTree,
newParent.intendedParentPath,
),
setCursorCommand(CSSCursor.Reparent),
],
{
elementsToRerender,
},
)
} else {
const moveCommands =
absoluteMoveStrategy(canvasState, interactionSession, {
...defaultCustomStrategyState(),
action: 'reparent',
})?.strategy.apply(strategyLifecycle).commands ?? []
return strategyApplicationResult(moveCommands)
}
},
}
)
}
}

Expand Down
Loading
Loading