@ui5/webcomponents 0.0.0-e7dd012d7 → 0.0.0-e818f286e

package/src/WheelSlider.js

@@ -7,6 +7,7 @@ import {
 	isPageUp,
 	isPageDown,
 } from "@ui5/webcomponents-base/dist/Keys.js";
+import getEffectiveContentDensity from "@ui5/webcomponents-base/dist/util/getEffectiveContentDensity.js";
 import "@ui5/webcomponents-icons/dist/navigation-up-arrow.js";
 import "@ui5/webcomponents-icons/dist/navigation-down-arrow.js";
 import ScrollEnablement from "@ui5/webcomponents-base/dist/delegate/ScrollEnablement.js";
@@ -23,9 +24,9 @@ const metadata = {
 	tag: "ui5-wheelslider",
 	properties: /** @lends sap.ui.webcomponents.main.WheelSlider.prototype */ {
 		/**
-		 * Defines whether the <code>ui5-wheelslider</code> is disabled
+		 * Defines whether the component is disabled
 		 * (default is set to <code>false</code>).
-		 * A disabled <code>ui5-wheelslider</code> can't be pressed or
+		 * A disabled component can't be pressed or
 		 * focused, and it is not in the tab chain.
 		 *
 		 * @type {boolean}
@@ -62,19 +63,20 @@ const metadata = {
 		 * Indicates if the wheelslider is expanded.
 		 * @type {boolean}
 		 * @defaultvalue false
-		 * @private
+		 * @public
 		 */
-		_expanded: {
+		expanded: {
 			type: Boolean,
 		},
 
 		_items: {
 			type: String,
 			multiple: true,
+			compareValues: true,
 		},
 
 		_itemsToShow: {
-			type: String,
+			type: Object,
 			multiple: true,
 		},
 
@@ -106,25 +108,28 @@ const metadata = {
 		 *  Fires when new value is selected.
 		 */
 		select: {
-			value: {
-				type: String,
+			detail: {
+				value: {
+					type: String,
+				},
 			},
 		},
 	},
 };
 
+const CELL_SIZE_COMPACT = 32;
+const CELL_SIZE_COZY = 46;
+
 /**
  * @class
  *
  * <h3 class="comment-api-title">Overview</h3>
  *
- *
  * <h3>Usage</h3>
  *
- * For the <code>ui5-wheelslider</code>
  * <h3>ES6 Module Import</h3>
  *
- * <code>import @ui5/webcomponents/dist/WheelSlider.js";</code>
+ * <code>import "@ui5/webcomponents/dist/WheelSlider.js";</code>
  *
  * @constructor
  * @author SAP SE
@@ -154,7 +159,6 @@ class WheelSlider extends UI5Element {
 	constructor() {
 		super();
 		this._currentElementIndex = 0;
-		this._itemCellHeight = 0;
 		this._itemsToShow = [];
 		this._scroller = new ScrollEnablement(this);
 		this._scroller.attachEvent("scroll", this._updateScrolling.bind(this));
@@ -163,7 +167,7 @@ class WheelSlider extends UI5Element {
 	}
 
 	onBeforeRendering() {
-		if (!this._expanded && this.cyclic) {
+		if (!this.expanded && this.cyclic) {
 			const index = this._currentElementIndex % this._items.length;
 			this._currentElementIndex = (this._timesMultipliedOnCyclic() / 2) * this._items.length + index;
 		}
@@ -173,7 +177,6 @@ class WheelSlider extends UI5Element {
 		}
 
 		this._buildItemsToShow();
-		this._updateItemCellHeight();
 	}
 
 	static get dependencies() {
@@ -185,11 +188,11 @@ class WheelSlider extends UI5Element {
 			this._scroller.scrollContainer = this.shadowRoot.querySelector(`#${this._id}--wrapper`);
 		}
 
-		if (!this._expanded) {
+		if (!this.expanded) {
 			this._scroller.scrollTo(0, 0);
 		}
 
-		if (this._expanded) {
+		if (this.expanded) {
 			const elements = this.shadowRoot.querySelectorAll(".ui5-wheelslider-item");
 			for (let i = 0; i < elements.length; i++) {
 				if (elements[i].textContent === this.value) {
@@ -212,27 +215,30 @@ class WheelSlider extends UI5Element {
 	}
 
 	expandSlider() {
-		this._expanded = true;
+		this.expanded = true;
 		this.fireEvent("expand", {});
 	}
 
 	collapseSlider() {
-		this._expanded = false;
+		this.expanded = false;
 		this.fireEvent("collapse", {});
 	}
 
-	_updateItemCellHeight() {
+	get _itemCellHeight() {
+		const defaultSize = getEffectiveContentDensity(document.body) === "compact" ? CELL_SIZE_COMPACT : CELL_SIZE_COZY;
+
 		if (this.shadowRoot.querySelectorAll(".ui5-wheelslider-item").length) {
 			const itemComputedStyle = getComputedStyle(this.shadowRoot.querySelector(".ui5-wheelslider-item"));
 			const itemHeightValue = itemComputedStyle.getPropertyValue("--_ui5_wheelslider_item_height");
-			const onlyDigitsValue = itemHeightValue.replace("rem", "");
-
-			this._itemCellHeight = Number(onlyDigitsValue);
+			const onlyDigitsValue = itemHeightValue.replace("px", "");
+			return Number(onlyDigitsValue) || defaultSize;
 		}
+
+		return defaultSize;
 	}
 
 	_updateScrolling() {
-		const sizeOfOneElementInPixels = this._itemCellHeight * 16,
+		const cellSizeInPx = this._itemCellHeight,
 			scrollWhere = this._scroller.scrollContainer.scrollTop;
 		let offsetIndex;
 
@@ -240,9 +246,9 @@ class WheelSlider extends UI5Element {
 			return;
 		}
 
-		offsetIndex = Math.round(scrollWhere / sizeOfOneElementInPixels);
+		offsetIndex = Math.round(scrollWhere / cellSizeInPx);
 
-		if (this.value === this._itemsToShow[offsetIndex]) {
+		if (this.value === this._itemsToShow[offsetIndex].value) {
 			return;
 		}
 
@@ -253,12 +259,12 @@ class WheelSlider extends UI5Element {
 			}
 		}
 
-		this.value = this._itemsToShow[offsetIndex];
+		this.value = this._itemsToShow[offsetIndex].value;
 		this._currentElementIndex = offsetIndex;
 	}
 
 	_handleScrollTouchEnd() {
-		if (this._expanded) {
+		if (this.expanded) {
 			this._selectElementByIndex(this._currentElementIndex);
 		}
 	}
@@ -281,18 +287,15 @@ class WheelSlider extends UI5Element {
 	_selectElementByIndex(currentIndex) {
 		let index = currentIndex;
 		const itemsCount = this._itemsToShow.length;
-		const sizeOfCellInCompactInRem = 2;
-		const sizeOfCellInCozyInRem = 2.875;
-		const sizeOfCellInCompactInPixels = sizeOfCellInCompactInRem * 16;
-		const sizeOfCellInCozyInPixels = sizeOfCellInCozyInRem * 16;
-		const scrollBy = this.isCompact ? sizeOfCellInCompactInPixels * index : sizeOfCellInCozyInPixels * index;
+		const cellSizeInPx = this._itemCellHeight;
+		const scrollBy = cellSizeInPx * index;
 
 		if (this.cyclic) {
 			index = this._handleArrayBorderReached(index);
 		}
 
 		if (index < itemsCount && index > -1) {
-			this._scroller.scrollTo(0, scrollBy);
+			this._scroller.scrollTo(0, scrollBy, 5, 100); // sometimes the container isn't painted yet so retry 5 times (although it succeeds on the 1st)
 			this._currentElementIndex = index;
 			this.value = this._items[index - (this._getCurrentRepetition() * this._items.length)];
 			this.fireEvent("select", { value: this.value });
@@ -308,14 +311,21 @@ class WheelSlider extends UI5Element {
 	}
 
 	_buildItemsToShow() {
-		this._itemsToShow = this._items;
+		let itemsToShow = this._items;
 		if (this.cyclic) {
-			if (this._itemsToShow.length < this._items.length * this._timesMultipliedOnCyclic()) {
+			if (itemsToShow.length < this._items.length * this._timesMultipliedOnCyclic()) {
 				for (let i = 0; i < this._timesMultipliedOnCyclic(); i++) {
-					this._itemsToShow = this._itemsToShow.concat(this._items);
+					itemsToShow = itemsToShow.concat(this._items);
 				}
 			}
 		}
+
+		this._itemsToShow = itemsToShow.map(value => {
+			return {
+				value,
+				"selected": (value === this.value),
+			};
+		});
 	}
 
 	_handleArrayBorderReached(currentIndex) {
@@ -332,6 +342,13 @@ class WheelSlider extends UI5Element {
 		return index;
 	}
 
+	/**
+	 *
+	 * @param {event} e Wheel Event
+	 * @private
+	 *
+	 * The listener for this event can't be passive as it calls preventDefault()
+	 */
 	_handleWheel(e) {
 		if (!e) {
 			return;
@@ -340,7 +357,7 @@ class WheelSlider extends UI5Element {
 		e.stopPropagation();
 		e.preventDefault();
 
-		if (e.timeStamp === this._prevWheelTimestamp || !this._expanded) {
+		if (e.timeStamp === this._prevWheelTimestamp || !this.expanded) {
 			return;
 		}
 
@@ -358,12 +375,12 @@ class WheelSlider extends UI5Element {
 			return;
 		}
 
-		if (this._expanded) {
+		if (this.expanded) {
 			this.value = e.target.textContent;
 			this._selectElement(e.target);
 			this.fireEvent("select", { value: this.value });
 		} else {
-			this._expanded = true;
+			this.expanded = true;
 		}
 	}
 
@@ -387,25 +404,25 @@ class WheelSlider extends UI5Element {
 		this._selectElementByIndex(nextElementIndex);
 	}
 
-	_onkeydown(е) {
-		if (!this._expanded) {
+	_onkeydown(e) {
+		if (!this.expanded) {
 			return;
 		}
 
-		if (isUp(е)) {
-			this._onArrowUp(е);
+		if (isUp(e)) {
+			this._onArrowUp(e);
 		}
 
-		if (isDown(е)) {
-			this._onArrowDown(е);
+		if (isDown(e)) {
+			this._onArrowDown(e);
 		}
 
-		if (isPageDown(е)) {
-			this._selectLimitCell(е, false);
+		if (isPageDown(e)) {
+			this._selectLimitCell(e, false);
 		}
 
-		if (isPageUp(е)) {
-			this._selectLimitCell(е, true);
+		if (isPageUp(e)) {
+			this._selectLimitCell(e, true);
 		}
 	}
 
@@ -418,16 +435,6 @@ class WheelSlider extends UI5Element {
 			this._selectElementByIndex(intexIncrease);
 		}
 	}
-
-	_onfocusin(e) {
-		e.preventDefault();
-		this.expandSlider();
-	}
-
-	_onfocusout(e) {
-		e.preventDefault();
-		this.collapseSlider();
-	}
 }
 
 WheelSlider.define();

package/src/YearPicker.hbs

@@ -3,21 +3,30 @@
 	role="grid"
 	aria-readonly="false"
 	aria-multiselectable="false"
-	style="{{styles.main}}"
 	@keydown={{_onkeydown}}
-	@mousedown={{_onmousedown}}
-	@mouseup={{_onmouseup}}
+	@keyup={{_onkeyup}}
+	@click={{_selectYear}}
+	@focusin={{_onfocusin}}
 >
-	{{#each _yearIntervals}}
+	{{#each _years}}
 		<div class="ui5-yp-interval-container">
 			{{#each this}}
-				<div id="{{this.id}}"
-					tabindex="{{this._tabIndex}}"
+				<div
 					data-sap-timestamp="{{this.timestamp}}"
+					tabindex="{{this._tabIndex}}"
+					?data-sap-focus-ref="{{this.focusRef}}"
 					class="{{this.classes}}"
 					role="gridcell"
-					aria-selected="false">
+					aria-selected="{{this.ariaSelected}}"
+				>
+					<span>
 						{{this.year}}
+					</span>
+					{{#if this.yearInSecType}}
+						<span class="ui5-yp-item-sec-type">
+							{{this.yearInSecType}}
+						</span>
+					{{/if}}
 				</div>
 			{{/each}}
 		</div>