@dxc-technology/halstack-react 0.0.0-ff5083e → 0.0.0-ff6c8bf

package/tag/Tag.accessibility.test.js

@@ -0,0 +1,69 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _axeHelper = require("../../test/accessibility/axe-helper.js");
+var _Tag = _interopRequireDefault(require("./Tag.tsx"));
+var icon = /*#__PURE__*/_react["default"].createElement("svg", {
+  viewBox: "0 0 24 24",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M0 0h24v24H0z",
+  fill: "none"
+}), /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"
+}));
+describe("Tag component accessibility tests", function () {
+  it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, container, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
+            label: "tag-test",
+            icon: icon,
+            iconBgColor: "#fabada",
+            margin: "medium",
+            size: "medium",
+            labelPosition: "before"
+          })), container = _render.container;
+          _context.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for new-window mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, container, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
+            label: "tag-test",
+            icon: icon,
+            iconBgColor: "#fabada",
+            margin: "medium",
+            size: "medium",
+            labelPosition: "before",
+            newWindow: true
+          })), container = _render2.container;
+          _context2.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+});

package/tag/Tag.js

@@ -1,77 +1,57 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 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"));
-
-var _utils = require("../common/utils.js");
-
+var _utils = require("../common/utils");
 var _Box = _interopRequireDefault(require("../box/Box"));
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var DxcTag = function DxcTag(_ref) {
   var icon = _ref.icon,
-      _ref$label = _ref.label,
-      label = _ref$label === void 0 ? "" : _ref$label,
-      linkHref = _ref.linkHref,
-      onClick = _ref.onClick,
-      _ref$iconBgColor = _ref.iconBgColor,
-      iconBgColor = _ref$iconBgColor === void 0 ? "#5f249f" : _ref$iconBgColor,
-      _ref$labelPosition = _ref.labelPosition,
-      labelPosition = _ref$labelPosition === void 0 ? "after" : _ref$labelPosition,
-      _ref$newWindow = _ref.newWindow,
-      newWindow = _ref$newWindow === void 0 ? false : _ref$newWindow,
-      margin = _ref.margin,
-      _ref$size = _ref.size,
-      size = _ref$size === void 0 ? "fitContent" : _ref$size,
-      _ref$tabIndex = _ref.tabIndex,
-      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
+    _ref$label = _ref.label,
+    label = _ref$label === void 0 ? "" : _ref$label,
+    linkHref = _ref.linkHref,
+    onClick = _ref.onClick,
+    _ref$iconBgColor = _ref.iconBgColor,
+    iconBgColor = _ref$iconBgColor === void 0 ? "#5f249f" : _ref$iconBgColor,
+    _ref$labelPosition = _ref.labelPosition,
+    labelPosition = _ref$labelPosition === void 0 ? "after" : _ref$labelPosition,
+    _ref$newWindow = _ref.newWindow,
+    newWindow = _ref$newWindow === void 0 ? false : _ref$newWindow,
+    margin = _ref.margin,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? "fitContent" : _ref$size,
+    _ref$tabIndex = _ref.tabIndex,
+    tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
   var colorsTheme = (0, _useTheme["default"])();
-
   var _useState = (0, _react.useState)(false),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      isHovered = _useState2[0],
-      changeIsHovered = _useState2[1];
-
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    isHovered = _useState2[0],
+    changeIsHovered = _useState2[1];
   var clickHandler = function clickHandler() {
     onClick && onClick();
   };
-
   var tagContent = /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     size: size,
     shadowDepth: isHovered && (onClick || linkHref) && 2 || 1
-  }, /*#__PURE__*/_react["default"].createElement(TagContent, {
-    labelPosition: labelPosition
-  }, labelPosition === "before" && size !== "small" && label && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label), icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
+  }, /*#__PURE__*/_react["default"].createElement(TagContent, null, labelPosition === "before" && size !== "small" && label && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label), icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
     iconBgColor: iconBgColor
-  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(TagIcon, {
-    src: icon
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: icon
   }) : icon), labelPosition === "after" && size !== "small" && label && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label)));
-
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.tag
   }, /*#__PURE__*/_react["default"].createElement(StyledDxcTag, {
@@ -93,19 +73,16 @@ var DxcTag = function DxcTag(_ref) {
     target: newWindow ? "_blank" : "_self"
   }, tagContent) : tagContent));
 };
-
 var sizes = {
   small: "42px",
   medium: "240px",
   large: "480px",
   fillParent: "100%",
-  fitContent: "unset"
+  fitContent: "fit-content"
 };
