width: 0,
padding: 0,
margin: "1rem auto auto 0.5rem",
- overflow: "hidden",
+ overflowY: 'scroll',
transition: "width 150ms",
},
button: {
export type MultiselectToolbarProps = {
checkedList: TCheckedList;
selectedUuid: string | null
- resources: ResourcesState;
+ iconProps: IconProps
executeMulti: (action: ContextMenuAction, checkedList: TCheckedList, resources: ResourcesState) => void;
- favorites: FavoritesState
};
+type IconProps = {
+ resources: ResourcesState;
+ favorites: FavoritesState
+}
+
export const MultiselectToolbar = connect(
mapStateToProps,
mapDispatchToProps
)(
withStyles(styles)((props: MultiselectToolbarProps & WithStyles<CssRules>) => {
- const { classes, checkedList, resources, selectedUuid, favorites } = props;
+ const { classes, checkedList, selectedUuid: singleSelectedUuid, iconProps } = props;
const currentResourceKinds = Array.from(selectedToKindSet(checkedList));
const currentPathIsTrash = window.location.pathname === "/trash";
const actions =
- currentPathIsTrash && selectedToKindSet(checkedList).size
- ? [msToggleTrashAction]
- : selectActionsByKind(currentResourceKinds, multiselectActionsFilters);
+ currentPathIsTrash && selectedToKindSet(checkedList).size
+ ? [msToggleTrashAction]
+ : selectActionsByKind(currentResourceKinds, multiselectActionsFilters)
+ .filter((action) => (singleSelectedUuid === null ? action.isForMulti : true));
return (
<React.Fragment>
action.hasAlts ? (
<Tooltip
className={classes.button}
- title={action.useAlts(selectedUuid, resources, favorites) ? action.altName: action.name}
+ title={currentPathIsTrash || action.useAlts(singleSelectedUuid, iconProps) ? action.altName : action.name}
key={i}
disableFocusListener
>
- <IconButton onClick={() => props.executeMulti(action, checkedList, resources)}>
- {action.useAlts(selectedUuid, resources, favorites) ? action.altIcon && action.altIcon({}): action.icon({})}
+ <IconButton onClick={() => props.executeMulti(action, checkedList, iconProps.resources)}>
+ {currentPathIsTrash || action.useAlts(singleSelectedUuid, iconProps) ? action.altIcon && action.altIcon({}) : action.icon({})}
</IconButton>
</Tooltip>
) : (
key={i}
disableFocusListener
>
- <IconButton onClick={() => props.executeMulti(action, checkedList, resources)}>{action.icon({})}</IconButton>
+ <IconButton onClick={() => props.executeMulti(action, checkedList, iconProps.resources)}>{action.icon({})}</IconButton>
</Tooltip>
)
)
});
}
-const isExactlyOneSelected = (checkedList: TCheckedList) => {
+export const isExactlyOneSelected = (checkedList: TCheckedList) => {
let tally = 0;
let current = '';
for (const uuid in checkedList) {
//--------------------------------------------------//
-function mapStateToProps(state: RootState) {
+function mapStateToProps({multiselect, resources, favorites}: RootState) {
return {
- checkedList: state.multiselect.checkedList as TCheckedList,
- selectedUuid: isExactlyOneSelected(state.multiselect.checkedList),
- resources: state.resources,
- favorites: state.favorites
- };
+ checkedList: multiselect.checkedList as TCheckedList,
+ selectedUuid: isExactlyOneSelected(multiselect.checkedList),
+ iconProps: {
+ resources,
+ favorites
+ }
+ }
}
function mapDispatchToProps(dispatch: Dispatch) {