Skip to content

[6.x] Fix asset selector drag-to-upload covering footer but not handling drops #14551

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
jasonvarga merged 4 commits into from
Apr 29, 2026
Merged

[6.x] Fix asset selector drag-to-upload covering footer but not handling drops #14551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d23447
Dragging file to asset selector's footer should upload it
duncanmcclean Apr 27, 2026
4a2bc20
only apply `h-full` in the asset selector
duncanmcclean Apr 27, 2026
561b3cc
Revert "only apply `h-full` in the asset selector"
duncanmcclean Apr 27, 2026
b842953
Avoid making Uploader instance reactive
jasonvarga Apr 28, 2026
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
13 changes: 9 additions & 4 deletions resources/js/components/assets/Browser/Browser.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<div ref="browser" class="h-full" @keydown.shift="shiftDown" @keyup="clearShift">
<Uploader
ref="uploader"
ref="internalUploader"
:container="container.id"
:path="path"
:enabled="!preventDragging && canUpload"
:enabled="!uploader && !preventDragging && canUpload"
@updated="uploadsUpdated"
@upload-complete="uploadCompleted"
@error="uploadError"
Expand Down Expand Up @@ -272,6 +272,10 @@ export default {
type: Array,
default: () => [],
},
uploader: {
type: Object,
default: null,
},
},

