Skip to content

Commit

Permalink
Merge pull request #15928 from primefaces/issue-15534
Browse files Browse the repository at this point in the history 
Message  | Fix type mismatch
  • Loading branch information
@cetincakiroglu
cetincakiroglu authored Jul 1, 2024
2 parents ceedbb9 + 73181ef commit 8813e27
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 48 deletions.
4 changes: 2 additions & 2 deletions src/app/components/message/message.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class UIMessage {
* Severity level of the message.
* @group Props
*/
@Input() severity: 'success' | 'info' | 'warning' | 'danger' | 'help' | 'primary' | 'secondary' | 'contrast' | null | undefined;
@Input() severity: 'success' | 'info' | 'warn' | 'error' | 'help' | 'primary' | 'secondary' | 'contrast' | string | null | undefined;
/**
* Text content.
* @group Props
Expand All @@ -60,7 +60,7 @@ export class UIMessage {

get icon() {
if (this.severity) {
return this.severity === 'success' ? 'success' : this.severity === 'info' ? 'info' : this.severity === 'warning' ? 'warn' : this.severity === 'danger' ? 'error' : 'info';
return this.severity;
} else {
return 'info';
}
Expand Down
71 changes: 25 additions & 46 deletions src/app/showcase/doc/apidoc/index.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -702,8 +702,7 @@
"name": "forceUpdate",
"optional": true,
"readonly": false,
"type": "Function",
"description": "A function that can be called to force an update in the lazy loaded data."
"type": "Function"
}
]
}
Expand Down Expand Up @@ -805,8 +804,7 @@
"name": "command",
"optional": true,
"readonly": false,
"type": "Function",
"description": "Callback to execute when item is clicked."
"type": "Function"
},
{
"name": "url",
Expand Down Expand Up @@ -1274,7 +1272,7 @@
"name": "severity",
"optional": false,
"readonly": false,
"type": "\"success\" | \"info\" | \"warning\" | \"primary\" | \"help\" | \"danger\" | \"secondary\" | \"contrast\"",
"type": "string",
"description": "Severity level of the message."
},
{
Expand Down Expand Up @@ -1736,8 +1734,7 @@
"name": "listener",
"optional": true,
"readonly": false,
"type": "Function",
"description": "A listener function for handling events related to the overlay."
"type": "Function"
},
{
"name": "responsive",
Expand All @@ -1750,43 +1747,37 @@
"name": "onBeforeShow",
"optional": true,
"readonly": false,
"type": "Function",
"description": "A callback function that is invoked before the overlay is shown."
"type": "Function"
},
{
"name": "onShow",
"optional": true,
"readonly": false,
"type": "Function",
"description": "A callback function that is invoked when the overlay is shown."
"type": "Function"
},
{
"name": "onBeforeHide",
"optional": true,
"readonly": false,
"type": "Function",
"description": "A callback function that is invoked before the overlay is hidden."
"type": "Function"
},
{
"name": "onHide",
"optional": true,
"readonly": false,
"type": "Function",
"description": "A callback function that is invoked when the overlay is hidden."
"type": "Function"
},
{
"name": "onAnimationStart",
"optional": true,
"readonly": false,
"type": "Function",
"description": "A callback function that is invoked when the overlay's animation starts."
"type": "Function"
},
{
"name": "onAnimationDone",
"optional": true,
"readonly": false,
"type": "Function",
"description": "A callback function that is invoked when the overlay's animation is done."
"type": "Function"
}
]
}
Expand Down Expand Up @@ -5869,7 +5860,7 @@
"parameters": [
{
"name": "context",
"type": "{\n \t clickCallBack: undefined, // Click callback\n }",
"type": "{\n \t clickCallBack: undefined, // undefined\n }",
"description": "input icon template params."
}
],
Expand Down Expand Up @@ -10591,15 +10582,13 @@
"name": "filter",
"optional": true,
"readonly": false,
"type": "Function",
"description": "Filter function."
"type": "Function"
},
{
"name": "reset",
"optional": true,
"readonly": false,
"type": "Function",
"description": "Reset function."
"type": "Function"
}
]
}
Expand Down Expand Up @@ -15173,15 +15162,13 @@
"name": "filter",
"optional": true,
"readonly": false,
"type": "Function",
"description": "Callback to filter options."
"type": "Function"
},
{
"name": "reset",
"optional": true,
"readonly": false,
"type": "Function",
"description": "Callback to reset filter."
"type": "Function"
}
]
}
Expand Down Expand Up @@ -16840,7 +16827,7 @@
"parameters": [
{
"name": "context",
"type": "{\n \t $implicit: any, // Selected option value.\n \t removeChip: undefined, // Function to remove chip.\n }",
"type": "{\n \t $implicit: any, // Selected option value.\n \t removeChip: undefined, // undefined\n }",
"description": "selected items data."
}
],
Expand Down Expand Up @@ -22758,8 +22745,7 @@
"name": "onClick",
"optional": false,
"readonly": false,
"type": "Function",
"description": "Header click function."
"type": "Function"
}
]
},
Expand Down Expand Up @@ -22820,22 +22806,19 @@
"name": "onClick",
"optional": false,
"readonly": false,
"type": "Function",
"description": "Content click function."
"type": "Function"
},
{
"name": "prevCallback",
"optional": false,
"readonly": false,
"type": "Function",
"description": "Content previous panel click function."
"type": "Function"
},
{
"name": "nextCallback",
"optional": false,
"readonly": false,
"type": "Function",
"description": "Content next panel click function."
"type": "Function"
}
]
},
Expand Down Expand Up @@ -23255,7 +23238,7 @@
"parameters": [
{
"name": "context",
"type": "{\n \t $implicit: string, // filterConstraint.value.\n \t filterCallback: undefined, // filter callback.\n \t type: string, // Type of the input.\n \t filterConstraint: string, // Filter constraint.\n \t placeholder: boolean, // Input placeholder.\n \t minFractionDigits: number, // Minimum fraction of digits.\n \t maxFractionDigits: number, // Maximum fraction of digits.\n \t prefix: string, // Input prefix.\n \t suffix: string, // Input suffix.\n \t locale: string, // Locale.\n \t localeMatcher: string, // Locale matcher.\n \t currency: boolean, // Enables currency input.\n \t currencyDisplay: boolean, // Display of the currency input.\n \t useGrouping: boolean, // Defines if filter grouping will be enabled.\n \t showButtons: boolean, // Defines the visibility of buttons.\n }"
"type": "{\n \t $implicit: string, // filterConstraint.value.\n \t filterCallback: undefined, // undefined\n \t type: string, // Type of the input.\n \t filterConstraint: string, // Filter constraint.\n \t placeholder: boolean, // Input placeholder.\n \t minFractionDigits: number, // Minimum fraction of digits.\n \t maxFractionDigits: number, // Maximum fraction of digits.\n \t prefix: string, // Input prefix.\n \t suffix: string, // Input suffix.\n \t locale: string, // Locale.\n \t localeMatcher: string, // Locale matcher.\n \t currency: boolean, // Enables currency input.\n \t currencyDisplay: boolean, // Display of the currency input.\n \t useGrouping: boolean, // Defines if filter grouping will be enabled.\n \t showButtons: boolean, // Defines the visibility of buttons.\n }"
}
],
"description": "Custom filter template."
Expand Down Expand Up @@ -23531,8 +23514,7 @@
"name": "rowSelectable",
"optional": false,
"readonly": false,
"type": "Function",
"description": "Defines if the row is selectable."
"type": "Function"
},
{
"name": "rowTrackBy",
Expand Down Expand Up @@ -25562,15 +25544,13 @@
"name": "sendCommand",
"optional": false,
"readonly": false,
"type": "Function",
"description": "Emits command value."
"type": "Function"
},
{
"name": "sendResponse",
"optional": false,
"readonly": false,
"type": "Function",
"description": "Emits response value."
"type": "Function"
}
]
}
Expand Down Expand Up @@ -29228,8 +29208,7 @@
"name": "filterConstraint",
"optional": false,
"readonly": false,
"type": "Function",
"description": "Filter constraints."
"type": "Function"
},
{
"name": "isStrictMode",
Expand Down

0 comments on commit 8813e27

Please sign in to comment.