@esri/calcite-components 1.0.0-next.308 → 1.0.0-next.311

package/dist/collection/components/calcite-input/calcite-input.js

@@ -199,12 +199,13 @@ export class CalciteInput {
       const inputMin = this.minString ? parseFloat(this.minString) : null;
       const valueNudgeDelayInMs = 100;
       this.incrementOrDecrementNumberValue(direction, inputMax, inputMin, nativeEvent);
-      let nudgeNumberValueIntervalCount = 0;
+      let firstValueNudge = true;
       this.nudgeNumberValueIntervalId = setInterval(() => {
-        nudgeNumberValueIntervalCount !== 0
-          ? this.incrementOrDecrementNumberValue(direction, inputMax, inputMin, nativeEvent)
-          : null;
-        nudgeNumberValueIntervalCount++;
+        if (firstValueNudge) {
+          firstValueNudge = false;
+          return;
+        }
+        this.incrementOrDecrementNumberValue(direction, inputMax, inputMin, nativeEvent);
       }, valueNudgeDelayInMs);
     };
     this.numberButtonMouseUpAndMouseOutHandler = () => {
@@ -422,7 +423,7 @@ export class CalciteInput {
       numberButtonsHorizontalDown));
     const prefixText = h("div", { class: CSS.prefix }, this.prefixText);
     const suffixText = h("div", { class: CSS.suffix }, this.suffixText);
