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

Simplify description and option names in the Lock modal dialog #67437

Merged
merged 3 commits into from
Dec 7, 2024
Merged

Simplify description and option names in the Lock modal dialog #67437

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3d32b5
Refactor Lock modal dialog for improved clarity and simplicity
sarthaknagoshe2002 Nov 29, 2024
e72bede
Fix: modify the e2e test cases
sarthaknagoshe2002 Dec 2, 2024
1ef036c
Fix: shorten the text & make it feel more specific
sarthaknagoshe2002 Dec 5, 2024
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
8 changes: 4 additions & 4 deletions packages/block-editor/src/components/block-lock/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export default function BlockLockModal( { clientId, onClose } ) {
<fieldset className="block-editor-block-lock-modal__options">
<legend>
{ __(
'Choose specific attributes to restrict or lock all available options.'
'Choose "Lock all" to disable all actions, or select specific features to lock.'
t-hamano marked this conversation as resolved.
Show resolved Hide resolved
) }
</legend>
{ /*
Expand Down Expand Up @@ -137,7 +137,7 @@ export default function BlockLockModal( { clientId, onClose } ) {
<li className="block-editor-block-lock-modal__checklist-item">
<CheckboxControl
__nextHasNoMarginBottom
label={ __( 'Restrict editing' ) }
label={ __( 'Lock editing' ) }
checked={ !! lock.edit }
onChange={ ( edit ) =>
setLock( ( prevLock ) => ( {
Expand All @@ -159,7 +159,7 @@ export default function BlockLockModal( { clientId, onClose } ) {
<li className="block-editor-block-lock-modal__checklist-item">
<CheckboxControl
__nextHasNoMarginBottom
label={ __( 'Disable movement' ) }
label={ __( 'Lock movement' ) }
checked={ lock.move }
onChange={ ( move ) =>
setLock( ( prevLock ) => ( {
Expand All @@ -178,7 +178,7 @@ export default function BlockLockModal( { clientId, onClose } ) {
<li className="block-editor-block-lock-modal__checklist-item">
<CheckboxControl
__nextHasNoMarginBottom
label={ __( 'Prevent removal' ) }
label={ __( 'Lock removal' ) }
checked={ lock.remove }
onChange={ ( remove ) =>
setLock( ( prevLock ) => ( {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/specs/editor/blocks/columns.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ test.describe( 'Columns', () => {
);
await editor.clickBlockToolbarButton( 'Options' );
await page.click( 'role=menuitem[name="Lock"i]' );
await page.locator( 'role=checkbox[name="Prevent removal"i]' ).check();
await page.locator( 'role=checkbox[name="Lock removal"i]' ).check();
await page.click( 'role=button[name="Apply"i]' );

// Select columns block
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/specs/editor/various/block-locking.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test.describe( 'Block Locking', () => {

await editor.clickBlockOptionsMenuItem( 'Lock' );

await page.click( 'role=checkbox[name="Prevent removal"]' );
await page.click( 'role=checkbox[name="Lock removal"]' );
await page.click( 'role=button[name="Apply"]' );

await expect(
Expand All @@ -35,7 +35,7 @@ test.describe( 'Block Locking', () => {

await editor.clickBlockOptionsMenuItem( 'Lock' );

await page.click( 'role=checkbox[name="Disable movement"]' );
await page.click( 'role=checkbox[name="Lock movement"]' );
await page.click( 'role=button[name="Apply"]' );

// Hide options.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/specs/editor/various/block-switcher.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ test.describe( 'Block Switcher', () => {
await expect( button ).toBeEnabled();

await editor.clickBlockOptionsMenuItem( 'Lock' );
await page.click( 'role=checkbox[name="Prevent removal"]' );
await page.click( 'role=checkbox[name="Lock removal"]' );
await page.click( 'role=button[name="Apply"]' );

// Verify the block switcher isn't enabled.
Expand Down
Loading