@atlaskit/renderer 103.0.0 → 103.0.2

package/dist/es2019/ui/SortingIcon.js

@@ -6,14 +6,9 @@ import { N20, N30 } from '@atlaskit/theme/colors';
 import { SortOrder } from '@atlaskit/editor-common/types';
 import { sortingIconMessages } from '../messages';
 import { injectIntl } from 'react-intl-next';
-import { token } from '@atlaskit/tokens'; // We use data url here because of this issue:
-// https://product-fabric.atlassian.net/browse/ED-8001
-// Remove this workaround if Firefox has fixed: https://bugzilla.mozilla.org/show_bug.cgi?id=1664350
-// TODO: Quality ticket: https://product-fabric.atlassian.net/browse/DSP-4136
-
-export const TableSortIconDataUrl = `data:image/svg+xml;utf8,${encodeURIComponent(`<svg xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M-8-6h24v24H-8z"></path><path d="M3 8.509V1c0-.552.449-1 1-1 .552 0 1 .448 1 1V8.51l1.217-1.206a1.05 1.05 0 011.477 0 1.03 1.03 0 01.004 1.463l-.003.002-2.956 2.93a1.053 1.053 0 01-1.478 0L.305 8.767a1.03 1.03 0 01.001-1.464 1.05 1.05 0 011.477 0L3 8.508z" fill="#42526E"></path></g></svg>`)}`;
-const TABLE_SORTING_ICON_CLASS = 'table-sorting-icon';
-export let StatusClassNames; // TODO: get design to check border
+import { token } from '@atlaskit/tokens';
+import { RendererCssClassName } from '../consts';
+export let StatusClassNames;
 
 (function (StatusClassNames) {
   StatusClassNames["ASC"] = "sorting-icon-svg__asc";
@@ -22,7 +17,7 @@ export let StatusClassNames; // TODO: get design to check border
   StatusClassNames["SORTING_NOT_ALLOWED"] = "sorting-icon-svg__not-allowed";
 })(StatusClassNames || (StatusClassNames = {}));
 
-const wrapperStyles = css`
+const buttonStyles = css`
   position: absolute;
   display: flex;
   height: 28px;
@@ -30,50 +25,90 @@ const wrapperStyles = css`
   margin: 6px;
   right: 0;
   top: 0;
-  border: 2px solid ${token('color.border.inverse', '#fff')};
+  border: 2px solid ${token('color.border', '#fff')};
   border-radius: ${gridSize() / 2}px;
-  background-color: ${token('color.background.neutral.subtle', N20)};
+  background-color: ${token('elevation.surface.overlay', N20)};
   justify-content: center;
   align-items: center;
+  cursor: pointer;
 
   &:hover {
-    background-color: ${token('color.background.neutral.subtle.hovered', N30)};
+    background-color: ${token('elevation.surface.overlay.hovered', N30)};
+  }
+
+  &:active {
+    background-color: ${token('elevation.surface.overlay.pressed', 'rgba(179, 212, 255, 0.6)')};
   }
 
-  &.${StatusClassNames.SORTING_NOT_ALLOWED} {
+  &.${RendererCssClassName.SORTABLE_COLUMN_ICON}__not-allowed {
     cursor: not-allowed;
   }
 `;
-const tableSortingIconStyles = css`
+const iconWrapperStyles = css`
   width: 8px;
   height: 12px;
   transition: transform 0.3s cubic-bezier(0.15, 1, 0.3, 1);
   transform-origin: 50% 50%;
-  background-image: url(${TableSortIconDataUrl});
+  display: flex;
+  justify-content: center;
 
   &.${StatusClassNames.DESC} {
     transform: rotate(-180deg);
   }
 
