Skip to content

Commit 3057e35

Browse files
committed
Reverse tab order of Mock menu items
I think maybe these were previously reversed so that you could shift-tab into the collapse/save button? A bit weird and confusing though, better to match visual order I think.
1 parent e7a0f69 commit 3057e35

File tree

3 files changed

+34
-35
lines changed

3 files changed

+34
-35
lines changed

src/components/mock/mock-item-menu.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as _ from 'lodash';
22
import * as React from 'react';
33

4-
import { styled, css } from '../../styles';
4+
import { styled } from '../../styles';
55
import { IconProp } from '../../icons';
66

77
import { IconButton } from '../common/icon-button';
@@ -12,7 +12,6 @@ export const IconMenu = styled.div<{ topOffset: number }>`
1212
right: 10px;
1313
1414
display: none; /* Made flex by container, on hover/expand */
15-
flex-direction: row-reverse;
1615
align-items: center;
1716
`;
1817

src/components/mock/mock-rule-group.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@ const RuleGroupMenu = (p: {
6868
onDelete: (event: React.MouseEvent) => void,
6969
}) => <IconMenu topOffset={-2}>
7070
<IconMenuButton
71-
title='Delete these rules'
72-
icon={['far', 'trash-alt']}
73-
onClick={p.onDelete}
71+
title={p.toggleState ? 'Deactivate these rules' : 'Activate these rules'}
72+
icon={['fas', p.toggleState ? 'toggle-on' : 'toggle-off']}
73+
onClick={p.onToggleActivation}
7474
/>
7575
<IconMenuButton
7676
title='Clone this rule'
7777
icon={['far', 'clone']}
7878
onClick={p.onClone}
7979
/>
8080
<IconMenuButton
81-
title={p.toggleState ? 'Deactivate these rules' : 'Activate these rules'}
82-
icon={['fas', p.toggleState ? 'toggle-on' : 'toggle-off']}
83-
onClick={p.onToggleActivation}
81+
title='Delete these rules'
82+
icon={['far', 'trash-alt']}
83+
onClick={p.onDelete}
8484
/>
8585
</IconMenu>;
8686

src/components/mock/mock-rule-row.tsx

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -220,33 +220,6 @@ const RuleMenu = (p: {
220220
onToggleActivation: (event: React.UIEvent) => void,
221221
onDelete: (event: React.UIEvent) => void,
222222
}) => <RuleMenuContainer topOffset={7}>
223-
<IconMenuButton
224-
title='Delete this rule'
225-
icon={['far', 'trash-alt']}
226-
onClick={p.onDelete}
227-
/>
228-
<IconMenuButton
229-
title='Clone this rule'
230-
icon={['far', 'clone']}
231-
onClick={p.onClone}
232-
/>
233-
<IconMenuButton
234-
title={p.toggleState ? 'Deactivate this rule' : 'Activate this rule'}
235-
icon={['fas', p.toggleState ? 'toggle-on' : 'toggle-off']}
236-
onClick={p.onToggleActivation}
237-
/>
238-
<IconMenuButton
239-
title='Give this rule a custom name'
240-
icon={['fas', 'edit']}
241-
disabled={p.isEditingTitle}
242-
onClick={p.onSetCustomTitle}
243-
/>
244-
<IconMenuButton
245-
title='Revert this rule to the last saved version'
246-
icon={['fas', 'undo']}
247-
disabled={!p.hasUnsavedChanges || p.isNewRule}
248-
onClick={p.onReset}
249-
/>
250223
<IconMenuButton
251224
icon={['fas',
252225
p.hasUnsavedChanges
@@ -262,6 +235,33 @@ const RuleMenu = (p: {
262235
: 'Hide rule details'}
263236
onClick={p.hasUnsavedChanges ? p.onSave : p.onToggleCollapse}
264237
/>
238+
<IconMenuButton
239+
title='Revert this rule to the last saved version'
240+
icon={['fas', 'undo']}
241+
disabled={!p.hasUnsavedChanges || p.isNewRule}
242+
onClick={p.onReset}
243+
/>
244+
<IconMenuButton
245+
title='Give this rule a custom name'
246+
icon={['fas', 'edit']}
247+
disabled={p.isEditingTitle}
248+
onClick={p.onSetCustomTitle}
249+
/>
250+
<IconMenuButton
251+
title={p.toggleState ? 'Deactivate this rule' : 'Activate this rule'}
252+
icon={['fas', p.toggleState ? 'toggle-on' : 'toggle-off']}
253+
onClick={p.onToggleActivation}
254+
/>
255+
<IconMenuButton
256+
title='Clone this rule'
257+
icon={['far', 'clone']}
258+
onClick={p.onClone}
259+
/>
260+
<IconMenuButton
261+
title='Delete this rule'
262+
icon={['far', 'trash-alt']}
263+
onClick={p.onDelete}
264+
/>
265265
</RuleMenuContainer>;
266266

267267
const extendRowDraggableStyles = (

0 commit comments

Comments
 (0)