Merge branch 'master' into fix/issue-7234

primefaces · Sep 25, 2024 · 41800fa · 41800fa
2 parents 232417c + ff3b083
commit 41800fa
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 6 deletions.
diff --git a/components/doc/common/apidoc/index.json b/components/doc/common/apidoc/index.json
@@ -32152,6 +32152,12 @@
                             "readonly": false,
                             "type": "InputTextProps"
                         },
+                        {
+                            "name": "parent",
+                            "optional": false,
+                            "readonly": false,
+                            "type": "InputTextPassThroughMethodOptions"
+                        },
                         {
                             "name": "context",
                             "optional": false,

diff --git a/components/doc/password/theming/tailwinddoc.js b/components/doc/password/theming/tailwinddoc.js
@@ -40,6 +40,9 @@ const Tailwind = {
         hideicon: {
             className: classNames('absolute top-1/2 -mt-2', 'right-3 text-gray-600 dark:text-white/70')
         },
+        inputIcon: {
+            root: 'mt-0'
+        },
         transition: TRANSITIONS.overlay
     }
 }

diff --git a/components/lib/inputtext/inputtext.d.ts b/components/lib/inputtext/inputtext.d.ts
@@ -22,6 +22,7 @@ export declare type InputTextPassThroughType<T> = PassThroughType<T, InputTextPa
  */
 export interface InputTextPassThroughMethodOptions {
     props: InputTextProps;
+    parent: InputTextPassThroughMethodOptions;
     context: InputTextContext;
 }
 

diff --git a/components/lib/passthrough/tailwind/index.js b/components/lib/passthrough/tailwind/index.js
@@ -1073,6 +1073,9 @@ const Tailwind = {
         hideIcon: {
             className: classNames('absolute top-1/2 -mt-2', 'right-3 text-gray-600 dark:text-white/70')
         },
+        inputIcon: {
+            root: 'mt-0'
+        },
         transition: TRANSITIONS.overlay
     },
     togglebutton: {

diff --git a/components/lib/password/Password.js b/components/lib/password/Password.js
@@ -483,7 +483,9 @@ export const Password = React.memo(
             input = (
                 <IconField className={cx('iconField')} pt={ptm('iconField')} __parentMetadata={{ parent: metaData }}>
                     {input}
-                    <InputIcon>{icon}</InputIcon>
+                    <InputIcon className={cx('inputIcon')} pt={ptm('inputIcon')} __parentMetadata={{ parent: metaData }}>
+                        {icon}
+                    </InputIcon>
                 </IconField>
             );
         }

diff --git a/components/lib/scrollpanel/ScrollPanel.js b/components/lib/scrollpanel/ScrollPanel.js
@@ -70,14 +70,22 @@ export const ScrollPanel = React.forwardRef((inProps, ref) => {
                 DomHandler.addClass(xBarRef.current, 'p-scrollpanel-hidden');
             } else {
                 DomHandler.removeClass(xBarRef.current, 'p-scrollpanel-hidden');
-                xBarRef.current.style.cssText = 'width:' + Math.max(scrollXRatio.current * 100, 10) + '%; left:' + (contentRef.current.scrollLeft / totalWidth) * 100 + '%;bottom:' + bottom + 'px;';
+                DomHandler.applyStyle(xBarRef.current, {
+                    width: Math.max(scrollXRatio.current * 100, 10) + '%',
+                    left: (contentRef.current.scrollLeft / totalWidth) * 100 + '%',
+                    bottom: bottom + 'px'
+                });
             }
 
             if (scrollYRatio.current >= 1) {
                 DomHandler.addClass(yBarRef.current, 'p-scrollpanel-hidden');
             } else {
                 DomHandler.removeClass(yBarRef.current, 'p-scrollpanel-hidden');
-                yBarRef.current.style.cssText = 'height:' + Math.max(scrollYRatio.current * 100, 10) + '%; top: calc(' + (contentRef.current.scrollTop / totalHeight) * 100 + '% - ' + xBarRef.current.clientHeight + 'px);right:' + right + 'px;';
+                DomHandler.applyStyle(yBarRef.current, {
+                    height: Math.max(scrollYRatio.current * 100, 10) + '%',
+                    top: 'calc(' + (contentRef.current.scrollTop / totalHeight) * 100 + '% - ' + xBarRef.current.clientHeight + 'px)',
+                    right: right + 'px'
+                });
             }
         });
     };

diff --git a/components/lib/utils/DomHandler.js b/components/lib/utils/DomHandler.js
@@ -1055,9 +1055,9 @@ export default class DomHandler {
 
     static applyStyle(element, style) {
         if (typeof style === 'string') {
-            element.style.cssText = this.style;
+            element.style.cssText = style;
         } else {
-            for (let prop in this.style) {
+            for (let prop in style) {
                 element.style[prop] = style[prop];
             }
         }

diff --git a/components/lib/utils/utils.d.ts b/components/lib/utils/utils.d.ts
@@ -87,7 +87,7 @@ export declare class DomHandler {
     static getCursorOffset(el: HTMLElement, prevText?: string, nextText?: string, currentText?: string): { top: any; left: any };
     static invokeElementMethod(el: HTMLElement, methodName: string, arg: any): void;
     static isClickable(el: HTMLElement): boolean;
-    static applyStyle(el: HTMLElement, style: any): void;
+    static applyStyle(el: HTMLElement, style: React.CSSProperties | string): void;
     static exportCSV(csv: any, filename: string): void;
     static saveAs(file: { name: string; url: any }): boolean;
     static createInlineStyle(nonce?: string, styleContainer?: ShadowRoot | HTMLElement): HTMLStyleElement;