-
 var calculateWidth = function calculateWidth(margin, size) {
   return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
-
 var StyledDxcTag = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  cursor: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  width: ", ";\n  height: ", ";\n"])), function (_ref2) {
   var hasAction = _ref2.hasAction;
   return hasAction && "pointer" || "unset";
@@ -114,35 +91,31 @@ var StyledDxcTag = _styledComponents["default"].div(_templateObject || (_templat
   return margin && (0, _typeof2["default"])(margin) !== "object" ? _variables.spaces[margin] : "0px";
 }, function (_ref4) {
   var margin = _ref4.margin;
-  return margin && margin.top ? _variables.spaces[margin.top] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.top ? _variables.spaces[margin.top] : "";
 }, function (_ref5) {
   var margin = _ref5.margin;
-  return margin && margin.right ? _variables.spaces[margin.right] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.right ? _variables.spaces[margin.right] : "";
 }, function (_ref6) {
   var margin = _ref6.margin;
-  return margin && margin.bottom ? _variables.spaces[margin.bottom] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.bottom ? _variables.spaces[margin.bottom] : "";
 }, function (_ref7) {
   var margin = _ref7.margin;
-  return margin && margin.left ? _variables.spaces[margin.left] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.left ? _variables.spaces[margin.left] : "";
 }, function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.theme.height;
 });
-
 var TagContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  width: 100%;\n  height: ", ";\n"])), function (props) {
   return props.theme.height;
 });
-
 var StyledLink = _styledComponents["default"].a(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  text-decoration: none;\n  border-radius: 4px;\n  width: 100%;\n  :focus {\n    outline: 2px solid ", ";\n    outline-offset: 0px;\n  }\n"])), function (props) {
   return props.theme.focusColor;
 });
-
 var StyledButton = _styledComponents["default"].button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  background: none;\n  border-radius: 4px;\n  border: none;\n  padding: 0;\n  cursor: pointer;\n  font-family: inherit;\n  width: 100%;\n  :focus {\n    outline: 2px solid ", ";\n  }\n"])), function (props) {
   return props.theme.focusColor;
 });
-
-var IconContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  background: ", ";\n  width: ", ";\n  height: 100%;\n  justify-content: center;\n  align-items: center;\n  color: ", ";\n  min-width: ", ";\n  overflow: hidden;\n  img,\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (_ref8) {
+var IconContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  background: ", ";\n  width: ", ";\n  height: 100%;\n  justify-content: center;\n  align-items: center;\n  color: ", ";\n  min-width: ", ";\n  overflow: hidden;\n  font-size: 24px;\n\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (_ref8) {
   var iconBgColor = _ref8.iconBgColor;
   return iconBgColor;
 }, function (props) {
@@ -156,10 +129,7 @@ var IconContainer = _styledComponents["default"].div(_templateObject5 || (_templ
 }, function (props) {
   return props.theme.iconHeight;
 });
-
-var TagIcon = _styledComponents["default"].img(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var TagLabel = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  flex-grow: 1;\n  text-align: center;\n  text-overflow: ellipsis;\n  overflow: hidden;\n  white-space: nowrap;\n"])), function (props) {
+var TagLabel = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  flex-grow: 1;\n  text-align: center;\n  text-overflow: ellipsis;\n  overflow: hidden;\n  white-space: nowrap;\n"])), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.fontSize;
@@ -178,6 +148,4 @@ var TagLabel = _styledComponents["default"].div(_templateObject7 || (_templateOb
 }, function (props) {
   return props.theme.labelPaddingRight;
 });
-
-var _default = DxcTag;
-exports["default"] = _default;
+var _default = exports["default"] = DxcTag;

package/tag/Tag.stories.tsx

@@ -3,6 +3,7 @@ import { userEvent, within } from "@storybook/testing-library";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import DxcTag from "./Tag";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Tag",
@@ -23,6 +24,13 @@ const largeIcon = (
   </svg>
 );
 
+const opinionatedTheme = {
+  tag: {
+    fontColor: "#000000",
+    iconColor: "#ffffff",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <ExampleContainer>
@@ -39,14 +47,11 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With label and icon" theme="light" level={4} />
-      <DxcTag
-        label="Tag"
-        icon="https://iconape.com/wp-content/files/yd/367773/svg/logo-linkedin-logo-icon-png-svg.png"
-      />
+      <DxcTag label="Tag" icon="person" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With right icon" theme="light" level={4} />
-      <DxcTag label="Tag" icon={icon} labelPosition="before" />
+      <DxcTag label="Tag" icon="group" labelPosition="before" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Icon background color" theme="light" level={4} />
@@ -59,7 +64,7 @@ export const Chromatic = () => (
     <ExampleContainer pseudoState="pseudo-focus">
       <Title title="With action focused" theme="light" level={4} />
       <DxcTag
-        icon={icon}
+        icon="done"
         label="Tag"
         onClick={() => {
           console.log("click");
@@ -102,7 +107,7 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium size" theme="light" level={4} />
-      <DxcTag label="Medium size medium s" size="medium" icon={icon} />
+      <DxcTag label="Medium size medium s" size="medium" icon="person" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium size with ellipsis" theme="light" level={4} />
@@ -124,7 +129,12 @@ export const Chromatic = () => (
       <Title title="FitContent size" theme="light" level={4} />
       <DxcTag label="FitContent" size="fitContent" icon={icon} />
     </ExampleContainer>
-    <hr />
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcTag label="Tag" icon={icon} />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );
 

package/tag/Tag.test.js

@@ -1,60 +1,41 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _react = _interopRequireDefault(require("react"));
-
 var _react2 = require("@testing-library/react");
-
-var _Tag = _interopRequireDefault(require("./Tag"));
-
+var _Tag = _interopRequireDefault(require("./Tag.tsx"));
 describe("Tag component tests", function () {
   test("Tag renders with correct label", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
-      label: "tag-test"
-    })),
-        getByText = _render.getByText;
-
+        label: "tag-test"
+      })),
+      getByText = _render.getByText;
     expect(getByText("tag-test")).toBeTruthy();
   });
   test("Tag renders with correct label before", function () {
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
-      label: "tag-test",
-      labelPosition: "before"
-    })),
-        getByText = _render2.getByText;
-
+        label: "tag-test",
+        labelPosition: "before"
+      })),
+      getByText = _render2.getByText;
     expect(getByText("tag-test")).toBeTruthy();
   });
