@dxc-technology/halstack-react 0.0.0-d3554d7 → 0.0.0-d3ac293

package/slider/Slider.test.js

@@ -6,24 +6,73 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Slider = _interopRequireDefault(require("./Slider"));
+var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
+
+var _Slider = _interopRequireDefault(require("./Slider.tsx"));
 
 describe("Slider component tests", function () {
-  test("Slider renders with correct text", function () {
+  test("Slider renders with correct text and label id", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      label: "label",
       minValue: 0,
       maxValue: 100,
       showLimitsValues: true
     })),
-        getByText = _render.getByText;
+        getByText = _render.getByText,
+        getByRole = _render.getByRole;
 
     expect(getByText("0")).toBeTruthy();
     expect(getByText("100")).toBeTruthy();
+    var sliderId = getByText("label").getAttribute("id");
+    expect(getByRole("slider").getAttribute("aria-labelledby")).toBe(sliderId);
+    expect(getByRole("slider").getAttribute("aria-orientation")).toBe("horizontal");
+  });
+  test("Slider renders with correct initial value when it is uncontrolled", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      defaultValue: 30,
+      minValue: 0,
+      maxValue: 100,
+      showLimitsValues: true,
+      showInput: true
+    })),
+        getByRole = _render2.getByRole;
+
+    var slider = getByRole("slider");
+    var input = getByRole("textbox");
+    expect(slider.getAttribute("aria-valuenow")).toBe("30");
+    expect(input.value).toBe("30");
+  });
+  test("Slider correct limit values", function () {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      defaultValue: 125,
+      minValue: 30,
+      maxValue: 125,
+      showLimitsValues: true
+    })),
+        getByRole = _render3.getByRole,
+        getByText = _render3.getByText;
+
+    var slider = getByRole("slider");
+    expect(slider.getAttribute("aria-valuemin")).toBe("30");
+    expect(slider.getAttribute("aria-valuemax")).toBe("125");
+
+    _userEvent["default"].tab();
+
+    _react2.fireEvent.keyDown(slider, {
+      key: "ArrowRight",
+      code: "ArrowRight",
+      keyCode: 39,
+      charCode: 39
+    });
+
+    expect(slider.getAttribute("aria-valuenow")).toBe("125");
+    expect(getByText("30")).toBeTruthy();
+    expect(getByText("125")).toBeTruthy();
   });
   test("Calls correct function onChange in controlled slider", function () {
     var onChange = jest.fn();
 
-    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       onChange: onChange,
@@ -31,8 +80,10 @@ describe("Slider component tests", function () {
       value: 13,
       showInput: true
     })),
-        getByRole = _render2.getByRole;
+        getByRole = _render4.getByRole;
 
+    expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("13");
+    expect(getByRole("textbox").value).toBe("13");
     (0, _react2.act)(function () {
       _react2.fireEvent.change(getByRole("textbox"), {
         target: {
@@ -41,18 +92,20 @@ describe("Slider component tests", function () {
       });
     });
     expect(onChange).toHaveBeenCalledWith(25);
+    expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("13");
+    expect(getByRole("textbox").value).toBe("13");
   });
   test("Calls correct function onChange in uncontrolled slider", function () {
     var onChange = jest.fn();
 
-    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       onChange: onChange,
       showLimitsValues: true,
       showInput: true
     })),
-        getByRole = _render3.getByRole;
+        getByRole = _render5.getByRole;
 
     (0, _react2.act)(function () {
       _react2.fireEvent.change(getByRole("textbox"), {
@@ -62,11 +115,13 @@ describe("Slider component tests", function () {
       });
     });
     expect(onChange).toHaveBeenCalledWith(25);
+    expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("25");
+    expect(getByRole("textbox").value).toBe("25");
   });
-  test("Disabled slider have disabled input", function () {
+  test("Disabled slider have disabled input and slider", function () {
     var onChange = jest.fn();
 
-    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       onChange: onChange,
@@ -75,7 +130,7 @@ describe("Slider component tests", function () {
       showInput: true,
       value: 13
     })),
-        getByRole = _render4.getByRole;
+        getByRole = _render6.getByRole;
 
     (0, _react2.act)(function () {
       _react2.fireEvent.change(getByRole("textbox"), {
@@ -86,33 +141,64 @@ describe("Slider component tests", function () {
     });
     expect(getByRole("textbox").hasAttribute("disabled")).toBeTruthy();
     expect(getByRole("textbox").value).toBe("13");
+    expect(getByRole("slider").hasAttribute("disabled")).toBeTruthy();
   });
-  test("Calls correct function onDragEnd", function () {
+  test("Calls correct function onDragEnd when it is uncontrolled", function () {
     var onDragEnd = jest.fn();
 
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
-      maxValue: 100,
-      showLimitsValues: true,
-      showInput: true,
+      maxValue: 150,
       onDragEnd: onDragEnd,
-      value: 25
+      showInput: true
     })),
-        getByRole = _render5.getByRole;
+        getByRole = _render7.getByRole;
 
+    var slider = getByRole("slider");
+    (0, _react2.act)(function () {
+      _react2.fireEvent.mouseDown(slider);
+    });
     (0, _react2.act)(function () {
-      _react2.fireEvent.mouseDown(getByRole("slider"));
+      _react2.fireEvent.mouseUp(slider, {
+        target: {
+          value: 120
+        }
+      });
+    });
+    expect(onDragEnd).toHaveBeenCalledWith("120");
+  });
+  test("Calls correct function onDragEnd when it is controlled", function () {
+    var onDragEnd = jest.fn();
 
-      _react2.fireEvent.mouseUp(getByRole("slider"));
+    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 150,
+      value: 50,
+      onDragEnd: onDragEnd,
+      showInput: true
+    })),
+        getByRole = _render8.getByRole;
+
+    var slider = getByRole("slider");
+    (0, _react2.act)(function () {
+      _react2.fireEvent.mouseDown(slider);
     });
-    expect(onDragEnd).toHaveBeenCalled();
+    (0, _react2.act)(function () {
+      _react2.fireEvent.mouseUp(slider, {
+        target: {
+          value: 120
+        }
+      });
+    });
+    expect(onDragEnd).toHaveBeenCalledWith("120");
+    expect(slider.getAttribute("aria-valuenow")).toBe("50");
   });
   test("Calls correct function labelFormatCallback", function () {
     var labelFormatCallback = jest.fn(function (x) {
       return "".concat(x, "$");
     });
 
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       showLimitsValues: true,
@@ -120,10 +206,45 @@ describe("Slider component tests", function () {
       value: 25,
       labelFormatCallback: labelFormatCallback
     })),
-        getByText = _render6.getByText;
+        getByText = _render9.getByText;
 
     expect(getByText("0$")).toBeTruthy();
     expect(getByText("100$")).toBeTruthy();
     expect(labelFormatCallback).toHaveBeenCalledTimes(2);
   });
+  test("Change value correctly to 0 from external function", function () {
+    var onChange = jest.fn();
+
+    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 100,
+      onChange: onChange,
+      showLimitsValues: true,
+      value: 13,
+      showInput: true
+    })),
+        rerender = _render10.rerender,
+        getByRole = _render10.getByRole;
+
+    var slider = getByRole("slider");
+
+    _userEvent["default"].tab();
+
+    _react2.fireEvent.keyDown(slider, {
+      key: "ArrowRight",
+      code: "ArrowRight",
+      keyCode: 39,
+      charCode: 39
+    });
+
+    rerender( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      minValue: 0,
+      maxValue: 100,
+      onChange: onChange,
+      showLimitsValues: true,
+      value: 0,
+      showInput: true
+    }));
+    expect(slider.getAttribute("aria-valuenow")).toBe("0");
+  });
 });

