Skip to content

fix(files): Add transition to buttons and take buttons away from mobile view #7030

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

Merged
juliusknorr merged 1 commit into from
Apr 16, 2025
Merged

fix(files): Add transition to buttons and take buttons away from mobile view #7030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/components/Menu/entries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import ActionAttachmentUpload from './ActionAttachmentUpload.vue'
import ActionInsertLink from './ActionInsertLink.vue'

import { MODIFIERS } from './keys.js'
import { isMobileDevice } from '../../helpers/isMobileDevice.js'

export const OutlineEntries = [{
key: 'outline',
Expand Down Expand Up @@ -70,8 +71,6 @@ export const ReadOnlyDoneEntries = [{
click: ({ $readOnlyActions }) => $readOnlyActions.toggle(),
}]

const isMobileDevice = /Android|iPhone|iPad|iPod/i.test(navigator.userAgent)

export const MenuEntries = [
{
key: 'undo',
Expand Down
108 changes: 59 additions & 49 deletions src/components/SuggestionsBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,56 +4,50 @@
-->

<template>
<div v-if="isEmptyContent" class="container-suggestions">
<NcButton ref="linkFileOrFolder"
type="secondary"
size="normal"
class="suggestions--button"
@click="linkFile">
<template #icon>
<Document :size="20" />
</template>
<template v-if="!isMobile" #default>
<transition name="fade">
<div v-if="isEmptyContent && !isMobileDevice" class="container-suggestions">
<NcButton ref="linkFileOrFolder"
type="secondary"
size="normal"
class="suggestions--button"
@click="linkFile">
<template #icon>
<Document :size="20" />
</template>
{{ t('text', 'Link to file or folder') }}
</template>
</NcButton>

<NcButton type="secondary"
size="normal"
class="suggestions--button"
@click="$callChooseLocalAttachment">
<template #icon>
<Upload :size="20" />
</template>
<template v-if="!isMobile" #default>
</NcButton>

<NcButton type="secondary"
size="normal"
class="suggestions--button"
@click="$callChooseLocalAttachment">
<template #icon>
<Upload :size="20" />
</template>
{{ t('text', 'Upload') }}
</template>
</NcButton>

<NcButton type="secondary"
size="normal"
class="suggestions--button"
@click="insertTable">
<template #icon>
<TableIcon :size="20" />
</template>
<template v-if="!isMobile" #default>
</NcButton>

<NcButton type="secondary"
size="normal"
class="suggestions--button"
@click="insertTable">
<template #icon>
<TableIcon :size="20" />
</template>
{{ t('text', 'Insert Table') }}
</template>
</NcButton>

<NcButton type="secondary"
size="normal"
class="suggestions--button"
@click="linkPicker">
<template #icon>
<Shape :size="20" />
</template>
<template v-if="!isMobile" #default>
</NcButton>

<NcButton type="secondary"
size="normal"
class="suggestions--button"
@click="linkPicker">
<template #icon>
<Shape :size="20" />
</template>
{{ t('text', 'Smart Picker') }}
</template>
</NcButton>
</div>
</NcButton>
</div>
</transition>
</template>

<script>
Expand All @@ -64,7 +58,7 @@ import { getLinkWithPicker } from '@nextcloud/vue/dist/Components/NcRichText.js'
import { useEditorMixin, useFileMixin } from './Editor.provider.js'
import { generateUrl } from '@nextcloud/router'
import { buildFilePicker } from '../helpers/filePicker.js'
import { useIsMobile } from '@nextcloud/vue/composables/useIsMobile'
import { isMobileDevice } from '../helpers/isMobileDevice.js'

export default {
name: 'SuggestionsBar',
Expand All @@ -82,9 +76,8 @@ export default {
],

setup() {
const isMobile = useIsMobile()
return {
isMobile,
isMobileDevice,
}
},

Expand Down Expand Up @@ -191,9 +184,26 @@ export default {
.container-suggestions {
display: flex;
margin-left: max(0px, (100% - var(--text-editor-max-width)) / 2);
flex-wrap: wrap;
}

.suggestions--button {
margin: 5px;
}

.fade-enter-active,
.fade-leave-active {
transition: opacity var(--animation-slow) ease-in-out;
}

.fade-enter-to,
.fade-leave {
opacity: 1;
}

.fade-enter,
.fade-leave-to {
opacity: 0;
}

</style>
6 changes: 6 additions & 0 deletions src/helpers/isMobileDevice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

export const isMobileDevice = /Android|iPhone|iPad|iPod/i.test(navigator.userAgent)
Loading