@@ -16,33 +16,27 @@ import { unlock } from '../../lock-unlock';
1616
1717export default function BlockVisibilityViewportToolbar ( { clientIds } ) {
1818 const hasBlockVisibilityButtonShownRef = useRef ( false ) ;
19- const { canToggleBlockVisibility, areBlocksHiddenAnywhere, isModalOpen } =
20- useSelect (
21- ( select ) => {
22- const {
23- getBlocksByClientId,
24- getBlockName,
25- isBlockHiddenAnywhere,
26- getViewportModalClientIds,
27- } = unlock ( select ( blockEditorStore ) ) ;
28- const _blocks = getBlocksByClientId ( clientIds ) ;
29- return {
30- canToggleBlockVisibility : _blocks . every ( ( { clientId } ) =>
31- hasBlockSupport (
32- getBlockName ( clientId ) ,
33- 'visibility' ,
34- true
35- )
36- ) ,
37- areBlocksHiddenAnywhere : clientIds ?. every ( ( clientId ) =>
38- isBlockHiddenAnywhere ( clientId )
39- ) ,
40- isModalOpen : getViewportModalClientIds ( ) !== null ,
41- } ;
42- } ,
19+ const { canToggleBlockVisibility, areBlocksHiddenAnywhere } = useSelect (
20+ ( select ) => {
21+ const { getBlocksByClientId, getBlockName, isBlockHiddenAnywhere } =
22+ unlock ( select ( blockEditorStore ) ) ;
23+ const _blocks = getBlocksByClientId ( clientIds ) ;
24+ return {
25+ canToggleBlockVisibility : _blocks . every ( ( { clientId } ) =>
26+ hasBlockSupport (
27+ getBlockName ( clientId ) ,
28+ 'visibility' ,
29+ true
30+ )
31+ ) ,
32+ areBlocksHiddenAnywhere : clientIds ?. every ( ( clientId ) =>
33+ isBlockHiddenAnywhere ( clientId )
34+ ) ,
35+ } ;
36+ } ,
4337
44- [ clientIds ]
45- ) ;
38+ [ clientIds ]
39+ ) ;
4640 const blockEditorDispatch = useDispatch ( blockEditorStore ) ;
4741
4842 /*
@@ -76,7 +70,6 @@ export default function BlockVisibilityViewportToolbar( { clientIds } ) {
7670 areBlocksHiddenAnywhere ? __ ( 'Hidden' ) : __ ( 'Visible' )
7771 }
7872 onClick = { ( ) => showViewportModal ( clientIds ) }
79- aria-expanded = { isModalOpen }
8073 aria-haspopup = "dialog"
8174 />
8275 </ ToolbarGroup >
0 commit comments