-    const localeNumberInput = this.type === "number" ? (h("input", { "aria-label": getLabelText(this), autofocus: this.autofocus ? true : null, defaultValue: this.defaultValue, disabled: this.disabled ? true : null, enterKeyHint: this.el.enterKeyHint, inputMode: this.el.inputMode, key: "localized-input", maxLength: this.maxLength, minLength: this.minLength, name: undefined, onBlur: this.inputBlurHandler, onFocus: this.inputFocusHandler, onInput: this.inputNumberInputHandler, onKeyDown: this.inputNumberKeyDownHandler, onKeyUp: this.inputKeyUpHandler, placeholder: this.placeholder || "", readOnly: this.readOnly, ref: this.setChildNumberElRef, tabIndex: this.disabled ? -1 : 0, type: "text", value: this.localizedValue })) : null;
+    const localeNumberInput = this.type === "number" ? (h("input", { "aria-label": getLabelText(this), autofocus: this.autofocus ? true : null, defaultValue: this.defaultValue, disabled: this.disabled ? true : null, enterKeyHint: this.el.enterKeyHint, inputMode: this.el.inputMode, key: "localized-input", maxLength: this.maxLength, minLength: this.minLength, name: undefined, onBlur: this.inputBlurHandler, onFocus: this.inputFocusHandler, onInput: this.inputNumberInputHandler, onKeyDown: this.inputNumberKeyDownHandler, onKeyUp: this.inputKeyUpHandler, placeholder: this.placeholder || "", readOnly: this.readOnly, ref: this.setChildNumberElRef, type: "text", value: this.localizedValue })) : null;
     const childEl = this.type !== "number"
       ? [
         h(this.childElType, { "aria-label": getLabelText(this), autofocus: this.autofocus ? true : null, class: {
@@ -435,7 +436,7 @@ export class CalciteInput {
       : null;
     return (h(Host, { onClick: this.inputFocusHandler, onKeyDown: this.keyDownHandler },
       h("div", { class: { [CSS.inputWrapper]: true, [CSS_UTILITY.rtl]: dir === "rtl" }, dir: dir },
-        this.type === "number" && this.numberButtonType === "horizontal"
+        this.type === "number" && this.numberButtonType === "horizontal" && !this.readOnly
           ? numberButtonsHorizontalDown
           : null,
         this.prefixText ? prefixText : null,
@@ -447,11 +448,11 @@ export class CalciteInput {
           this.loading ? loader : null),
         h("div", { class: CSS.actionWrapper },
           h("slot", { name: SLOTS.action })),
-        this.type === "number" && this.numberButtonType === "vertical"
+        this.type === "number" && this.numberButtonType === "vertical" && !this.readOnly
           ? numberButtonsVertical
           : null,
         this.suffixText ? suffixText : null,
-        this.type === "number" && this.numberButtonType === "horizontal"
+        this.type === "number" && this.numberButtonType === "horizontal" && !this.readOnly
           ? numberButtonsHorizontalUp
           : null,
         h(HiddenFormInputSlot, { component: this }))));

package/dist/collection/components/calcite-shell-panel/calcite-shell-panel.css

@@ -106,6 +106,49 @@
   box-sizing: border-box;
 }
 
+:host(:hover) .separator:not(:hover):not(:focus),
+:host(:focus-within) .separator:not(:hover):not(:focus) {
+  opacity: 1;
+  background-color: var(--calcite-ui-border-3);
+}
+
+.separator {
+  position: absolute;
+  background-color: transparent;
+  bottom: 0;
+  display: flex;
+  height: 100%;
+  opacity: 0;
+  pointer-events: auto;
+  top: 0;
+  transition-property: all;
+  transition-duration: 150ms;
+  transition-timing-function: ease-in-out;
+  transition-delay: 0s;
+  width: 0.125rem;
+  z-index: 10;
+  cursor: col-resize;
+  outline: none;
+}
+
+.separator:hover {
+  opacity: 1;
+  background-color: var(--calcite-ui-border-2);
+}
+
+.separator:focus {
+  background-color: var(--calcite-ui-brand);
+  opacity: 1;
+}
+
+:host([position=start]) .separator {
+  inset-inline-end: -2px;
+}
+
+:host([position=end]) .separator {
+  inset-inline-start: -2px;
+}
+
 ::slotted(calcite-panel),
 ::slotted(calcite-flow) {
   flex: 1 1 auto;

package/dist/collection/components/calcite-shell-panel/calcite-shell-panel.js

@@ -2,9 +2,10 @@
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
  */
-import { Component, Element, Event, Prop, Watch, h } from "@stencil/core";
-import { CSS, SLOTS } from "./resources";
+import { Component, Element, Event, Prop, Watch, h, State, forceUpdate } from "@stencil/core";
+import { CSS, SLOTS, TEXT } from "./resources";
 import { getSlotted } from "../../utils/dom";
+import { clamp } from "../../utils/math";
 /**
  * @slot - A slot for adding content to the shell panel.
  * @slot action-bar - A slot for adding a `calcite-action-bar` to the panel.
@@ -32,10 +33,121 @@ export class CalciteShellPanel {
      * This sets width of the content area.
      */
     this.widthScale = "m";
+    /**
+     * Accessible label for resize separator.
+     * @default "Resize"
+     */
+    this.intlResize = TEXT.resize;
+    /**
+     * This property makes the content area resizable if the calcite-shell-panel is not 'detached'.
+     */
+    this.resizable = false;
+    this.contentWidth = null;
+    this.initialContentWidth = null;
+    this.initialClientX = null;
+    this.contentWidthMax = null;
+    this.contentWidthMin = null;
+    this.step = 1;
+    this.stepMultiplier = 10;
+    this.storeContentEl = (contentEl) => {
+      this.contentEl = contentEl;
+    };
+    this.getKeyAdjustedWidth = (event) => {
+      const { key } = event;
+      const { step, stepMultiplier, contentWidthMin, contentWidthMax, initialContentWidth, position } = this;
+      const multipliedStep = step * stepMultiplier;
+      const MOVEMENT_KEYS = [
+        "ArrowUp",
+        "ArrowDown",
+        "ArrowLeft",
+        "ArrowRight",
+        "Home",
+        "End",
+        "PageUp",
+        "PageDown"
+      ];
+      if (MOVEMENT_KEYS.indexOf(key) > -1) {
+        event.preventDefault();
+      }
+      const increaseKeys = key === "ArrowUp" || (position === "end" ? key === "ArrowLeft" : key === "ArrowRight");
+      if (increaseKeys) {
+        const stepValue = event.shiftKey ? multipliedStep : step;
+        return initialContentWidth + stepValue;
+      }
+      const decreaseKeys = key === "ArrowDown" || (position === "end" ? key === "ArrowRight" : key === "ArrowLeft");
+      if (decreaseKeys) {
+        const stepValue = event.shiftKey ? multipliedStep : step;
+        return initialContentWidth - stepValue;
+      }
+      if (typeof contentWidthMin === "number" && key === "Home") {
+        return contentWidthMin;
+      }
+      if (typeof contentWidthMax === "number" && key === "End") {
+        return contentWidthMax;
+      }
+      if (key === "PageDown") {
+        return initialContentWidth - multipliedStep;
+      }
+      if (key === "PageUp") {
+        return initialContentWidth + multipliedStep;
+      }
+      return null;
+    };
+    this.separatorKeyDown = (event) => {
+      this.setInitialContentWidth();
+      const width = this.getKeyAdjustedWidth(event);
+      if (typeof width === "number") {
+        this.setContentWidth(width);
+      }
+    };
+    this.separatorPointerMove = (event) => {
+      event.preventDefault();
+      const { initialContentWidth, position, initialClientX } = this;
+      const offset = event.clientX - initialClientX;
+      this.setContentWidth(position === "end" ? initialContentWidth - offset : initialContentWidth + offset);
+    };
+    this.separatorPointerUp = (event) => {
+      event.preventDefault();
+      document.removeEventListener("pointerup", this.separatorPointerUp);
+      document.removeEventListener("pointermove", this.separatorPointerMove);
+    };
+    this.setInitialContentWidth = () => {
+      var _a;
+      this.initialContentWidth = (_a = this.contentEl) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect().width;
+    };
+    this.separatorPointerDown = (event) => {
+      event.preventDefault();
+      const { separatorEl } = this;
+      separatorEl && document.activeElement !== separatorEl && separatorEl.focus();
+      this.setInitialContentWidth();
+      this.initialClientX = event.clientX;
+      document.addEventListener("pointerup", this.separatorPointerUp);
+      document.addEventListener("pointermove", this.separatorPointerMove);
+    };
+    this.connectSeparator = (separatorEl) => {
+      this.disconnectSeparator();
+      this.separatorEl = separatorEl;
+      separatorEl.addEventListener("pointerdown", this.separatorPointerDown);
+    };
+    this.disconnectSeparator = () => {
+      var _a;
+      (_a = this.separatorEl) === null || _a === void 0 ? void 0 : _a.removeEventListener("pointerdown", this.separatorPointerDown);
+    };
   }
   watchHandler() {
     this.calciteShellPanelToggle.emit();
   }
+  //--------------------------------------------------------------------------
+  //
+  //  Lifecycle
+  //
+  //--------------------------------------------------------------------------
+  disconnectedCallback() {
+    this.disconnectSeparator();
+  }
+  componentDidLoad() {
+    this.updateAriaValues();
+  }
   // --------------------------------------------------------------------------
   //
   //  Render Methods
@@ -48,18 +160,53 @@ export class CalciteShellPanel {
       h("slot", { name: SLOTS.header }))) : null;
   }
   render() {
-    const { collapsed, detached, position } = this;
-    const contentNode = (h("div", { class: { [CSS.content]: true, [CSS.contentDetached]: detached }, hidden: collapsed },
+    const { collapsed, detached, position, initialContentWidth, contentWidth, contentWidthMax, contentWidthMin, intlResize, resizable } = this;
+    const allowResizing = !detached && resizable;
+    const contentNode = (h("div", { class: { [CSS.content]: true, [CSS.contentDetached]: detached }, hidden: collapsed, ref: this.storeContentEl, style: allowResizing && contentWidth ? { width: `${contentWidth}px` } : null },
       this.renderHeader(),
       h("div", { class: CSS.contentBody },
         h("slot", null))));
+    const separatorNode = allowResizing ? (h("div", { "aria-label": intlResize, "aria-orientation": "horizontal", "aria-valuemax": contentWidthMax, "aria-valuemin": contentWidthMin, "aria-valuenow": contentWidth !== null && contentWidth !== void 0 ? contentWidth : initialContentWidth, class: CSS.separator, onKeyDown: this.separatorKeyDown, ref: this.connectSeparator, role: "separator", tabIndex: 0, "touch-action": "none" })) : null;
     const actionBarNode = h("slot", { name: SLOTS.actionBar });
-    const mainNodes = [actionBarNode, contentNode];
+    const mainNodes = [actionBarNode, contentNode, separatorNode];
     if (position === "end") {
       mainNodes.reverse();
     }
     return h("div", { class: { [CSS.container]: true } }, mainNodes);
   }
+  // --------------------------------------------------------------------------
+  //
+  //  private Methods
+  //
+  // --------------------------------------------------------------------------
+  setContentWidth(width) {
+    const { contentWidthMax, contentWidthMin } = this;
+    const roundedWidth = Math.round(width);
+    this.contentWidth =
+      typeof contentWidthMax === "number" && typeof contentWidthMin === "number"
+        ? clamp(roundedWidth, contentWidthMin, contentWidthMax)
+        : roundedWidth;
+  }
+  updateAriaValues() {
+    const { contentEl } = this;
+    const computedStyle = contentEl && getComputedStyle(contentEl);
+    if (!computedStyle) {
+      return;
+    }
+    const max = parseInt(computedStyle.getPropertyValue("max-width"), 10);
+    const min = parseInt(computedStyle.getPropertyValue("min-width"), 10);
+    const valueNow = parseInt(computedStyle.getPropertyValue("width"), 10);
+    if (typeof valueNow === "number" && !isNaN(valueNow)) {
+      this.initialContentWidth = valueNow;
+    }
+    if (typeof max === "number" && !isNaN(max)) {
+      this.contentWidthMax = max;
+    }
+    if (typeof min === "number" && !isNaN(min)) {
+      this.contentWidthMin = min;
+    }
+    forceUpdate(this);
+  }
   static get is() { return "calcite-shell-panel"; }
   static get encapsulation() { return "shadow"; }
   static get originalStyleUrls() { return {
@@ -172,8 +319,50 @@ export class CalciteShellPanel {
       },
       "attribute": "position",
       "reflect": true
+    },
+    "intlResize": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "string",
+        "resolved": "string",
+        "references": {}
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [{
+            "name": "default",
+            "text": "\"Resize\""
+          }],
+        "text": "Accessible label for resize separator."
+      },
+      "attribute": "intl-resize",
+      "reflect": false,
+      "defaultValue": "TEXT.resize"
+    },
+    "resizable": {
+      "type": "boolean",
+      "mutable": false,
+      "complexType": {
+        "original": "boolean",
+        "resolved": "boolean",
+        "references": {}
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [],
+        "text": "This property makes the content area resizable if the calcite-shell-panel is not 'detached'."
+      },
+      "attribute": "resizable",
+      "reflect": true,
+      "defaultValue": "false"
     }
   }; }
+  static get states() { return {
+    "contentWidth": {}
+  }; }
   static get events() { return [{
       "method": "calciteShellPanelToggle",
       "name": "calciteShellPanelToggle",

package/dist/collection/components/calcite-shell-panel/resources.js

@@ -7,9 +7,13 @@ export const CSS = {
   content: "content",
   contentHeader: "content__header",
   contentBody: "content__body",
-  contentDetached: "content--detached"
+  contentDetached: "content--detached",
+  separator: "separator"
 };
 export const SLOTS = {
   actionBar: "action-bar",
   header: "header"
 };
+export const TEXT = {
+  resize: "Resize"
+};

package/dist/collection/components/calcite-split-button/calcite-split-button.js

@@ -26,6 +26,8 @@ export class CalciteSplitButton {
     /** optionally add a calcite-loader component to the control,
      disabling interaction. with the primary button */
     this.loading = false;
+    /** Describes the type of positioning to use for the dropdown. If your element is in a fixed container, use the 'fixed' value. */
+    this.overlayPositioning = "absolute";
     /** specify the scale of the control, defaults to m */
     this.scale = "m";
     /** specify the width of the button, defaults to auto */
@@ -46,7 +48,7 @@ export class CalciteSplitButton {
       h("calcite-button", { appearance: this.appearance, color: this.color, dir: dir, disabled: this.disabled, "icon-end": this.primaryIconEnd ? this.primaryIconEnd : null, "icon-start": this.primaryIconStart ? this.primaryIconStart : null, iconFlipRtl: this.primaryIconFlipRtl ? this.primaryIconFlipRtl : null, label: this.primaryLabel, loading: this.loading, onClick: this.calciteSplitButtonPrimaryClickHandler, scale: this.scale, splitChild: "primary", width: buttonWidth }, this.primaryText),
       h("div", { class: CSS.dividerContainer },
         h("div", { class: CSS.divider })),
-      h("calcite-dropdown", { active: this.active, dir: dir, onClick: this.calciteSplitButtonSecondaryClickHandler, placement: "bottom-trailing", scale: this.scale, width: this.scale },
+      h("calcite-dropdown", { active: this.active, dir: dir, onClick: this.calciteSplitButtonSecondaryClickHandler, overlayPositioning: this.overlayPositioning, placement: "bottom-trailing", scale: this.scale, width: this.scale },
         h("calcite-button", { appearance: this.appearance, color: this.color, dir: dir, disabled: this.disabled, "icon-start": this.dropdownIcon, label: this.dropdownLabel, scale: this.scale, slot: "dropdown-trigger", splitChild: "secondary" }),
         h("slot", null))));
   }
@@ -211,6 +213,29 @@ export class CalciteSplitButton {
       "reflect": true,
       "defaultValue": "false"
     },
+    "overlayPositioning": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "OverlayPositioning",
+        "resolved": "\"absolute\" | \"fixed\"",
+        "references": {
+          "OverlayPositioning": {
+            "location": "import",
+            "path": "../../utils/popper"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [],
+        "text": "Describes the type of positioning to use for the dropdown. If your element is in a fixed container, use the 'fixed' value."
+      },
+      "attribute": "overlay-positioning",
+      "reflect": false,
+      "defaultValue": "\"absolute\""
+    },
     "primaryIconEnd": {
       "type": "string",
       "mutable": false,

package/dist/components/calcite-alert.js

@@ -63,8 +63,13 @@ let CalciteAlert$1 = class extends HTMLElement {
     this.queueLength = 0;
     /** is the alert queued */
     this.queued = false;
+    this.autoDismissTimeout = null;
+    this.trackTimer = new Date();
     /** close and emit the closed alert and the queue */
     this.closeAlert = () => {
+      if (this.autoDismissTimeout) {
+        this.autoDismissTimeout = null;
+      }
       this.queued = false;
       this.active = false;
       this.queue = this.queue.filter((e) => e !== this.el);
@@ -88,6 +93,12 @@ let CalciteAlert$1 = class extends HTMLElement {
   updateRequestedIcon() {
     this.requestedIcon = setRequestedIcon(StatusIcons, this.icon, this.color);
   }
+  updateDuration(newDuration, prevDuration) {
+    if (this.autoDismiss && prevDuration !== newDuration && this.autoDismissTimeout) {
+      window.clearTimeout(this.autoDismissTimeout);
+      this.autoDismissTimeout = window.setTimeout(() => this.closeAlert(), DURATIONS[this.autoDismissDuration] - (new Date().valueOf() - this.trackTimer.valueOf()));
+    }
+  }
   //--------------------------------------------------------------------------
   //
   //  Lifecycle
@@ -104,20 +115,25 @@ let CalciteAlert$1 = class extends HTMLElement {
   componentDidLoad() {
     this.alertLinkEl = this.el.querySelectorAll("calcite-link")[0];
   }
+  disconnectedCallback() {
+    if (this.autoDismissTimeout) {
+      window.clearTimeout(this.autoDismissTimeout);
+    }
+  }
   render() {
     const dir = getElementDir(this.el);
     const closeButton = (h("button", { "aria-label": this.intlClose, class: "alert-close", onClick: this.closeAlert, ref: (el) => (this.closeButton = el), type: "button" }, h("calcite-icon", { icon: "x", scale: this.scale === "l" ? "m" : "s" })));
     const queueText = `+${this.queueLength > 2 ? this.queueLength - 1 : 1}`;
     const queueCount = (h("div", { class: `${this.queueLength > 1 ? "active " : ""}alert-queue-count` }, h("calcite-chip", { scale: this.scale, value: queueText }, queueText)));
     const { active, autoDismiss, label, queued, requestedIcon } = this;
-    const progress = h("div", { class: "alert-dismiss-progress" });
+    const progressBar = h("div", { class: "alert-dismiss-progress" });
     const role = autoDismiss ? "alert" : "alertdialog";
     const hidden = !active;
     return (h(Host, { "aria-hidden": hidden.toString(), "aria-label": label, "calcite-hydrated-hidden": hidden, role: role }, h("div", { class: {
         container: true,
         queued,
         [CSS_UTILITY.rtl]: dir === "rtl"
-      } }, requestedIcon ? (h("div", { class: "alert-icon" }, h("calcite-icon", { icon: requestedIcon, scale: this.scale === "l" ? "m" : "s" }))) : null, h("div", { class: "alert-content" }, h("slot", { name: SLOTS.title }), h("slot", { name: SLOTS.message }), h("slot", { name: SLOTS.link })), queueCount, !autoDismiss ? closeButton : null, active && !queued && autoDismiss ? progress : null)));
+      } }, requestedIcon ? (h("div", { class: "alert-icon" }, h("calcite-icon", { icon: requestedIcon, scale: this.scale === "l" ? "m" : "s" }))) : null, h("div", { class: "alert-content" }, h("slot", { name: SLOTS.title }), h("slot", { name: SLOTS.message }), h("slot", { name: SLOTS.link })), queueCount, !autoDismiss ? closeButton : null, active && !queued && autoDismiss ? progressBar : null)));
   }
   // when an alert is opened or closed, update queue and determine active alert
   alertSync(event) {
@@ -163,8 +179,8 @@ let CalciteAlert$1 = class extends HTMLElement {
     var _a;
     if (((_a = this.queue) === null || _a === void 0 ? void 0 : _a[0]) === this.el) {
       this.openAlert();
-      clearTimeout(this.autoDismissTimeout);
-      if (this.autoDismiss) {
+      if (this.autoDismiss && !this.autoDismissTimeout) {
+        this.trackTimer = new Date();
         this.autoDismissTimeout = window.setTimeout(() => this.closeAlert(), DURATIONS[this.autoDismissDuration]);
       }
     }
@@ -185,7 +201,8 @@ let CalciteAlert$1 = class extends HTMLElement {
   static get watchers() { return {
     "active": ["watchActive"],
     "icon": ["updateRequestedIcon"],
-    "color": ["updateRequestedIcon"]
+    "color": ["updateRequestedIcon"],
+    "autoDismissDuration": ["updateDuration"]
   }; }
   static get style() { return calciteAlertCss; }
 };

package/dist/components/calcite-color-picker-swatch2.js

@@ -215,12 +215,13 @@ var colorString = createCommonjsModule(function (module) {
 /* MIT license */
 
 
+var hasOwnProperty = Object.hasOwnProperty;
 
 var reverseNames = {};
 
 // create a list of reverse color names
 for (var name in colorName$1) {
-	if (colorName$1.hasOwnProperty(name)) {
+	if (hasOwnProperty.call(colorName$1, name)) {
 		reverseNames[colorName$1[name]] = name;
 	}
 }
@@ -263,9 +264,9 @@ cs.get.rgb = function (string) {
 
 	var abbr = /^#([a-f0-9]{3,4})$/i;
 	var hex = /^#([a-f0-9]{6})([a-f0-9]{2})?$/i;
-	var rgba = /^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/;
-	var per = /^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/;
-	var keyword = /(\D+)/;
+	var rgba = /^rgba?\(\s*([+-]?\d+)\s*,?\s*([+-]?\d+)\s*,?\s*([+-]?\d+)\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
+	var per = /^rgba?\(\s*([+-]?[\d\.]+)\%\s*,?\s*([+-]?[\d\.]+)\%\s*,?\s*([+-]?[\d\.]+)\%\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
+	var keyword = /^(\w+)$/;
 
 	var rgb = [0, 0, 0, 1];
 	var match;
@@ -302,7 +303,11 @@ cs.get.rgb = function (string) {
 		}
 
 		if (match[4]) {
-			rgb[3] = parseFloat(match[4]);
+			if (match[5]) {
+				rgb[3] = parseFloat(match[4]) * 0.01;
+			} else {
+				rgb[3] = parseFloat(match[4]);
+			}
 		}
 	} else if (match = string.match(per)) {
 		for (i = 0; i < 3; i++) {
@@ -310,19 +315,22 @@ cs.get.rgb = function (string) {
 		}
 
 		if (match[4]) {
-			rgb[3] = parseFloat(match[4]);
+			if (match[5]) {
+				rgb[3] = parseFloat(match[4]) * 0.01;
+			} else {
+				rgb[3] = parseFloat(match[4]);
+			}
 		}
 	} else if (match = string.match(keyword)) {
 		if (match[1] === 'transparent') {
 			return [0, 0, 0, 0];
 		}
 
-		rgb = colorName$1[match[1]];
-
-		if (!rgb) {
+		if (!hasOwnProperty.call(colorName$1, match[1])) {
 			return null;
 		}
 
+		rgb = colorName$1[match[1]];
 		rgb[3] = 1;
 
 		return rgb;
@@ -348,7 +356,7 @@ cs.get.hsl = function (string) {
 
 	if (match) {
 		var alpha = parseFloat(match[4]);
-		var h = (parseFloat(match[1]) + 360) % 360;
+		var h = ((parseFloat(match[1]) % 360) + 360) % 360;
 		var s = clamp(parseFloat(match[2]), 0, 100);
 		var l = clamp(parseFloat(match[3]), 0, 100);
 		var a = clamp(isNaN(alpha) ? 1 : alpha, 0, 1);
@@ -443,7 +451,7 @@ function clamp(num, min, max) {
 }
 
 function hexDouble(num) {
-	var str = num.toString(16).toUpperCase();
+	var str = Math.round(num).toString(16).toUpperCase();
 	return (str.length < 2) ? '0' + str : str;
 }
 });