Refactor #5426 - For FileUpload

primefaces · Mar 25, 2024 · e879d1d · e879d1d
1 parent 06a6d16
commit e879d1d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 49 deletions.
diff --git a/components/lib/fileupload/FileContent.vue b/components/lib/fileupload/FileContent.vue
@@ -4,15 +4,15 @@
         <div :class="cx('details')" v-bind="ptm('details')">
             <div :class="cx('fileName')" v-bind="ptm('fileName')">{{ file.name }}</div>
             <span :class="cx('fileSize')" v-bind="ptm('fileSize')">{{ formatSize(file.size) }}</span>
-            <FileUploadBadge :value="badgeValue" :class="cx('badge')" :severity="badgeSeverity" :unstyled="unstyled" :pt="ptm('badge')" />
+            <Badge :value="badgeValue" :class="cx('badge')" :severity="badgeSeverity" :unstyled="unstyled" :pt="ptm('badge')" />
         </div>
         <div :class="cx('actions')" v-bind="ptm('actions')">
-            <FileUploadButton @click="$emit('remove', index)" text rounded severity="danger" :class="cx('removeButton')" :unstyled="unstyled" :pt="ptm('removeButton')">
+            <Button @click="$emit('remove', index)" text rounded severity="danger" :class="cx('removeButton')" :unstyled="unstyled" :pt="ptm('removeButton')">
                 <template #icon="iconProps">
                     <component v-if="templates.fileremoveicon" :is="templates.fileremoveicon" :class="iconProps.class" :file="file" :index="index" />
                     <TimesIcon v-else :class="iconProps.class" aria-hidden="true" v-bind="ptm('removeButton')['icon']" />
                 </template>
-            </FileUploadButton>
+            </Button>
         </div>
     </div>
 </template>
@@ -67,8 +67,8 @@ export default {
         }
     },
     components: {
-        FileUploadButton: Button,
-        FileUploadBadge: Badge,
+        Button,
+        Badge,
         TimesIcon
     }
 };