setup() {
Expand Down Expand Up @@ -476,8 +480,9 @@ export default {
this.loadAssets();
},

path() {
path(path) {
this.loadAssets();
this.$emit('path-changed', path);
},

searchQuery() {
Expand Down Expand Up @@ -676,7 +681,7 @@ export default {
},

openFileBrowser() {
this.$refs.uploader.browse();
(this.uploader || this.$refs.internalUploader).browse();
},

selectFolder(path) {
Expand Down
146 changes: 87 additions & 59 deletions resources/js/components/assets/Selector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,96 @@
<template>
<div class="h-full">
<div class="flex h-full min-h-0 flex-col">
<div class="flex flex-1 flex-col gap-4 overflow-auto p-4">
<AssetBrowser
:container="container"
:initial-per-page="$config.get('paginationSize')"
:initial-columns="columns"
:selected-path="folder"
:selected-assets="browserSelections"
:restrict-folder-navigation="restrictFolderNavigation"
:max-files="maxFiles"
:query-scopes="queryScopes"
:autoselect-uploads="true"
allow-selecting-existing-upload
:allow-bulk-actions="false"
@selections-updated="selectionsUpdated"
@edit-asset="toggleAssetSelection"
@initialized="focusSearchInput"
>
<template #initializing>
<div class="flex flex-1">
<div class="absolute inset-0 z-200 flex items-center justify-center text-center">
<Icon name="loading" />
</div>
</div>
</template>
<Uploader
ref="uploader"
:container="container.id"
:path="currentPath"
:enabled="container.can_upload"
@updated="(uploads) => $refs.browser?.uploadsUpdated(uploads)"
@upload-complete="(asset) => $refs.browser?.uploadCompleted(asset)"
@error="(upload, uploads) => $refs.browser?.uploadError(upload, uploads)"
v-slot="{ dragging }"
>
<div class="relative h-full">
<div class="drag-notification" v-show="dragging">
<Icon name="upload-cloud-large" class="m-4 size-13" />
<span>{{ __('Drop File to Upload') }}</span>
</div>

<template #header="{ canUpload, openFileBrowser, canCreateFolders, startCreatingFolder, mode, modeChanged }">
<div class="flex items-center gap-2 sm:gap-3 mb-4">
<div class="flex flex-1 items-center gap-2 sm:gap-3">
<Search ref="search" />
<div class="flex h-full min-h-0 flex-col">
<div class="flex flex-1 flex-col gap-4 overflow-auto p-4">
<AssetBrowser
ref="browser"
:container="container"
:initial-per-page="$config.get('paginationSize')"
:initial-columns="columns"
:selected-path="folder"
:selected-assets="browserSelections"
:restrict-folder-navigation="restrictFolderNavigation"
:max-files="maxFiles"
:query-scopes="queryScopes"
:autoselect-uploads="true"
:uploader="uploaderInstance"
allow-selecting-existing-upload
:allow-bulk-actions="false"
@selections-updated="selectionsUpdated"
@edit-asset="toggleAssetSelection"
@initialized="focusSearchInput"
@path-changed="currentPath = $event"
>
<template #initializing>
<div class="flex flex-1">
<div class="absolute inset-0 z-200 flex items-center justify-center text-center">
<Icon name="loading" />
</div>
</div>
</template>

<Button v-if="canUpload" :text="__('Upload')" icon="upload" @click="openFileBrowser" />
<Button v-if="canCreateFolders" :text="__('Create Folder')" icon="folder-add" @click="startCreatingFolder" />
<template #header="{ canUpload, openFileBrowser, canCreateFolders, startCreatingFolder, mode, modeChanged }">
<div class="flex items-center gap-2 sm:gap-3 mb-4">
<div class="flex flex-1 items-center gap-2 sm:gap-3">
<Search ref="search" />
</div>

<ToggleGroup :model-value="mode" @update:model-value="modeChanged">
<ToggleItem icon="layout-grid" value="grid" />
<ToggleItem icon="layout-list" value="table" />
</ToggleGroup>
</div>
</template>
</AssetBrowser>
</div>
<Button v-if="canUpload" :text="__('Upload')" icon="upload" @click="openFileBrowser" />
<Button v-if="canCreateFolders" :text="__('Create Folder')" icon="folder-add" @click="startCreatingFolder" />

<ToggleGroup :model-value="mode" @update:model-value="modeChanged">
<ToggleItem icon="layout-grid" value="grid" />
<ToggleItem icon="layout-list" value="table" />
</ToggleGroup>
</div>
</template>
</AssetBrowser>
</div>

<div class="flex items-center justify-between border-t bg-gray-100 dark:bg-gray-850 dark:border-gray-700 px-4 py-2 sm:p-4">
<div
class="dark:text-gray-200 text-sm text-gray-700"
v-text="
hasMaxFiles
? __n(':count/:max selected', browserSelections, { max: maxFiles })
: __n(':count asset selected|:count assets selected', browserSelections)
"
/>

<div class="flex items-center space-x-3">
<Button variant="ghost" @click="close">
{{ __('Cancel') }}
</Button>

<Button variant="primary" @click="select">
{{ __('Select') }}
</Button>
<div class="flex items-center justify-between border-t bg-gray-100 dark:bg-gray-850 dark:border-gray-700 px-4 py-2 sm:p-4">
<div
class="dark:text-gray-200 text-sm text-gray-700"
v-text="
hasMaxFiles
? __n(':count/:max selected', browserSelections, { max: maxFiles })
: __n(':count asset selected|:count assets selected', browserSelections)
"
/>

<div class="flex items-center space-x-3">
<Button variant="ghost" @click="close">
{{ __('Cancel') }}
</Button>

<Button variant="primary" @click="select">
{{ __('Select') }}
</Button>
</div>
</div>
</div>
</div>
</div>
</Uploader>
</template>

<script>
import { markRaw } from 'vue';
import AssetBrowser from './Browser/Browser.vue'
import Uploader from './Uploader.vue'
import {
Button,
ToggleGroup,
Expand All @@ -92,6 +113,7 @@ export default {

components: {
Uploads,
Uploader,
PanelHeader, Grid,
Slider,
ListingPagination, Breadcrumbs,
Expand Down Expand Up @@ -128,9 +150,15 @@ export default {
// We only want selection changes to be reflected in the fieldtype once the user is ready to commit
// them. They should be able to cancel at any time and have their updated selections discarded.
browserSelections: this.selected,
currentPath: this.folder,
uploaderInstance: null,
};
},

mounted() {
this.uploaderInstance = markRaw(this.$refs.uploader);
},

computed: {
hasMaxFiles() {
return this.maxFiles === Infinity ? false : Boolean(this.maxFiles);
Expand Down
16 changes: 11 additions & 5 deletions resources/js/components/assets/Uploader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,23 @@ export default {
ref: 'nativeFileField',
});

const events = this.enabled
? {
onDragenter: this.dragenter,
onDragover: this.dragover,
onDragleave: this.dragleave,
onDrop: this.drop,
}
: {};

return h(
'div',
{
class: 'h-full',
onDragenter: this.dragenter,
onDragover: this.dragover,
onDragleave: this.dragleave,
onDrop: this.drop,
...events,
},
[
h('div', { class: { 'pointer-events-none': this.dragging } }, [
h('div', { class: ['h-full', { 'pointer-events-none': this.dragging }] }, [
fileField,
...this.$slots.default({ dragging: this.enabled ? this.dragging : false }),
]),
Expand Down
Loading