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

Editor Canvas: Fix animation when device type changes #56970

Merged
merged 3 commits into from
Dec 13, 2023
Merged

Editor Canvas: Fix animation when device type changes #56970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a11c2b
Editor Canvas: Fix animation when device type changes
t-hamano Dec 12, 2023
1eb867c
Include margin in deviceStyles
t-hamano Dec 12, 2023
cbe44bf
Merge branch 'trunk' into fix/editor-canvas-animation
t-hamano Dec 13, 2023
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
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/use-resize-canvas/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# useResizeCanvas

This React hook generates inline CSS suitable for resizing a container to fit a device's dimensions. It adjusts the CSS according to the current device dimensions. It has no effect on desktop.
This React hook generates inline CSS suitable for resizing a container to fit a device's dimensions. It adjusts the CSS according to the current device dimensions.

On-page CSS media queries are also updated to match the width of the device.

Expand Down
5 changes: 4 additions & 1 deletion packages/block-editor/src/components/use-resize-canvas/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ export default function useResizeCanvas( deviceType ) {
overflowY: 'auto',
};
default:
return null;
return {
marginLeft: marginHorizontal,
marginRight: marginHorizontal,
};
}
};

Expand Down
5 changes: 4 additions & 1 deletion packages/editor/src/components/editor-canvas/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,10 @@ function EditorCanvas(
height="100%"
iframeProps={ {
...iframeProps,
style: { ...iframeProps?.style, ...deviceStyles },
style: {
...iframeProps?.style,
...deviceStyles,
},
} }
>
{ themeSupportsLayout &&
Expand Down
Loading