@itwin/itwinui-react 1.23.2 → 1.26.1

package/esm/core/ColorPicker/ColorBuilder.js

@@ -44,20 +44,24 @@ var getHorizontalPercentageOfRectangle = function (rect, pointer) {
  * and a set of sliders to adjust hue and alpha values.
  */
 export var ColorBuilder = React.forwardRef(function (props, ref) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     var className = props.className, rest = __rest(props, ["className"]);
     var builderRef = React.useRef();
     var refs = useMergedRefs(builderRef, ref);
     useTheme();
-    var _k = useColorPickerContext(), activeColor = _k.activeColor, hsvColor = _k.hsvColor, onChangeComplete = _k.onChangeComplete, applyHsvColorChange = _k.applyHsvColorChange;
+    var _o = useColorPickerContext(), activeColor = _o.activeColor, hsvColor = _o.hsvColor, onChangeComplete = _o.onChangeComplete, applyHsvColorChange = _o.applyHsvColorChange, showAlpha = _o.showAlpha;
     // Set values for slider
-    var hueSliderColor = React.useMemo(function () { return ColorValue.create({ h: hsvColor.h, s: 100, v: 100 }); }, [hsvColor]);
+    var hueSliderColor = React.useMemo(function () { return ColorValue.create({ h: hsvColor.h, s: 100, v: 100 }); }, [hsvColor.h]);
     var sliderValue = React.useMemo(function () { return hsvColor.h; }, [hsvColor]);
+    var alphaValue = React.useMemo(function () { var _a; return (showAlpha ? (_a = hsvColor.a) !== null && _a !== void 0 ? _a : 1 : 1); }, [
+        hsvColor.a,
+        showAlpha,
+    ]);
     // Set values for color square and color dot
     var dotColorString = React.useMemo(function () { return activeColor.toHexString(); }, [
         activeColor,
     ]);
-    var _l = React.useState(false), colorDotActive = _l[0], setColorDotActive = _l[1];
+    var _p = React.useState(false), colorDotActive = _p[0], setColorDotActive = _p[1];
     var hueColorString = hueSliderColor.toHexString();
     var colorSquareStyle = ((_c = (_b = (_a = getWindow()) === null || _a === void 0 ? void 0 : _a.CSS) === null || _b === void 0 ? void 0 : _b.supports) === null || _c === void 0 ? void 0 : _c.call(_b, "--hue:\u00A0" + hueColorString))
         ? {
@@ -65,9 +69,12 @@ export var ColorBuilder = React.forwardRef(function (props, ref) {
             '--selected-color': dotColorString,
         }
         : { backgroundColor: hueColorString };
+    var opacitySliderStyle = ((_f = (_e = (_d = getWindow()) === null || _d === void 0 ? void 0 : _d.CSS) === null || _e === void 0 ? void 0 : _e.supports) === null || _f === void 0 ? void 0 : _f.call(_e, "--selected-color:\u00A0" + hueColorString))
+        ? { '--selected-color': hueColorString }
+        : { backgroundColor: hueColorString };
     var squareTop = 100 - hsvColor.v;
     var squareLeft = hsvColor.s;
-    var colorDotStyle = ((_f = (_e = (_d = getWindow()) === null || _d === void 0 ? void 0 : _d.CSS) === null || _e === void 0 ? void 0 : _e.supports) === null || _f === void 0 ? void 0 : _f.call(_e, "--top:\u00A0" + squareTop.toString() + "%"))
+    var colorDotStyle = ((_j = (_h = (_g = getWindow()) === null || _g === void 0 ? void 0 : _g.CSS) === null || _h === void 0 ? void 0 : _h.supports) === null || _j === void 0 ? void 0 : _j.call(_h, "--top:\u00A0" + squareTop.toString() + "%"))
         ? {
             '--top': squareTop.toString() + '%',
             '--left': squareLeft.toString() + '%',
@@ -78,15 +85,27 @@ export var ColorBuilder = React.forwardRef(function (props, ref) {
             left: squareLeft.toString() + '%',
         };
     // Update slider change
-    var updateSlider = React.useCallback(function (huePercent, selectionChanged) {
-        var hue = Math.round(huePercent);
+    var updateHueSlider = React.useCallback(function (huePercent, selectionChanged) {
+        var hue = Number(huePercent.toFixed(2));
         var newHsvColor = {
             h: hue,
             s: hsvColor.s,
             v: hsvColor.v,
+            a: hsvColor.a,
         };
         applyHsvColorChange(newHsvColor, selectionChanged);
-    }, [applyHsvColorChange, hsvColor.s, hsvColor.v]);
+    }, [applyHsvColorChange, hsvColor]);
+    // Update opacity slider change
+    var updateOpacitySlider = React.useCallback(function (alphaPercent, selectionChanged) {
+        var alpha = Number(alphaPercent.toFixed(2));
+        var newHsvColor = {
+            h: hsvColor.h,
+            s: hsvColor.s,
+            v: hsvColor.v,
+            a: alpha,
+        };
+        applyHsvColorChange(newHsvColor, selectionChanged);
+    }, [applyHsvColorChange, hsvColor]);
     // Update Color field square change
     var squareRef = React.useRef(null);
     var colorDotRef = React.useRef(null);
@@ -95,9 +114,10 @@ export var ColorBuilder = React.forwardRef(function (props, ref) {
             h: hsvColor.h,
             s: x,
             v: 100 - y,
+            a: hsvColor.a,
         };
         applyHsvColorChange(newHsvColor, selectionChanged);
-    }, [applyHsvColorChange, hsvColor.h]);
+    }, [applyHsvColorChange, hsvColor]);
     var updateSquareValue = React.useCallback(function (event, callbackType) {
         if ((squareRef.current && colorDotActive) ||
             (squareRef.current && callbackType === 'onClick')) {
@@ -117,18 +137,18 @@ export var ColorBuilder = React.forwardRef(function (props, ref) {
         event.preventDefault();
         event.stopPropagation();
     }, [updateSquareValue]);
-    useEventListener('pointerup', handleSquarePointerUp, (_g = builderRef.current) === null || _g === void 0 ? void 0 : _g.ownerDocument);
+    useEventListener('pointerup', handleSquarePointerUp, (_k = builderRef.current) === null || _k === void 0 ? void 0 : _k.ownerDocument);
     var handleSquarePointerMove = React.useCallback(function (event) {
         event.preventDefault();
         event.stopPropagation();
         updateSquareValue(event, 'onUpdate');
     }, [updateSquareValue]);
-    useEventListener('pointermove', handleSquarePointerMove, (_h = builderRef.current) === null || _h === void 0 ? void 0 : _h.ownerDocument);
+    useEventListener('pointermove', handleSquarePointerMove, (_l = builderRef.current) === null || _l === void 0 ? void 0 : _l.ownerDocument);
     var handleSquarePointerLeave = React.useCallback(function (event) {
         updateSquareValue(event, 'onChange');
         setColorDotActive(false);
     }, [updateSquareValue]);
-    useEventListener('pointerleave', handleSquarePointerLeave, (_j = builderRef.current) === null || _j === void 0 ? void 0 : _j.ownerDocument);
+    useEventListener('pointerleave', handleSquarePointerLeave, (_m = builderRef.current) === null || _m === void 0 ? void 0 : _m.ownerDocument);
     var keysPressed = React.useRef({}); // keep track of which keys are currently pressed
     // Arrow key navigation for color dot
     var handleColorDotKeyDown = function (event) {
@@ -187,8 +207,13 @@ export var ColorBuilder = React.forwardRef(function (props, ref) {
                     (_a = colorDotRef.current) === null || _a === void 0 ? void 0 : _a.focus();
                 }, onKeyDown: handleColorDotKeyDown, onKeyUp: handleColorDotKeyUp, tabIndex: 0, ref: colorDotRef })),
         React.createElement(Slider, { minLabel: '', maxLabel: '', values: [sliderValue], className: 'iui-hue-slider', trackDisplayMode: 'none', tooltipProps: function () { return ({ visible: false }); }, onChange: function (values) {
-                updateSlider(values[0], true);
+                updateHueSlider(values[0], true);
+            }, onUpdate: function (values) {
+                updateHueSlider(values[0], false);
+            }, min: 0, max: 359 }),
+        showAlpha && (React.createElement(Slider, { minLabel: '', maxLabel: '', values: [alphaValue], className: 'iui-opacity-slider', trackDisplayMode: 'none', tooltipProps: function () { return ({ visible: false }); }, onChange: function (values) {
+                updateOpacitySlider(values[0], true);
             }, onUpdate: function (values) {
-                updateSlider(values[0], false);
-            }, min: 0, max: 359 })));
+                updateOpacitySlider(values[0], false);
+            }, min: 0, max: 1, step: 0.01, style: opacitySliderStyle }))));
 });

