Skip to content

[6.x] Fix asset editor prev/next buttons and "Edit Image" button in Bard #14728

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

Open
joshuablum wants to merge 3 commits into
base: 6.x
Choose a base branch
from
Open

[6.x] Fix asset editor prev/next buttons and "Edit Image" button in Bard #14728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4c00c6
Fix prev/next buttons in asset fieldtype editor
joshuablum May 26, 2026
45a5521
Fix Bard `Edit Image` button
joshuablum May 26, 2026
7d50e17
Hide prev/next buttons when there's just one asset
joshuablum May 26, 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
8 changes: 6 additions & 2 deletions resources/js/components/assets/Editor/Editor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@
</ui-badge>
</div>
<div class="flex items-center space-x-3 rtl:space-x-reverse">
<ui-button icon="chevron-left" @click="navigateToPreviousAsset" v-tooltip="__('Previous Asset')" />
<ui-button icon="chevron-right" @click="navigateToNextAsset" v-tooltip="__('Next Asset')" />
<ui-button v-if="showNavigation" icon="chevron-left" @click="navigateToPreviousAsset" v-tooltip="__('Previous Asset')" />
<ui-button v-if="showNavigation" icon="chevron-right" @click="navigateToNextAsset" v-tooltip="__('Next Asset')" />
<ui-button variant="primary" icon="save" @click="saveAndClose" v-if="!readOnly" :text="__('Save')" />
</div>
</div>
Expand Down Expand Up @@ -239,6 +239,10 @@ export default {
type: Boolean,
default: true,
},
showNavigation: {
type: Boolean,
default: true,
},
allowDeleting: {
type: Boolean,
default() {
Expand Down
31 changes: 28 additions & 3 deletions resources/js/components/fieldtypes/assets/Asset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@ export default {
type: Boolean,
default: true,
},
siblings: {
type: Array,
default: () => [],
},
},

data() {
return {
editing: false,
editingId: null,
};
},

Expand Down Expand Up @@ -73,9 +78,10 @@ export default {

edit() {
if (this.readOnly) return;
if (this.asset.invalid) return;
if (this.asset?.invalid) return;

this.editing = true;
this.editingId = this.asset?.id ?? null;
},

remove() {
Expand All @@ -98,6 +104,7 @@ export default {

closeEditor() {
this.editing = false;
this.editingId = null;
},

assetSaved(asset) {
Expand All @@ -108,10 +115,28 @@ export default {
actionCompleted(successful, response) {
if (successful === false) return;
const id = response.ids[0] || null;
if (id && id !== this.asset.id) {
this.$emit('id-changed', id);
if (id && id !== this.editingId) {
this.$emit('id-changed', this.editingId, id);
}
this.closeEditor();
},

navigateToPrevious() {
const index = this.siblings.findIndex((asset) => asset.id === this.editingId);
if (index <= 0) return;

const previousId = this.siblings[index - 1].id;
this.editingId = null;
this.$nextTick(() => (this.editingId = previousId));
},

navigateToNext() {
const index = this.siblings.findIndex((asset) => asset.id === this.editingId);
if (index === -1 || index >= this.siblings.length - 1) return;

const nextId = this.siblings[index + 1].id;
this.editingId = null;
this.$nextTick(() => (this.editingId = nextId));
},
},
};
7 changes: 5 additions & 2 deletions resources/js/components/fieldtypes/assets/AssetRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,12 @@
/>

<asset-editor
v-if="editing"
:id="asset.id"
v-if="editingId"
:id="editingId"
:allow-deleting="false"
:show-navigation="siblings.length > 1"
@previous="navigateToPrevious"
@next="navigateToNext"
@closed="closeEditor"
@saved="assetSaved"
@action-completed="actionCompleted"
Expand Down
7 changes: 5 additions & 2 deletions resources/js/components/fieldtypes/assets/AssetTile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
:title="asset.invalid ? invalidLabel : label"
>
<asset-editor
v-if="editing"
:id="asset.id"
v-if="editingId"
:id="editingId"
:allow-deleting="false"
:show-navigation="siblings.length > 1"
@previous="navigateToPrevious"
@next="navigateToNext"
@closed="closeEditor"
@saved="assetSaved"
@action-completed="actionCompleted"
Expand Down
6 changes: 4 additions & 2 deletions resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,14 @@
v-for="asset in assets"
:key="asset.id"
:asset="asset"
:siblings="assets"
:read-only="isReadOnly"
:show-filename="config.show_filename"
:show-set-alt="showSetAlt"
:checkerboard-mode="checkerboardMode"
@updated="assetUpdated"
@removed="assetRemoved"
@id-changed="idChanged(asset.id, $event)"
@id-changed="idChanged"
>
</asset-tile>
</div>
Expand Down Expand Up @@ -156,12 +157,13 @@
v-for="asset in assets"
:key="asset.id"
:asset="asset"
:siblings="assets"
:read-only="isReadOnly"
:show-filename="config.show_filename"
:show-set-alt="showSetAlt"
@updated="assetUpdated"
@removed="assetRemoved"
@id-changed="idChanged(asset.id, $event)"
@id-changed="idChanged"
/>
</tbody>
</sortable-list>
Expand Down
1 change: 1 addition & 0 deletions resources/js/components/fieldtypes/bard/Image.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
:id="assetId"
:showToolbar="false"
:allow-deleting="false"
:show-navigation="false"
@closed="closeEditor"
@saved="editorAssetSaved"
@actionCompleted="actionCompleted"
Expand Down
Loading