-
Notifications
You must be signed in to change notification settings - Fork 171
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
**Problem:** It's not possible to correctly drag-to-reparent into a grid. **Fix:** Allow dragging elements into a grid, positioning them as part of the grid hierarchy. | Before | After | |-------|----------| | <video src="https://github.com/user-attachments/assets/66d6bcd1-fe68-4286-bad0-2d02ba1819a0"></video> | <video src="https://github.com/user-attachments/assets/db989837-d750-4b2e-8850-6fd00269eb36"></video> | Fixes #6257
- Loading branch information
Showing
10 changed files
with
392 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
248 changes: 248 additions & 0 deletions
248
editor/src/components/canvas/canvas-strategies/strategies/grid-reparent-strategy.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,248 @@ | ||
| import { MetadataUtils } from '../../../../core/model/element-metadata-utils' | ||
| import { mapDropNulls } from '../../../../core/shared/array-utils' | ||
| import * as EP from '../../../../core/shared/element-path' | ||
| import * as PP from '../../../../core/shared/property-path' | ||
| import type { ElementPath } from '../../../../core/shared/project-file-types' | ||
| import { CSSCursor } from '../../canvas-types' | ||
| import { setCursorCommand } from '../../commands/set-cursor-command' | ||
| import { | ||
| propertyToDelete, | ||
| propertyToSet, | ||
| updateBulkProperties, | ||
| } from '../../commands/set-property-command' | ||
| import { updateSelectedViews } from '../../commands/update-selected-views-command' | ||
| import { ParentBounds } from '../../controls/parent-bounds' | ||
| import { ParentOutlines } from '../../controls/parent-outlines' | ||
| import { ZeroSizedElementControls } from '../../controls/zero-sized-element-controls' | ||
| import type { CanvasStrategyFactory } from '../canvas-strategies' | ||
| import type { | ||
| CanvasStrategy, | ||
| CustomStrategyState, | ||
| InteractionCanvasState, | ||
| } from '../canvas-strategy-types' | ||
| import { | ||
| controlWithProps, | ||
| emptyStrategyApplicationResult, | ||
| getTargetPathsFromInteractionTarget, | ||
| strategyApplicationResult, | ||
| } from '../canvas-strategy-types' | ||
| import type { InteractionSession, UpdatedPathMap } from '../interaction-state' | ||
| import { honoursPropsPosition, shouldKeepMovingDraggedGroupChildren } from './absolute-utils' | ||
| import { replaceFragmentLikePathsWithTheirChildrenRecursive } from './fragment-like-helpers' | ||
| import { ifAllowedToReparent, isAllowedToReparent } from './reparent-helpers/reparent-helpers' | ||
| import type { ReparentTarget } from './reparent-helpers/reparent-strategy-helpers' | ||
| import { getReparentOutcome, pathToReparent } from './reparent-utils' | ||
| import { flattenSelection } from './shared-move-strategies-helpers' | ||
| import { isInfinityRectangle } from '../../../../core/shared/math-utils' | ||
| import { showGridControls } from '../../commands/show-grid-controls-command' | ||
| import { GridControls } from '../../controls/grid-controls' | ||
| import type { ElementInstanceMetadataMap } from '../../../../core/shared/element-template' | ||
| import type { ElementPathTrees } from '../../../../core/shared/element-path-tree' | ||
| import type { AllElementProps } from '../../../editor/store/editor-state' | ||
| import type { BuiltInDependencies } from '../../../../core/es-modules/package-manager/built-in-dependencies-list' | ||
| import type { NodeModules, ProjectContentTreeRoot } from 'utopia-shared/src/types' | ||
| import type { InsertionPath } from '../../../editor/store/insertion-path' | ||
| import type { WhenToRun } from '../../commands/commands' | ||
| import { removeAbsolutePositioningProps } from './reparent-helpers/reparent-property-changes' | ||
|
|
||
| export function gridReparentStrategy( | ||
| reparentTarget: ReparentTarget, | ||
| fitness: number, | ||
| customStrategyState: CustomStrategyState, | ||
| ): CanvasStrategyFactory { | ||
| return ( | ||
| canvasState: InteractionCanvasState, | ||
| interactionSession: InteractionSession | null, | ||
| ): CanvasStrategy | null => { | ||
| const selectedElements = getTargetPathsFromInteractionTarget(canvasState.interactionTarget) | ||
| if ( | ||
| selectedElements.length === 0 || | ||
| interactionSession == null || | ||
| interactionSession.interactionData.type !== 'DRAG' | ||
| ) { | ||
| return null | ||
| } | ||
|
|
||
| const gridFrame = MetadataUtils.findElementByElementPath( | ||
| canvasState.startingMetadata, | ||
| reparentTarget.newParent.intendedParentPath, | ||
| )?.globalFrame | ||
| if (gridFrame == null || isInfinityRectangle(gridFrame)) { | ||
| return null | ||
| } | ||
|
|
||
| const dragInteractionData = interactionSession.interactionData | ||
| const filteredSelectedElements = flattenSelection(selectedElements) | ||
| const isApplicable = replaceFragmentLikePathsWithTheirChildrenRecursive( | ||
| canvasState.startingMetadata, | ||
| canvasState.startingAllElementProps, | ||
| canvasState.startingElementPathTree, | ||
| filteredSelectedElements, | ||
| ).every((element) => { | ||
| return honoursPropsPosition(canvasState, element) | ||
| }) | ||
| if (!isApplicable) { | ||
| return null | ||
| } | ||
| return { | ||
| id: `GRID_REPARENT`, | ||
| name: `Reparent (Grid)`, | ||
| descriptiveLabel: 'Reparent (Grid)', | ||
| icon: { | ||
| 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', | ||
| }), | ||
| { | ||
| control: GridControls, | ||
| props: { targets: [reparentTarget.newParent.intendedParentPath] }, | ||
| key: `draw-into-grid-strategy-controls`, | ||
| show: 'always-visible', | ||
| priority: 'bottom', | ||
| }, | ||
| ], | ||
| fitness: shouldKeepMovingDraggedGroupChildren( | ||
| canvasState.startingMetadata, | ||
| selectedElements, | ||
| reparentTarget.newParent, | ||
| ) | ||
| ? 1 | ||
| : fitness, | ||
| apply: () => { | ||
| const { projectContents, nodeModules } = canvasState | ||
| const newParent = reparentTarget.newParent | ||
| return ifAllowedToReparent( | ||
| canvasState, | ||
| canvasState.startingMetadata, | ||
| filteredSelectedElements, | ||
| newParent.intendedParentPath, | ||
| () => { | ||
| if (dragInteractionData.drag == null) { | ||
| return emptyStrategyApplicationResult | ||
| } | ||
|
|
||
| const allowedToReparent = filteredSelectedElements.every((selectedElement) => { | ||
| return isAllowedToReparent( | ||
| canvasState.projectContents, | ||
| canvasState.startingMetadata, | ||
| selectedElement, | ||
| newParent.intendedParentPath, | ||
| ) | ||
| }) | ||
|
|
||
| if (!(reparentTarget.shouldReparent && allowedToReparent)) { | ||
| return emptyStrategyApplicationResult | ||
| } | ||
| const outcomes = mapDropNulls( | ||
| (selectedElement) => | ||
| gridReparentCommands( | ||
| canvasState.startingMetadata, | ||
| canvasState.startingElementPathTree, | ||
| canvasState.startingAllElementProps, | ||
| canvasState.builtInDependencies, | ||
| projectContents, | ||
| nodeModules, | ||
| selectedElement, | ||
| newParent, | ||
| ), | ||
| selectedElements, | ||
| ) | ||
|
|
||
| let newPaths: Array<ElementPath> = [] | ||
| let updatedTargetPaths: UpdatedPathMap = {} | ||
|
|
||
| outcomes.forEach((c) => { | ||
| newPaths.push(c.newPath) | ||
| updatedTargetPaths[EP.toString(c.oldPath)] = c.newPath | ||
| }) | ||
|
|
||
| const gridContainerCommands = updateBulkProperties( | ||
| 'mid-interaction', | ||
| reparentTarget.newParent.intendedParentPath, | ||
| [ | ||
| propertyToSet(PP.create('style', 'width'), gridFrame.width), | ||
| propertyToSet(PP.create('style', 'height'), gridFrame.height), | ||
| ], | ||
| ) | ||
|
|
||
| const elementsToRerender = EP.uniqueElementPaths([ | ||
| ...customStrategyState.elementsToRerender, | ||
| ...newPaths, | ||
| ...newPaths.map(EP.parentPath), | ||
| ...filteredSelectedElements.map(EP.parentPath), | ||
| ]) | ||
|
|
||
| return strategyApplicationResult( | ||
| [ | ||
| ...outcomes.flatMap((c) => c.commands), | ||
| gridContainerCommands, | ||
| updateSelectedViews('always', newPaths), | ||
| setCursorCommand(CSSCursor.Reparent), | ||
| showGridControls('mid-interaction', reparentTarget.newParent.intendedParentPath), | ||
| ], | ||
| { | ||
| elementsToRerender, | ||
| }, | ||
| ) | ||
| }, | ||
| ) | ||
| }, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function gridReparentCommands( | ||
| jsxMetadata: ElementInstanceMetadataMap, | ||
| tree: ElementPathTrees, | ||
| allElementProps: AllElementProps, | ||
| builtinDependencies: BuiltInDependencies, | ||
| projectContents: ProjectContentTreeRoot, | ||
| nodeModules: NodeModules, | ||
| target: ElementPath, | ||
| newParent: InsertionPath, | ||
| ) { | ||
| const reparentResult = getReparentOutcome( | ||
| jsxMetadata, | ||
| tree, | ||
| allElementProps, | ||
| builtinDependencies, | ||
| projectContents, | ||
| nodeModules, | ||
| pathToReparent(target), | ||
| newParent, | ||
| 'always', | ||
| null, | ||
| ) | ||
|
|
||
| if (reparentResult == null) { | ||
| return null | ||
| } | ||
|
|
||
| const { commands: reparentCommands, newPath } = reparentResult | ||
|
|
||
| const gridCellCommands = removeAbsolutePositioningProps('always', newPath) | ||
|
|
||
| return { | ||
| commands: [...reparentCommands, gridCellCommands], | ||
| newPath: newPath, | ||
| oldPath: target, | ||
| } | ||
| } |
Oops, something went wrong.