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

Jump to bottom

Unify the global block styles panel with the block inspector panels #49428

Merged
merged 10 commits into from
May 5, 2023
Merged

Unify the global block styles panel with the block inspector panels #49428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
44b5dd0
Unify the global block styles panel with the block inspector panels
youknowriad Mar 29, 2023
7dae142
Add effects and filters screens to the block screen
youknowriad Apr 7, 2023
22e096f
Reorder like the block inspector
youknowriad Apr 7, 2023
cb033ee
Move the Custom CSS panel to the block screen
youknowriad May 2, 2023
3afd7e4
Restore block variations
youknowriad May 2, 2023
c0511a6
Cleanup
youknowriad May 2, 2023
3934658
Fix typos
youknowriad May 2, 2023
86759b0
Fix small typos
youknowriad May 3, 2023
47d29f2
Remove useless menu items
youknowriad May 4, 2023
8acff4c
Fix e2e tests
youknowriad May 5, 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/edit-site/src/components/global-styles/block-preview-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const BlockPreviewPanel = ( { name, variation = '' } ) => {
...blockExample,
attributes: {
...blockExample?.attributes,
className: variation,
className: 'is-style-' + variation,
},
};
const blocks =
Expand Down
4 changes: 3 additions & 1 deletion packages/edit-site/src/components/global-styles/border-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ export default function BorderPanel( { name, variation = '' } ) {
}
const prefix = prefixParts.join( '.' );

const [ style ] = useGlobalStyle( prefix, name, 'user', false );
const [ style ] = useGlobalStyle( prefix, name, 'user', {
shouldDecodeEncode: false,
} );
const [ inheritedStyle, setStyle ] = useGlobalStyle( prefix, name, 'all', {
shouldDecodeEncode: false,
} );
Expand Down
175 changes: 0 additions & 175 deletions packages/edit-site/src/components/global-styles/context-menu.js
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions packages/edit-site/src/components/global-styles/custom-css.js
View file
Open in desktop

This file was deleted.

18 changes: 7 additions & 11 deletions packages/edit-site/src/components/global-styles/dimensions-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,15 @@ const DEFAULT_CONTROLS = {
childLayout: false,
};

export default function DimensionsPanel( { name, variation = '' } ) {
let prefixParts = [];
if ( variation ) {
prefixParts = [ 'variations', variation ].concat( prefixParts );
}
const prefix = prefixParts.join( '.' );

const [ style ] = useGlobalStyle( prefix, name, 'user', false );
const [ inheritedStyle, setStyle ] = useGlobalStyle( prefix, name, 'all', {
export default function DimensionsPanel() {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is only rendered for the top level dimensions global styles screen, that's why I removed the arguments. Same for the other similar screens.

const [ style ] = useGlobalStyle( '', undefined, 'user', {
shouldDecodeEncode: false,
} );
const [ inheritedStyle, setStyle ] = useGlobalStyle( '', undefined, 'all', {
shouldDecodeEncode: false,
} );
const [ rawSettings, setSettings ] = useGlobalSetting( '', name );
const settings = useSettingsForBlockElement( rawSettings, name );
const [ rawSettings, setSettings ] = useGlobalSetting( '' );
const settings = useSettingsForBlockElement( rawSettings );

// These intermediary objects are needed because the "layout" property is stored
// in settings rather than styles.
Expand Down
40 changes: 0 additions & 40 deletions packages/edit-site/src/components/global-styles/effects-panel.js
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions packages/edit-site/src/components/global-styles/filters-panel.js
View file
Open in desktop

This file was deleted.

Loading