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

Position Panel: Open by default if a position type is set #49151

Merged
merged 6 commits into from
Mar 21, 2023
Merged

Position Panel: Open by default if a position type is set #49151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7cc5812
Position Panel: Open by default is a position type is set
andrewserong Mar 17, 2023
32289bb
Remove prop drilling clientId, grab all selected client ids and use f…
andrewserong Mar 20, 2023
a56b54f
Iterate over block selection and open by default if at least one bloc…
andrewserong Mar 20, 2023
ffc76f7
Add useState and an effect so that we only perform the calculation once
andrewserong Mar 21, 2023
4da0531
Try to reduce flicker
andrewserong Mar 21, 2023
f998b3b
Update to useLayoutEffect
andrewserong Mar 21, 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/block-inspector/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ const BlockInspectorSingleBlock = ( { clientId, blockName } ) => {
label={ __( 'Border' ) }
/>
<InspectorControls.Slot group="styles" />
<PositionControls />
<PositionControls clientId={ clientId } />
<div>
<AdvancedControls />
</div>
Expand Down
5 changes: 4 additions & 1 deletion packages/block-editor/src/components/inspector-controls-tabs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ export default function InspectorControlsTabs( {
{ ( tab ) => {
if ( tab.name === TAB_SETTINGS.name ) {
return (
<SettingsTab showAdvancedControls={ !! blockName } />
<SettingsTab
clientId={ clientId }
showAdvancedControls={ !! blockName }
/>
);
}

Expand Down
19 changes: 17 additions & 2 deletions packages/block-editor/src/components/inspector-controls-tabs/position-controls-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,44 @@ import {
PanelBody,
__experimentalUseSlotFills as useSlotFills,
} from '@wordpress/components';
import { useSelect } from '@wordpress/data';
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
*/
import InspectorControlsGroups from '../inspector-controls/groups';
import { default as InspectorControls } from '../inspector-controls';
import { store as blockEditorStore } from '../../store';

const PositionControls = () => {
const PositionControls = ( { clientId } ) => {
const fills = useSlotFills(
InspectorControlsGroups.position.Slot.__unstableName
);
const hasFills = Boolean( fills && fills.length );

const { blockAttributes } = useSelect(
( select ) => {
const { getBlockAttributes } = select( blockEditorStore );
return {
blockAttributes: getBlockAttributes( clientId ),
};
},
[ clientId ]
);

if ( ! hasFills ) {
return null;
}

// If a position type is set, open the panel by default.
const initialOpen = !! blockAttributes?.style?.position?.type;

return (
<PanelBody
className="block-editor-block-inspector__position"
title={ __( 'Position' ) }
initialOpen={ false }
initialOpen={ initialOpen }
>
<InspectorControls.Slot group="position" />
</PanelBody>
Expand Down
4 changes: 2 additions & 2 deletions packages/block-editor/src/components/inspector-controls-tabs/settings-tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import PositionControls from './position-controls-panel';
import { default as InspectorControls } from '../inspector-controls';
import SettingsTabHint from './settings-tab-hint';

const SettingsTab = ( { showAdvancedControls = false } ) => (
const SettingsTab = ( { clientId, showAdvancedControls = false } ) => (
<>
<InspectorControls.Slot />
<PositionControls />
<PositionControls clientId={ clientId } />
{ showAdvancedControls && (
<div>
<AdvancedControls />
Expand Down