package/esm/core/ColorPicker/ColorInputPanel.js

@@ -41,43 +41,62 @@ import '@itwin/itwinui-css/css/color-picker.css';
  * </ColorPicker>
  */
 export var ColorInputPanel = React.forwardRef(function (props, ref) {
-    var defaultColorFormat = props.defaultColorFormat, _a = props.allowedColorFormats, allowedColorFormats = _a === void 0 ? ['hsl', 'rgb', 'hex'] : _a, className = props.className, rest = __rest(props, ["defaultColorFormat", "allowedColorFormats", "className"]);
+    var _a, _b, _c, _d, _f, _g, _h, _j;
+    var defaultColorFormat = props.defaultColorFormat, _k = props.allowedColorFormats, allowedColorFormats = _k === void 0 ? ['hsl', 'rgb', 'hex'] : _k, className = props.className, rest = __rest(props, ["defaultColorFormat", "allowedColorFormats", "className"]);
     useTheme();
-    var _b = useColorPickerContext(), activeColor = _b.activeColor, applyHsvColorChange = _b.applyHsvColorChange, hsvColor = _b.hsvColor;
-    var _c = React.useState(defaultColorFormat), currentFormat = _c[0], setCurrentFormat = _c[1];
+    var inputsContainerRef = React.useRef(null);
+    var _l = useColorPickerContext(), activeColor = _l.activeColor, applyHsvColorChange = _l.applyHsvColorChange, hsvColor = _l.hsvColor, showAlpha = _l.showAlpha;
+    var _m = React.useState(defaultColorFormat), currentFormat = _m[0], setCurrentFormat = _m[1];
     React.useEffect(function () {
         setCurrentFormat(defaultColorFormat);
     }, [defaultColorFormat]);
     // need to use state since input may have parsing error
-    var _d = React.useState([]), input = _d[0], setInput = _d[1];
+    var _o = React.useState(['', '', '', '']), input = _o[0], setInput = _o[1];
     React.useEffect(function () {
+        var _a, _b;
         if (currentFormat === 'hsl') {
             var hsl = activeColor.toHslColor();
-            // use activeHue to preserve hue for 0,0,0 edge case
-            setInput([hsvColor.h.toString(), hsl.s.toString(), hsl.l.toString()]);
+            setInput([
+                ColorValue.getFormattedColorNumber(hsvColor.h),
+                ColorValue.getFormattedColorNumber(hsl.s),
+                ColorValue.getFormattedColorNumber(hsl.l),
+                ColorValue.getFormattedColorNumber((_a = hsl.a) !== null && _a !== void 0 ? _a : activeColor.getAlpha() / 255, 2),
+            ]);
         }
         else if (currentFormat === 'rgb') {
             var rgb = activeColor.toRgbColor();
-            setInput([rgb.r.toString(), rgb.g.toString(), rgb.b.toString()]);
+            setInput([
+                rgb.r.toString(),
+                rgb.g.toString(),
+                rgb.b.toString(),
+                ColorValue.getFormattedColorNumber((_b = rgb.a) !== null && _b !== void 0 ? _b : activeColor.getAlpha() / 255, 2),
+            ]);
         }
         else {
-            setInput([activeColor.toHexString()]);
+            setInput([activeColor.toHexString(showAlpha)]);
+            setValidHexInput(true);
         }
-    }, [activeColor, hsvColor.h, currentFormat]);
-    var _f = React.useState(true), validHexInput = _f[0], setValidHexInput = _f[1];
+    }, [activeColor, hsvColor.h, currentFormat, showAlpha]);
+    var _p = React.useState(true), validHexInput = _p[0], setValidHexInput = _p[1];
     var swapColorFormat = React.useCallback(function () {
         var _a;
         var newFormat = (_a = allowedColorFormats[(allowedColorFormats.indexOf(currentFormat) + 1) %
             allowedColorFormats.length]) !== null && _a !== void 0 ? _a : allowedColorFormats[0];
         setCurrentFormat(newFormat);
     }, [currentFormat, allowedColorFormats]);
