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

Keep grid rearrange shadow inside container #6273

Merged
merged 3 commits into from
Sep 2, 2024
Merged

Keep grid rearrange shadow inside container #6273

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23e03a6
wrap shadow coords
ruggi Aug 29, 2024
8232071
Merge branch 'master' into feat/grid-shadow-inside-container
ruggi Aug 29, 2024
47c5652
Merge branch 'master' into feat/grid-shadow-inside-container
ruggi Aug 30, 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
46 changes: 44 additions & 2 deletions editor/src/components/canvas/controls/grid-controls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
pointsEqual,
scaleRect,
windowPoint,
zeroRectangle,
zeroRectIfNullOrInfinity,
} from '../../../core/shared/math-utils'
import {
Expand Down Expand Up @@ -505,6 +506,7 @@ export const GridControls = controlForStrategyMemoized<GridControlsProps>(({ tar

const canvasOffsetRef = useRefEditorState((store) => store.editor.canvas.roundedCanvasOffset)
const scaleRef = useRefEditorState((store) => store.editor.canvas.scale)
const metadataRef = useRefEditorState((store) => store.editor.jsxMetadata)

const activelyDraggingOrResizingCell = useEditorState(
Substores.canvas,
Expand Down Expand Up @@ -618,6 +620,20 @@ export const GridControls = controlForStrategyMemoized<GridControlsProps>(({ tar

const gridPath = optionalMap(EP.parentPath, shadow?.elementPath)

const gridFrame = React.useMemo(() => {
Copy link
Contributor

Choose a reason for hiding this comment

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

we can maybe take padding here into consideration (so that the shadow won't get over the paddings)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

true, I tried it when writing the code and it makes sense too – I just did not know which was best tbh, so I just went with the minimum option, but I guess it's easy to change if we find that it would feel better being "stuck to the inner grid" 🤔

if (gridPath == null) {
return zeroRectangle
}
const maybeGridFrame = MetadataUtils.findElementByElementPath(
metadataRef.current,
gridPath,
)?.globalFrame
if (maybeGridFrame == null || !isFiniteRectangle(maybeGridFrame)) {
return zeroRectangle
}
return maybeGridFrame
}, [gridPath, metadataRef])

useSnapAnimation({
targetRootCell: targetRootCell,
controls: controls,
Expand Down Expand Up @@ -722,8 +738,34 @@ export const GridControls = controlForStrategyMemoized<GridControlsProps>(({ tar
}
}

return { x: getCoord('x', 'width'), y: getCoord('y', 'height') }
}, [features, initialShadowFrame, interactionData, shadow, hoveringStart, mouseCanvasPosition])
// make sure the shadow is displayed only inside the grid container bounds
function wrapCoord(c: number, min: number, max: number, shadowSize: number) {
return Math.min(Math.max(c, min), max - shadowSize)
Copy link
Contributor

Choose a reason for hiding this comment

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

nice

}

return {
x: wrapCoord(
getCoord('x', 'width') ?? 0,
gridFrame.x,
gridFrame.x + gridFrame.width,
shadow.globalFrame.width,
),
y: wrapCoord(
getCoord('y', 'height') ?? 0,
gridFrame.y,
gridFrame.y + gridFrame.height,
shadow.globalFrame.height,
),
}
}, [
features,
initialShadowFrame,
interactionData,
shadow,
hoveringStart,
mouseCanvasPosition,
gridFrame,
])

if (grids.length === 0) {
return null
Expand Down
Loading