Skip to content

Commit 53f6bb2

Browse files
authored
Merge pull request #364 from ironSource/release/8.x.x
Release/8.x.x
2 parents 6893216 + 2cbbac7 commit 53f6bb2

File tree

8 files changed

+53
-2
lines changed

8 files changed

+53
-2
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
44

5+
## [8.5.0](https://github.com/ironSource/fusion-ui/compare/v8.5.0-rc.0...v8.5.0) (2025-01-20)
6+
7+
## [8.5.0-rc.0](https://github.com/ironSource/fusion-ui/compare/v8.4.2...v8.5.0-rc.0) (2025-01-12)
8+
9+
10+
### Features
11+
12+
* **ISCT-540:** dropdown option v1 get new tooltiped icon ([2e0a8af](https://github.com/ironSource/fusion-ui/commit/2e0a8afbf4baff3d57749242e0db1c2c00b92424))
13+
514
### [8.4.2](https://github.com/ironSource/fusion-ui/compare/v8.4.2-rc.0...v8.4.2) (2025-01-06)
615

716
### [8.4.2-rc.0](https://github.com/ironSource/fusion-ui/compare/v8.4.1...v8.4.2-rc.0) (2025-01-06)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fusion-ui",
3-
"version": "8.4.2",
3+
"version": "8.5.0",
44
"description": "UI library created by ironSource",
55
"license": "MIT",
66
"repository": {

projects/fusion-docs/src/app/pages/components/dropdown-docs/dropdown-docs.component.html

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

projects/fusion-docs/src/app/pages/components/dropdown-docs/dropdown-docs.component.ts

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

projects/fusion-ui/components/dropdown-option/common/base/dropdown-option.base.component.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
<fusion-icon *ngIf="option.indicationStatus"
1010
[name]="{iconName: 'status-dots', iconVersion: 'v1'}"></fusion-icon>
1111
<span innerHTML="{{ optionToStringFunc | generic: option:mappingOptions:settings }}"></span>
12+
<span *ngIf="option.tooltipedIcon && !option.isDisabled">
13+
<fusion-icon class="option-tooltiped-icon"
14+
[fusionTooltip]="option.tooltipedIcon?.tooltipText"
15+
[name]="option.tooltipedIcon?.iconName"></fusion-icon>
16+
</span>
1217
<div *ngIf="option.subText?.text && shouldDisplayMultiRaw" class="sub-text-container">
1318
<fusion-icon *ngIf="option.subText?.icon" class="sub-text-icon" [name]="option.subText?.icon"></fusion-icon>
1419
<label>{{ option.subText?.text }}</label>

projects/fusion-ui/components/dropdown-option/entities/dropdown-option.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,11 @@ export interface DropdownOption {
2525
tooltipCustom?: TooltipCustom;
2626
isDisabled?: boolean;
2727
content?: DynamicComponentConfiguration; // dynamic content as option
28+
/**
29+
* This property for option in component v1
30+
*/
31+
tooltipedIcon?: {
32+
iconName: string;
33+
tooltipText: string;
34+
};
2835
}

projects/fusion-ui/components/dropdown-option/v1/dropdown-option.component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@
2424
}
2525
}
2626

27+
.option-tooltiped-icon{
28+
width: 14px;
29+
height: 14px;
30+
margin-left: 5px;
31+
color: $light-700;
32+
vertical-align: text-top;
33+
}
34+
2735
img {
2836
max-width: 19px;
2937
@extend %borderRadius;

projects/fusion-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ironsource/fusion-ui",
3-
"version": "8.4.2",
3+
"version": "8.5.0",
44
"dependencies": {
55
"chart.js": "4.4.2",
66
"@floating-ui/dom": "^1.0.9",

0 commit comments

Comments
 (0)