+    var isFocusInside = function (focused) {
+        return !!(focused &&
+            inputsContainerRef.current &&
+            inputsContainerRef.current.contains(focused));
+    };
     var handleColorInputChange = function () {
         var color;
         if (currentFormat === 'hex') {
             try {
-                color = ColorValue.fromString(input[0]);
+                var value = input[0].replace(/ /g, '').toLowerCase(); // remove white space from input
+                color = ColorValue.create(value);
                 setValidHexInput(true);
-                if (activeColor.toHexString() === input[0]) {
+                if (activeColor.toHexString(showAlpha).toLowerCase() === value) {
                     return;
                 }
             }
@@ -87,33 +106,47 @@ export var ColorInputPanel = React.forwardRef(function (props, ref) {
             }
         }
         if (currentFormat === 'hsl') {
-            var _a = input.map(Number), h = _a[0], s = _a[1], l = _a[2];
-            if (h < 0 || h > 360 || s < 0 || s > 100 || l < 0 || l > 100) {
+            var _a = input.map(Number), h = _a[0], s = _a[1], l = _a[2], a = _a[3];
+            if (h < 0 ||
+                h > 360 ||
+                s < 0 ||
+                s > 100 ||
+                l < 0 ||
+                l > 100 ||
+                a < 0 ||
+                a > 1) {
                 return;
             }
             var hsl = activeColor.toHslColor();
-            if (hsl.h === h && hsl.s === s && hsl.l === l) {
+            if (hsl.h === h && hsl.s === s && hsl.l === l && hsl.a === a) {
                 return;
             }
-            color = ColorValue.create({ h: h, s: s, l: l });
+            color = ColorValue.create({ h: h, s: s, l: l, a: a });
         }
         if (currentFormat === 'rgb') {
-            var _b = input.map(Number), r = _b[0], g = _b[1], b = _b[2];
-            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
+            var _b = input.map(Number), r = _b[0], g = _b[1], b = _b[2], a = _b[3];
+            if (r < 0 ||
+                r > 255 ||
+                g < 0 ||
+                g > 255 ||
+                b < 0 ||
+                b > 255 ||
+                a < 0 ||
+                a > 1) {
                 return;
             }
             var rgb = activeColor.toRgbColor();
-            if (rgb.r === r && rgb.g === g && rgb.b === b) {
+            if (rgb.r === r && rgb.g === g && rgb.b === b && rgb.a === a) {
                 return;
             }
-            color = ColorValue.create({ r: r, g: g, b: b });
+            color = ColorValue.create({ r: r, g: g, b: b, a: a });
         }
         if (color) {
-            applyHsvColorChange(color.toHsvColor(), true);
+            applyHsvColorChange(color.toHsvColor(), true, color);
         }
     };
     var hexInputField = (React.createElement(InputContainer, { status: validHexInput ? undefined : 'negative' },
-        React.createElement(Input, { size: 'small', maxLength: 7, minLength: 1, placeholder: 'HEX', value: input[0], onChange: function (event) {
+        React.createElement(Input, { size: 'small', maxLength: showAlpha ? 9 : 7, minLength: 1, placeholder: 'HEX', value: input[0], onChange: function (event) {
                 var value = event.target.value.startsWith('#')
                     ? event.target.value
                     : "#" + event.target.value;
@@ -131,8 +164,8 @@ export var ColorInputPanel = React.forwardRef(function (props, ref) {
         React.createElement(InputContainer, { status: Number(input[0]) < 0 || Number(input[0]) > 360
                 ? 'negative'
                 : undefined },
-            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '359', placeholder: 'H', value: input[0], onChange: function (event) {
-                    setInput([event.target.value, input[1], input[2]]);
+            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '359', step: '.1', placeholder: 'H', value: (_a = input[0]) !== null && _a !== void 0 ? _a : '', onChange: function (event) {
+                    setInput([event.target.value, input[1], input[2], input[3]]);
                 }, onKeyDown: function (event) {
                     if (event.key === 'Enter') {
                         event.preventDefault();
@@ -140,13 +173,15 @@ export var ColorInputPanel = React.forwardRef(function (props, ref) {
                     }
                 }, onBlur: function (event) {
                     event.preventDefault();
-                    handleColorInputChange();
+                    if (!isFocusInside(event.relatedTarget)) {
+                        handleColorInputChange();
+                    }
                 } })),
         React.createElement(InputContainer, { status: Number(input[1]) < 0 || Number(input[1]) > 100
                 ? 'negative'
                 : undefined },
-            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '100', placeholder: 'S', value: input[1], onChange: function (event) {
-                    setInput([input[0], event.target.value, input[2]]);
+            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '100', step: '.1', placeholder: 'S', value: (_b = input[1]) !== null && _b !== void 0 ? _b : '', onChange: function (event) {
+                    setInput([input[0], event.target.value, input[2], input[3]]);
                 }, onKeyDown: function (event) {
                     if (event.key === 'Enter') {
                         event.preventDefault();
@@ -154,13 +189,15 @@ export var ColorInputPanel = React.forwardRef(function (props, ref) {
                     }
                 }, onBlur: function (event) {
                     event.preventDefault();
-                    handleColorInputChange();
+                    if (!isFocusInside(event.relatedTarget)) {
+                        handleColorInputChange();
+                    }
                 } })),
         React.createElement(InputContainer, { status: Number(input[2]) < 0 || Number(input[2]) > 100
                 ? 'negative'
                 : undefined },
-            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '100', placeholder: 'L', value: input[2], onChange: function (event) {
-                    setInput([input[0], input[1], event.target.value]);
+            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '100', step: '.1', placeholder: 'L', value: (_c = input[2]) !== null && _c !== void 0 ? _c : '', onChange: function (event) {
+                    setInput([input[0], input[1], event.target.value, input[3]]);
                 }, onKeyDown: function (event) {
                     if (event.key === 'Enter') {
                         event.preventDefault();
@@ -168,14 +205,32 @@ export var ColorInputPanel = React.forwardRef(function (props, ref) {
                     }
                 }, onBlur: function (event) {
                     event.preventDefault();
-                    handleColorInputChange();
-                } }))));
+                    if (!isFocusInside(event.relatedTarget)) {
+                        handleColorInputChange();
+                    }
+                } })),
+        showAlpha && (React.createElement(InputContainer, { status: Number(input[3]) < 0 || Number(input[3]) > 1
+                ? 'negative'
+                : undefined },
+            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '1', step: '.01', placeholder: 'A', value: (_d = input[3]) !== null && _d !== void 0 ? _d : '', onChange: function (event) {
+                    setInput([input[0], input[1], input[2], event.target.value]);
+                }, onKeyDown: function (event) {
+                    if (event.key === 'Enter') {
+                        event.preventDefault();
+                        handleColorInputChange();
+                    }
+                }, onBlur: function (event) {
+                    event.preventDefault();
+                    if (!isFocusInside(event.relatedTarget)) {
+                        handleColorInputChange();
+                    }
+                } })))));
     var rgbInputs = (React.createElement(React.Fragment, null,
         React.createElement(InputContainer, { status: Number(input[0]) < 0 || Number(input[0]) > 255
                 ? 'negative'
                 : undefined },
-            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'R', value: input[0], onChange: function (event) {
-                    setInput([event.target.value, input[1], input[2]]);
+            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'R', value: (_f = input[0]) !== null && _f !== void 0 ? _f : '', onChange: function (event) {
+                    setInput([event.target.value, input[1], input[2], input[3]]);
                 }, onKeyDown: function (event) {
                     if (event.key === 'Enter') {
                         event.preventDefault();
@@ -183,13 +238,15 @@ export var ColorInputPanel = React.forwardRef(function (props, ref) {
                     }
                 }, onBlur: function (event) {
                     event.preventDefault();
-                    handleColorInputChange();
+                    if (!isFocusInside(event.relatedTarget)) {
+                        handleColorInputChange();
+                    }
                 } })),
         React.createElement(InputContainer, { status: Number(input[1]) < 0 || Number(input[1]) > 255
                 ? 'negative'
                 : undefined },
-            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'G', value: input[1], onChange: function (event) {
-                    setInput([input[0], event.target.value, input[2]]);
+            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'G', value: (_g = input[1]) !== null && _g !== void 0 ? _g : '', onChange: function (event) {
+                    setInput([input[0], event.target.value, input[2], input[3]]);
                 }, onKeyDown: function (event) {
                     if (event.key === 'Enter') {
                         event.preventDefault();
@@ -197,13 +254,15 @@ export var ColorInputPanel = React.forwardRef(function (props, ref) {
                     }
                 }, onBlur: function (event) {
                     event.preventDefault();
-                    handleColorInputChange();
+                    if (!isFocusInside(event.relatedTarget)) {
+                        handleColorInputChange();
+                    }
                 } })),
         React.createElement(InputContainer, { status: Number(input[2]) < 0 || Number(input[2]) > 255
                 ? 'negative'
                 : undefined },
-            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'B', value: input[2], onChange: function (event) {
-                    setInput([input[0], input[1], event.target.value]);
+            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'B', value: (_h = input[2]) !== null && _h !== void 0 ? _h : '', onChange: function (event) {
+                    setInput([input[0], input[1], event.target.value, input[3]]);
                 }, onKeyDown: function (event) {
                     if (event.key === 'Enter') {
                         event.preventDefault();
@@ -211,17 +270,37 @@ export var ColorInputPanel = React.forwardRef(function (props, ref) {
                     }
                 }, onBlur: function (event) {
                     event.preventDefault();
-                    handleColorInputChange();
-                } }))));
+                    if (!isFocusInside(event.relatedTarget)) {
+                        handleColorInputChange();
+                    }
+                } })),
+        showAlpha && (React.createElement(InputContainer, { status: Number(input[3]) < 0 || Number(input[3]) > 1
+                ? 'negative'
+                : undefined },
+            React.createElement(Input, { size: 'small', type: 'number', min: '0', max: '1', step: '.01', placeholder: 'A', value: (_j = input[3]) !== null && _j !== void 0 ? _j : '', onChange: function (event) {
+                    setInput([input[0], input[1], input[2], event.target.value]);
+                }, onKeyDown: function (event) {
+                    if (event.key === 'Enter') {
+                        event.preventDefault();
+                        handleColorInputChange();
+                    }
+                }, onBlur: function (event) {
+                    event.preventDefault();
+                    if (!isFocusInside(event.relatedTarget)) {
+                        handleColorInputChange();
+                    }
+                } })))));
     return (React.createElement("div", __assign({ className: cx('iui-color-input-wrapper', className), ref: ref }, rest),
-        React.createElement("div", { className: 'iui-color-picker-section-label' }, currentFormat.toUpperCase()),
+        React.createElement("div", { className: 'iui-color-picker-section-label' }, showAlpha && currentFormat != 'hex'
+            ? currentFormat.toUpperCase() + 'A'
+            : currentFormat.toUpperCase()),
         React.createElement("div", { className: 'iui-color-input' },
             allowedColorFormats.length > 1 && (React.createElement(IconButton, { styleType: 'borderless', onClick: swapColorFormat, size: 'small' },
                 React.createElement("svg", { viewBox: '0 0 16 16', className: 'iui-icon', "aria-hidden": true },
                     React.createElement("path", { d: 'm5 15-3.78125-3.5 3.78125-3.5v2h8v3h-8zm6-7 3.78125-3.5-3.78125-3.5v2h-8v3h8z' })))),
-            React.createElement("div", { className: 'iui-color-input-fields' },
+            React.createElement("div", { ref: inputsContainerRef, className: 'iui-color-input-fields' },
                 currentFormat === 'hex' && hexInputField,
-                currentFormat === 'hsl' && hslInputs,
-                currentFormat === 'rgb' && rgbInputs))));
+                currentFormat === 'rgb' && rgbInputs,
+                currentFormat === 'hsl' && hslInputs))));
 });
 export default ColorInputPanel;