-  &.${TABLE_SORTING_ICON_CLASS}-inactive {
+  &.${RendererCssClassName.SORTABLE_COLUMN_ICON}-inactive {
     opacity: 0.7;
   }
+`; // The icon is created with CSS due to the following Firefox issue: https://product-fabric.atlassian.net/browse/ED-8001
+// The TL;DR is that svg's in tables mess up how HTML is copied in Firefox. Using a styled div instead solves the problem.
+// For this reason, svg's should be avoided in tables until this issue is fixed: https://bugzilla.mozilla.org/show_bug.cgi?id=1664350
+
+const iconStyles = css`
+  height: 100%;
+  width: 2px;
+  border-radius: 50px;
+  background: ${token('color.icon', '#42526E')};
+
+  &::before,
+  &::after {
+    background: ${token('color.icon', '#42526E')};
+    content: '';
+    height: 2px;
+    width: 6px;
+    position: absolute;
+    border-radius: 50px;
+  }
+
+  &::before {
+    transform: rotate(45deg) translate(3.4px, 8.5px);
+  }
+
+  &::after {
+    transform: rotate(-45deg) translate(-6.3px, 5.7px);
+  }
 `;
 
-const getClassName = status => {
-  switch (status) {
+const getIconClassName = (isSortingAllowed, sortOrdered) => {
+  const activated = sortOrdered !== SortOrder.NO_ORDER;
+  const activeStatusClass = `${RendererCssClassName.SORTABLE_COLUMN_ICON}-${activated ? 'active' : 'inactive'}`;
+
+  if (!isSortingAllowed) {
+    return `${StatusClassNames.SORTING_NOT_ALLOWED} ${activeStatusClass}`;
+  }
+
+  switch (sortOrdered) {
     case SortOrder.ASC:
-      return StatusClassNames.ASC;
+      return `${StatusClassNames.ASC} ${activeStatusClass}`;
 
     case SortOrder.DESC:
-      return StatusClassNames.DESC;
+      return `${StatusClassNames.DESC} ${activeStatusClass}`;
 
     default:
-      return StatusClassNames.NO_ORDER;
+      return `${StatusClassNames.NO_ORDER} ${activeStatusClass}`;
   }
 };
 
-const getTooltipTitle = (intl, isSortingAllowed, status) => {
+const getTooltipTitle = (intl, isSortingAllowed, sortOrdered) => {
   const {
     noOrderLabel,
     ascOrderLabel,
@@ -85,7 +120,7 @@ const getTooltipTitle = (intl, isSortingAllowed, status) => {
     return intl.formatMessage(invalidLabel);
   }
 
-  switch (status) {
+  switch (sortOrdered) {
     case SortOrder.NO_ORDER:
       return intl.formatMessage(noOrderLabel);
 
@@ -102,22 +137,44 @@ const getTooltipTitle = (intl, isSortingAllowed, status) => {
 const SortingIcon = ({
   isSortingAllowed,
   sortOrdered,
-  intl
+  intl,
+  onClick,
+  onKeyDown
 }) => {
-  const activated = sortOrdered !== SortOrder.NO_ORDER;
-  const wrapperClassName = !isSortingAllowed ? StatusClassNames.SORTING_NOT_ALLOWED : '';
+  const buttonClassName = `${RendererCssClassName.SORTABLE_COLUMN_ICON}${isSortingAllowed ? '' : ` ${RendererCssClassName.SORTABLE_COLUMN_ICON}__not-allowed`}`;
   const content = getTooltipTitle(intl, isSortingAllowed, sortOrdered);
+
+  const handleClick = () => {
+    if (isSortingAllowed) {
+      onClick();
+    }
+  };
+
+  const handleKeyDown = event => {
+    if (isSortingAllowed) {
+      onKeyDown(event);
+    }
+  };
+
   return jsx(Tooltip, {
     delay: 0,
     content: content,
     position: "top"
-  }, jsx("figure", {
-    css: wrapperStyles,
-    className: wrapperClassName
   }, jsx("div", {
-    css: tableSortingIconStyles,
-    className: `${getClassName(sortOrdered)} ${TABLE_SORTING_ICON_CLASS}-${activated ? 'active' : 'inactive'}`
-  })));
+    css: buttonStyles,
+    className: buttonClassName,
+    role: "button",
+    tabIndex: isSortingAllowed ? 0 : -1,
+    "aria-label": "sort column",
+    "aria-disabled": !isSortingAllowed,
+    onClick: handleClick,
+    onKeyDown: handleKeyDown
+  }, jsx("div", {
+    css: iconWrapperStyles,
+    className: getIconClassName(isSortingAllowed, sortOrdered)
+  }, jsx("div", {
+    css: iconStyles
+  }))));
 };
 
 export default injectIntl(SortingIcon);

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "103.0.0",
+	"version": "103.0.2",
 	"sideEffects": false
 }

package/dist/esm/consts.js

@@ -5,9 +5,9 @@ export var RendererCssClassName = {
   EXTENSION_CENTER_ALIGN: "".concat(clPrefix, "extension-center-align"),
   EXTENSION_OVERFLOW_CONTAINER: "".concat(clPrefix, "extension-overflow-container"),
   NUMBER_COLUMN: "".concat(clPrefix, "table-number-column"),
+  SORTABLE_COLUMN_WRAPPER: "".concat(clPrefix, "tableHeader-sortable-column__wrapper"),
   SORTABLE_COLUMN: "".concat(clPrefix, "tableHeader-sortable-column"),
-  SORTABLE_COLUMN_BUTTON: "".concat(clPrefix, "tableHeader-sortable-column__button"),
-  SORTABLE_COLUMN_NOT_ALLOWED: "".concat(clPrefix, "tableHeader-sortable-column__not-allowed"),
+  SORTABLE_COLUMN_ICON_WRAPPER: "".concat(clPrefix, "tableHeader-sorting-icon__wrapper"),
   SORTABLE_COLUMN_ICON: "".concat(clPrefix, "tableHeader-sorting-icon"),
   SORTABLE_COLUMN_NO_ORDER: "".concat(clPrefix, "tableHeader-sorting-icon__no-order")
 };

package/dist/esm/messages.js

@@ -56,7 +56,7 @@ export var sortingIconMessages = defineMessages({
   },
   invalidLabel: {
     id: 'fabric.editor.headingLink.invalidLabel',
-    defaultMessage: "\u26A0\uFE0F  You can't sort a table with merged cell",
+    defaultMessage: "\u26A0\uFE0F  You can't sort a table with merged cells",
     description: 'this sort is invalid for merged cells'
   }
 });

package/dist/esm/react/nodes/panel.js

@@ -1,8 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 
 var _templateObject, _templateObject2;
 
+var _excluded = ["backgroundColor", "hasIcon"];
+
 /** @jsx jsx */
 import React from 'react';
 import { css, jsx } from '@emotion/react';
@@ -16,24 +19,28 @@ import EmojiItem from './emoji'; // AFP-2532 TODO: Fix automatic suppressions be
 import { themed } from '@atlaskit/theme';
 import { PanelInfoIcon, PanelSuccessIcon, PanelNoteIcon, PanelWarningIcon, PanelErrorIcon } from '@atlaskit/editor-common/icons';
 
-var PanelStyled = function PanelStyled(props) {
+var PanelStyled = function PanelStyled(_ref) {
+  var backgroundColor = _ref.backgroundColor,
+      hasIcon = _ref.hasIcon,
+      props = _objectWithoutProperties(_ref, _excluded);
+
   var styles = function styles(theme) {
-    return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    &.", " {\n      ", "\n    }\n  "])), PanelSharedCssClassName.prefix, panelSharedStylesWithoutPrefix({
+    return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    &.", " {\n      ", "\n\n      &[data-panel-type=", "] {\n        ", "\n      }\n    }\n  "])), PanelSharedCssClassName.prefix, panelSharedStylesWithoutPrefix({
       theme: theme
-    }));
+    }), PanelType.CUSTOM, hasIcon ? '' : 'padding: 12px;');
   };
 
-  if (props['data-panel-type'] === PanelType.CUSTOM && props.backgroundColor) {
+  if (props['data-panel-type'] === PanelType.CUSTOM && backgroundColor) {
     styles = function styles(theme) {
       var customStyle = themed({
         dark: getPanelBackgroundDarkModeColors,
-        light: "background-color: ".concat(props.backgroundColor, ";")
+        light: "background-color: ".concat(backgroundColor, ";")
       })({
         theme: theme
       });
-      return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        &.", " {\n          ", "\n        }\n\n        &[data-panel-type=", "] {\n          ", ";\n        }\n      "])), PanelSharedCssClassName.prefix, panelSharedStylesWithoutPrefix({
+      return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        &.", " {\n          ", "\n        }\n\n        &[data-panel-type=", "] {\n          ", ";\n          ", "\n        }\n      "])), PanelSharedCssClassName.prefix, panelSharedStylesWithoutPrefix({
         theme: theme
-      }), PanelType.CUSTOM, customStyle);
+      }), PanelType.CUSTOM, customStyle, hasIcon ? '' : 'padding: 12px;');
     };
   }
 
@@ -86,9 +93,9 @@ var Panel = function Panel(props) {
     });
   };
 
-  var renderIcon = function renderIcon() {
-    var icon = getIcon();
+  var icon = getIcon();
 
+  var renderIcon = function renderIcon() {
     if (icon) {
       return jsx("div", {
         className: PanelSharedCssClassName.icon
@@ -103,7 +110,8 @@ var Panel = function Panel(props) {
     "data-panel-icon": panelIcon,
     "data-panel-icon-id": panelIconId,
     "data-panel-icon-text": panelIconText,
-    backgroundColor: panelColor
+    backgroundColor: panelColor,
+    hasIcon: Boolean(icon)
   }, renderIcon(), jsx("div", {
     className: PanelSharedCssClassName.content
   }, children));

package/dist/esm/react/nodes/tableCell.js

@@ -152,19 +152,11 @@ export var withSortableColumn = function withSortableColumn(WrapperComponent) {
         if (keys.includes(event.key) && !IgnoreSorting.includes(tagName)) {
           event.preventDefault();
 
-          _this.onClick(event);
+          _this.sort();
         }
       });
 
-      _defineProperty(_assertThisInitialized(_this), "onClick", function (event) {
-        // ignore sorting when specific elements are clicked
-        var _ref2 = event.target,
-            tagName = _ref2.tagName;
-
-        if (IgnoreSorting.includes(tagName)) {
-          return;
-        }
-
+      _defineProperty(_assertThisInitialized(_this), "sort", function () {
         var _this$props2 = _this.props,
             fireAnalyticsEvent = _this$props2.fireAnalyticsEvent,
             onSorting = _this$props2.onSorting,
@@ -217,28 +209,18 @@ export var withSortableColumn = function withSortableColumn(WrapperComponent) {
           return /*#__PURE__*/React.createElement(WrapperComponent, this.props);
         }
 
-        var className = RendererCssClassName.SORTABLE_COLUMN;
-
-        if (!onSorting) {
-          className = "".concat(className, " ").concat(RendererCssClassName.SORTABLE_COLUMN_NOT_ALLOWED);
-        }
-
         return /*#__PURE__*/React.createElement(WrapperComponent, _extends({}, this.props, {
-          className: className,
+          className: RendererCssClassName.SORTABLE_COLUMN_WRAPPER,
           ariaSort: getSortOrderLabel(intl, sortOrdered)
         }), /*#__PURE__*/React.createElement("div", {
-          className: RendererCssClassName.SORTABLE_COLUMN_BUTTON,
-          role: "button",
-          tabIndex: onSorting ? 0 : -1,
-          onClick: this.onClick,
-          onKeyDown: this.onKeyPress,
-          "aria-disabled": !onSorting
+          className: RendererCssClassName.SORTABLE_COLUMN
         }, children, /*#__PURE__*/React.createElement("figure", {
-          "aria-hidden": true,
-          className: "".concat(RendererCssClassName.SORTABLE_COLUMN_ICON, " ").concat(sortOrderedClassName)
+          className: "".concat(RendererCssClassName.SORTABLE_COLUMN_ICON_WRAPPER, " ").concat(sortOrderedClassName)
         }, /*#__PURE__*/React.createElement(SortingIcon, {
           isSortingAllowed: !!onSorting,
-          sortOrdered: sortOrdered
+          sortOrdered: sortOrdered,
+          onClick: this.sort,
+          onKeyDown: this.onKeyPress
         }))));
       }
     }]);

package/dist/esm/ui/ExtensionRenderer.js

@@ -49,6 +49,8 @@ var ExtensionRenderer = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_assertThisInitialized(_this), "getNodeRenderer", memoizeOne(getNodeRenderer));
 
     _defineProperty(_assertThisInitialized(_this), "renderExtensionNode", function (extensionProvider) {
+      var _marks$find, _marks$find$attrs;
+
       var _this$props = _this.props,
           extensionHandlers = _this$props.extensionHandlers,
           rendererContext = _this$props.rendererContext,
@@ -58,14 +60,19 @@ var ExtensionRenderer = /*#__PURE__*/function (_React$Component) {
           content = _this$props.content,
           text = _this$props.text,
           type = _this$props.type,
-          localId = _this$props.localId;
+          localId = _this$props.localId,
+          marks = _this$props.marks;
+      var fragmentLocalId = marks === null || marks === void 0 ? void 0 : (_marks$find = marks.find(function (m) {
+        return m.type.name === 'fragment';
+      })) === null || _marks$find === void 0 ? void 0 : (_marks$find$attrs = _marks$find.attrs) === null || _marks$find$attrs === void 0 ? void 0 : _marks$find$attrs.localId;
       var node = {
         type: type,
         extensionKey: extensionKey,
         extensionType: extensionType,
         parameters: parameters,
         content: content || text,
-        localId: localId
+        localId: localId,
+        fragmentLocalId: fragmentLocalId
       };
       var result = null;
 

package/dist/esm/ui/Renderer/index.js

@@ -50,7 +50,7 @@ import { RenderTracking } from '../../react/utils/performance/RenderTracking';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "103.0.0";
+var packageVersion = "103.0.2";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
 

package/dist/esm/ui/Renderer/style.js

@@ -8,8 +8,9 @@ import { gridSize, fontFamily, fontSize, borderRadius } from '@atlaskit/theme/co
 import * as colors from '@atlaskit/theme/colors';
 import { headingSizes as headingSizesImport } from '@atlaskit/theme/typography';
 import { token } from '@atlaskit/tokens';
-import { tableSharedStyle, columnLayoutSharedStyle, blockquoteSharedStyles, headingsSharedStyles, ruleSharedStyles, whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, mediaSingleSharedStyle, TableSharedCssClassName, tableMarginTop, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, richMediaClassName, tasksAndDecisionsStyles, smartCardSharedStyles, tableCellPadding, textColorStyles } from '@atlaskit/editor-common/styles';
+import { tableSharedStyle, columnLayoutSharedStyle, blockquoteSharedStyles, headingsSharedStyles, ruleSharedStyles, whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, mediaSingleSharedStyle, TableSharedCssClassName, tableMarginTop, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, richMediaClassName, tasksAndDecisionsStyles, smartCardSharedStyles, tableCellPadding, textColorStyles, codeBlockInListSafariFix } from '@atlaskit/editor-common/styles';
 import { shadowClassNames } from '@atlaskit/editor-common/ui';
+import { browser } from '@atlaskit/editor-common/utils';
 import { editorFontSize, blockNodesVerticalMargin, akEditorTableToolbar, akEditorTableToolbarDark, akEditorTableBorder, akEditorTableBorderDark, akEditorTableNumberColumnWidth, gridMediumMaxWidth, akEditorFullWidthLayoutWidth, akEditorStickyHeaderZIndex, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import { RendererCssClassName } from '../../consts';
 import { HeadingAnchorWrapperClassName } from '../../react/nodes/heading-anchor';
@@ -70,7 +71,7 @@ var tableSortableColumnStyle = function tableSortableColumnStyle(_ref2) {
     headingsCss = "\n      /**\n       * When the sort button is enabled we want the heading's copy link button\n       * to reserve space so that it can prematurely wrap to avoid the button\n       * being displayed underneath the sort button (hidden or obscured).\n       *\n       * The two buttons fight each other since the sort button is displayed\n       * on hover of the <th /> and the copy link button is displayed on hover\n       * of the heading.\n       *\n       * Note that this can break the WYSIWYG experience in the case where\n       * a heading fills the width of the table cell and the only thing which\n       * wraps is the copy link button. This is hopefully a rare fringe case.\n       */\n      .".concat(HeadingAnchorWrapperClassName, " {\n        position: unset;\n      }\n      > {\n        h1, h2, h3, h4, h5, h6 {\n          margin-right: 30px;\n        }\n      }\n    ");
   }
 
-  return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    .", " {\n      padding: 0;\n\n      .", " {\n        width: 100%;\n        height: 100%;\n        cursor: pointer;\n        padding: ", "px;\n        border-width: 1.5px;\n        border-style: solid;\n        border-color: transparent;\n\n        > *:first-child {\n          margin-top: 0;\n        }\n\n        > .ProseMirror-gapcursor.-right:first-of-type + * {\n          margin-top: 0;\n        }\n\n        > .ProseMirror-gapcursor:first-of-type + span + * {\n          margin-top: 0;\n        }\n\n        @supports selector(:focus-visible) {\n          &:focus {\n            outline: unset;\n          }\n          &:focus-visible {\n            border-color: ", ";\n          }\n        }\n\n        ", "\n      }\n\n      &.", "\n        .", " {\n        cursor: default;\n      }\n\n      .", " {\n        margin: 0;\n        opacity: 1;\n        transition: opacity 0.2s ease-in-out;\n      }\n\n      .", " {\n        opacity: 0;\n      }\n\n      &:hover {\n        .", " {\n          opacity: 1;\n        }\n      }\n    }\n  "])), RendererCssClassName.SORTABLE_COLUMN, RendererCssClassName.SORTABLE_COLUMN_BUTTON, tableCellPadding, token('color.border.focused', colors.B300), headingsCss, RendererCssClassName.SORTABLE_COLUMN_NOT_ALLOWED, RendererCssClassName.SORTABLE_COLUMN_BUTTON, RendererCssClassName.SORTABLE_COLUMN_ICON, RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, RendererCssClassName.SORTABLE_COLUMN_NO_ORDER);
+  return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    .", " {\n      padding: 0;\n\n      .", " {\n        width: 100%;\n        height: 100%;\n        padding: ", "px;\n        border-width: 1.5px;\n        border-style: solid;\n        border-color: transparent;\n\n        > *:first-child {\n          margin-top: 0;\n        }\n\n        > .ProseMirror-gapcursor:first-child + *,\n        > style:first-child + .ProseMirror-gapcursor + * {\n          margin-top: 0;\n        }\n\n        > .ProseMirror-gapcursor:first-child + span + *,\n        > style:first-child + .ProseMirror-gapcursor + span + * {\n          margin-top: 0;\n        }\n\n        @supports selector(:focus-visible) {\n          &:focus {\n            outline: unset;\n          }\n          &:focus-visible {\n            border-color: ", ";\n          }\n        }\n\n        ", "\n      }\n\n      .", " {\n        margin: 0;\n        .", " {\n          opacity: 1;\n          transition: opacity 0.2s ease-in-out;\n        }\n      }\n\n      .", " {\n        .", " {\n          opacity: 0;\n          &:focus {\n            opacity: 1;\n          }\n        }\n      }\n\n      &:hover {\n        .", " {\n          .", " {\n            opacity: 1;\n          }\n        }\n      }\n    }\n  "])), RendererCssClassName.SORTABLE_COLUMN_WRAPPER, RendererCssClassName.SORTABLE_COLUMN, tableCellPadding, token('color.border.focused', colors.B300), headingsCss, RendererCssClassName.SORTABLE_COLUMN_ICON_WRAPPER, RendererCssClassName.SORTABLE_COLUMN_ICON, RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, RendererCssClassName.SORTABLE_COLUMN_ICON, RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, RendererCssClassName.SORTABLE_COLUMN_ICON);
 };
 
 var fullPageStyles = function fullPageStyles(_ref3, _ref4) {
@@ -100,7 +101,7 @@ export var rendererStyles = function rendererStyles(wrapperProps) {
     var themeProps = {
       theme: theme
     };
-    return css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n    font-size: ", "px;\n    line-height: 1.5rem;\n    color: ", ";\n\n    .", "::after {\n      // we add a clearfix after ak-renderer-document in order to\n      // contain internal floats (such as media images that are \"wrap-left\")\n      // to just the renderer (and not spill outside of it)\n      content: '';\n      visibility: hidden;\n      display: block;\n      height: 0;\n      clear: both;\n    }\n\n    ", "\n    ", "\n\n    & h1 {\n      ", "\n    }\n\n    & h2 {\n      ", "\n    }\n\n    & h3 {\n      ", "\n    }\n\n    & h4 {\n      ", "\n    }\n\n    & h5 {\n      ", "\n    }\n\n    & h6 {\n      ", "\n    }\n\n    & span.akActionMark {\n      color: ", ";\n      text-decoration: none;\n\n      &:hover {\n        color: ", ";\n        text-decoration: underline;\n      }\n\n      &:active {\n        color: ", ";\n      }\n    }\n\n    & span.akActionMark {\n      cursor: pointer;\n    }\n\n    & span[data-placeholder] {\n      color: ", ";\n    }\n\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", "\n\n    & .UnknownBlock {\n      font-family: ", ";\n      font-size: ", ";\n      font-weight: 400;\n      white-space: pre-wrap;\n      word-wrap: break-word;\n    }\n\n    & span.date-node {\n      background: ", ";\n      border-radius: ", "px;\n      color: ", ";\n      padding: 2px 4px;\n      margin: 0 1px;\n      transition: background 0.3s;\n    }\n\n    & span.date-node-highlighted {\n      background: ", ";\n      color: ", ";\n    }\n\n    & .renderer-image {\n      max-width: 100%;\n      display: block;\n      margin: ", "px 0;\n    }\n\n    .", ".rich-media-wrapped\n      + .", ":not(.rich-media-wrapped) {\n      clear: both;\n    }\n\n    & .code-block,\n    & blockquote,\n    & hr,\n    & > div > div:not(.rich-media-wrapped),\n    .", ".rich-media-wrapped\n      + .rich-media-wrapped\n      + *:not(.rich-media-wrapped),\n    .", ".rich-media-wrapped + div:not(.rich-media-wrapped),\n    .", ".image-align-start,\n      .", ".image-center,\n      .", ".image-align-end {\n      clear: both;\n    }\n\n    & .rich-media-wrapped {\n      & + h1,\n      & + h2,\n      & + h3,\n      & + h4,\n      & + h5,\n      & + h6 {\n        margin-top: 8px;\n      }\n    }\n\n    ", "\n    /* plugin styles */\n    ", " &\n    div[class^='image-wrap-'] + div[class^='image-wrap-'] {\n      margin-left: 0;\n      margin-right: 0;\n    }\n\n    /* Breakout for tables and extensions */\n    .", " > {\n      * .", " {\n        width: 100% !important;\n        left: 0 !important;\n      }\n\n      * .", " {\n        overflow-x: auto;\n      }\n\n      & .", ":first-child {\n        margin-top: 0;\n      }\n    }\n\n    .", " {\n      .", " {\n        margin-top: ", ";\n      }\n\n      .", " {\n        margin-left: 50%;\n        transform: translateX(-50%);\n      }\n\n      .", " {\n        overflow-x: auto;\n      }\n\n      .", "\n        .", " {\n        display: flex;\n      }\n    }\n\n    ", "\n\n    .", " .", " {\n      z-index: 0;\n      transition: all 0.1s linear;\n      display: flex; /* needed to avoid position: fixed jumpiness in Chrome */\n\n      /** Shadow overrides */\n      &.", "::after,\n        &.", "::before {\n        top: ", "px;\n        height: calc(100% - ", "px);\n        z-index: ", ";\n      }\n\n      &\n        .", ",\n        &\n        .", " {\n        height: calc(100% - ", "px);\n      }\n\n      /**\n     * A hack for making all the <th /> heights equal in case some have shorter\n     * content than others.\n     *\n     * This is done to make sort buttons fill entire <th />.\n     */\n      table {\n        height: 1px; /* will be ignored */\n        ", ";\n        margin-left: 0;\n        margin-right: 0;\n      }\n\n      table tr:first-of-type {\n        height: 100%;\n\n        td,\n        th {\n          position: relative;\n        }\n      }\n\n      table[data-number-column='true'] {\n        .", " {\n          background-color: ", ";\n          border-right: 1px solid\n            ", ";\n          width: ", "px;\n          text-align: center;\n          color: ", ";\n          font-size: ", ";\n        }\n\n        .fixed .", " {\n          border-right: 0px none;\n        }\n      }\n    }\n\n    tr[data-header-row].fixed {\n      position: fixed !important;\n      display: flex;\n      overflow: hidden;\n      z-index: ", ";\n\n      border-right: 1px solid\n        ", ";\n      border-bottom: 1px solid\n        ", ";\n\n      /* this is to compensate for the table border */\n      transform: translateX(-1px);\n    }\n\n    .sticky > th {\n      z-index: ", ";\n      position: sticky !important;\n      top: 0;\n    }\n\n    /* Make the number column header sticky */\n    .sticky > td {\n      position: sticky !important;\n      top: 0;\n    }\n\n    /* add border for position: sticky\n     and work around background-clip: padding-box\n     bug for FF causing box-shadow bug in Chrome */\n    .sticky th,\n    .sticky td {\n      box-shadow: 0px 1px\n          ", ",\n        0px -0.5px ", ",\n        inset -1px 0px ", ",\n        0px -1px ", ";\n    }\n\n    /* this will remove jumpiness caused in Chrome for sticky headers */\n    .fixed + tr {\n      min-height: 0px;\n    }\n\n    /*\n   * We wrap CodeBlock in a grid to prevent it from overflowing the container of the renderer.\n   * See ED-4159.\n   */\n    & .code-block {\n      max-width: 100%;\n      /* -ms- properties are necessary until MS supports the latest version of the grid spec */\n      /* stylelint-disable value-no-vendor-prefix, declaration-block-no-duplicate-properties */\n      display: -ms-grid;\n      display: grid;\n      -ms-grid-columns: auto 1fr;\n      /* stylelint-enable */\n\n      grid-template-columns: minmax(0, 1fr);\n      position: relative;\n      border-radius: ", "px;\n\n      /*\n     * The overall renderer has word-wrap: break; which causes issues with\n     * code block line numbers in Safari / iOS.\n     */\n      word-wrap: normal;\n\n      & > span {\n        /* stylelint-disable value-no-vendor-prefix */\n        -ms-grid-row: 1;\n        -ms-grid-column: 2;\n        /* stylelint-enable */\n        grid-column: 1;\n      }\n    }\n\n    & .MediaGroup,\n    & .code-block {\n      margin-top: ", ";\n\n      &:first-child {\n        margin-top: 0;\n      }\n\n      &:hover button.copy-to-clipboard,\n      .copy-to-clipboard:focus {\n        opacity: 1;\n        position: absolute;\n        height: 32px;\n        width: 32px;\n        right: 6px;\n        top: 4px;\n        padding: 2px;\n      }\n    }\n\n    ", "\n\n    ", ";\n    & [data-layout-section] {\n      margin-top: ", "px;\n      & > div + div {\n        margin-left: ", "px;\n      }\n\n      @media screen and (max-width: ", "px) {\n        & > div + div {\n          margin-left: 0;\n        }\n      }\n    }\n  "])), editorFontSize(themeProps), themed({
+    return css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n      font-size: ", "px;\n      line-height: 1.5rem;\n      color: ", ";\n\n      .", "::after {\n        // we add a clearfix after ak-renderer-document in order to\n        // contain internal floats (such as media images that are \"wrap-left\")\n        // to just the renderer (and not spill outside of it)\n        content: '';\n        visibility: hidden;\n        display: block;\n        height: 0;\n        clear: both;\n      }\n\n      ", "\n      ", "\n\n    & h1 {\n        ", "\n      }\n\n      & h2 {\n        ", "\n      }\n\n      & h3 {\n        ", "\n      }\n\n      & h4 {\n        ", "\n      }\n\n      & h5 {\n        ", "\n      }\n\n      & h6 {\n        ", "\n      }\n\n      & span.akActionMark {\n        color: ", ";\n        text-decoration: none;\n\n        &:hover {\n          color: ", ";\n          text-decoration: underline;\n        }\n\n        &:active {\n          color: ", ";\n        }\n      }\n\n      & span.akActionMark {\n        cursor: pointer;\n      }\n\n      & span[data-placeholder] {\n        color: ", ";\n      }\n\n      ", ";\n      ", ";\n      ", ";\n      ", ";\n      ", ";\n      ", ";\n      ", ";\n      ", ";\n      ", ";\n      ", ";\n      ", ";\n      ", ";\n      ", ";\n      ", "\n\n      & .UnknownBlock {\n        font-family: ", ";\n        font-size: ", ";\n        font-weight: 400;\n        white-space: pre-wrap;\n        word-wrap: break-word;\n      }\n\n      & span.date-node {\n        background: ", ";\n        border-radius: ", "px;\n        color: ", ";\n        padding: 2px 4px;\n        margin: 0 1px;\n        transition: background 0.3s;\n      }\n\n      & span.date-node-highlighted {\n        background: ", ";\n        color: ", ";\n      }\n\n      & .renderer-image {\n        max-width: 100%;\n        display: block;\n        margin: ", "px 0;\n      }\n\n      .", ".rich-media-wrapped\n        + .", ":not(.rich-media-wrapped) {\n        clear: both;\n      }\n\n      & .code-block,\n      & blockquote,\n      & hr,\n      & > div > div:not(.rich-media-wrapped),\n      .", ".rich-media-wrapped\n        + .rich-media-wrapped\n        + *:not(.rich-media-wrapped),\n      .", ".rich-media-wrapped + div:not(.rich-media-wrapped),\n      .", ".image-align-start,\n        .", ".image-center,\n        .", ".image-align-end {\n        clear: both;\n      }\n\n      & .rich-media-wrapped {\n        & + h1,\n        & + h2,\n        & + h3,\n        & + h4,\n        & + h5,\n        & + h6 {\n          margin-top: 8px;\n        }\n      }\n\n      ", "\n      /* plugin styles */\n    ", " &\n    div[class^='image-wrap-'] + div[class^='image-wrap-'] {\n        margin-left: 0;\n        margin-right: 0;\n      }\n\n      /* Breakout for tables and extensions */\n      .", " > {\n        * .", " {\n          width: 100% !important;\n          left: 0 !important;\n        }\n\n        * .", " {\n          overflow-x: auto;\n        }\n\n        & .", ":first-child {\n          margin-top: 0;\n        }\n      }\n\n      .", " {\n        .", " {\n          margin-top: ", ";\n        }\n\n        .", " {\n          margin-left: 50%;\n          transform: translateX(-50%);\n        }\n\n        .", " {\n          overflow-x: auto;\n        }\n\n        .", "\n          .", " {\n          display: flex;\n        }\n      }\n\n      ", "\n\n      .", " .", " {\n        z-index: 0;\n        transition: all 0.1s linear;\n        display: flex; /* needed to avoid position: fixed jumpiness in Chrome */\n\n        /** Shadow overrides */\n        &.", "::after,\n          &.", "::before {\n          top: ", "px;\n          height: calc(100% - ", "px);\n          z-index: ", ";\n        }\n\n        &\n          .", ",\n          &\n          .", " {\n          height: calc(100% - ", "px);\n        }\n\n        /**\n     * A hack for making all the <th /> heights equal in case some have shorter\n     * content than others.\n     *\n     * This is done to make sort buttons fill entire <th />.\n     */\n        table {\n          height: 1px; /* will be ignored */\n          ", ";\n          margin-left: 0;\n          margin-right: 0;\n        }\n\n        table tr:first-of-type {\n          height: 100%;\n\n          td,\n          th {\n            position: relative;\n          }\n        }\n\n        table[data-number-column='true'] {\n          .", " {\n            background-color: ", ";\n            border-right: 1px solid\n              ", ";\n            width: ", "px;\n            text-align: center;\n            color: ", ";\n            font-size: ", ";\n          }\n\n          .fixed .", " {\n            border-right: 0px none;\n          }\n        }\n      }\n\n      tr[data-header-row].fixed {\n        position: fixed !important;\n        display: flex;\n        overflow: hidden;\n        z-index: ", ";\n\n        border-right: 1px solid\n          ", ";\n        border-bottom: 1px solid\n          ", ";\n\n        /* this is to compensate for the table border */\n        transform: translateX(-1px);\n      }\n\n      .sticky > th {\n        z-index: ", ";\n        position: sticky !important;\n        top: 0;\n      }\n\n      /* Make the number column header sticky */\n      .sticky > td {\n        position: sticky !important;\n        top: 0;\n      }\n\n      /* add border for position: sticky\n     and work around background-clip: padding-box\n     bug for FF causing box-shadow bug in Chrome */\n      .sticky th,\n      .sticky td {\n        box-shadow: 0px 1px\n            ", ",\n          0px -0.5px ", ",\n          inset -1px 0px ", ",\n          0px -1px ", ";\n      }\n\n      /* this will remove jumpiness caused in Chrome for sticky headers */\n      .fixed + tr {\n        min-height: 0px;\n      }\n\n      /*\n   * We wrap CodeBlock in a grid to prevent it from overflowing the container of the renderer.\n   * See ED-4159.\n   */\n      & .code-block {\n        max-width: 100%;\n        /* -ms- properties are necessary until MS supports the latest version of the grid spec */\n        /* stylelint-disable value-no-vendor-prefix, declaration-block-no-duplicate-properties */\n        display: -ms-grid;\n        display: grid;\n        -ms-grid-columns: auto 1fr;\n        /* stylelint-enable */\n\n        grid-template-columns: minmax(0, 1fr);\n        position: relative;\n        border-radius: ", "px;\n\n        /*\n     * The overall renderer has word-wrap: break; which causes issues with\n     * code block line numbers in Safari / iOS.\n     */\n        word-wrap: normal;\n\n        & > span {\n          /* stylelint-disable value-no-vendor-prefix */\n          -ms-grid-row: 1;\n          -ms-grid-column: 2;\n          /* stylelint-enable */\n          grid-column: 1;\n        }\n      }\n\n      & .MediaGroup,\n      & .code-block {\n        margin-top: ", ";\n\n        &:first-child {\n          margin-top: 0;\n        }\n\n        &:hover button.copy-to-clipboard,\n        .copy-to-clipboard:focus {\n          opacity: 1;\n          position: absolute;\n          height: 32px;\n          width: 32px;\n          right: 6px;\n          top: 4px;\n          padding: 2px;\n        }\n      }\n\n      ", "\n\n      ", ";\n      & [data-layout-section] {\n        margin-top: ", "px;\n        & > div + div {\n          margin-left: ", "px;\n        }\n\n        @media screen and (max-width: ", "px) {\n          & > div + div {\n            margin-left: 0;\n          }\n        }\n      }\n\n      & li {\n        > .code-block {\n          margin: ", " 0 0 0;\n        }\n        > .code-block:first-child {\n          margin-top: 0;\n        }\n\n        > div:last-of-type.code-block {\n          margin-bottom: ", ";\n        }\n\n        ", "\n      }\n    "])), editorFontSize(themeProps), themed({
       light: token('color.text', colors.N800),
       dark: token('color.text', '#B8C7E0')
     })(themeProps), RendererCssClassName.DOCUMENT, fullPageStyles(wrapperProps, themeProps), fullWidthStyles(wrapperProps), headingAnchorStyle('h1'), headingAnchorStyle('h2'), headingAnchorStyle('h3'), headingAnchorStyle('h4'), headingAnchorStyle('h5'), headingAnchorStyle('h6'), token('color.link', colors.B400), token('color.link', colors.B300), token('color.link.pressed', colors.B500), colors.placeholderText(themeProps), whitespaceSharedStyles, blockquoteSharedStyles, headingsSharedStyles(themeProps), ruleSharedStyles(themeProps), paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, codeMarkSharedStyles(themeProps), shadowSharedStyle, dateSharedStyle, textColorStyles, tasksAndDecisionsStyles, smartCardSharedStyles, fontFamily(), relativeFontSizeToBase16(fontSize()), themed({
@@ -136,6 +137,6 @@ export var rendererStyles = function rendererStyles(wrapperProps) {
     })(themeProps), themed({
       light: token('color.border', akEditorTableToolbar),
       dark: token('color.border', akEditorTableToolbarDark)
-    })(themeProps), borderRadius(), blockNodesVerticalMargin, getLightWeightCodeBlockStylesForRootRendererStyleSheet(), columnLayoutSharedStyle, gridSize() * 2.5, gridSize() * 4, gridMediumMaxWidth);
+    })(themeProps), borderRadius(), blockNodesVerticalMargin, getLightWeightCodeBlockStylesForRootRendererStyleSheet(), columnLayoutSharedStyle, gridSize() * 2.5, gridSize() * 4, gridMediumMaxWidth, blockNodesVerticalMargin, blockNodesVerticalMargin, browser.safari ? codeBlockInListSafariFix : '');
   };
 };

package/dist/esm/ui/SortingIcon.js

@@ -1,6 +1,6 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3;
 
 /** @jsx jsx */
 import { css, jsx } from '@emotion/react';
@@ -10,14 +10,9 @@ import { N20, N30 } from '@atlaskit/theme/colors';
 import { SortOrder } from '@atlaskit/editor-common/types';
 import { sortingIconMessages } from '../messages';
 import { injectIntl } from 'react-intl-next';
-import { token } from '@atlaskit/tokens'; // We use data url here because of this issue:
-// https://product-fabric.atlassian.net/browse/ED-8001
-// Remove this workaround if Firefox has fixed: https://bugzilla.mozilla.org/show_bug.cgi?id=1664350
-// TODO: Quality ticket: https://product-fabric.atlassian.net/browse/DSP-4136
-
-export var TableSortIconDataUrl = "data:image/svg+xml;utf8,".concat(encodeURIComponent("<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill=\"none\" fill-rule=\"evenodd\"><path d=\"M-8-6h24v24H-8z\"></path><path d=\"M3 8.509V1c0-.552.449-1 1-1 .552 0 1 .448 1 1V8.51l1.217-1.206a1.05 1.05 0 011.477 0 1.03 1.03 0 01.004 1.463l-.003.002-2.956 2.93a1.053 1.053 0 01-1.478 0L.305 8.767a1.03 1.03 0 01.001-1.464 1.05 1.05 0 011.477 0L3 8.508z\" fill=\"#42526E\"></path></g></svg>"));
-var TABLE_SORTING_ICON_CLASS = 'table-sorting-icon';
-export var StatusClassNames; // TODO: get design to check border
+import { token } from '@atlaskit/tokens';
+import { RendererCssClassName } from '../consts';
+export var StatusClassNames;
 
 (function (StatusClassNames) {
   StatusClassNames["ASC"] = "sorting-icon-svg__asc";
@@ -26,23 +21,34 @@ export var StatusClassNames; // TODO: get design to check border
   StatusClassNames["SORTING_NOT_ALLOWED"] = "sorting-icon-svg__not-allowed";
 })(StatusClassNames || (StatusClassNames = {}));
 
-var wrapperStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: absolute;\n  display: flex;\n  height: 28px;\n  width: 28px;\n  margin: 6px;\n  right: 0;\n  top: 0;\n  border: 2px solid ", ";\n  border-radius: ", "px;\n  background-color: ", ";\n  justify-content: center;\n  align-items: center;\n\n  &:hover {\n    background-color: ", ";\n  }\n\n  &.", " {\n    cursor: not-allowed;\n  }\n"])), token('color.border.inverse', '#fff'), gridSize() / 2, token('color.background.neutral.subtle', N20), token('color.background.neutral.subtle.hovered', N30), StatusClassNames.SORTING_NOT_ALLOWED);
-var tableSortingIconStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 8px;\n  height: 12px;\n  transition: transform 0.3s cubic-bezier(0.15, 1, 0.3, 1);\n  transform-origin: 50% 50%;\n  background-image: url(", ");\n\n  &.", " {\n    transform: rotate(-180deg);\n  }\n\n  &.", "-inactive {\n    opacity: 0.7;\n  }\n"])), TableSortIconDataUrl, StatusClassNames.DESC, TABLE_SORTING_ICON_CLASS);
+var buttonStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: absolute;\n  display: flex;\n  height: 28px;\n  width: 28px;\n  margin: 6px;\n  right: 0;\n  top: 0;\n  border: 2px solid ", ";\n  border-radius: ", "px;\n  background-color: ", ";\n  justify-content: center;\n  align-items: center;\n  cursor: pointer;\n\n  &:hover {\n    background-color: ", ";\n  }\n\n  &:active {\n    background-color: ", ";\n  }\n\n  &.", "__not-allowed {\n    cursor: not-allowed;\n  }\n"])), token('color.border', '#fff'), gridSize() / 2, token('elevation.surface.overlay', N20), token('elevation.surface.overlay.hovered', N30), token('elevation.surface.overlay.pressed', 'rgba(179, 212, 255, 0.6)'), RendererCssClassName.SORTABLE_COLUMN_ICON);
+var iconWrapperStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 8px;\n  height: 12px;\n  transition: transform 0.3s cubic-bezier(0.15, 1, 0.3, 1);\n  transform-origin: 50% 50%;\n  display: flex;\n  justify-content: center;\n\n  &.", " {\n    transform: rotate(-180deg);\n  }\n\n  &.", "-inactive {\n    opacity: 0.7;\n  }\n"])), StatusClassNames.DESC, RendererCssClassName.SORTABLE_COLUMN_ICON); // The icon is created with CSS due to the following Firefox issue: https://product-fabric.atlassian.net/browse/ED-8001
+// The TL;DR is that svg's in tables mess up how HTML is copied in Firefox. Using a styled div instead solves the problem.
+// For this reason, svg's should be avoided in tables until this issue is fixed: https://bugzilla.mozilla.org/show_bug.cgi?id=1664350
+
+var iconStyles = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  height: 100%;\n  width: 2px;\n  border-radius: 50px;\n  background: ", ";\n\n  &::before,\n  &::after {\n    background: ", ";\n    content: '';\n    height: 2px;\n    width: 6px;\n    position: absolute;\n    border-radius: 50px;\n  }\n\n  &::before {\n    transform: rotate(45deg) translate(3.4px, 8.5px);\n  }\n\n  &::after {\n    transform: rotate(-45deg) translate(-6.3px, 5.7px);\n  }\n"])), token('color.icon', '#42526E'), token('color.icon', '#42526E'));
+
+var getIconClassName = function getIconClassName(isSortingAllowed, sortOrdered) {
+  var activated = sortOrdered !== SortOrder.NO_ORDER;
+  var activeStatusClass = "".concat(RendererCssClassName.SORTABLE_COLUMN_ICON, "-").concat(activated ? 'active' : 'inactive');
+
+  if (!isSortingAllowed) {
+    return "".concat(StatusClassNames.SORTING_NOT_ALLOWED, " ").concat(activeStatusClass);
+  }
 
-var getClassName = function getClassName(status) {
-  switch (status) {
+  switch (sortOrdered) {
     case SortOrder.ASC:
-      return StatusClassNames.ASC;
+      return "".concat(StatusClassNames.ASC, " ").concat(activeStatusClass);
 
     case SortOrder.DESC:
-      return StatusClassNames.DESC;
+      return "".concat(StatusClassNames.DESC, " ").concat(activeStatusClass);
 
     default:
-      return StatusClassNames.NO_ORDER;
+      return "".concat(StatusClassNames.NO_ORDER, " ").concat(activeStatusClass);
   }
 };
 
-var getTooltipTitle = function getTooltipTitle(intl, isSortingAllowed, status) {
+var getTooltipTitle = function getTooltipTitle(intl, isSortingAllowed, sortOrdered) {
   var noOrderLabel = sortingIconMessages.noOrderLabel,
       ascOrderLabel = sortingIconMessages.ascOrderLabel,
       descOrderLabel = sortingIconMessages.descOrderLabel,
@@ -52,7 +58,7 @@ var getTooltipTitle = function getTooltipTitle(intl, isSortingAllowed, status) {
     return intl.formatMessage(invalidLabel);
   }
 
-  switch (status) {
+  switch (sortOrdered) {
     case SortOrder.NO_ORDER:
       return intl.formatMessage(noOrderLabel);
 
@@ -69,21 +75,43 @@ var getTooltipTitle = function getTooltipTitle(intl, isSortingAllowed, status) {
 var SortingIcon = function SortingIcon(_ref) {
   var isSortingAllowed = _ref.isSortingAllowed,
       sortOrdered = _ref.sortOrdered,
-      intl = _ref.intl;
-  var activated = sortOrdered !== SortOrder.NO_ORDER;
-  var wrapperClassName = !isSortingAllowed ? StatusClassNames.SORTING_NOT_ALLOWED : '';
+      intl = _ref.intl,
+      onClick = _ref.onClick,
+      onKeyDown = _ref.onKeyDown;
+  var buttonClassName = "".concat(RendererCssClassName.SORTABLE_COLUMN_ICON).concat(isSortingAllowed ? '' : " ".concat(RendererCssClassName.SORTABLE_COLUMN_ICON, "__not-allowed"));
   var content = getTooltipTitle(intl, isSortingAllowed, sortOrdered);
+
+  var handleClick = function handleClick() {
+    if (isSortingAllowed) {
+      onClick();
+    }
+  };
+
+  var handleKeyDown = function handleKeyDown(event) {
+    if (isSortingAllowed) {
+      onKeyDown(event);
+    }
+  };
+
   return jsx(Tooltip, {
     delay: 0,
     content: content,
     position: "top"
-  }, jsx("figure", {
-    css: wrapperStyles,
-    className: wrapperClassName
   }, jsx("div", {
-    css: tableSortingIconStyles,
-    className: "".concat(getClassName(sortOrdered), " ").concat(TABLE_SORTING_ICON_CLASS, "-").concat(activated ? 'active' : 'inactive')
-  })));
+    css: buttonStyles,
+    className: buttonClassName,
+    role: "button",
+    tabIndex: isSortingAllowed ? 0 : -1,
+    "aria-label": "sort column",
+    "aria-disabled": !isSortingAllowed,
+    onClick: handleClick,
+    onKeyDown: handleKeyDown
+  }, jsx("div", {
+    css: iconWrapperStyles,
+    className: getIconClassName(isSortingAllowed, sortOrdered)
+  }, jsx("div", {
+    css: iconStyles
+  }))));
 };
 
 export default injectIntl(SortingIcon);

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "103.0.0",
+	"version": "103.0.2",
 	"sideEffects": false
 }