@salutejs/plasma-new-hope 0.90.0-canary.1260.9580678742.0 → 0.91.0-canary.1233.9650661962.0

package/styled-components/cjs/examples/plasma_web/components/Select/style.css

@@ -0,0 +1,38 @@
+
+.container {
+    width: 100%;
+}
+
+table {
+    border-collapse: collapse;
+    box-shadow: 0 0 20px rgba(0,0,0,0.1);
+}
+
+th,
+td {
+    padding: 15px;
+}
+
+th {
+    text-align: left;
+}
+
+table, th, td {
+    border: 1px solid lightgray;
+    border-collapse: collapse;
+}
+
+thead {
+    th {
+        background-color: #55608f;
+        color: #fff;
+    }
+}
+
+tbody {
+
+    td {
+        position: relative;
+
+    }
+}

package/styled-components/cjs/hooks/index.js

@@ -21,6 +21,12 @@ Object.defineProperty(exports, "useIsomorphicLayoutEffect", {
     return _useIsomorphicLayoutEffect.useIsomorphicLayoutEffect;
   }
 });
+Object.defineProperty(exports, "useOutsideClick", {
+  enumerable: true,
+  get: function get() {
+    return _useOutsideClick.useOutsideClick;
+  }
+});
 Object.defineProperty(exports, "usePreviousValue", {
   enumerable: true,
   get: function get() {
@@ -37,4 +43,5 @@ var _useUniqId = /*#__PURE__*/require("./useUniqId");
 var _usePreviousValue = /*#__PURE__*/require("./usePreviousValue");
 var _useForceUpdate = /*#__PURE__*/require("./useForceUpdate");
 var _useDidMountEffect = /*#__PURE__*/require("./useDidMountEffect");
+var _useOutsideClick = /*#__PURE__*/require("./useOutsideClick");
 var _useIsomorphicLayoutEffect = /*#__PURE__*/require("./useIsomorphicLayoutEffect");

package/styled-components/cjs/hooks/useOutsideClick.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useOutsideClick = void 0;
+var _react = /*#__PURE__*/require("react");
+var useOutsideClick = exports.useOutsideClick = function useOutsideClick(callback) {
+  var ref = (0, _react.useRef)(null);
+  (0, _react.useEffect)(function () {
+    var handleClickOutside = function handleClickOutside(event) {
+      if (ref.current && !ref.current.contains(event.target)) {
+        callback();
+      }
+    };
+    document.addEventListener('mouseup', handleClickOutside);
+    document.addEventListener('touchend', handleClickOutside);
+    return function () {
+      document.removeEventListener('mouseup', handleClickOutside);
+      document.removeEventListener('touchend', handleClickOutside);
+    };
+  }, [callback]);
+  return ref;
+};

package/styled-components/cjs/utils/index.js

@@ -28,6 +28,12 @@ Object.defineProperty(exports, "getSizeValueFromProp", {
     return _getSizeValueFromProp.getSizeValueFromProp;
   }
 });
+Object.defineProperty(exports, "isEmpty", {
+  enumerable: true,
+  get: function get() {
+    return _isEmpty.isEmpty;
+  }
+});
 Object.defineProperty(exports, "isNumber", {
   enumerable: true,
   get: function get() {
@@ -45,6 +51,7 @@ var _extractTextFrom = /*#__PURE__*/require("./extractTextFrom");
 var _getSizeValueFromProp = /*#__PURE__*/require("./getSizeValueFromProp");
 var _react = /*#__PURE__*/require("./react");
 var _isNumber = /*#__PURE__*/require("./isNumber");
+var _isEmpty = /*#__PURE__*/require("./isEmpty");
 var cx = exports.cx = function cx() {
   for (var _len = arguments.length, classes = new Array(_len), _key = 0; _key < _len; _key++) {
     classes[_key] = arguments[_key];

package/styled-components/cjs/utils/isEmpty.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isEmpty = void 0;
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+var isEmpty = exports.isEmpty = function isEmpty(obj) {
+  // null and undefined are "empty"
+  if (obj == null) {
+    return true;
+  }
+
+  // Assume if it has a length property with a non-zero value
+  // that that property is correct.
+  if (obj.length > 0) {
+    return false;
+  }
+  if (obj.length === 0) {
+    return true;
+  }
+
+  // If it isn't an object at this point
+  // it is empty, but it can't be anything *but* empty
+  // Is it empty?  Depends on your application.
+  if (_typeof(obj) !== 'object') {
+    return true;
+  }
+
+  // Otherwise, does it have any properties of its own?
+  // Note that this doesn't handle
+  // toString and valueOf enumeration bugs in IE < 9
+  for (var key in obj) {
+    if (hasOwnProperty.call(obj, key)) {
+      return false;
+    }
+  }
+  return true;
+};
+
+// Example
+// '' true
+// '{}' true
+// '[]' true
+// '123' false
+// '[123]' false

package/styled-components/es/components/Button/Button.styles.js

@@ -39,10 +39,10 @@ export var StyledContentLeft = /*#__PURE__*/styled.div.withConfig({
 export var StyledContentRight = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-9d9bqj-6"
 })(["display:flex;margin:var(", ");"], tokens.buttonRightContentMargin);
-export var base = /*#__PURE__*/css(_templateObject || (_templateObject = /*#__PURE__*/_taggedTemplateLiteral(["\n    position: relative;\n    display: inline-flex;\n    align-items: center;\n    box-sizing: border-box;\n    justify-content: center;\n\n    appearance: none;\n    border: none;\n    cursor: pointer;\n    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n\n    a& {\n        text-decoration: none;\n    }\n\n    /* NOTE: \n        --plasma_computed-btn-br-radius is defined in Button.tsx\n    */\n    --plasma_private-btn-br: var(--plasma_computed-btn-br);\n    border-radius: var(--plasma_private-btn-br);\n\n    &&.", " {\n        width: var(", ");\n        padding: 0;\n    }\n"])), /*#__PURE__*/String(classes.buttonSquare), tokens.buttonHeight);
+export var base = /*#__PURE__*/css(_templateObject || (_templateObject = /*#__PURE__*/_taggedTemplateLiteral(["\n    position: relative;\n    display: inline-flex;\n    align-items: center;\n    box-sizing: border-box;\n    justify-content: center;\n\n    appearance: none;\n    border: none;\n    cursor: pointer;\n    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n\n    a& {\n        text-decoration: none;\n    }\n\n    /* NOTE:\n        --plasma_computed-btn-br-radius is defined in Button.tsx\n    */\n    --plasma_private-btn-br: var(--plasma_computed-btn-br);\n    border-radius: var(--plasma_private-btn-br);\n\n    &&.", " {\n        width: var(", ");\n        padding: 0;\n    }\n"])), /*#__PURE__*/String(classes.buttonSquare), tokens.buttonHeight);
 
 // INFO: Для возможности переиспользования стилей в других компонентах
-export var baseContent = /*#__PURE__*/"\n    position: relative;\n    display: inline-flex;\n    align-items: center;\n    box-sizing: border-box;\n    justify-content: center;\n\n    appearance: none;\n    border: none;\n    cursor: pointer;\n    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n\n    a& {\n        text-decoration: none;\n    }\n\n    /* NOTE: \n        --plasma_computed-btn-br-radius is defined in Button.tsx\n    */\n    --plasma_private-btn-br: var(--plasma_computed-btn-br);\n    border-radius: var(--plasma_private-btn-br);\n\n    &&.".concat(String(classes.buttonSquare), " {\n        width: var(").concat(tokens.buttonHeight, ");\n        padding: 0;\n    }\n\n    color: var(").concat(tokens.buttonColor, ");\n    background-color: var(").concat(tokens.buttonBackgroundColor, ");\n\n    :hover {\n        color: var(").concat(tokens.buttonColorHover, ", var(").concat(tokens.buttonColor, "));\n        background-color: var(").concat(tokens.buttonBackgroundColorHover, ", var(").concat(tokens.buttonBackgroundColor, "));\n\n        scale: var(").concat(tokens.buttonScaleHover, ");\n    }\n\n    :active {\n        color: var(").concat(tokens.buttonColorActive, ", var(").concat(tokens.buttonColor, "));\n        background-color: var(").concat(tokens.buttonBackgroundColorActive, ", var(").concat(tokens.buttonBackgroundColor, "));\n\n        scale: var(").concat(tokens.buttonScaleActive, ");\n    }\n\n    height: var(").concat(tokens.buttonHeight, ");\n    width: var(").concat(tokens.buttonWidth, ");\n\n    /* TODO: #714 move these calc's to plasma-mapping | ds-generator and add Math.round() */\n    padding: 0 var(").concat(tokens.buttonPadding, ", calc(var(").concat(tokens.buttonHeight, ") * 1.618 / 4));\n\n    font-family: var(").concat(tokens.buttonFontFamily, ");\n    font-size: var(").concat(tokens.buttonFontSize, ");\n    font-style: var(").concat(tokens.buttonFontStyle, ");\n    font-weight: var(").concat(tokens.buttonFontWeight, ");\n    letter-spacing: var(").concat(tokens.buttonLetterSpacing, ");\n    line-height: var(").concat(tokens.buttonLineHeight, ");\n\n    /* TODO: #710 make it token API ? */\n    --plasma_private-btn-outline-size: var(--plasma-button-outline-size, 0.0625rem);\n\n    :focus {\n        outline: none;\n    }\n\n    ").concat(addFocus({
+export var baseContent = /*#__PURE__*/"\n    position: relative;\n    display: inline-flex;\n    align-items: center;\n    box-sizing: border-box;\n    justify-content: center;\n\n    appearance: none;\n    border: none;\n    cursor: pointer;\n    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n\n    a& {\n        text-decoration: none;\n    }\n\n    /* NOTE:\n        --plasma_computed-btn-br-radius is defined in Button.tsx\n    */\n    --plasma_private-btn-br: var(--plasma_computed-btn-br);\n    border-radius: var(--plasma_private-btn-br);\n\n    &&.".concat(String(classes.buttonSquare), " {\n        width: var(").concat(tokens.buttonHeight, ");\n        padding: 0;\n    }\n\n    color: var(").concat(tokens.buttonColor, ");\n    background-color: var(").concat(tokens.buttonBackgroundColor, ");\n\n    :hover {\n        color: var(").concat(tokens.buttonColorHover, ", var(").concat(tokens.buttonColor, "));\n        background-color: var(").concat(tokens.buttonBackgroundColorHover, ", var(").concat(tokens.buttonBackgroundColor, "));\n\n        scale: var(").concat(tokens.buttonScaleHover, ");\n    }\n\n    :active {\n        color: var(").concat(tokens.buttonColorActive, ", var(").concat(tokens.buttonColor, "));\n        background-color: var(").concat(tokens.buttonBackgroundColorActive, ", var(").concat(tokens.buttonBackgroundColor, "));\n\n        scale: var(").concat(tokens.buttonScaleActive, ");\n    }\n\n    height: var(").concat(tokens.buttonHeight, ");\n    width: var(").concat(tokens.buttonWidth, ");\n\n    /* TODO: #714 move these calc's to plasma-mapping | ds-generator and add Math.round() */\n    padding: 0 var(").concat(tokens.buttonPadding, ", calc(var(").concat(tokens.buttonHeight, ") * 1.618 / 4));\n\n    font-family: var(").concat(tokens.buttonFontFamily, ");\n    font-size: var(").concat(tokens.buttonFontSize, ");\n    font-style: var(").concat(tokens.buttonFontStyle, ");\n    font-weight: var(").concat(tokens.buttonFontWeight, ");\n    letter-spacing: var(").concat(tokens.buttonLetterSpacing, ");\n    line-height: var(").concat(tokens.buttonLineHeight, ");\n\n    /* TODO: #710 make it token API ? */\n    --plasma_private-btn-outline-size: var(--plasma-button-outline-size, 0.0625rem);\n\n    :focus {\n        outline: none;\n    }\n\n    ").concat(addFocus({
   outlineOffset: '-0.125rem',
   outlineSize: 'var(--plasma_private-btn-outline-size)',
   outlineRadius: 'calc(0.125rem + var(--plasma_private-btn-br))',

package/styled-components/es/components/Button/Button.template-doc.mdx

@@ -86,7 +86,7 @@ import { Button } from '@salutejs/{{package}}';
 
 export function App() {
     return (
-        <div style={{ display: "flex", flexDirection: "column", gap: "1rem" }}>
+        <div style=\{{ display: "flex", flexDirection: "column", gap: "1rem" }}>
             <Button text="Button" stretching="fixed" />
             <Button text="Button" stretching="auto" />
             <Button text="Button" stretching="filled" />
@@ -99,7 +99,7 @@ export function App() {
 Позиционирование контента внутри кнопки регулируется с помощью свойства `contentPlacing`.
 Возможные значения свойства `contentPlacing`:
 + `default` – контент центрируется;
-+ `relaxed` – контент распологается по краям.
++ `relaxed` – контент располагается по краям.
 
 ```tsx live
 import React from 'react';
@@ -107,7 +107,7 @@ import { Button } from '@salutejs/{{package}}';
 
 export function App() {
     return (
-        <div style={{ display: "flex", flexDirection: "column", gap: "1rem" }}>
+        <div style=\{{ display: "flex", flexDirection: "column", gap: "1rem" }}>
             <Button text="Hello" value="Plasma" stretching="filled" contentPlacing="default" />
             <Button text="Hello" value="Plasma" stretching="filled" contentPlacing="relaxed" />
         </div>

package/styled-components/es/components/Chip/Chip.tokens.js

@@ -17,6 +17,8 @@ export var tokens = {
   focusColor: '--plasma-chip-focus-color',
   outlineSize: '--plasma-chip-outline-size',
   closeIconColor: '--plasma-chip-close-icon-color',
+  closeIconColorHover: '--plasma-chip-close-icon-color-hover',
+  closeIconColorActive: '--plasma-chip-close-icon-color-active',
   borderRadius: '--plasma-chip-border-radius',
   pilledBorderRadius: '--plasma-chip-pilled-border-radius',
   width: '--plasma-chip-width',

package/styled-components/es/components/Combobox/Combobox.js

@@ -12,9 +12,9 @@ import React, { Children, forwardRef, useEffect, useRef, useState } from 'react'
 import { safeUseId, useForkRef } from '@salutejs/plasma-core';
 import { cx } from '../../utils';
 import { getPlacements } from '../Dropdown/utils';
-import { getChildren, getNewSelected, getValues } from '../Select/utils';
-import { useKeyNavigation } from '../Select/hooks';
 import { useDidMountEffect, useForceUpdate } from '../../hooks';
+import { getChildren, getNewSelected, getValues } from './utils';
+import { useKeyNavigation } from './hooks';
 import { base as viewCSS } from './variations/_view/base';
 import { base as sizeCSS } from './variations/_size/base';
 import { ComboboxTarget } from './ui';

package/styled-components/es/components/Combobox/hooks/index.js

@@ -1 +1,2 @@
-export { useFocusController } from './useFocusController';
+export { useFocusController } from './useFocusController';
+export { useKeyNavigation, Keys } from './useKeyNavigation';

package/styled-components/es/components/Combobox/ui/ComboboxTarget/ComboboxTarget.js

@@ -12,8 +12,7 @@ import React, { forwardRef, useRef, useState } from 'react';
 import { classes } from '../../Combobox.tokens';
 import { cx } from '../../../../utils';
 import { ComboboxChip } from '../ComboboxChip/ComboboxChip';
-import { useFocusController } from '../../hooks';
-import { Keys } from '../../../Select/hooks/useKeyNavigation';
+import { useFocusController, Keys } from '../../hooks';
 import { StyledArrow, StyledChips, StyledContent, StyledLabel, StyledComboboxInput, StyledComboboxInputHelper, StyledComboboxTarget, StyledText } from './ComboboxTarget.styles';
 var hasChips = classes.hasChips,
   innerLabelUp = classes.innerLabelUp,

package/styled-components/es/components/Combobox/utils/index.js

@@ -1,5 +1,10 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-import React, { cloneElement, isValidElement } from 'react';
+import React, { cloneElement, isValidElement, Children } from 'react';
 var isReactObject = function isReactObject(element) {
   return _typeof(element) === 'object' || typeof element === 'function';
 };
@@ -12,4 +17,103 @@ export var getValidComponent = function getValidComponent(element, props) {
     return /*#__PURE__*/React.createElement(Component, props);
   }
   return element;
+};
+export var getNewSelected = function getNewSelected(selected, newValue, type) {
+  if (newValue === undefined || newValue === null) {
+    return newValue;
+  }
+  if ((type === 'single' || type === 'native') && (typeof newValue === 'string' || typeof newValue === 'number' || typeof newValue === 'boolean')) {
+    return newValue;
+  }
+  var newSelected = selected || [];
+  var set = new Set(newSelected);
+  if (set.has(newValue)) {
+    set["delete"](newValue);
+  } else {
+    set.add(newValue);
+  }
+  return Array.from(set);
+};
+var getChildrenInnerText = function getChildrenInnerText(children) {
+  if (!children || typeof children === 'string') {
+    return children;
+  }
+  return getChildrenInnerText(children.props.children);
+};
+export var getValues = function getValues(items, value) {
+  var result = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  items.forEach(function (item) {
+    if (item.props === undefined) {
+      return result;
+    }
+    var newValue = item.props.value;
+    if (item.props.children && Array.isArray(item.props.children)) {
+      return getValues(item.props.children, value, result);
+    }
+    if (!Array.isArray(value) && newValue === value || Array.isArray(value) && value !== null && value !== void 0 && value.find(function (v) {
+      return newValue === v;
+    })) {
+      var index = Array.isArray(value) && (value === null || value === void 0 ? void 0 : value.findIndex(function (v) {
+        return newValue === v;
+      })) || 0;
+      if (item.props.text) {
+        var _newText = item.props.text;
+        result[index] = [newValue, _newText];
+        return;
+      }
+      var newText = getChildrenInnerText(item.props.children);
+      result[index] = [newValue, newText];
+    }
+    return result;
+  });
+  return result;
+};
+var getChildrenItemChecked = function getChildrenItemChecked(value, child) {
+  return !Array.isArray(value) && (child === null || child === void 0 ? void 0 : child.props.value) === value || Array.isArray(value) && Boolean(value === null || value === void 0 ? void 0 : value.find(function (v) {
+    return (child === null || child === void 0 ? void 0 : child.props.value) === v;
+  }));
+};
+
+// INFO: Функция для рекурсивного обновления пропсов
+export var updatePropsRecursively = function updatePropsRecursively(children, externalProps, value, search, filterFunction) {
+  return Children.map(children || [], function (child) {
+    if (! /*#__PURE__*/isValidElement(child)) {
+      return child;
+    }
+    var hasValue = ('value' in (child === null || child === void 0 ? void 0 : child.props));
+    var props = _objectSpread({
+      key: "".concat(value, "$"),
+      checked: getChildrenItemChecked(value, child)
+    }, hasValue && {
+      ref: function ref(element) {
+        var _externalProps$childr;
+        if (externalProps !== null && externalProps !== void 0 && (_externalProps$childr = externalProps.childrenRefs) !== null && _externalProps$childr !== void 0 && _externalProps$childr.current && element) {
+          externalProps.childrenRefs.current.push(element);
+        }
+      },
+      onClick: function onClick(event) {
+        var _child$props$onClick, _child$props, _externalProps$onClic;
+        (_child$props$onClick = (_child$props = child.props).onClick) === null || _child$props$onClick === void 0 || _child$props$onClick.call(_child$props, event);
+        externalProps === null || externalProps === void 0 || (_externalProps$onClic = externalProps.onClick) === null || _externalProps$onClic === void 0 || _externalProps$onClic.call(externalProps, event);
+      }
+    });
+    var updatedChild = updatePropsRecursively(child.props.children, externalProps, value, search, filterFunction);
+    if (filterFunction) {
+      var _child$props2;
+      var text = ((_child$props2 = child.props) === null || _child$props2 === void 0 ? void 0 : _child$props2.text) || '';
+      return filterFunction(text, search) ? /*#__PURE__*/cloneElement(child, props, updatedChild) : null;
+    }
+    return /*#__PURE__*/cloneElement(child, props, updatedChild);
+  });
+};
+var defaultFilterFunction = function defaultFilterFunction(text) {
+  var filterValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  return text.includes(filterValue);
+};
+export var getChildren = function getChildren(children, externalProps, value, search) {
+  var filterFunction = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : defaultFilterFunction;
+  if (externalProps.childrenRefs) {
+    externalProps.childrenRefs.current = [];
+  }
+  return updatePropsRecursively(children, externalProps, value, search, filterFunction);
 };

package/styled-components/es/components/Dropdown/Dropdown.js

@@ -1,4 +1,4 @@
-var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow", "portal"];
+var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -54,7 +54,6 @@ export var dropdownRoot = function dropdownRoot(Root) {
       variant = _ref$variant === void 0 ? 'normal' : _ref$variant,
       _ref$hasArrow = _ref.hasArrow,
       hasArrow = _ref$hasArrow === void 0 ? true : _ref$hasArrow,
-      portal = _ref.portal,
       rest = _objectWithoutProperties(_ref, _excluded);
     var _useReducer = useReducer(pathReducer, []),
       _useReducer2 = _slicedToArray(_useReducer, 2),
@@ -106,8 +105,15 @@ export var dropdownRoot = function dropdownRoot(Root) {
       }, '').replace(/^(\/)/, '');
       return focusedToValueMap === null || focusedToValueMap === void 0 || (_focusedToValueMap$ge = focusedToValueMap.get(focusedPathAsString)) === null || _focusedToValueMap$ge === void 0 ? void 0 : _focusedToValueMap$ge.value.toString();
     };
-    return /*#__PURE__*/React.createElement(StyledPopover, {
+    return /*#__PURE__*/React.createElement(Root, _extends({
+      className: cx(className, classes.dropdownRoot),
+      ref: ref,
+      view: view,
+      size: size,
+      items: items
+    }, rest), /*#__PURE__*/React.createElement(StyledPopover, {
       isOpen: isCurrentListOpen,
+      usePortal: false,
       onToggle: handleGlobalToggle,
       offset: offset,
       placement: getPlacements(placement),
@@ -121,15 +127,8 @@ export var dropdownRoot = function dropdownRoot(Root) {
         'aria-activedescendant': getActiveDescendant(),
         onKeyDown: onKeyDown
       }),
-      preventOverflow: false,
-      usePortal: Boolean(portal),
-      frame: portal
-    }, /*#__PURE__*/React.createElement(Root, _extends({
-      className: cx(className, classes.dropdownRoot),
-      ref: ref,
-      view: view,
-      size: size
-    }, rest), /*#__PURE__*/React.createElement(Ul, {
+      preventOverflow: false
+    }, /*#__PURE__*/React.createElement(Ul, {
       listHeight: listHeight,
       listOverflow: listOverflow,
       role: "tree",

package/styled-components/es/components/Dropdown/Dropdown.tokens.js

@@ -12,24 +12,52 @@ export var tokens = {
   borderRadius: '--plasma-dropdown-border-radius',
   padding: '--plasma-dropdown-padding',
   disclosureIconColor: '--plasma-dropdown-disclosure-icon-color',
+  disabledOpacity: '--plasma-dropdown-disabled-opacity',
+  focusColor: '--plasma-dropdown-focus-color',
   itemBackground: '--plasma-dropdown-item-background',
-  itemColor: '--plasma-dropdown-item-color',
   itemBackgroundHover: '--plasma-dropdown-item-background-hover',
+  itemBackgroundSelected: '--plasma-dropdown-item-background-selected',
+  // Old
+  itemBackgroundSelectedHover: '--plasma-dropdown-item-background-selected-hover',
+  // Old
+  itemColor: '--plasma-dropdown-item-color',
+  itemColorSelected: '--plasma-dropdown-item-color-selected',
+  // Old
+  itemColorSelectedHover: '--plasma-dropdown-item-color-selected-hover',
+  // Old
   itemBorderRadius: '--plasma-dropdown-item-border-radius',
+  itemWidth: '--plasma-dropdown-item-width',
+  // Old
+  itemHeight: '--plasma-dropdown-item-height',
+  // Old
+  itemMarginTop: '--plasma-dropdown-item-margin-top',
+  // Old
+  itemMarginRight: '--plasma-dropdown-item-margin-right',
+  // Old
+  itemMarginBottom: '--plasma-dropdown-item-margin-bottom',
+  // Old
+  itemMarginLeft: '--plasma-dropdown-item-margin-left',
+  // Old
   itemPaddingTop: '--plasma-dropdown-item-padding-top',
   itemPaddingTopTight: '--plasma-dropdown-item-padding-top-tight',
   itemPaddingRight: '--plasma-dropdown-item-padding-right',
   itemPaddingBottom: '--plasma-dropdown-item-padding-bottom',
   itemPaddingBottomTight: '--plasma-dropdown-item-padding-bottom-tight',
   itemPaddingLeft: '--plasma-dropdown-item-padding-left',
+  itemContentLeftWidth: '--plasma-dropdown-item-content-left-width',
+  // Old
+  itemContentLeftColor: '--plasma-dropdown-item-content-left-color',
+  // Old
+  itemContentRightWidth: '--plasma-dropdown-item-content-right-width',
+  // Old
+  itemContentRightColor: '--plasma-dropdown-item-content-right-color',
+  // Old
   itemFontFamily: '--plasma-dropdown-item-font-family',
   itemFontSize: '--plasma-dropdown-item-font-size',
   itemFontStyle: '--plasma-dropdown-item-font-style',
   itemFontWeightBold: '--plasma-dropdown-item-letter-spacing',
   itemFontLetterSpacing: '--plasma-dropdown-item-line-height',
   itemFontLineHeight: '--plasma-dropdown-item-font-weight',
-  disabledOpacity: '--plasma-dropdown-disabled-opacity',
-  focusColor: '--plasma-dropdown-focus-color',
   // TODO: Remove below tokens as soon as they are no longer needed
   footerBackground: '--plasma-dropdown-footer-background',
   footerWidth: '--plasma-dropdown-footer-width',
@@ -97,19 +125,5 @@ export var tokens = {
   groupLabelMarginTop: '--plasma-dropdown-group-label-margin-top',
   groupLabelMarginRight: '--plasma-dropdown-group-label-margin-right',
   groupLabelMarginBottom: '--plasma-dropdown-group-label-margin-bottom',
-  groupLabelMarginLeft: '--plasma-dropdown-group-label-margin-left',
-  itemBackgroundSelected: '--plasma-dropdown-item-background-selected',
-  itemColorSelected: '--plasma-dropdown-item-color-selected',
-  itemBackgroundSelectedHover: '--plasma-dropdown-item-background-selected-hover',
-  itemColorSelectedHover: '--plasma-dropdown-item-color-selected-hover',
-  itemContentLeftColor: '--plasma-dropdown-item-content-left-color',
-  itemContentRightColor: '--plasma-dropdown-item-content-right-color',
-  itemWidth: '--plasma-dropdown-item-width',
-  itemHeight: '--plasma-dropdown-item-height',
-  itemMarginTop: '--plasma-dropdown-item-margin-top',
-  itemMarginRight: '--plasma-dropdown-item-margin-right',
-  itemMarginBottom: '--plasma-dropdown-item-margin-bottom',
-  itemMarginLeft: '--plasma-dropdown-item-margin-left',
-  itemContentLeftWidth: '--plasma-dropdown-item-content-left-width',
-  itemContentRightWidth: '--plasma-dropdown-item-content-right-width'
+  groupLabelMarginLeft: '--plasma-dropdown-group-label-margin-left'
 };

package/styled-components/es/components/Dropdown/hooks/useKeyboardNavigation.js

@@ -30,14 +30,19 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
     closeOnSelect = _ref.closeOnSelect,
     onItemSelect = _ref.onItemSelect,
     onItemClick = _ref.onItemClick;
-  var currentLength = pathMap.get(path === null || path === void 0 ? void 0 : path[path.length - 1]) || 0;
   var currentIndex = (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[focusedPath.length - 1]) || 0;
+  var currentLength = pathMap.get(path === null || path === void 0 ? void 0 : path[focusedPath.length - 1]) || 0;
   var onKeyDown = function onKeyDown(event) {
     switch (event.code) {
       case keys.ArrowUp:
         {
           if (focusedPath.length) {
             if (currentIndex > 0) {
+              if (path.length > focusedPath.length) {
+                dispatchPath({
+                  type: 'removed_last_level'
+                });
+              }
               dispatchFocusedPath({
                 type: 'change_last_focus',
                 value: currentIndex - 1
@@ -58,6 +63,11 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
         {
           if (focusedPath.length) {
             if (currentIndex + 1 < currentLength) {
+              if (path.length > focusedPath.length) {
+                dispatchPath({
+                  type: 'removed_last_level'
+                });
+              }
               dispatchFocusedPath({
                 type: 'change_last_focus',
                 value: currentIndex + 1
@@ -96,14 +106,17 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
           }
           var currentItem = getFurtherPath(focusedPath, focusedToValueMap);
           if (currentItem !== null && currentItem !== void 0 && currentItem.items) {
-            dispatchPath({
-              type: 'added_next_level',
-              value: currentItem.value.toString()
-            });
-            dispatchFocusedPath({
-              type: 'add_focus',
-              value: 0
-            });
+            if (path.length > focusedPath.length) {
+              dispatchFocusedPath({
+                type: 'add_focus',
+                value: 0
+              });
+            } else {
+              dispatchPath({
+                type: 'added_next_level',
+                value: currentItem.value.toString()
+              });
+            }
           }
           break;
         }
@@ -125,14 +138,17 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
             break;
           }
           if (_currentItem !== null && _currentItem !== void 0 && _currentItem.items) {
-            dispatchPath({
-              type: 'added_next_level',
-              value: _currentItem.value.toString()
-            });
-            dispatchFocusedPath({
-              type: 'add_focus',
-              value: 0
-            });
+            if (path.length > focusedPath.length) {
+              dispatchFocusedPath({
+                type: 'add_focus',
+                value: 0
+              });
+            } else {
+              dispatchPath({
+                type: 'added_next_level',
+                value: _currentItem.value.toString()
+              });
+            }
           } else {
             if (closeOnSelect) {
               handleGlobalToggle(false, event);
@@ -161,6 +177,11 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
       case keys.Home:
         {
           if (path[0]) {
+            if (path.length > focusedPath.length) {
+              dispatchPath({
+                type: 'removed_last_level'
+              });
+            }
             dispatchFocusedPath({
               type: 'change_last_focus',
               value: 0
@@ -179,6 +200,11 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
       case keys.End:
         {
           if (path[0]) {
+            if (path.length > focusedPath.length) {
+              dispatchPath({
+                type: 'removed_last_level'
+              });
+            }
             dispatchFocusedPath({
               type: 'change_last_focus',
               value: currentLength - 1
@@ -200,6 +226,11 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
           if (!path[0]) {
             break;
           }
+          if (path.length > focusedPath.length) {
+            dispatchPath({
+              type: 'removed_last_level'
+            });
+          }
           if (currentIndex <= JUMP_SIZE) {
             dispatchFocusedPath({
               type: 'change_last_focus',
@@ -218,6 +249,11 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
           if (!path[0]) {
             break;
           }
+          if (path.length > focusedPath.length) {
+            dispatchPath({
+              type: 'removed_last_level'
+            });
+          }
           if (currentLength - currentIndex <= JUMP_SIZE) {
             dispatchFocusedPath({
               type: 'change_last_focus',