package/esm/core/ColorPicker/ColorPicker.d.ts

@@ -30,6 +30,11 @@ export declare type ColorPickerProps = {
      * @default false
      */
     setFocus?: boolean;
+    /**
+     * If true, ColorBuilder will show the alpha slider and ColorInputPanel will show an alpha input.
+     * @default false
+     */
+    showAlpha?: boolean;
 } & Omit<CommonProps, 'title'>;
 /**
  * ColorPicker to display color builder options, color inputs, and a palette of ColorSwatches.

package/esm/core/ColorPicker/ColorPicker.js

@@ -49,7 +49,7 @@ export var getColorValue = function (color) {
  * </ColorPicker>
  */
 export var ColorPicker = function (props) {
-    var children = props.children, className = props.className, selectedColor = props.selectedColor, onChange = props.onChange, onChangeComplete = props.onChangeComplete, _a = props.setFocus, setFocus = _a === void 0 ? false : _a, rest = __rest(props, ["children", "className", "selectedColor", "onChange", "onChangeComplete", "setFocus"]);
+    var children = props.children, className = props.className, selectedColor = props.selectedColor, onChange = props.onChange, onChangeComplete = props.onChangeComplete, _a = props.setFocus, setFocus = _a === void 0 ? false : _a, _b = props.showAlpha, showAlpha = _b === void 0 ? false : _b, rest = __rest(props, ["children", "className", "selectedColor", "onChange", "onChangeComplete", "setFocus", "showAlpha"]);
     useTheme();
     var ref = React.useRef(null);
     // set focus on the first tabbable element
@@ -63,13 +63,13 @@ export var ColorPicker = function (props) {
         selectedColor,
     ]);
     var activeColorTbgr = React.useRef(inColor.toTbgr());
