@ui5/webcomponents 1.7.3 → 1.7.5

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.5](https://github.com/SAP/ui5-webcomponents/compare/v1.7.4...v1.7.5) (2023-01-12)
+
+**Note:** Version bump only for package @ui5/webcomponents
+
+
+
+
+
+## [1.7.4](https://github.com/SAP/ui5-webcomponents/compare/v1.7.3...v1.7.4) (2022-12-05)
+
+
+### Bug Fixes
+
+* **ui5-avatar:** fix icon rendering inside ui5-avatar ([#6060](https://github.com/SAP/ui5-webcomponents/issues/6060)) ([0fabac4](https://github.com/SAP/ui5-webcomponents/commit/0fabac43b9d7bc18f478f30177d99c3f63bafa88)), closes [#6043](https://github.com/SAP/ui5-webcomponents/issues/6043)
+
+
+
+
+
 ## [1.7.2](https://github.com/SAP/ui5-webcomponents/compare/v1.7.1...v1.7.2) (2022-11-07)
 
 

package/dist/Avatar.js

@@ -16,6 +16,8 @@ import AvatarSize from "./types/AvatarSize.js";
 import AvatarShape from "./types/AvatarShape.js";
 import AvatarColorScheme from "./types/AvatarColorScheme.js";
 
+// Icon
+import "@ui5/webcomponents-icons/dist/employee.js";
 /**
  * @public
  */
@@ -372,30 +374,31 @@ class Avatar extends UI5Element {
 		this._onclick = this.interactive ? this._onClickHandler.bind(this) : undefined;
 	}
 
-	onEnterDOM() {
-		this._checkInitialsWidth();
+	onAfterRendering() {
+		this._checkInitials();
+	}
 
-		if (!this.validInitials) {
-			// if initials are not valid,an icon should be shown inside the avatar
-			this._setFallbackIcon();
-		}
+	onEnterDOM() {
+		this._checkInitials();
 	}
 
 	_setFallbackIcon() {
-		// the default icon shown inside the avatar,
-		// when the initials are not valid
-		this.icon = "employee";
+		// if there isn`t icon set in the avatar the default one is shown, when the initials are not valid or are missing
+		this.icon = this.icon || "employee";
 		return this.icon;
 	}
 
-	_checkInitialsWidth() {
-		// if initials` width is bigger than the avatar,
-		// an icon should be shown inside the avatar
+	_checkInitials() {
 		const avatar = this.getDomRef(),
 			avatarInitials = avatar.querySelector(".ui5-avatar-initials");
+		// if there aren`t initalts set - the fallBack icon should be shown
+		if (!this.validInitials) {
+			this._setFallbackIcon();
+		}
+		// if initials` width is bigger than the avatar, an icon should be shown inside the avatar
 		if (this.initials && this.initials.length === 3) {
-			if (avatarInitials.scrollWidth >= avatar.scrollWidth) {
-				this.icon = "employee";
+			if (avatarInitials && avatarInitials.scrollWidth >= avatar.scrollWidth) {
+				this._setFallbackIcon();
 			}
 		}
 		return this.icon;

package/dist/TimeSelection.js

@@ -236,7 +236,7 @@ class TimeSelection extends UI5Element {
 	}
 
 	get periodsArray() {
-		return this.getFormat().aDayPeriods.map(x => x.toUpperCase());
+		return this.getFormat().aDayPeriodsAbbrev.map(x => x.toUpperCase());
 	}
 
 	get _hoursSliderFocused() {