package/slider/types.d.ts

@@ -1,5 +1,5 @@
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+export declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+export declare type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
@@ -14,6 +14,10 @@ declare type Props = {
      * Name attribute of the input element.
      */
     name?: string;
+    /**
+     * Initial value of the slider, only when it is uncontrolled.
+     */
+    defaultValue?: number;
     /**
      * The selected value. If undefined, the component will be uncontrolled and the value will be managed internally by the component.
      */
@@ -75,4 +79,8 @@ declare type Props = {
      */
     size?: "medium" | "large" | "fillParent";
 };
+/**
+ * Reference to the component.
+ */
+export declare type RefType = HTMLDivElement;
 export default Props;

package/spinner/Spinner.js

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
@@ -178,7 +178,7 @@ var BackOverlay = _styledComponents["default"].div(_templateObject3 || (_templat
   return "".concat(props.theme.overlayOpacity);
 });
 
-var BackgroundSpinner = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: absolute;\n  z-index: 1;\n"])));
+var BackgroundSpinner = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: absolute;\n"])));
 
 var SVGBackground = _styledComponents["default"].svg(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n"])));
 
@@ -190,7 +190,7 @@ var CircleBackground = _styledComponents["default"].circle(_templateObject6 || (
   return props.mode !== "small" ? "8.5px" : "2px";
 });
 
-var Spinner = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: relative;\n  z-index: 2;\n"])));
+var Spinner = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: relative;\n"])));
 
 var SVGSpinner = _styledComponents["default"].svg(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  transform: rotate(-90deg);\n  top: 0;\n  left: 0;\n  transform-origin: center;\n  overflow: visible;\n  animation: ", ";\n"])), function (props) {
   return !props.isDeterminated ? "1.4s linear infinite both spinner-svg" : "";
@@ -199,7 +199,7 @@ var SVGSpinner = _styledComponents["default"].svg(_templateObject8 || (_template
 var CircleSpinner = _styledComponents["default"].circle(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  fill: transparent;\n  stroke-linecap: initial;\n  vector-effect: non-scaling-stroke;\n  animation: ", ";\n  stroke: ", ";\n  transform-origin: ", ";\n  stroke-dasharray: ", ";\n  stroke-width: ", ";\n  stroke-dashoffset: ", ";\n"])), function (props) {
   return props.isDeterminated ? "none" : props.mode !== "small" ? "1.4s ease-in-out infinite both svg-circle-large" : "1.4s ease-in-out infinite both svg-circle-small";
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.trackCircleColorOnDark : props.theme.trackCircleColor;
+  return props.backgroundType === "dark" || props.mode === "overlay" ? props.theme.trackCircleColorOverlay : props.theme.trackCircleColor;
 }, function (props) {
   return !props.isDeterminated ? "50% 50%" : "";
 }, function (props) {

package/spinner/Spinner.stories.jsx

@@ -2,12 +2,23 @@ import React from "react";
 import DxcSpinner from "./Spinner";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Spinner",
   component: DxcSpinner,
 };
 
+const opinionatedTheme = {
+  spinner: {
+    accentColor: "#5f249f",
+    baseColor: "#ffffff",
+    fontColor: "#000000",
+    overlayColor: "#a46ede",
+    overlayFontColor: "#ffffff",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <ExampleContainer>
@@ -62,7 +73,13 @@ export const Chromatic = () => (
       <DxcSpinner margin="xlarge" mode="small" value="75"></DxcSpinner>
       <Title title="Xxlarge margin" theme="light" level={4} />
       <DxcSpinner margin="xxlarge" mode="small" value="75"></DxcSpinner>
-      <hr />
+    </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="With label and value label" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSpinner label="Label" value="50" showValue></DxcSpinner>
+      </HalstackProvider>
     </ExampleContainer>
   </>
 );
@@ -101,3 +118,12 @@ export const SpinnerOverlayWithValueAndLabel = () => (
     <DxcSpinner mode="overlay" label="Label" value="50" showValue></DxcSpinner>
   </ExampleContainer>
 );
+
+export const SpinnerOverlayWithValueAndLabelOpinionated = () => (
+  <ExampleContainer>
+    <HalstackProvider theme={opinionatedTheme}>
+      <Title title="Mode overlay" theme="light" level={4} />
+      <DxcSpinner mode="overlay" label="Label" value="50" showValue></DxcSpinner>
+    </HalstackProvider>
+  </ExampleContainer>
+);

package/spinner/Spinner.test.js

@@ -6,7 +6,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Spinner = _interopRequireDefault(require("./Spinner"));
+var _Spinner = _interopRequireDefault(require("./Spinner.tsx"));
 
 describe("Spinner component tests", function () {
   test("Spinner renders with correct label", function () {

package/switch/Switch.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import SwitchPropsType from "./types";
-declare const DxcSwitch: ({ checked, value, label, labelPosition, name, disabled, onChange, required, margin, size, tabIndex, }: SwitchPropsType) => JSX.Element;
+declare const DxcSwitch: React.ForwardRefExoticComponent<SwitchPropsType & React.RefAttributes<HTMLDivElement>>;
 export default DxcSwitch;