@ui5/webcomponents 0.0.0-8db0ce01a → 0.0.0-a3eca7ade

package/src/ColorPalettePopover.js

@@ -0,0 +1,244 @@
+import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
+import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
+import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
+import CSSColor from "@ui5/webcomponents-base/dist/types/CSSColor.js";
+import ColorPalettePopoverTemplate from "./generated/templates/ColorPalettePopoverTemplate.lit.js";
+
+// Styles
+import ColorPalettePopoverCss from "./generated/themes/ColorPalettePopover.css.js";
+import ResponsivePopoverCommonCss from "./generated/themes/ResponsivePopoverCommon.css.js";
+import {
+	COLORPALETTE_POPOVER_TITLE,
+	COLOR_PALETTE_DIALOG_CANCEL_BUTTON,
+} from "./generated/i18n/i18n-defaults.js";
+
+import Button from "./Button.js";
+import Title from "./Title.js";
+import ResponsivePopover from "./ResponsivePopover.js";
+import ColorPalette from "./ColorPalette.js";
+
+/**
+ * @public
+ */
+const metadata = {
+	tag: "ui5-color-palette-popover",
+	managedSlots: true,
+	properties: /** @lends sap.ui.webcomponents.main.ColorPalettePopover.prototype */ {
+		/**
+		 * Defines whether the user can see the last used colors in the bottom of the component
+		 * @type {boolean}
+		 * @defaultvalue false
+		 * @public
+		 */
+		showRecentColors: {
+			type: Boolean,
+		},
+
+		/**
+		 * Defines whether the user can choose a custom color from a component.
+		 * <b>Note:</b> In order to use this property you need to import the following module: <code>"@ui5/webcomponents/dist/features/ColorPaletteMoreColors.js"</code>
+		 * @type {boolean}
+		 * @defaultvalue false
+		 * @public
+		 */
+		showMoreColors: {
+			type: Boolean,
+		},
+
+		/**
+		 * Defines whether the user can choose the default color from a button.
+		 * @type {boolean}
+		 * @defaultvalue false
+		 * @public
+		 */
+		showDefaultColor: {
+			type: Boolean,
+		},
+
+		/**
+		 * Defines the default color of the component.
+		 * <b>Note:</b> The default color should be a part of the ColorPalette colors</code>
+		 * @type {CSSColor}
+		 * @public
+		 */
+		defaultColor: {
+			type: CSSColor,
+		},
+	},
+	slots: /** @lends sap.ui.webcomponents.main.ColorPalettePopover.prototype */ {
+		/**
+		 * Defines the content of the component.
+		 * @type {sap.ui.webcomponents.main.IColorPaletteItem[]}
+		 * @slot colors
+		 * @public
+		 */
+		"default": {
+			type: HTMLElement,
+			propertyName: "colors",
+			individualSlots: true,
+		},
+	},
+	events: /** @lends sap.ui.webcomponents.main.ColorPalettePopover.prototype */ {
+		/**
+		 * Fired when the user selects a color.
+		 *
+		 * @event sap.ui.webcomponents.main.ColorPalettePopover#item-click
+		 * @public
+		 * @param {string} color the selected color
+		 */
+		"item-click": {
+			details: {
+				color: {
+					type: String,
+				},
+			},
+		 },
+	},
+};
+
+/**
+ * @class
+ *
+ * <h3 class="comment-api-title">Overview</h3>
+ * Represents a predefined range of colors for easier selection.
+ *
+ * Overview
+ * The ColorPalettePopover provides the users with a slot to predefine colors.
+ *
+ * You can customize them with the use of the colors property. You can specify a defaultColor and display a "Default color" button for the user to choose directly.
+ * You can display a "More colors..." button that opens an additional color picker for the user to choose specific colors that are not present in the predefined range.
+ *
+ * <h3>Usage</h3>
+ *
+ * The palette is intended for users, who don't want to check and remember the different values of the colors and spend large amount of time to configure the right color through the color picker.
+ *
+ * For the <code>ui5-color-palette-popover</code>
+ * <h3>ES6 Module Import</h3>
+ *
+ * <code>import @ui5/webcomponents/dist/ColorPalettePopover.js";</code>
+ *
+ * @constructor
+ * @author SAP SE
+ * @alias sap.ui.webcomponents.main.ColorPalettePopover
+ * @extends UI5Element
+ * @tagname ui5-color-palette-popover
+ * @public
+ * @since 1.0.0-rc.16
+ */
+class ColorPalettePopover extends UI5Element {
+	static get metadata() {
+		return metadata;
+	}
+
+	static get render() {
+		return litRender;
+	}
+
+	static get styles() {
+		return [ResponsivePopoverCommonCss, ColorPalettePopoverCss];
+	}
+
+	static get template() {
+		return ColorPalettePopoverTemplate;
+	}
+
+	static get dependencies() {
+		return [
+			ResponsivePopover,
+			Button,
+			Title,
+			ColorPalette,
+		];
+	}
+
+	static async onDefine() {
+		ColorPalettePopover.i18nBundle = await getI18nBundle("@ui5/webcomponents");
+	}
+
+	constructor() {
+		super();
+	}
+
+	_respPopover() {
+		this.responsivePopover = this.shadowRoot.querySelector("[ui5-responsive-popover]");
+
+		return this.responsivePopover;
+	}
+
+	_colorPalette() {
+		return this.responsivePopover.content[0].querySelector("[ui5-color-palette]");
+	}
+
+	/**
+	 * Shows the ColorPalettePopover.
+	 * @param {HTMLElement} opener the element that the popover is shown at
+	 * @public
+	 * @since 1.1.1
+	 */
+	showAt(opener) {
+		this._openPopover(opener);
+	}
+
+	/**
+	 * Shows the ColorPalettePopover.
+	 * <b>Note:</b> The method is deprecated and will be removed in future, use <code>showAt</code> instead.
+	 * @param {HTMLElement} opener the element that the popover is shown at
+	 * @public
+	 * @since 1.0.0-rc.16
+	 * @deprecated The method is deprecated in favour of <code>showAt</code>.
+	 */
+	openPopover(opener) {
+		console.warn("The method 'openPopover' is deprecated and will be removed in future, use 'showAt' instead."); // eslint-disable-line
+		this._openPopover(opener);
+	}
+
+	_openPopover(opener) {
+		this._respPopover();
+
+		this.responsivePopover.showAt(opener, true);
+
+		if (this.showDefaultColor) {
+			this._colorPalette().colorPaletteNavigationElements[0].focus();
+		} else {
+			this._colorPalette().focusColorElement(this._colorPalette().colorPaletteNavigationElements[0], this._colorPalette()._itemNavigation);
+		}
+	}
+
+	closePopover() {
+		this.responsivePopover.close();
+	}
+
+	onSelectedColor(event) {
+		this.closePopover();
+		this.fireEvent("item-click", event.detail);
+	}
+
+	/**
+	 * Returns if the component is opened.
+	 *
+	 * @protected
+	 * @since 1.0.0-rc.16
+	 * @returns {boolean}
+	 */
+	isOpen() {
+		this._respPopover();
+
+		return this.responsivePopover.opened;
+	}
+
+	get colorPaletteColors() {
+		return this.getSlottedNodes("colors");
+	}
+
+	get _colorPaletteTitle() {
+		return ColorPalettePopover.i18nBundle.getText(COLORPALETTE_POPOVER_TITLE);
+	}
+
+	get _cancelButtonLabel() {
+		return ColorPalettePopover.i18nBundle.getText(COLOR_PALETTE_DIALOG_CANCEL_BUTTON);
+	}
+}
+
+ColorPalettePopover.define();
+
+export default ColorPalettePopover;

