Skip to content

Commit 7741519

Browse files
committed
Add an error state class for when folders are created with no name. Otherwise we can't differentiate between the placeholder in place when folders are being created and an error state
1 parent 59f5f5c commit 7741519

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

resources/css/components/assets.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@
113113
grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
114114

115115
[data-placeholder-shown] {
116-
@apply overflow-hidden mt-2 text-center font-mono text-red-600 dark:text-red-600 text-xs text-ellipsis whitespace-nowrap lowercase;
116+
@apply overflow-hidden mt-2 text-center font-mono text-xs text-ellipsis whitespace-nowrap lowercase;
117+
&:has(+ .st-has-error) {
118+
@apply text-red-600 dark:text-red-600;
119+
}
117120
}
118121
}
119122

resources/js/components/assets/Browser/AssetBrowserMixin.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export default {
88
path: String,
99
restrictFolderNavigation: Boolean,
1010
creatingFolder: Boolean,
11+
folderError: Boolean,
1112
},
1213

1314
data() {

resources/js/components/assets/Browser/Browser.vue

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ export default {
266266
searchQuery: '',
267267
editedAssetId: this.initialEditingAssetId,
268268
creatingFolder: false,
269+
folderError: false,
269270
uploads: [],
270271
page: 1,
271272
preferencesPrefix: `assets.${this.container.id}`,
@@ -364,6 +365,7 @@ export default {
364365
restrictFolderNavigation: this.restrictFolderNavigation,
365366
path: this.path,
366367
creatingFolder: this.creatingFolder,
368+
folderError: this.folderError,
367369
};
368370
},
369371
@@ -375,7 +377,10 @@ export default {
375377
'edit-asset': (event) => this.$emit('edit-asset', event),
376378
'select-folder': this.selectFolder,
377379
'create-folder': this.createFolder,
378-
'cancel-creating-folder': () => (this.creatingFolder = false),
380+
'cancel-creating-folder': () => {
381+
this.creatingFolder = false;
382+
this.folderError = false;
383+
},
379384
'prevent-dragging': (preventDragging) => (this.preventDragging = preventDragging),
380385
};
381386
},
@@ -446,6 +451,7 @@ export default {
446451
447452
startCreatingFolder() {
448453
this.creatingFolder = true;
454+
this.folderError = false;
449455
},
450456
451457
listingRequestCompleted({ response }) {
@@ -559,6 +565,7 @@ export default {
559565
this.folders.push(response.data);
560566
this.folders = sortBy(this.folders, 'title');
561567
this.creatingFolder = false;
568+
this.folderError = false;
562569
563570
this.$refs.grid?.clearNewFolderName();
564571
this.$refs.table?.clearNewFolderName();
@@ -571,10 +578,12 @@ export default {
571578
? this.$toast.error(errors.directory[0])
572579
: this.$toast.error(message);
573580
581+
this.folderError = true;
574582
this.$refs.grid?.focusNewFolderInput();
575583
this.$refs.table?.focusNewFolderInput();
576584
} else {
577585
this.$toast.error(__('Something went wrong'));
586+
this.folderError = true;
578587
}
579588
});
580589
},

resources/js/components/assets/Browser/Grid.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@
6666
:start-with-edit-mode="true"
6767
submit-mode="enter"
6868
:placeholder="__('Name')"
69-
class="flex w-[80px] items-center placeholder:lowercase justify-center overflow-hidden mt-2 text-center font-mono text-xs text-ellipsis whitespace-nowrap placeholder:text-gray-400 dark:placeholder:text-gray-500 text-gray-500"
69+
:class="[
70+
'flex w-[80px] items-center placeholder:lowercase justify-center overflow-hidden mt-2 text-center font-mono text-xs text-ellipsis whitespace-nowrap placeholder:text-gray-400 dark:placeholder:text-gray-500 text-gray-500',
71+
{ 'st-has-error': folderError }
72+
]"
7073
@submit="$emit('create-folder', newFolderName)"
7174
@cancel="
7275
() => {

0 commit comments

Comments
 (0)