Skip to content

Position controls: Fix useSelect warning for selected state viewports #83570

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

Merged
t-hamano merged 1 commit into from
Sep 28, 2026
+28 −34
Merged

Position controls: Fix useSelect warning for selected state viewports #83570

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 28 additions & 34 deletions packages/block-editor/src/components/inspector-controls-tabs/position-controls-panel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
__experimentalToolsPanel as ToolsPanel,
__experimentalToolsPanelItem as ToolsPanelItem,
} from '@wordpress/components';
import { useDispatch, useSelect } from '@wordpress/data';
import { useDispatch, useRegistry, useSelect } from '@wordpress/data';
import { __ } from '@wordpress/i18n';
import InspectorControlsGroups from '../inspector-controls/groups';
import { default as InspectorControls } from '../inspector-controls';
Expand Down Expand Up @@ -47,38 +47,27 @@ const hasAnyPositionValue = ( style ) => {
};

const PositionControlsPanel = () => {
const {
selectedClientIds,
selectedBlocks,
selectedStateViewports,
hasPositionAttribute,
} = useSelect( ( select ) => {
const {
getBlocksByClientId,
getSelectedBlockClientIds,
getSelectedBlockStyleState,
} = unlock( select( blockEditorStore ) );

const selectedBlockClientIds = getSelectedBlockClientIds();
const _selectedBlocks = getBlocksByClientId( selectedBlockClientIds );

return {
selectedClientIds: selectedBlockClientIds,
selectedBlocks: _selectedBlocks,
selectedStateViewports: Object.fromEntries(
selectedBlockClientIds.map( ( clientId ) => [
clientId,
getPositionStateViewport(
getSelectedBlockStyleState( clientId )
),
] )
),
hasPositionAttribute: _selectedBlocks?.some( ( { attributes } ) =>
hasAnyPositionValue( attributes?.style )
),
};
}, [] );

const { selectedClientIds, selectedBlocks, hasPositionAttribute } =
useSelect( ( select ) => {
const { getBlocksByClientId, getSelectedBlockClientIds } =
select( blockEditorStore );

const selectedBlockClientIds = getSelectedBlockClientIds();
const _selectedBlocks = getBlocksByClientId(
selectedBlockClientIds
);

return {
selectedClientIds: selectedBlockClientIds,
selectedBlocks: _selectedBlocks,
hasPositionAttribute: _selectedBlocks?.some(
( { attributes } ) =>
hasAnyPositionValue( attributes?.style )
),
};
}, [] );

const registry = useRegistry();
const { updateBlockAttributes } = useDispatch( blockEditorStore );
const dropdownMenuProps = useToolsPanelDropdownMenuProps();

Expand All @@ -87,9 +76,14 @@ const PositionControlsPanel = () => {
return;
}

const { getSelectedBlockStyleState } = unlock(
registry.select( blockEditorStore )
);
const attributesByClientId = Object.fromEntries(
selectedBlocks?.map( ( { clientId, attributes } ) => {
const viewport = selectedStateViewports[ clientId ];
const viewport = getPositionStateViewport(
getSelectedBlockStyleState( clientId )
);
const style = { ...attributes?.style };

if ( viewport ) {
Expand Down
Loading