Skip to content

Commit 07669f4

Browse files
committed
fix: Changed the order of the Save and Cancel buttons
1 parent ad06e85 commit 07669f4

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Changed the order of the "Save" and "Cancel" buttons on the sharing page to improve accessibility. @Wagner3UB

packages/volto/src/components/manage/Sharing/Sharing.jsx

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,19 @@ class SharingComponent extends Component {
485485
/>
486486
</p>
487487
</Segment>
488-
<Segment className="actions" attached clearing>
488+
<Segment className="right aligned actions" attached clearing>
489+
<Button
490+
basic
491+
secondary
492+
aria-label={this.props.intl.formatMessage(messages.cancel)}
493+
title={this.props.intl.formatMessage(messages.cancel)}
494+
onClick={this.onCancel}
495+
>
496+
<Icon className="circled" name={clearSVG} size="30px" />
497+
</Button>
489498
<Button
490499
basic
491500
primary
492-
floated="right"
493501
type="submit"
494502
aria-label={this.props.intl.formatMessage(messages.save)}
495503
title={this.props.intl.formatMessage(messages.save)}
@@ -498,16 +506,6 @@ class SharingComponent extends Component {
498506
>
499507
<Icon className="circled" name={aheadSVG} size="30px" />
500508
</Button>
501-
<Button
502-
basic
503-
secondary
504-
aria-label={this.props.intl.formatMessage(messages.cancel)}
505-
title={this.props.intl.formatMessage(messages.cancel)}
506-
floated="right"
507-
onClick={this.onCancel}
508-
>
509-
<Icon className="circled" name={clearSVG} size="30px" />
510-
</Button>
511509
</Segment>
512510
</Form>
513511
</Plug>

packages/volto/src/components/manage/Sharing/__snapshots__/Sharing.test.jsx.snap

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,12 @@ exports[`Sharing > renders a sharing component 1`] = `
144144
</p>
145145
</div>
146146
<div
147-
class="ui clearing attached segment actions"
147+
class="ui clearing attached segment right aligned actions"
148148
>
149149
<button
150-
aria-label="Save"
151-
class="ui basic primary right floated button"
152-
title="Save"
153-
type="submit"
150+
aria-label="Cancel"
151+
class="ui basic secondary button"
152+
title="Cancel"
154153
>
155154
<svg
156155
class="icon circled"
@@ -159,15 +158,16 @@ exports[`Sharing > renders a sharing component 1`] = `
159158
xmlns="http://www.w3.org/2000/svg"
160159
>
161160
<path
162-
d="M18.707 5.293 17.293 6.707 27.586 17 5 17 5 19 27.586 19 17.293 29.293 18.707 30.707 31.414 18z"
161+
d="M27.899 9.515 26.485 8.101 18 16.586 9.514 8.101 8.1 9.515 16.586 18 8.1 26.486 9.514 27.9 18 19.414 26.485 27.9 27.899 26.486 19.414 18z"
163162
fill-rule="evenodd"
164163
/>
165164
</svg>
166165
</button>
167166
<button
168-
aria-label="Cancel"
169-
class="ui basic secondary right floated button"
170-
title="Cancel"
167+
aria-label="Save"
168+
class="ui basic primary button"
169+
title="Save"
170+
type="submit"
171171
>
172172
<svg
173173
class="icon circled"
@@ -176,7 +176,7 @@ exports[`Sharing > renders a sharing component 1`] = `
176176
xmlns="http://www.w3.org/2000/svg"
177177
>
178178
<path
179-
d="M27.899 9.515 26.485 8.101 18 16.586 9.514 8.101 8.1 9.515 16.586 18 8.1 26.486 9.514 27.9 18 19.414 26.485 27.9 27.899 26.486 19.414 18z"
179+
d="M18.707 5.293 17.293 6.707 27.586 17 5 17 5 19 27.586 19 17.293 29.293 18.707 30.707 31.414 18z"
180180
fill-rule="evenodd"
181181
/>
182182
</svg>

0 commit comments

Comments
 (0)