-    var _b = React.useState(inColor), activeColor = _b[0], setActiveColor = _b[1]; // Color of colorDot or active ColorSwatch
+    var _c = React.useState(inColor), activeColor = _c[0], setActiveColor = _c[1]; // Color of colorDot or active ColorSwatch
     React.useEffect(function () {
         setActiveColor(inColor);
     }, [inColor]);
-    var _c = React.useState(function () {
+    var _d = React.useState(function () {
         return activeColor.toHsvColor();
-    }), hsvColor = _c[0], setHsvColor = _c[1];
+    }), hsvColor = _d[0], setHsvColor = _d[1];
     // The following code is used to preserve the Hue after initial mount. If the current HSV value produces the same rgb value
     // as the selectedColor prop then leave the HSV color unchanged. This prevents the jumping of HUE as the s/v values are changed
     // by user moving the pointer.
@@ -79,10 +79,10 @@ export var ColorPicker = function (props) {
             setHsvColor(inColor.toHsvColor());
         }
     }, [inColor]);
-    var applyHsvColorChange = React.useCallback(function (newColor, selectionChanged) {
+    var applyHsvColorChange = React.useCallback(function (newColor, selectionChanged, newColorValue) {
         // save the HSV values
         setHsvColor(newColor);
-        var newActiveColor = ColorValue.create(newColor);
+        var newActiveColor = newColorValue !== null && newColorValue !== void 0 ? newColorValue : ColorValue.create(newColor);
         // Only update selected color when dragging is done
         if (selectionChanged) {
             onChangeComplete === null || onChangeComplete === void 0 ? void 0 : onChangeComplete(newActiveColor);
@@ -101,6 +101,7 @@ export var ColorPicker = function (props) {
                 hsvColor: hsvColor,
                 applyHsvColorChange: applyHsvColorChange,
                 onChangeComplete: onChangeComplete,
+                showAlpha: showAlpha,
             } }, children)));
 };
 export default ColorPicker;