-  test("Tag renders with correct icon", function () {
-    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
-      label: "tag-test",
-      icon: "/test-icon.jpg"
-    })),
-        getByRole = _render3.getByRole;
-
-    expect(getByRole("img").getAttribute("src")).toBe("/test-icon.jpg");
-  });
   test("Tag renders with link href", function () {
-    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
-      label: "tag-test",
-      linkHref: "/test/page"
-    })),
-        getByRole = _render4.getByRole;
-
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
+        label: "tag-test",
+        linkHref: "/test/page"
+      })),
+      getByRole = _render3.getByRole;
     expect(getByRole("link").getAttribute("href")).toBe("/test/page");
   });
   test("Call correct function on click", function () {
     var onClick = jest.fn();
-
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
-      label: "tag-test",
-      onClick: onClick
-    })),
-        getByText = _render5.getByText;
-
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
+        label: "tag-test",
+        onClick: onClick
+      })),
+      getByText = _render4.getByText;
     _react2.fireEvent.click(getByText("tag-test"));
-
     expect(onClick).toHaveBeenCalled();
   });
 });

package/tag/types.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="react" />
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement>;
-declare type TagCommonProps = {
+type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
+type TagCommonProps = {
     /**
      * If defined, the tag will be displayed as an anchor, using this prop as "href".
      * Component will show some visual feedback on hover.
@@ -45,9 +45,9 @@ declare type TagCommonProps = {
      */
     tabIndex?: number;
 };
-declare type TagLabelProps = TagCommonProps & {
+type TagLabelProps = TagCommonProps & {
     /**
-     * Element or path used as the icon that will be placed next to the label.
+     * Material Symbol name or SVG element used as the icon that will be placed next to the label.
      */
     icon?: string | SVG;
     /**
@@ -55,9 +55,9 @@ declare type TagLabelProps = TagCommonProps & {
      */
     label: string;
 };
-declare type TagIconProps = TagCommonProps & {
+type TagIconProps = TagCommonProps & {
     /**
-     * Element or path used as the icon that will be placed next to the label.
+     * Material Symbol name or SVG element used as the icon that will be placed next to the label.
      */
     icon: string | SVG;
     /**
@@ -65,5 +65,5 @@ declare type TagIconProps = TagCommonProps & {
      */
     label?: string;
 };
-declare type Props = TagLabelProps | TagIconProps;
+type Props = TagLabelProps | TagIconProps;
 export default Props;

package/text-input/Suggestion.js

@@ -1,55 +1,67 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
-var _react = _interopRequireDefault(require("react"));
-
+var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
-
 var _templateObject, _templateObject2;
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+var transformSpecialChars = function transformSpecialChars(str) {
+  var specialCharsRegex = /[\\*()\[\]{}+?/]/;
+  var value = str;
+  if (specialCharsRegex.test(value)) {
+    var regexAsString = specialCharsRegex.toString().split("");
+    var uniqueSpecialChars = regexAsString.filter(function (item, index) {
+      return regexAsString.indexOf(item) === index;
+    });
+    uniqueSpecialChars.forEach(function (specialChar) {
+      if (str.includes(specialChar)) value = value.replace(specialChar, "\\" + specialChar);
+    });
+  }
+  return value;
+};
 var Suggestion = function Suggestion(_ref) {
   var id = _ref.id,
-      value = _ref.value,
-      onClick = _ref.onClick,
-      suggestion = _ref.suggestion,
-      isLast = _ref.isLast,
-      visuallyFocused = _ref.visuallyFocused,
-      highlighted = _ref.highlighted;
-  var regEx = new RegExp(value, "i");
-  var matchedWords = suggestion.match(regEx);
-  var noMatchedWords = suggestion.replace(regEx, "");
+    value = _ref.value,
+    _onClick = _ref.onClick,
+    suggestion = _ref.suggestion,
+    isLast = _ref.isLast,
+    visuallyFocused = _ref.visuallyFocused,
+    highlighted = _ref.highlighted;
+  var matchedSuggestion = (0, _react.useMemo)(function () {
+    var regEx = new RegExp(transformSpecialChars(value), "i");
+    return {
+      matchedWords: suggestion.match(regEx),
+      noMatchedWords: suggestion.replace(regEx, "")
+    };
+  }, [value, suggestion]);
   return /*#__PURE__*/_react["default"].createElement(SuggestionContainer, {
     id: id,
-    onClick: onClick,
+    onClick: function onClick() {
+      _onClick(suggestion);
+    },
     visuallyFocused: visuallyFocused,
     role: "option",
-    "aria-selected": visuallyFocused ? "true" : undefined
+    "aria-selected": visuallyFocused ? true : undefined
   }, /*#__PURE__*/_react["default"].createElement(StyledSuggestion, {
-    last: isLast,
+    isLast: isLast,
     visuallyFocused: visuallyFocused
-  }, highlighted ? suggestion : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("strong", null, matchedWords), noMatchedWords)));
+  }, highlighted ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("strong", null, matchedSuggestion.matchedWords), matchedSuggestion.noMatchedWords) : suggestion));
 };
