Refactor on VirtualScroller. Related - #4226

primefaces · Apr 17, 2023 · c034168 · c034168
1 parent f4164ba
commit c034168
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/components/lib/virtualscroller/VirtualScroller.js b/components/lib/virtualscroller/VirtualScroller.js
@@ -584,15 +584,15 @@ export const VirtualScroller = React.memo(
 
         const createLoader = () => {
             const iconClassName = 'p-virtualscroller-loading-icon';
-            const icon = props.loaderIcon || <SpinnerIcon className={iconClassName} spin />;
+            const icon = props.loadingIcon || <SpinnerIcon className={iconClassName} spin />;
             const loadingIcon = IconUtils.getJSXIcon(icon, { className: iconClassName }, { props });
 
             if (!props.loaderDisabled && props.showLoader && loadingState) {
                 const className = classNames('p-virtualscroller-loader', {
                     'p-component-overlay': !props.loadingTemplate
                 });
 
-                let content = <i> {loadingIcon} </i>;
+                let content = loadingIcon;
 
                 if (props.loadingTemplate) {
                     content = loaderArrState.map((_, index) => {

diff --git a/components/lib/virtualscroller/virtualscroller.d.ts b/components/lib/virtualscroller/virtualscroller.d.ts
@@ -197,10 +197,6 @@ interface VirtualScrollerContentTemplateOptions {
      * Template of loading item.
      */
     loadingTemplate: React.ReactNode | ((options: VirtualScrollerLoadingTemplateOptions) => React.ReactNode);
-    /**
-     * Icon of the loading icon.
-     */
-    loadingIcon: IconType<VirtualScrollerProps> | number[];
     /**
      * The height/width of item according to orientation.
      */
@@ -362,12 +358,17 @@ export interface VirtualScrollerProps {
      * @defaultValue false
      */
     showLoader?: boolean | undefined;
+    /**
+     * The icon to show while indicating data load is in progress.
+     */
+    loadingIcon?: IconType<VirtualScrollerProps> | undefined;
     /**
      * The template of loader.
      */
     loadingTemplate?: React.ReactNode | ((options: VirtualScrollerLoadingTemplateOptions) => React.ReactNode);
     /**
      * The template of loader's icon.
+     * @deprecated Since v9.2.3, use `loadingIcon` instead.
      */
     loaderIconTemplate?: React.ReactNode | ((options: VirtualScrollerLoaderIconTemplateOptions) => React.ReactNode);
     /**