package/esm/core/ColorPicker/ColorPickerContext.d.ts

@@ -5,12 +5,14 @@ export declare const ColorPickerContext: React.Context<{
     setActiveColor: (color: ColorValue | ((prevColor: ColorValue) => ColorValue)) => void;
     hsvColor: HsvColor;
     onChangeComplete?: ((color: ColorValue) => void) | undefined;
-    applyHsvColorChange: (newColor: HsvColor, selectionChanged: boolean) => void;
+    applyHsvColorChange: (newColor: HsvColor, selectionChanged: boolean, newColorValue?: ColorValue | undefined) => void;
+    showAlpha: boolean;
 } | undefined>;
 export declare const useColorPickerContext: () => {
     activeColor: ColorValue;
     setActiveColor: (color: ColorValue | ((prevColor: ColorValue) => ColorValue)) => void;
     hsvColor: HsvColor;
     onChangeComplete?: ((color: ColorValue) => void) | undefined;
-    applyHsvColorChange: (newColor: HsvColor, selectionChanged: boolean) => void;
+    applyHsvColorChange: (newColor: HsvColor, selectionChanged: boolean, newColorValue?: ColorValue | undefined) => void;
+    showAlpha: boolean;
 };

package/esm/core/ColorPicker/ColorSwatch.d.ts

