@thecb/components 6.0.0-beta.18 → 6.0.0-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "6.0.0-beta.18",
+  "version": "6.0.0-beta.20",
   "description": "Common lib for CityBase react components",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -78,6 +78,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
+    "core-js": "^3.22.5",
     "formatted-input": "^1.0.0",
     "framer-motion": "^1.11.0",
     "numeral": "^2.0.6",

package/src/components/atoms/dropdown/Dropdown.js

@@ -4,6 +4,8 @@ import Text from "../text";
 import { noop } from "../../../util/general";
 import DropdownIcon from "./DropdownIcon";
 import styled from "styled-components";
+// support for Array.prototype.at() in older browsers
+import "core-js/proposals/relative-indexing-method";
 
 import {
   WHITE,
@@ -173,9 +175,8 @@ const Dropdown = ({
         break;
       case "End":
         e.preventDefault();
-        optionRefs.current[
-          optionRefs?.current?.length ?? 0 - 1
-        ].current.focus();
+        console.log("option refs current", optionRefs.current);
+        optionRefs.current.at(-1).current.focus();
         break;
       case "Escape":
         if (isOpen) {
@@ -191,15 +192,15 @@ const Dropdown = ({
   };
 
   const handleItemSelection = (evt, choice, i) => {
-    disabledValues.includes(choice.value)
-      ? evt => evt.preventDefault()
-      : () => {
-          setSelectedRef(optionRefs.current[i]);
-          onSelect(choice.value);
-          if (isOpen) {
-            onClick();
-          }
-        };
+    if (disabledValues.includes(choice.value)) {
+      evt.preventDefault();
+    } else {
+      setSelectedRef(optionRefs.current[i]);
+      onSelect(choice.value);
+      if (isOpen) {
+        onClick();
+      }
+    }
   };
 
   useEffect(() => {