From db71189a8c0833589f9a504642c0787f5a5f3cd8 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sat, 25 May 2024 21:41:57 +0200 Subject: [PATCH 1/4] fix: Error in type definition --- components/doc/common/apidoc/index.json | 4 ++-- components/lib/inputtext/inputtext.d.ts | 2 +- package-lock.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/doc/common/apidoc/index.json b/components/doc/common/apidoc/index.json index fda578fbf5..89de0d3f1c 100644 --- a/components/doc/common/apidoc/index.json +++ b/components/doc/common/apidoc/index.json @@ -30412,7 +30412,7 @@ "name": "value", "optional": true, "readonly": false, - "type": "string", + "type": "null | string", "default": "", "description": "The value of component" }, @@ -31914,7 +31914,7 @@ "name": "value", "optional": true, "readonly": false, - "type": "string", + "type": "null | string", "default": "", "description": "The value of component" }, diff --git a/components/lib/inputtext/inputtext.d.ts b/components/lib/inputtext/inputtext.d.ts index 87df9595e3..b7e07ad18d 100644 --- a/components/lib/inputtext/inputtext.d.ts +++ b/components/lib/inputtext/inputtext.d.ts @@ -102,7 +102,7 @@ export interface InputTextProps extends Omit} event - Browser event diff --git a/package-lock.json b/package-lock.json index 87a63854e3..cef6c89e7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "primereact", - "version": "10.6.5", + "version": "10.6.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "primereact", - "version": "10.6.5", + "version": "10.6.6", "dependencies": { "@docsearch/react": "3.5.2", "chart.js": "4.4.2", From 074a0bb6cae1e08babcaaf17ec2a057de59c7f46 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sun, 26 May 2024 00:36:25 +0200 Subject: [PATCH 2/4] fix: emptyMessage prop and default label in unstyled mode --- components/lib/dropdown/Dropdown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/lib/dropdown/Dropdown.js b/components/lib/dropdown/Dropdown.js index 8d0051a036..6593b86aaf 100644 --- a/components/lib/dropdown/Dropdown.js +++ b/components/lib/dropdown/Dropdown.js @@ -1109,7 +1109,7 @@ export const Dropdown = React.memo( return ; } - const content = props.valueTemplate ? ObjectUtils.getJSXElement(props.valueTemplate, selectedOption, props) : label || props.placeholder || 'empty'; + const content = props.valueTemplate ? ObjectUtils.getJSXElement(props.valueTemplate, selectedOption, props) : label || props.placeholder || props.emptyMessage || ''; const inputProps = mergeProps( { ref: inputRef, @@ -1119,7 +1119,7 @@ export const Dropdown = React.memo( ptm('input') ); - return {content}; + return {content || <> }; }; const onClearIconKeyDown = (event) => { From 2008986536330f4d9d371ce1cae1ff99e060bc5c Mon Sep 17 00:00:00 2001 From: Ivan Date: Sun, 26 May 2024 15:59:53 +0100 Subject: [PATCH 3/4] Update components/lib/dropdown/Dropdown.js Co-authored-by: Melloware --- components/lib/dropdown/Dropdown.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/lib/dropdown/Dropdown.js b/components/lib/dropdown/Dropdown.js index 6593b86aaf..f9cc01ea13 100644 --- a/components/lib/dropdown/Dropdown.js +++ b/components/lib/dropdown/Dropdown.js @@ -1119,7 +1119,7 @@ export const Dropdown = React.memo( ptm('input') ); - return {content || <> }; + return {content}; }; const onClearIconKeyDown = (event) => { From e5c45db599a7ac72558929d868da340683d0d85a Mon Sep 17 00:00:00 2001 From: Ivan Date: Sun, 26 May 2024 16:00:03 +0100 Subject: [PATCH 4/4] Update components/lib/dropdown/Dropdown.js Co-authored-by: Melloware --- components/lib/dropdown/Dropdown.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/lib/dropdown/Dropdown.js b/components/lib/dropdown/Dropdown.js index f9cc01ea13..20411f8df5 100644 --- a/components/lib/dropdown/Dropdown.js +++ b/components/lib/dropdown/Dropdown.js @@ -1109,7 +1109,7 @@ export const Dropdown = React.memo( return ; } - const content = props.valueTemplate ? ObjectUtils.getJSXElement(props.valueTemplate, selectedOption, props) : label || props.placeholder || props.emptyMessage || ''; + const content = props.valueTemplate ? ObjectUtils.getJSXElement(props.valueTemplate, selectedOption, props) : label || props.placeholder || props.emptyMessage || <> ; const inputProps = mergeProps( { ref: inputRef,