-
-var SuggestionContainer = _styledComponents["default"].li(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 0 0.5rem;\n  line-height: 1.715em;\n  cursor: pointer;\n\n  box-shadow: inset 0 0 0 2px\n    ", ";\n  &:hover {\n    background-color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n"])), function (props) {
+var SuggestionContainer = _styledComponents["default"].li(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 0 0.5rem;\n  line-height: 1.715em;\n  cursor: pointer;\n  box-shadow: inset 0 0 0 2px\n    ", ";\n\n  &:hover {\n    background-color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n"])), function (props) {
   return props.visuallyFocused ? props.theme.focusListOptionBorderColor : "transparent";
 }, function (props) {
   return props.theme.hoverListOptionBackgroundColor;
 }, function (props) {
   return props.theme.activeListOptionBackgroundColor;
 });
-
 var StyledSuggestion = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100%;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  padding: 0.25rem 0.5rem 0.188rem 0.5rem;\n  ", ";\n"])), function (props) {
-  return props.last || props.visuallyFocused ? "border-bottom: 1px solid transparent" : "border-bottom: 1px solid ".concat(props.theme.listOptionDividerColor);
+  return props.isLast || props.visuallyFocused ? "border-bottom: 1px solid transparent" : "border-bottom: 1px solid ".concat(props.theme.listOptionDividerColor);
 });
-
-var _default = /*#__PURE__*/_react["default"].memo(Suggestion);
-
-exports["default"] = _default;
+var _default = exports["default"] = /*#__PURE__*/_react["default"].memo(Suggestion);

package/text-input/Suggestions.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+import { SuggestionsProps } from "./types";
+declare const _default: React.MemoExoticComponent<({ id, value, suggestions, visualFocusIndex, highlightedSuggestions, searchHasErrors, isSearching, suggestionOnClick, styles, }: SuggestionsProps) => JSX.Element>;
+export default _default;