@atlaskit/editor-common 78.37.1 → 78.37.3

package/dist/es2019/element-browser/components/CategoryList.js

@@ -1,26 +1,64 @@
 import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
-
 import React, { Fragment, memo, useCallback } from 'react';
 import { css, jsx } from '@emotion/react';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/custom-theme-button';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B400, B50, N800 } from '@atlaskit/theme/colors';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent } from '../../analytics';
 import { DEVICE_BREAKPOINT_NUMBERS, GRID_SIZE } from '../constants';
 import useFocus from '../hooks/use-focus';
+const arrowsKeys = new Set(['ArrowUp', 'ArrowDown']);
 function CategoryList({
   categories = [],
   ...props
 }) {
-  const [focusedCategoryIndex, setFocusedCategoryIndex] = React.useState(null);
-  return jsx(Fragment, null, categories.map((category, index) => jsx(CategoryListItem, _extends({
-    key: category.title,
-    index: index,
-    category: category,
-    focus: focusedCategoryIndex === index,
-    setFocusedCategoryIndex: setFocusedCategoryIndex
-  }, props))));
+  const [focusedCategoryIndexState, setFocusedCategoryIndexState] = React.useState(null);
+  const {
+    focusedCategoryIndex: focusedCategoryIndexProp,
+    setFocusedCategoryIndex: setFocusedCategoryIndexProp,
+    onSelectCategory
+  } = props;
+  const focusedCategoryIndex = getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') ? focusedCategoryIndexProp : focusedCategoryIndexState;
+  const setFocusedCategoryIndex = getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') ? setFocusedCategoryIndexProp : setFocusedCategoryIndexState;
+  return jsx(Fragment, null, categories.map((category, index) => {
+    const categoriesLength = categories === null || categories === void 0 ? void 0 : categories.length;
+    let selectNextCategory;
+    let selectPreviousCategory;
+    if (getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') && categoriesLength > 1) {
+      selectNextCategory = () => {
+        if (index !== categoriesLength - 1) {
+          setFocusedCategoryIndex(index + 1);
+          onSelectCategory(categories[index + 1]);
+        } else {
+          setFocusedCategoryIndex(0);
+          onSelectCategory(categories[0]);
+        }
+        return;
+      };
+      selectPreviousCategory = () => {
+        if (index !== 0) {
+          setFocusedCategoryIndex(index - 1);
+          onSelectCategory(categories[index - 1]);
+        } else {
+          setFocusedCategoryIndex(categoriesLength - 1);
+          onSelectCategory(categories[categoriesLength - 1]);
+        }
+        return;
+      };
+    }
+    return jsx(CategoryListItem, _extends({
+      key: category.title,
+      index: index,
+      category: category,
+      focus: focusedCategoryIndex === index
+    }, props, {
+      setFocusedCategoryIndex: setFocusedCategoryIndex,
+      selectPreviousCategory: selectPreviousCategory,
+      selectNextCategory: selectNextCategory
+    }));
+  }));
 }
 function CategoryListItem({
   category,
@@ -29,11 +67,17 @@ function CategoryListItem({
   index,
   focus,
   setFocusedCategoryIndex,
-  createAnalyticsEvent
+  createAnalyticsEvent,
+  setFocusedItemIndex,
+  setFocusOnSearch,
+  selectPreviousCategory,
+  selectNextCategory
 }) {
   const ref = useFocus(focus);
   const onClick = useCallback(() => {
-    onSelectCategory(category);
+    if (!getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1')) {
+      onSelectCategory(category);
+    }
     /**
      * When user double clicks on same category, focus on first item.
      */
@@ -42,6 +86,9 @@ function CategoryListItem({
     } else {
       setFocusedCategoryIndex(index);
     }
+    if (getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1')) {
+      onSelectCategory(category);
+    }
     fireAnalyticsEvent(createAnalyticsEvent)({
       payload: {
         action: ACTION.CLICKED,
@@ -76,6 +123,41 @@ function CategoryListItem({
       ...rest
     };
   }, [category.name, selectedCategory]);
+  const onTabPress = useCallback(e => {
+    const isShiftPressed = e.shiftKey;
+    if (!isShiftPressed) {
+      // set focus from focused category to first item in it
+      if (setFocusedItemIndex) {
+        setFocusedItemIndex(0);
+        e.preventDefault();
+      }
+    } else {
+      // jump from first category back to search
+      if (setFocusOnSearch) {
+        setFocusOnSearch();
+        e.preventDefault();
+      }
+    }
+    return;
+  }, [setFocusedItemIndex, setFocusOnSearch]);
+  const onArrowPress = useCallback(e => {
+    if (e.key === 'ArrowUp' && selectPreviousCategory) {
+      return selectPreviousCategory();
+    }
+    if (e.key === 'ArrowDown' && selectNextCategory) {
+      return selectNextCategory();
+    }
+  }, [selectPreviousCategory, selectNextCategory]);
+  const onKeyDown = useCallback(e => {
+    const isTabPressed = e.key === 'Tab';
+    const isArrowPressed = arrowsKeys.has(e.key);
+    if (isTabPressed) {
+      return onTabPress(e);
+    }
+    if (isArrowPressed) {
+      return onArrowPress(e);
+    }
+  }, [onTabPress, onArrowPress]);
   return jsx("div", {
     css: buttonWrapper,
     role: "presentation"
@@ -84,13 +166,15 @@ function CategoryListItem({
     isSelected: selectedCategory === category.name,
     onClick: onClick,
     onFocus: onFocus,
+    onKeyDown: getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') ? onKeyDown : undefined,
     theme: getTheme,
     role: "tab",
     "aria-selected": selectedCategory === category.name ? 'true' : 'false',
     "aria-controls": `browse-category-${category.name}-tab`,
     id: `browse-category--${category.name}-button`,
     ref: ref,
-    testId: "element-browser-category-item"
+    testId: "element-browser-category-item",
+    tabIndex: -1
   }, category.title));
 }
 const buttonWrapper = css({

package/dist/es2019/element-browser/components/ElementList/ElementList.js

@@ -8,6 +8,7 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import { ButtonItem } from '@atlaskit/menu';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B100, N200 } from '@atlaskit/theme/colors';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Tooltip from '@atlaskit/tooltip';
@@ -46,7 +47,10 @@ function ElementList({
   createAnalyticsEvent,
   emptyStateHandler,
   selectedCategory,
+  selectedCategoryIndex,
   searchTerm,
+  setFocusedCategoryIndex,
+  setFocusedItemIndex,
   ...props
 }) {
   const {
@@ -89,15 +93,37 @@ function ElementList({
       style: style,
       key: key,
       className: "element-item-wrapper",
-      css: elementItemWrapper
+      css: elementItemWrapper,
+      onKeyDown: getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') ? e => {
+        if (e.key === 'Tab') {
+          if (e.shiftKey && index === 0) {
+            if (setFocusedCategoryIndex) {
+              if (!!selectedCategoryIndex) {
+                setFocusedCategoryIndex(selectedCategoryIndex);
+              } else {
+                setFocusedCategoryIndex(0);
+              }
+              e.preventDefault();
+            }
+          }
+          // before focus jumps from elements list we need to rerender react-virtualized collection.
+          // Otherwise on the next render 'scrollToCell' will have same cached value
+          // and collection will not be scrolled to top.
+          // So Tab press on category will not work anymore due to invisible 1-t element.
+          else if (index === items.length - 2) {
+            setFocusedItemIndex(items.length - 1);
+          }
+        }
+      } : undefined
     }, jsx(MemoizedElementItem, _extends({
       inlineMode: !fullMode,
       index: index,
       item: items[index],
       selected: selectedItemIndex === index,
-      focus: focusedItemIndex === index
+      focus: focusedItemIndex === index,
+      setFocusedItemIndex: setFocusedItemIndex
     }, props)));
-  }, [items, fullMode, selectedItemIndex, focusedItemIndex, props]);
+  }, [items, fullMode, selectedItemIndex, focusedItemIndex, selectedCategoryIndex, setFocusedCategoryIndex, setFocusedItemIndex, props]);
   return jsx(Fragment, null, jsx(ContainerWidthMonitor, null), jsx("div", {
     css: elementItemsWrapper,
     "data-testid": "element-items",

package/dist/es2019/element-browser/components/StatelessElementBrowser.js

@@ -1,9 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
-import React, { memo, useCallback, useEffect, useState } from 'react';
+import React, { memo, useCallback, useEffect, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent } from '../../analytics';
 import { DEVICE_BREAKPOINT_NUMBERS, GRID_SIZE, INLINE_SIDEBAR_HEIGHT, SIDEBAR_HEADING_WRAPPER_HEIGHT, SIDEBAR_WIDTH } from '../constants';
 import useContainerWidth from '../hooks/use-container-width';
@@ -90,22 +91,47 @@ function StatelessElementBrowser(props) {
     items,
     onSelectItem,
     onInsertItem,
-    viewMoreItem
+    viewMoreItem,
+    selectedCategory,
+    onSelectCategory,
+    searchTerm,
+    showCategories
   } = props;
   const {
     containerWidth,
     ContainerWidthMonitor
   } = useContainerWidth();
+  const categoryBeenChosen = useRef(false);
   const [columnCount, setColumnCount] = useState(1);
+  let selectedCategoryIndex;
+  let isFocusSearch;
+  if (getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1')) {
+    var _props$categories;
+    selectedCategoryIndex = (_props$categories = props.categories) === null || _props$categories === void 0 ? void 0 : _props$categories.findIndex(category => {
+      return category.name === selectedCategory;
+    });
+    if (showCategories) {
+      const isEmptySearchTerm = !searchTerm || (searchTerm === null || searchTerm === void 0 ? void 0 : searchTerm.length) === 0;
+      if (!isEmptySearchTerm) {
+        // clear the flag if the search happens after a user has chosen the category
+        categoryBeenChosen.current = false;
+      }
+      // A11Y: if categories exists, on the initial render search element should receive focus.
+      // After user pick some category the category should stay focused.
+      isFocusSearch = !categoryBeenChosen.current || !isEmptySearchTerm;
+    }
+  }
   const {
     selectedItemIndex,
     focusedItemIndex,
     setFocusedItemIndex,
+    setFocusedCategoryIndex,
+    focusedCategoryIndex,
     focusOnSearch,
     focusOnViewMore,
     onKeyDown,
     setFocusOnSearch
-  } = useSelectAndFocusOnArrowNavigation(items.length - 1, columnCount, !!viewMoreItem);
+  } = useSelectAndFocusOnArrowNavigation(items.length - 1, columnCount, !!viewMoreItem, isFocusSearch);
   useEffect(() => {
     fireAnalyticsEvent(props.createAnalyticsEvent)({
       payload: {
@@ -135,15 +161,29 @@ function StatelessElementBrowser(props) {
    * The actual enter key press is handled on individual items level.
    */
   const selectedItem = selectedItemIndex !== undefined ? items[selectedItemIndex] : null;
-  const onItemsEnterKeyPress = useCallback(e => {
-    if (e.key !== 'Enter') {
-      return;
+  const onItemsEnterTabKeyPress = useCallback(e => {
+    if (getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1')) {
+      if (e.key !== 'Enter' && (e.key !== 'Tab' || !showCategories)) {
+        return;
+      }
+    } else {
+      if (e.key !== 'Enter') {
+        return;
+      }
+    }
+    if (getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1')) {
+      if (showCategories && e.key === 'Tab' && selectedCategoryIndex !== undefined) {
+        // A11Y: Set focus on first category if tab pressed on search
+        setFocusedCategoryIndex(selectedCategoryIndex);
+        e.preventDefault();
+        return;
+      }
     }
     if (onInsertItem && selectedItem != null) {
       onInsertItem(selectedItem);
     }
     e.preventDefault();
-  }, [onInsertItem, selectedItem]);
+  }, [onInsertItem, selectedItem, setFocusedCategoryIndex, showCategories, selectedCategoryIndex]);
 
   /**
    * On arrow key selection and clicks the selectedItemIndex will change.
@@ -154,6 +194,10 @@ function StatelessElementBrowser(props) {
       onSelectItem(selectedItem);
     }
   }, [onSelectItem, selectedItem]);
+  const onSelectCategoryCB = useCallback(category => {
+    onSelectCategory(category);
+    categoryBeenChosen.current = true;
+  }, [categoryBeenChosen, onSelectCategory]);
   return jsx("div", {
     css: wrapper,
     "data-testid": "element-browser"
@@ -161,10 +205,12 @@ function StatelessElementBrowser(props) {
     selectedItemIndex: selectedItemIndex,
     focusedItemIndex: focusedItemIndex,
     setFocusedItemIndex: setFocusedItemIndex,
+    focusedCategoryIndex: focusedCategoryIndex,
+    setFocusedCategoryIndex: setFocusedCategoryIndex,
     focusOnSearch: focusOnSearch,
     setColumnCount: setColumnCount,
     setFocusOnSearch: setFocusOnSearch,
-    onKeyPress: onItemsEnterKeyPress,
+    onKeyPress: onItemsEnterTabKeyPress,
     onKeyDown: onKeyDown,
     viewMoreItem: viewMoreItem,
     focusOnViewMore: focusOnViewMore
@@ -175,8 +221,12 @@ function StatelessElementBrowser(props) {
     focusOnSearch: focusOnSearch,
     setColumnCount: setColumnCount,
     setFocusOnSearch: setFocusOnSearch,
-    onKeyPress: onItemsEnterKeyPress,
-    onKeyDown: onKeyDown
+    onKeyPress: onItemsEnterTabKeyPress,
+    onKeyDown: onKeyDown,
+    focusedCategoryIndex: focusedCategoryIndex,
+    setFocusedCategoryIndex: setFocusedCategoryIndex,
+    selectedCategoryIndex: selectedCategoryIndex,
+    onSelectCategory: getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') ? onSelectCategoryCB : onSelectCategory
   })));
 }
 function MobileBrowser({
@@ -192,6 +242,8 @@ function MobileBrowser({
   selectedItemIndex,
   focusedItemIndex,
   setFocusedItemIndex,
+  focusedCategoryIndex,
+  setFocusedCategoryIndex,
   focusOnSearch,
   focusOnViewMore,
   setColumnCount,
@@ -224,7 +276,11 @@ function MobileBrowser({
   }, jsx(CategoryList, {
     categories: categories,
     onSelectCategory: onSelectCategory,
-    selectedCategory: selectedCategory
+    selectedCategory: selectedCategory,
+    focusedCategoryIndex: focusedCategoryIndex,
+    setFocusedCategoryIndex: setFocusedCategoryIndex,
+    setFocusedItemIndex: setFocusedItemIndex,
+    setFocusOnSearch: setFocusOnSearch
   }))), jsx("div", {
     css: mobileMainContent
   }, jsx(ElementList, {
@@ -257,6 +313,9 @@ function DesktopBrowser({
   selectedItemIndex,
   focusedItemIndex,
   setFocusedItemIndex,
+  focusedCategoryIndex,
+  setFocusedCategoryIndex,
+  selectedCategoryIndex,
   focusOnSearch,
   setColumnCount,
   setFocusOnSearch,
@@ -287,7 +346,11 @@ function DesktopBrowser({
     categories: categories,
     onSelectCategory: onSelectCategory,
     selectedCategory: selectedCategory,
-    createAnalyticsEvent: createAnalyticsEvent
+    createAnalyticsEvent: createAnalyticsEvent,
+    focusedCategoryIndex: focusedCategoryIndex,
+    setFocusedCategoryIndex: setFocusedCategoryIndex,
+    setFocusedItemIndex: setFocusedItemIndex,
+    setFocusOnSearch: setFocusOnSearch
   }))), jsx("div", {
     css: mainContent,
     onKeyDown: onKeyDown,
@@ -316,7 +379,9 @@ function DesktopBrowser({
     createAnalyticsEvent: createAnalyticsEvent,
     emptyStateHandler: emptyStateHandler,
     selectedCategory: selectedCategory,
-    searchTerm: searchTerm
+    selectedCategoryIndex: selectedCategoryIndex,
+    searchTerm: searchTerm,
+    setFocusedCategoryIndex: showCategories ? setFocusedCategoryIndex : undefined
   })));
 }
 const MemoizedElementBrowser = /*#__PURE__*/memo(withAnalyticsContext({

package/dist/es2019/element-browser/hooks/use-select-and-focus-on-arrow-navigation.js

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useReducer, useRef } from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 /**
  * a custom hook that handles keyboard navigation for Arrow keys based on a
@@ -57,6 +58,7 @@ const reducer = (state, action) => {
       return {
         ...state,
         focusedItemIndex: undefined,
+        focusedCategoryIndex: undefined,
         focusOnSearch: true,
         focusOnViewMore: false
       };
@@ -172,7 +174,7 @@ const getInitialState = (listSize, canFocusViewMore) => initialState => ({
   listSize,
   canFocusViewMore
 });
-function useSelectAndFocusOnArrowNavigation(listSize, step, canFocusViewMore) {
+function useSelectAndFocusOnArrowNavigation(listSize, step, canFocusViewMore, isFocusSearch) {
   const [state, dispatch] = useReducer(reducer, initialState, getInitialState(listSize, canFocusViewMore));
   useEffect(() => {
     dispatch({
@@ -186,25 +188,55 @@ function useSelectAndFocusOnArrowNavigation(listSize, step, canFocusViewMore) {
     selectedItemIndex,
     focusedItemIndex,
     focusOnSearch,
-    focusOnViewMore
+    focusOnViewMore,
+    focusedCategoryIndex
   } = state;
+
+  // calls if items size changed
   const reset = useCallback(listSize => {
     let payload = {
       ...initialState,
       listSize
     };
+    if (getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1')) {
+      // A11Y: if categories exist ,on the initial render search element should receive focus.
+      // After user pick some category the category should stay focused.
+      payload = Object.assign(payload, {
+        focusOnSearch: isFocusSearch !== null && isFocusSearch !== void 0 ? isFocusSearch : initialState.focusOnSearch
+      });
+    }
     dispatch({
       type: ACTIONS.UPDATE_STATE,
       payload
     });
-  }, []);
+  }, [isFocusSearch]);
   const removeFocusFromSearchAndSetOnItem = useCallback(index => {
-    const payload = {
+    let payload = {
       focusedItemIndex: index,
       selectedItemIndex: index,
       focusOnSearch: false,
       focusOnViewMore: false
     };
+    if (getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1')) {
+      payload = Object.assign(payload, {
+        focusedCategoryIndex: undefined
+      });
+    }
+    dispatch({
+      type: ACTIONS.UPDATE_STATE,
+      payload
+    });
+  }, [dispatch]);
+  const setFocusedCategoryIndex = useCallback(index => {
+    if (!getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1')) {
+      return;
+    }
+    const payload = {
+      focusOnSearch: false,
+      focusOnViewMore: false,
+      focusedCategoryIndex: index,
+      focusedItemIndex: undefined
+    };
     dispatch({
       type: ACTIONS.UPDATE_STATE,
       payload
@@ -269,7 +301,9 @@ function useSelectAndFocusOnArrowNavigation(listSize, step, canFocusViewMore) {
     focusOnViewMore,
     setFocusOnSearch,
     focusedItemIndex,
-    setFocusedItemIndex: removeFocusFromSearchAndSetOnItem
+    setFocusedItemIndex: removeFocusFromSearchAndSetOnItem,
+    focusedCategoryIndex,
+    setFocusedCategoryIndex: setFocusedCategoryIndex
   };
 }
 export const ensureSafeIndex = (index, listSize) => {

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "78.37.1";
+const packageVersion = "78.37.3";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/ui/DropList/index.js

@@ -7,7 +7,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "78.37.1";
+const packageVersion = "78.37.3";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/element-browser/components/CategoryList.js

@@ -7,31 +7,65 @@ var _excluded = ["categories"],
 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; }
 /** @jsx jsx */
-
 import React, { Fragment, memo, useCallback } from 'react';
 import { css, jsx } from '@emotion/react';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/custom-theme-button';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B400, B50, N800 } from '@atlaskit/theme/colors';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent } from '../../analytics';
 import { DEVICE_BREAKPOINT_NUMBERS, GRID_SIZE } from '../constants';
 import useFocus from '../hooks/use-focus';
+var arrowsKeys = new Set(['ArrowUp', 'ArrowDown']);
 function CategoryList(_ref) {
   var _ref$categories = _ref.categories,
     categories = _ref$categories === void 0 ? [] : _ref$categories,
     props = _objectWithoutProperties(_ref, _excluded);
   var _React$useState = React.useState(null),
     _React$useState2 = _slicedToArray(_React$useState, 2),
-    focusedCategoryIndex = _React$useState2[0],
-    setFocusedCategoryIndex = _React$useState2[1];
+    focusedCategoryIndexState = _React$useState2[0],
+    setFocusedCategoryIndexState = _React$useState2[1];
+  var focusedCategoryIndexProp = props.focusedCategoryIndex,
+    setFocusedCategoryIndexProp = props.setFocusedCategoryIndex,
+    onSelectCategory = props.onSelectCategory;
+  var focusedCategoryIndex = getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') ? focusedCategoryIndexProp : focusedCategoryIndexState;
+  var setFocusedCategoryIndex = getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') ? setFocusedCategoryIndexProp : setFocusedCategoryIndexState;
   return jsx(Fragment, null, categories.map(function (category, index) {
+    var categoriesLength = categories === null || categories === void 0 ? void 0 : categories.length;
+    var selectNextCategory;
+    var selectPreviousCategory;
+    if (getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') && categoriesLength > 1) {
+      selectNextCategory = function selectNextCategory() {
+        if (index !== categoriesLength - 1) {
+          setFocusedCategoryIndex(index + 1);
+          onSelectCategory(categories[index + 1]);
+        } else {
+          setFocusedCategoryIndex(0);
+          onSelectCategory(categories[0]);
+        }
+        return;
+      };
+      selectPreviousCategory = function selectPreviousCategory() {
+        if (index !== 0) {
+          setFocusedCategoryIndex(index - 1);
+          onSelectCategory(categories[index - 1]);
+        } else {
+          setFocusedCategoryIndex(categoriesLength - 1);
+          onSelectCategory(categories[categoriesLength - 1]);
+        }
+        return;
+      };
+    }
     return jsx(CategoryListItem, _extends({
       key: category.title,
       index: index,
       category: category,
-      focus: focusedCategoryIndex === index,
-      setFocusedCategoryIndex: setFocusedCategoryIndex
-    }, props));
+      focus: focusedCategoryIndex === index
+    }, props, {
+      setFocusedCategoryIndex: setFocusedCategoryIndex,
+      selectPreviousCategory: selectPreviousCategory,
+      selectNextCategory: selectNextCategory
+    }));
   }));
 }
 function CategoryListItem(_ref2) {
@@ -41,10 +75,16 @@ function CategoryListItem(_ref2) {
     index = _ref2.index,
     focus = _ref2.focus,
     setFocusedCategoryIndex = _ref2.setFocusedCategoryIndex,
-    createAnalyticsEvent = _ref2.createAnalyticsEvent;
+    createAnalyticsEvent = _ref2.createAnalyticsEvent,
+    setFocusedItemIndex = _ref2.setFocusedItemIndex,
+    setFocusOnSearch = _ref2.setFocusOnSearch,
+    selectPreviousCategory = _ref2.selectPreviousCategory,
+    selectNextCategory = _ref2.selectNextCategory;
   var ref = useFocus(focus);
   var onClick = useCallback(function () {
-    onSelectCategory(category);
+    if (!getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1')) {
+      onSelectCategory(category);
+    }
     /**
      * When user double clicks on same category, focus on first item.
      */
@@ -53,6 +93,9 @@ function CategoryListItem(_ref2) {
     } else {
       setFocusedCategoryIndex(index);
     }
+    if (getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1')) {
+      onSelectCategory(category);
+    }
     fireAnalyticsEvent(createAnalyticsEvent)({
       payload: {
         action: ACTION.CLICKED,
@@ -83,6 +126,41 @@ function CategoryListItem(_ref2) {
       })
     }, rest);
   }, [category.name, selectedCategory]);
+  var onTabPress = useCallback(function (e) {
+    var isShiftPressed = e.shiftKey;
+    if (!isShiftPressed) {
+      // set focus from focused category to first item in it
+      if (setFocusedItemIndex) {
+        setFocusedItemIndex(0);
+        e.preventDefault();
+      }
+    } else {
+      // jump from first category back to search
+      if (setFocusOnSearch) {
+        setFocusOnSearch();
+        e.preventDefault();
+      }
+    }
+    return;
+  }, [setFocusedItemIndex, setFocusOnSearch]);
+  var onArrowPress = useCallback(function (e) {
+    if (e.key === 'ArrowUp' && selectPreviousCategory) {
+      return selectPreviousCategory();
+    }
+    if (e.key === 'ArrowDown' && selectNextCategory) {
+      return selectNextCategory();
+    }
+  }, [selectPreviousCategory, selectNextCategory]);
+  var onKeyDown = useCallback(function (e) {
+    var isTabPressed = e.key === 'Tab';
+    var isArrowPressed = arrowsKeys.has(e.key);
+    if (isTabPressed) {
+      return onTabPress(e);
+    }
+    if (isArrowPressed) {
+      return onArrowPress(e);
+    }
+  }, [onTabPress, onArrowPress]);
   return jsx("div", {
     css: buttonWrapper,
     role: "presentation"
@@ -91,13 +169,15 @@ function CategoryListItem(_ref2) {
     isSelected: selectedCategory === category.name,
     onClick: onClick,
     onFocus: onFocus,
+    onKeyDown: getBooleanFF('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') ? onKeyDown : undefined,
     theme: getTheme,
     role: "tab",
     "aria-selected": selectedCategory === category.name ? 'true' : 'false',
     "aria-controls": "browse-category-".concat(category.name, "-tab"),
     id: "browse-category--".concat(category.name, "-button"),
     ref: ref,
-    testId: "element-browser-category-item"
+    testId: "element-browser-category-item",
+    tabIndex: -1
   }, category.title));
 }
 var buttonWrapper = css(_defineProperty({