@@ -17,5 +17,5 @@ export declare type ColorSwatchProps = {
  * <ColorSwatch color='#23450b' onClick={onClick}/>
  * <ColorSwatch color={{ r: 255, g: 255, b: 0 }} onClick={onClick}/>
  */
-export declare const ColorSwatch: React.ForwardRefExoticComponent<Pick<ColorSwatchProps, "dir" | "slot" | "style" | "title" | "id" | "role" | "children" | "className" | "accessKey" | "draggable" | "hidden" | "lang" | "translate" | "prefix" | "contentEditable" | "inputMode" | "tabIndex" | "onFocus" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "contextMenu" | "placeholder" | "spellCheck" | "radioGroup" | "about" | "datatype" | "inlist" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "isActive" | "key"> & React.RefAttributes<HTMLDivElement>>;
+export declare const ColorSwatch: React.ForwardRefExoticComponent<Pick<ColorSwatchProps, "dir" | "slot" | "style" | "title" | "id" | "role" | "children" | "className" | "accessKey" | "draggable" | "hidden" | "lang" | "translate" | "prefix" | "contentEditable" | "inputMode" | "tabIndex" | "onFocus" | "color" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "contextMenu" | "placeholder" | "spellCheck" | "radioGroup" | "about" | "datatype" | "inlist" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "isActive" | "key"> & React.RefAttributes<HTMLDivElement>>;
 export default ColorSwatch;

package/esm/core/ColorPicker/ColorSwatch.js

@@ -36,12 +36,18 @@ import { getColorValue } from './ColorPicker';
  * <ColorSwatch color={{ r: 255, g: 255, b: 0 }} onClick={onClick}/>
  */
 export var ColorSwatch = React.forwardRef(function (props, ref) {
-    var _a, _b, _c;
     var color = props.color, style = props.style, onClick = props.onClick, isActive = props.isActive, className = props.className, rest = __rest(props, ["color", "style", "onClick", "isActive", "className"]);
     useTheme();
-    var c = typeof color === 'string' ? color : getColorValue(color).toHexString();
-    var _style = color && ((_c = (_b = (_a = getWindow()) === null || _a === void 0 ? void 0 : _a.CSS) === null || _b === void 0 ? void 0 : _b.supports) === null || _c === void 0 ? void 0 : _c.call(_b, "--swatch-color: " + c))
-        ? __assign({ '--swatch-color': c }, style) : __assign({ backgroundColor: c }, style);
+    var colorString = React.useMemo(function () {
+        return typeof color === 'string'
+            ? color
+            : getColorValue(color).toHslString(true);
+    }, [color]);
+    var _style = React.useMemo(function () {
+        var _a, _b, _c;
+        return ((_c = (_b = (_a = getWindow()) === null || _a === void 0 ? void 0 : _a.CSS) === null || _b === void 0 ? void 0 : _b.supports) === null || _c === void 0 ? void 0 : _c.call(_b, "--swatch-color: " + colorString))
+            ? __assign({ '--swatch-color': colorString }, style) : __assign({ backgroundColor: colorString }, style);
+    }, [colorString, style]);
     return (React.createElement("div", __assign({ className: cx('iui-color-swatch', { 'iui-active': isActive }, className), style: _style, onClick: onClick, tabIndex: isActive ? 0 : -1, "aria-selected": isActive, ref: ref }, rest)));
 });
 export default ColorSwatch;

package/esm/core/DatePicker/DatePicker.d.ts

@@ -18,7 +18,7 @@ export declare type DatePickerProps = {
     /**
      * Callback when date is changed.
      */
-    onChange?: (date?: Date) => void;
+    onChange?: (date: Date) => void;
     /**
      * Pass localized week days (start from sunday) and months.
      * Use helper function `generateLocalizedStrings` to generate strings using `Intl.DateTimeFormat`.

package/esm/core/InformationPanel/InformationPanel.d.ts

@@ -35,7 +35,10 @@ export declare type InformationPanelProps = {
  *       <Text variant='subheading'>InfoPanel heading</Text>
  *     </InformationPanelHeader>
  *     <InformationPanelBody>
- *       <span>Info panel content</span>
+ *       <Text>Metadata</Text>
+ *       <InformationPanelContent ... />
+ *       <Text>Attributes</Text>
+ *       <InformationPanelContent ... />
  *     </InformationPanelBody>
  *   </InformationPanel>
  * </InformationPanelWrapper>

package/esm/core/InformationPanel/InformationPanel.js

@@ -41,7 +41,10 @@ import '@itwin/itwinui-css/css/information-panel.css';
  *       <Text variant='subheading'>InfoPanel heading</Text>
  *     </InformationPanelHeader>
  *     <InformationPanelBody>
- *       <span>Info panel content</span>
+ *       <Text>Metadata</Text>
+ *       <InformationPanelContent ... />
+ *       <Text>Attributes</Text>
+ *       <InformationPanelContent ... />
  *     </InformationPanelBody>
  *   </InformationPanel>
  * </InformationPanelWrapper>