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

feat: Show share synchronization as a minor action (Part 1) #3250

Merged
merged 12 commits into from
Nov 22, 2024
Merged

feat: Show share synchronization as a minor action (Part 1) #3250

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a6b7fc7
feat: Upgrade cozy-ui to 113.3.0 & cozy-harvest-lib to 30.6.4
Merkur39 Nov 21, 2024
df2024a
refactor: Rename SelectableItem's prop
Merkur39 Nov 20, 2024
f7631f0
fix(DeleteItem): Missing props
Merkur39 Nov 21, 2024
402a6c9
feat: Customize trash action
Merkur39 Nov 21, 2024
2ba37df
fix(PublicFolderView): Add Divider and organise actions in ActionsMenu
Merkur39 Nov 21, 2024
1997c25
feat: Display MoreMenu all the time
Merkur39 Nov 21, 2024
fdaa92b
feat(ActionMenuWithHeader): Remove useless argument in ActionsMenu
Merkur39 Nov 21, 2024
94503ef
feat: Add openExternalLink action
Merkur39 Nov 21, 2024
409d05a
feat: Update french text of the leave shared folder button
Merkur39 Nov 21, 2024
3c2d5c1
feat: Replace the last depreciated ActionMenu's
Merkur39 Nov 21, 2024
f5dd54f
fix: No display actions if no file selected
Merkur39 Nov 22, 2024
212cf25
feat: Returns processing
Merkur39 Nov 22, 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
2 changes: 1 addition & 1 deletion src/modules/drive/Toolbar/components/MoreMenu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const MoreMenu = ({
<DownloadButtonItem displayedFolder={displayedFolder} />
</InsideRegularFolder>
{isMobile && hasWriteAccess && <AddMenuItem />}
<SelectableItem showSelectionBar={showSelectionBar} />
<SelectableItem onClick={showSelectionBar} />
{hasWriteAccess && (
<InsideRegularFolder
displayedFolder={displayedFolder}
Expand Down
7 changes: 3 additions & 4 deletions src/modules/drive/Toolbar/selectable/SelectableItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
/**
* Action to show the selection bar
*/
const SelectableItem = ({ showSelectionBar }) => {
const SelectableItem = ({ onClick }) => {
const { t } = useI18n()

return (
<ActionMenuItem
<ActionMenuItem left={<Icon icon={CheckSquareIcon} />} onClick={onClick}>
Merkur39 marked this conversation as resolved.
Show resolved Hide resolved
left={<Icon icon={CheckSquareIcon} />}
onClick={showSelectionBar}
>
Expand All @@ -23,8 +23,7 @@ const SelectableItem = ({ showSelectionBar }) => {
}

SelectableItem.propTypes = {
/** Function to show the selection bar coming from SelectionBar */
showSelectionBar: PropTypes.func.isRequired
onClick: PropTypes.func.isRequired
}

export default SelectableItem
4 changes: 1 addition & 3 deletions src/modules/public/PublicToolbarMoreMenu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ const PublicToolbarMoreMenu = ({
</ActionMenuItem>
)}
{isMobile && hasWriteAccess && <AddMenuItem />}
{files.length > 1 && (
<SelectableItem showSelectionBar={showSelectionBar} />
)}
{files.length > 1 && <SelectableItem onClick={showSelectionBar} />}
</ActionMenu>
)}
</>
Expand Down