diff --git a/components/lib/fileupload/FileUpload.d.ts b/components/lib/fileupload/FileUpload.d.ts
@@ -208,16 +208,9 @@ export interface FileUploadPassThroughOptions {
     buttonbar?: FileUploadPassThroughOptionType;
     /**
      * Used to pass attributes to the choose button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    chooseButton?: FileUploadPassThroughOptionType;
-    /**
-     * Used to pass attributes to the choose icon's DOM element.
-     */
-    chooseIcon?: FileUploadPassThroughOptionType;
-    /**
-     * Used to pass attributes to the choose button label's DOM element.
-     */
-    chooseButtonLabel?: FileUploadPassThroughOptionType;
+    chooseButton?: ButtonPassThroughOptions<FileUploadPassThroughMethodOptions>;
     /**
      * Used to pass attributes to the upload button's DOM element.
      * @see {@link ButtonPassThroughOptions}
@@ -280,13 +273,10 @@ export interface FileUploadPassThroughOptions {
      */
     empty?: FileUploadPassThroughOptionType;
     /**
-     * Used to pass attributes to the label's DOM element.
-     */
-    label?: FileUploadPassThroughOptionType;
-    /**
-     * Used to pass attributes to the upload icon's DOM element.
+     * Used to pass attributes to the basic mode's button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    uploadIcon?: FileUploadPassThroughOptionType;
+    button?: ButtonPassThroughOptions<FileUploadPassThroughMethodOptions>;
     /**
      * Used to manage all lifecycle hooks.
      * @see {@link BaseComponent.ComponentHooks}

diff --git a/components/lib/fileupload/FileUpload.vue b/components/lib/fileupload/FileUpload.vue
@@ -3,33 +3,34 @@
         <input ref="fileInput" type="file" @change="onFileSelect" :multiple="multiple" :accept="accept" :disabled="chooseDisabled" v-bind="ptm('input')" />
         <div :class="cx('buttonbar')" v-bind="ptm('buttonbar')">
             <slot name="header" :files="files" :uploadedFiles="uploadedFiles" :chooseCallback="choose" :uploadCallback="upload" :clearCallback="clear">
-                <span v-ripple :class="chooseButtonClass" :style="style" @click="choose" @keydown.enter="choose" @focus="onFocus" @blur="onBlur" tabindex="0" v-bind="ptm('chooseButton')">
-                    <slot name="chooseicon" :class="cx('chooseIcon')">
-                        <component :is="chooseIcon ? 'span' : 'PlusIcon'" :class="[cx('chooseIcon'), chooseIcon]" aria-hidden="true" v-bind="ptm('chooseIcon')" />
-                    </slot>
-                    <span :class="cx('chooseButtonLabel')" v-bind="ptm('chooseButtonLabel')">{{ chooseButtonLabel }}</span>
-                </span>
-                <FileUploadButton v-if="showUploadButton" :label="uploadButtonLabel" @click="upload" :disabled="uploadDisabled" :unstyled="unstyled" :pt="ptm('uploadButton')">
+                <Button :label="chooseButtonLabel" :class="chooseButtonClass" :style="style" :disabled="disabled" :unstyled="unstyled" @click="choose" @keydown.enter="choose" @focus="onFocus" @blur="onBlur" :pt="ptm('chooseButton')">
+                    <template #icon="iconProps">
+                        <slot name="chooseicon" :class="cx('chooseIcon')">
+                            <component :is="chooseIcon ? 'span' : 'PlusIcon'" :class="[iconProps.class, cx('chooseIcon'), chooseIcon]" aria-hidden="true" v-bind="ptm('chooseButton')['icon']" />
+                        </slot>
+                    </template>
+                </Button>
+                <Button v-if="showUploadButton" :label="uploadButtonLabel" @click="upload" :disabled="uploadDisabled" :unstyled="unstyled" :pt="ptm('uploadButton')">
                     <template #icon="iconProps">
                         <slot name="uploadicon">
                             <component :is="uploadIcon ? 'span' : 'UploadIcon'" :class="[iconProps.class, uploadIcon]" aria-hidden="true" v-bind="ptm('uploadButton')['icon']" data-pc-section="uploadbuttonicon" />
                         </slot>
                     </template>
-                </FileUploadButton>
-                <FileUploadButton v-if="showCancelButton" :label="cancelButtonLabel" @click="clear" :disabled="cancelDisabled" :unstyled="unstyled" :pt="ptm('cancelButton')">
+                </Button>
+                <Button v-if="showCancelButton" :label="cancelButtonLabel" @click="clear" :disabled="cancelDisabled" :unstyled="unstyled" :pt="ptm('cancelButton')">
                     <template #icon="iconProps">
                         <slot name="cancelicon">
                             <component :is="cancelIcon ? 'span' : 'TimesIcon'" :class="[iconProps.class, cancelIcon]" aria-hidden="true" v-bind="ptm('cancelButton')['icon']" data-pc-section="cancelbuttonicon" />
                         </slot>
                     </template>
-                </FileUploadButton>
+                </Button>
             </slot>
         </div>
         <div ref="content" :class="cx('content')" @dragenter="onDragEnter" @dragover="onDragOver" @dragleave="onDragLeave" @drop="onDrop" v-bind="ptm('content')" :data-p-highlight="false">
             <slot name="content" :files="files" :uploadedFiles="uploadedFiles" :removeUploadedFileCallback="removeUploadedFile" :removeFileCallback="remove" :progress="progress" :messages="messages">
                 <template v-if="hasFiles">
-                    <FileUploadProgressBar :value="progress" :showValue="false" :unstyled="unstyled" :pt="ptm('progressbar')" />
-                    <FileUploadMessage v-for="msg of messages" :key="msg" severity="error" @close="onMessageClose" :unstyled="unstyled" :pt="ptm('message')">{{ msg }}</FileUploadMessage>
+                    <ProgressBar :value="progress" :showValue="false" :unstyled="unstyled" :pt="ptm('progressbar')" />
+                    <Message v-for="msg of messages" :key="msg" severity="error" @close="onMessageClose" :unstyled="unstyled" :pt="ptm('message')">{{ msg }}</Message>
                     <FileContent :files="files" @remove="remove" :badgeValue="pendingLabel" :previewWidth="previewWidth" :templates="$slots" :unstyled="unstyled" :pt="pt" />
                 </template>
                 <FileContent :files="uploadedFiles" @remove="removeUploadedFile" :badgeValue="completedLabel" badgeSeverity="success" :previewWidth="previewWidth" :templates="$slots" :unstyled="unstyled" :pt="pt" />
@@ -40,17 +41,18 @@
         </div>
     </div>
     <div v-else-if="isBasic" :class="cx('root')" v-bind="ptmi('root')">
-        <FileUploadMessage v-for="msg of messages" :key="msg" severity="error" @close="onMessageClose" :unstyled="unstyled" :pt="ptm('messages')">{{ msg }}</FileUploadMessage>
-        <span v-ripple :class="chooseButtonClass" :style="style" @mouseup="onBasicUploaderClick" @keydown.enter="choose" @focus="onFocus" @blur="onBlur" tabindex="0" v-bind="ptm('chooseButton')">
-            <slot v-if="!hasFiles || auto" name="uploadicon" :class="cx('uploadIcon')">
-                <component :is="uploadIcon ? 'span' : 'UploadIcon'" :class="[cx('uploadIcon'), uploadIcon]" aria-hidden="true" v-bind="ptm('uploadIcon')" />
-            </slot>
-            <slot v-else name="chooseicon" :class="cx('chooseIcon')">
-                <component :is="chooseIcon ? 'span' : 'PlusIcon'" :class="[cx('chooseIcon'), chooseIcon]" aria-hidden="true" v-bind="ptm('chooseIcon')" />
-            </slot>
-            <span :class="cx('label')" v-bind="ptm('label')">{{ basicChooseButtonLabel }}</span>
-            <input v-if="!hasFiles" ref="fileInput" type="file" :accept="accept" :disabled="disabled" :multiple="multiple" @change="onFileSelect" @focus="onFocus" @blur="onBlur" v-bind="ptm('input')" />
-        </span>
+        <Message v-for="msg of messages" :key="msg" severity="error" @close="onMessageClose" :unstyled="unstyled" :pt="ptm('messages')">{{ msg }}</Message>
+        <Button :label="basicChooseButtonLabel" :class="chooseButtonClass" :style="style" @mouseup="onBasicUploaderClick" @keydown.enter="choose" @focus="onFocus" @blur="onBlur" v-bind="ptm('button')">
+            <template #icon="iconProps">
+                <slot v-if="!hasFiles || auto" name="uploadicon" :class="cx('uploadIcon')">
+                    <component :is="uploadIcon ? 'span' : 'UploadIcon'" :class="[iconProps.class, cx('uploadIcon'), uploadIcon]" aria-hidden="true" v-bind="ptm('button')['icon']" />
+                </slot>
+                <slot v-else name="chooseicon" :class="cx('chooseIcon')">
+                    <component :is="chooseIcon ? 'span' : 'PlusIcon'" :class="[iconProps.class, cx('chooseIcon'), chooseIcon]" aria-hidden="true" v-bind="ptm('button')['icon']" />
+                </slot>
+            </template>
+        </Button>
+        <input v-if="!hasFiles" ref="fileInput" type="file" :accept="accept" :disabled="disabled" :multiple="multiple" @change="onFileSelect" @focus="onFocus" @blur="onBlur" v-bind="ptm('input')" />
     </div>
 </template>
 
@@ -403,9 +405,9 @@ export default {
         }
     },
     components: {
-        FileUploadButton: Button,
-        FileUploadProgressBar: ProgressBar,
-        FileUploadMessage: Message,
+        Button,
+        ProgressBar,
+        Message,
         FileContent,
         PlusIcon,
         UploadIcon,

diff --git a/components/lib/fileupload/style/FileUploadStyle.js b/components/lib/fileupload/style/FileUploadStyle.js
@@ -4,10 +4,9 @@ const classes = {
     root: ({ props }) => [`p-fileupload p-fileupload-${props.mode} p-component`],
     buttonbar: 'p-fileupload-buttonbar',
     chooseButton: ({ instance, props }) => [
-        'p-component p-fileupload-choose',
+        'p-fileupload-choose',
         {
             'p-fileupload-choose-selected': props.mode === 'basic' && instance.hasFiles,
-            'p-disabled': props.disabled,
             'p-focus': instance.focused
         }
     ],

diff --git a/components/lib/themes/primeone/base/fileupload/index.js b/components/lib/themes/primeone/base/fileupload/index.js
@@ -5,7 +5,7 @@ export default {
     overflow: hidden;
 }
 
-.p-fileupload-choose input[type="file"] {
+.p-fileupload input[type="file"] {
     display: none;
 }