package/src/ColorPicker.hbs

@@ -46,6 +46,7 @@
             <ui5-input
                 class="ui5-color-picker-hex-input"
                 value="{{hex}}"
+                @keydown="{{_onkeydown}}"
                 @ui5-change="{{_handleHEXChange}}"
                 value-state="{{hexInputErrorState}}"
             ></ui5-input>
@@ -85,6 +86,7 @@
         </div>
         <div class="ui5-color-picker-rgb">
             <ui5-input
+				id="alpha"
                 disabled="{{inputsDisabled}}"
                 class="ui5-color-picker-rgb-input"
                 value="{{_alpha}}"

package/src/ColorPicker.js

@@ -1,4 +1,5 @@
 import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
+import { isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
 import CSSColor from "@ui5/webcomponents-base/dist/types/CSSColor.js";
 import { isIE } from "@ui5/webcomponents-base/dist/Device.js";
 import { renderFinished } from "@ui5/webcomponents-base/dist/Render.js";
@@ -27,10 +28,10 @@ const metadata = {
 	properties: /** @lends sap.ui.webcomponents.main.ColorPicker.prototype */ {
 
 		/**
-		 * Defines the currently selected color of the <code>ui5-color-picker</code>.
+		 * Defines the currently selected color of the component.
 		 * <br><br>
 		 * <b>Note</b>: use HEX, RGB, RGBA, HSV formats or a CSS color name when modifying this property.
-		 * @type {String}
+		 * @type {CSSColor}
 		 * @public
 		 */
 		color: {
@@ -41,7 +42,7 @@ const metadata = {
 		/**
 		 * Defines the HEX code of the currently selected color
 		 * *Note*: If Alpha(transperancy) is set it is not included in this property. Use <code>color</code> property.
-		 * @type {String}
+		 * @type {string}
 		 * @private
 		 */
 		hex: {
@@ -52,7 +53,7 @@ const metadata = {
 
 		/**
 		 * Defines the current main color which is selected via the hue slider and is shown in the main color square.
-		 * @type {String}
+		 * @type {string}
 		 * @private
 		 */
 		_mainColor: {
@@ -87,6 +88,20 @@ const metadata = {
 			defaultValue: 0,
 		},
 
+		/**
+		 * @private
+		 */
+		_isSelectedColorChanged: {
+			type: Boolean,
+		},
+
+		/**
+		 * @private
+		 */
+		 _isHueValueChanged: {
+			type: Boolean,
+		},
+
 		/**
 		 * @private
 		 */
@@ -112,7 +127,7 @@ const metadata = {
  * @class
  *
  * <h3 class="comment-api-title">Overview</h3>
- * The ColorPicker allows users to choose any color and provides different input options for selecting colors.
+ * The <code>ui5-color-picker</code> allows users to choose any color and provides different input options for selecting colors.
  *
  * <h3>Usage</h3>
  *
@@ -188,9 +203,10 @@ class ColorPicker extends UI5Element {
 	onBeforeRendering() {
 		// we have the color & _mainColor properties here
 		this._color = getRGBColor(this.color);
+		const tempColor = `rgba(${this._color.r}, ${this._color.g}, ${this._color.b}, 1)`;
 		this._setHex();
 		this._setValues();
-		this.style.setProperty("--ui5_Color_Picker_Progress_Container_Color", this.color);
+		this.style.setProperty("--ui5_Color_Picker_Progress_Container_Color", tempColor);
 	}
 
 	async onAfterRendering() {
@@ -318,11 +334,21 @@ class ColorPicker extends UI5Element {
 
 	_handleAlphaInput(event) {
 		this._alpha = parseFloat(event.target.value);
+		this._setColor(this._color);
 	}
 
 	_handleHueInput(event) {
 		this.selectedHue = event.target.value;
+		this._hue = this.selectedHue;
 		this._setMainColor(this._hue);
+		// Idication that changes to the hue value triggered as a result of user pressing over the hue slider.
+		this._isHueValueChanged = true;
+
+		const tempColor = this._calculateColorFromCoordinates(this._selectedCoordinates.x + 6.5, this._selectedCoordinates.y + 6.5);
+
+		if (tempColor) {
+			this._setColor(HSLToRGB(tempColor));
+		}
 	}
 
 	_handleHEXChange(event) {
@@ -334,6 +360,10 @@ class ColorPicker extends UI5Element {
 			newValue = `${newValue[0]}${newValue[0]}${newValue[1]}${newValue[1]}${newValue[2]}${newValue[2]}`;
 		}
 
+		if (newValue === this.hex) {
+			return;
+		}
+
 		this.hex = newValue;
 		if (newValue.length !== 6 || !hexRegex.test(newValue)) {
 			this._wrongHEX = true;
@@ -358,6 +388,8 @@ class ColorPicker extends UI5Element {
 		case "blue":
 			tempColor = { ...this._color, b: targetValue };
 			break;
+		default:
+			tempColor = { ...this._color };
 		}
 
 		this._setColor(tempColor);
@@ -414,17 +446,26 @@ class ColorPicker extends UI5Element {
 			y: y - 6.5, // Center the coordinates, because of the height of the circle
 		};
 
+		// Idication that changes to the color settings are triggered as a result of user pressing over the main color section.
+		this._isSelectedColorChanged = true;
+
 		const tempColor = this._calculateColorFromCoordinates(x, y);
 		if (tempColor) {
 			this._setColor(HSLToRGB(tempColor));
 		}
 	}
 
+	_onkeydown(event) {
+		if (isEnter(event)) {
+			this._handleHEXChange(event);
+		}
+	}
+
 	_calculateColorFromCoordinates(x, y) {
 		// By using the selected coordinates(x = Lightness, y = Saturation) and hue(selected from the hue slider)
 		// and HSL format, the color will be parsed to RGB
 
-		const h = Math.round(this._hue / 4.25), // 0 ≤ H < 360
+		const h = this._hue / 4.25, // 0 ≤ H < 360
 			// 0 ≤ S ≤ 1
 			s = 1 - +(Math.round((y / 256) + "e+2") + "e-2"), // eslint-disable-line
 			// 0 ≤ V ≤ 1
@@ -477,9 +518,11 @@ class ColorPicker extends UI5Element {
 			y: (256 - (Math.round(hslColours.s * 100) * 2.56)) - 6.5, // Center the coordinates, because of the height of the circle
 		};
 
-		if (this.selectedHue) {
-			this._hue = this.selectedHue;
-			this.selectedHue = undefined;
+		if (this._isSelectedColorChanged) { // We shouldn't update the hue value when user presses over the main color section.
+			this._isSelectedColorChanged = false;
+		} else if (this._isHueValueChanged) { // We shouldn't recalculate the hue value when user changes the hue slider.
+			this._isHueValueChanged = false;
+			this._hue = this.selectedHue ? this.selectedHue : this._hue;
 		} else {
 			this._hue = Math.round(hslColours.h * 4.25);
 		}

package/src/ComboBox.hbs

@@ -4,7 +4,7 @@
 	{{/if}}
 
 	<input id="ui5-combobox-input"
-		.value="{{_tempValue}}"
+		.value="{{value}}"
 		inner-input
 		placeholder="{{placeholder}}"
 		?disabled={{disabled}}
@@ -14,6 +14,7 @@
 		@change="{{_inputChange}}"
 		@click={{_click}}
 		@keydown="{{_keydown}}"
+		@keyup="{{_keyup}}"
 		@focusin="{{_focusin}}"
 		@focusout="{{_focusout}}"
 		aria-expanded="{{open}}"
@@ -23,8 +24,13 @@
 		aria-describedby="{{valueStateTextId}}"
 		aria-label="{{ariaLabelText}}"
 		aria-required="{{required}}"
+		data-sap-focus-ref
 	/>
 
+	{{#if readonly}}
+		<ui5-icon class="ui5-input-readonly-icon" name="not-editable" @click="{{_readonlyIconClick}}"></ui5-icon>
+	{{/if}}
+
 	{{#if icon}}
 		<slot name="icon"></slot>
 	{{/if}}