@atlaskit/renderer 103.0.0 → 103.0.2

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @atlaskit/renderer
 
+## 103.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 103.0.1
+
+### Patch Changes
+
+- [`324e88d23ad`](https://bitbucket.org/atlassian/atlassian-frontend/commits/324e88d23ad) - Exposes fragmentLocalId as part of ExtensionRenderer.
+- [`3f7900cbf37`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3f7900cbf37) - [ux] ED-14993 added better support for codeblocks inside lists and gap cursor selection inside lists:
+
+  - made list markers visible in safari (desktop and mobile) when list contains codeblocks;
+  - fixed bug so users can now set gapcursor next to codeblock by clicking or touching (mobile) the list marker;
+  - fixed bug so when users have gapcursor next to a codeblock, they can still toggle (or untoggle) it into a list;
+  - fixed margins for codeblocks in lists;
+
+- [`51e84999643`](https://bitbucket.org/atlassian/atlassian-frontend/commits/51e84999643) - ED-15381 - Patch table / layout CSS to fix issue of ProseMirror gapcursor within the cell
+- [`268cd192e21`](https://bitbucket.org/atlassian/atlassian-frontend/commits/268cd192e21) - DSP-4136 - Update renderer's table sorting icon to support design tokens.
+- [`907a18e29bb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/907a18e29bb) - [ux] Increase padding for panels with no emoji
+- [`cff103bb0c4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cff103bb0c4) - [ux] Only allow sort table columns when sort button is clicked
+- [`0915ecdd1db`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0915ecdd1db) - Removed styled components from dev and peer dependencies
+- [`5a57831530b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5a57831530b) - ED-15353 Fix comments dialog table overlap flakey testwq
+- [`1adad899d8a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1adad899d8a) - Fix typo in table sort tooltip
+- Updated dependencies
+
 ## 103.0.0
 
 ### Patch Changes

package/dist/cjs/consts.js

@@ -11,9 +11,9 @@ 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/cjs/messages.js

@@ -66,7 +66,7 @@ var sortingIconMessages = (0, _reactIntlNext.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/cjs/react/nodes/panel.js

@@ -11,6 +11,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@emotion/react");
@@ -31,24 +33,30 @@ var _icons = require("@atlaskit/editor-common/icons");
 
 var _templateObject, _templateObject2;
 
-var PanelStyled = function PanelStyled(props) {
+var _excluded = ["backgroundColor", "hasIcon"];
+
+var PanelStyled = function PanelStyled(_ref) {
+  var backgroundColor = _ref.backgroundColor,
+      hasIcon = _ref.hasIcon,
+      props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+
   var styles = function styles(theme) {
-    return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n    &.", " {\n      ", "\n    }\n  "])), _panel.PanelSharedCssClassName.prefix, (0, _panel.panelSharedStylesWithoutPrefix)({
+    return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n    &.", " {\n      ", "\n\n      &[data-panel-type=", "] {\n        ", "\n      }\n    }\n  "])), _panel.PanelSharedCssClassName.prefix, (0, _panel.panelSharedStylesWithoutPrefix)({
       theme: theme
-    }));
+    }), _adfSchema.PanelType.CUSTOM, hasIcon ? '' : 'padding: 12px;');
   };
 
-  if (props['data-panel-type'] === _adfSchema.PanelType.CUSTOM && props.backgroundColor) {
+  if (props['data-panel-type'] === _adfSchema.PanelType.CUSTOM && backgroundColor) {
     styles = function styles(theme) {
       var customStyle = (0, _theme.themed)({
         dark: _panel.getPanelBackgroundDarkModeColors,
-        light: "background-color: ".concat(props.backgroundColor, ";")
+        light: "background-color: ".concat(backgroundColor, ";")
       })({
         theme: theme
       });
-      return (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n        &.", " {\n          ", "\n        }\n\n        &[data-panel-type=", "] {\n          ", ";\n        }\n      "])), _panel.PanelSharedCssClassName.prefix, (0, _panel.panelSharedStylesWithoutPrefix)({
+      return (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n        &.", " {\n          ", "\n        }\n\n        &[data-panel-type=", "] {\n          ", ";\n          ", "\n        }\n      "])), _panel.PanelSharedCssClassName.prefix, (0, _panel.panelSharedStylesWithoutPrefix)({
         theme: theme
-      }), _adfSchema.PanelType.CUSTOM, customStyle);
+      }), _adfSchema.PanelType.CUSTOM, customStyle, hasIcon ? '' : 'padding: 12px;');
     };
   }
 
@@ -101,9 +109,9 @@ var Panel = function Panel(props) {
     });
   };
 
-  var renderIcon = function renderIcon() {
-    var icon = getIcon();
+  var icon = getIcon();
 
+  var renderIcon = function renderIcon() {
     if (icon) {
       return (0, _react2.jsx)("div", {
         className: _panel.PanelSharedCssClassName.icon
@@ -118,7 +126,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(), (0, _react2.jsx)("div", {
     className: _panel.PanelSharedCssClassName.content
   }, children));

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

@@ -174,18 +174,10 @@ var withSortableColumn = function withSortableColumn(WrapperComponent) {
         if (keys.includes(event.key) && !IgnoreSorting.includes(tagName)) {
           event.preventDefault();
 
-          _this.onClick(event);
+          _this.sort();
         }
       });
-      (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onClick", function (event) {
-        // ignore sorting when specific elements are clicked
-        var _ref2 = event.target,
-            tagName = _ref2.tagName;
-
-        if (IgnoreSorting.includes(tagName)) {
-          return;
-        }
-
+      (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sort", function () {
         var _this$props2 = _this.props,
             fireAnalyticsEvent = _this$props2.fireAnalyticsEvent,
             onSorting = _this$props2.onSorting,
@@ -237,28 +229,18 @@ var withSortableColumn = function withSortableColumn(WrapperComponent) {
           return /*#__PURE__*/_react.default.createElement(WrapperComponent, this.props);
         }
 
-        var className = _consts.RendererCssClassName.SORTABLE_COLUMN;
-
-        if (!onSorting) {
-          className = "".concat(className, " ").concat(_consts.RendererCssClassName.SORTABLE_COLUMN_NOT_ALLOWED);
-        }
-
         return /*#__PURE__*/_react.default.createElement(WrapperComponent, (0, _extends2.default)({}, this.props, {
-          className: className,
+          className: _consts.RendererCssClassName.SORTABLE_COLUMN_WRAPPER,
           ariaSort: getSortOrderLabel(intl, sortOrdered)
         }), /*#__PURE__*/_react.default.createElement("div", {
-          className: _consts.RendererCssClassName.SORTABLE_COLUMN_BUTTON,
-          role: "button",
-          tabIndex: onSorting ? 0 : -1,
-          onClick: this.onClick,
-          onKeyDown: this.onKeyPress,
-          "aria-disabled": !onSorting
+          className: _consts.RendererCssClassName.SORTABLE_COLUMN
         }, children, /*#__PURE__*/_react.default.createElement("figure", {
-          "aria-hidden": true,
-          className: "".concat(_consts.RendererCssClassName.SORTABLE_COLUMN_ICON, " ").concat(sortOrderedClassName)
+          className: "".concat(_consts.RendererCssClassName.SORTABLE_COLUMN_ICON_WRAPPER, " ").concat(sortOrderedClassName)
         }, /*#__PURE__*/_react.default.createElement(_SortingIcon.default, {
           isSortingAllowed: !!onSorting,
-          sortOrdered: sortOrdered
+          sortOrdered: sortOrdered,
+          onClick: this.sort,
+          onKeyDown: this.onKeyPress
         }))));
       }
     }]);

package/dist/cjs/ui/ExtensionRenderer.js

@@ -63,6 +63,8 @@ var ExtensionRenderer = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getNodeRenderer", (0, _memoizeOne.default)(_extensions.getNodeRenderer));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderExtensionNode", function (extensionProvider) {
+      var _marks$find, _marks$find$attrs;
+
       var _this$props = _this.props,
           extensionHandlers = _this$props.extensionHandlers,
           rendererContext = _this$props.rendererContext,
@@ -72,14 +74,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/cjs/ui/Renderer/index.js

@@ -102,7 +102,7 @@ exports.NORMAL_SEVERITY_THRESHOLD = NORMAL_SEVERITY_THRESHOLD;
 var DEGRADED_SEVERITY_THRESHOLD = 3000;
 exports.DEGRADED_SEVERITY_THRESHOLD = DEGRADED_SEVERITY_THRESHOLD;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "103.0.0";
+var packageVersion = "103.0.2";
 
 var Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);

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

@@ -27,6 +27,8 @@ var _styles = require("@atlaskit/editor-common/styles");
 
 var _ui = require("@atlaskit/editor-common/ui");
 
+var _utils = require("@atlaskit/editor-common/utils");
+
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
 var _consts = require("../../consts");
@@ -98,7 +100,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(_headingAnchor.HeadingAnchorWrapperClassName, " {\n        position: unset;\n      }\n      > {\n        h1, h2, h3, h4, h5, h6 {\n          margin-right: 30px;\n        }\n      }\n    ");
   }
 
-  return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\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  "])), _consts.RendererCssClassName.SORTABLE_COLUMN, _consts.RendererCssClassName.SORTABLE_COLUMN_BUTTON, _styles.tableCellPadding, (0, _tokens.token)('color.border.focused', colors.B300), headingsCss, _consts.RendererCssClassName.SORTABLE_COLUMN_NOT_ALLOWED, _consts.RendererCssClassName.SORTABLE_COLUMN_BUTTON, _consts.RendererCssClassName.SORTABLE_COLUMN_ICON, _consts.RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, _consts.RendererCssClassName.SORTABLE_COLUMN_NO_ORDER);
+  return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\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  "])), _consts.RendererCssClassName.SORTABLE_COLUMN_WRAPPER, _consts.RendererCssClassName.SORTABLE_COLUMN, _styles.tableCellPadding, (0, _tokens.token)('color.border.focused', colors.B300), headingsCss, _consts.RendererCssClassName.SORTABLE_COLUMN_ICON_WRAPPER, _consts.RendererCssClassName.SORTABLE_COLUMN_ICON, _consts.RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, _consts.RendererCssClassName.SORTABLE_COLUMN_ICON, _consts.RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, _consts.RendererCssClassName.SORTABLE_COLUMN_ICON);
 };
 
 var fullPageStyles = function fullPageStyles(_ref3, _ref4) {
@@ -128,7 +130,7 @@ var rendererStyles = function rendererStyles(wrapperProps) {
     var themeProps = {
       theme: theme
     };
-    return (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\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  "])), (0, _editorSharedStyles.editorFontSize)(themeProps), (0, _components.themed)({
+    return (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\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    "])), (0, _editorSharedStyles.editorFontSize)(themeProps), (0, _components.themed)({
       light: (0, _tokens.token)('color.text', colors.N800),
       dark: (0, _tokens.token)('color.text', '#B8C7E0')
     })(themeProps), _consts.RendererCssClassName.DOCUMENT, fullPageStyles(wrapperProps, themeProps), fullWidthStyles(wrapperProps), headingAnchorStyle('h1'), headingAnchorStyle('h2'), headingAnchorStyle('h3'), headingAnchorStyle('h4'), headingAnchorStyle('h5'), headingAnchorStyle('h6'), (0, _tokens.token)('color.link', colors.B400), (0, _tokens.token)('color.link', colors.B300), (0, _tokens.token)('color.link.pressed', colors.B500), colors.placeholderText(themeProps), _styles.whitespaceSharedStyles, _styles.blockquoteSharedStyles, (0, _styles.headingsSharedStyles)(themeProps), (0, _styles.ruleSharedStyles)(themeProps), _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.blockMarksSharedStyles, (0, _styles.codeMarkSharedStyles)(themeProps), _styles.shadowSharedStyle, _styles.dateSharedStyle, _styles.textColorStyles, _styles.tasksAndDecisionsStyles, _styles.smartCardSharedStyles, (0, _constants.fontFamily)(), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), (0, _components.themed)({
@@ -164,7 +166,7 @@ var rendererStyles = function rendererStyles(wrapperProps) {
     })(themeProps), (0, _components.themed)({
       light: (0, _tokens.token)('color.border', _editorSharedStyles.akEditorTableToolbar),
       dark: (0, _tokens.token)('color.border', _editorSharedStyles.akEditorTableToolbarDark)
-    })(themeProps), (0, _constants.borderRadius)(), _editorSharedStyles.blockNodesVerticalMargin, (0, _lightWeightCodeBlock.getLightWeightCodeBlockStylesForRootRendererStyleSheet)(), _styles.columnLayoutSharedStyle, (0, _constants.gridSize)() * 2.5, (0, _constants.gridSize)() * 4, _editorSharedStyles.gridMediumMaxWidth);
+    })(themeProps), (0, _constants.borderRadius)(), _editorSharedStyles.blockNodesVerticalMargin, (0, _lightWeightCodeBlock.getLightWeightCodeBlockStylesForRootRendererStyleSheet)(), _styles.columnLayoutSharedStyle, (0, _constants.gridSize)() * 2.5, (0, _constants.gridSize)() * 4, _editorSharedStyles.gridMediumMaxWidth, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.blockNodesVerticalMargin, _utils.browser.safari ? _styles.codeBlockInListSafariFix : '');
   };
 };
 

package/dist/cjs/ui/SortingIcon.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.TableSortIconDataUrl = exports.StatusClassNames = void 0;
+exports.default = exports.StatusClassNames = void 0;
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
@@ -25,17 +25,11 @@ var _reactIntlNext = require("react-intl-next");
 
 var _tokens = require("@atlaskit/tokens");
 
-var _templateObject, _templateObject2;
+var _consts = require("../consts");
 
-// 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
-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>"));
-exports.TableSortIconDataUrl = TableSortIconDataUrl;
-var TABLE_SORTING_ICON_CLASS = 'table-sorting-icon';
-var StatusClassNames; // TODO: get design to check border
+var _templateObject, _templateObject2, _templateObject3;
 
+var StatusClassNames;
 exports.StatusClassNames = StatusClassNames;
 
 (function (StatusClassNames) {
@@ -45,23 +39,34 @@ exports.StatusClassNames = StatusClassNames;
   StatusClassNames["SORTING_NOT_ALLOWED"] = "sorting-icon-svg__not-allowed";
 })(StatusClassNames || (exports.StatusClassNames = StatusClassNames = {}));
 
-var wrapperStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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"])), (0, _tokens.token)('color.border.inverse', '#fff'), (0, _constants.gridSize)() / 2, (0, _tokens.token)('color.background.neutral.subtle', _colors.N20), (0, _tokens.token)('color.background.neutral.subtle.hovered', _colors.N30), StatusClassNames.SORTING_NOT_ALLOWED);
-var tableSortingIconStyles = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\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 = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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"])), (0, _tokens.token)('color.border', '#fff'), (0, _constants.gridSize)() / 2, (0, _tokens.token)('elevation.surface.overlay', _colors.N20), (0, _tokens.token)('elevation.surface.overlay.hovered', _colors.N30), (0, _tokens.token)('elevation.surface.overlay.pressed', 'rgba(179, 212, 255, 0.6)'), _consts.RendererCssClassName.SORTABLE_COLUMN_ICON);
+var iconWrapperStyles = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\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, _consts.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 getClassName = function getClassName(status) {
-  switch (status) {
+var iconStyles = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\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"])), (0, _tokens.token)('color.icon', '#42526E'), (0, _tokens.token)('color.icon', '#42526E'));
+
+var getIconClassName = function getIconClassName(isSortingAllowed, sortOrdered) {
+  var activated = sortOrdered !== _types.SortOrder.NO_ORDER;
+  var activeStatusClass = "".concat(_consts.RendererCssClassName.SORTABLE_COLUMN_ICON, "-").concat(activated ? 'active' : 'inactive');
+
+  if (!isSortingAllowed) {
+    return "".concat(StatusClassNames.SORTING_NOT_ALLOWED, " ").concat(activeStatusClass);
+  }
+
+  switch (sortOrdered) {
     case _types.SortOrder.ASC:
-      return StatusClassNames.ASC;
+      return "".concat(StatusClassNames.ASC, " ").concat(activeStatusClass);
 
     case _types.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 = _messages.sortingIconMessages.noOrderLabel,
       ascOrderLabel = _messages.sortingIconMessages.ascOrderLabel,
       descOrderLabel = _messages.sortingIconMessages.descOrderLabel,
@@ -71,7 +76,7 @@ var getTooltipTitle = function getTooltipTitle(intl, isSortingAllowed, status) {
     return intl.formatMessage(invalidLabel);
   }
 
-  switch (status) {
+  switch (sortOrdered) {
     case _types.SortOrder.NO_ORDER:
       return intl.formatMessage(noOrderLabel);
 
@@ -88,21 +93,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 !== _types.SortOrder.NO_ORDER;
-  var wrapperClassName = !isSortingAllowed ? StatusClassNames.SORTING_NOT_ALLOWED : '';
+      intl = _ref.intl,
+      onClick = _ref.onClick,
+      onKeyDown = _ref.onKeyDown;
+  var buttonClassName = "".concat(_consts.RendererCssClassName.SORTABLE_COLUMN_ICON).concat(isSortingAllowed ? '' : " ".concat(_consts.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 (0, _react.jsx)(_tooltip.default, {
     delay: 0,
     content: content,
     position: "top"
-  }, (0, _react.jsx)("figure", {
-    css: wrapperStyles,
-    className: wrapperClassName
   }, (0, _react.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
+  }, (0, _react.jsx)("div", {
+    css: iconWrapperStyles,
+    className: getIconClassName(isSortingAllowed, sortOrdered)
+  }, (0, _react.jsx)("div", {
+    css: iconStyles
+  }))));
 };
 
 var _default = (0, _reactIntlNext.injectIntl)(SortingIcon);

package/dist/cjs/version.json

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

package/dist/es2019/consts.js

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

package/dist/es2019/messages.js

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

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

@@ -13,20 +13,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';
 
-const PanelStyled = props => {
+const PanelStyled = ({
+  backgroundColor,
+  hasIcon,
+  ...props
+}) => {
   let styles = theme => css`
     &.${PanelSharedCssClassName.prefix} {
       ${panelSharedStylesWithoutPrefix({
     theme
   })}
+
+      &[data-panel-type=${PanelType.CUSTOM}] {
+        ${hasIcon ? '' : 'padding: 12px;'}
+      }
     }
   `;
 
-  if (props['data-panel-type'] === PanelType.CUSTOM && props.backgroundColor) {
+  if (props['data-panel-type'] === PanelType.CUSTOM && backgroundColor) {
     styles = theme => {
       const customStyle = themed({
         dark: getPanelBackgroundDarkModeColors,
-        light: `background-color: ${props.backgroundColor};`
+        light: `background-color: ${backgroundColor};`
       })({
         theme
       });
@@ -39,6 +47,7 @@ const PanelStyled = props => {
 
         &[data-panel-type=${PanelType.CUSTOM}] {
           ${customStyle};
+          ${hasIcon ? '' : 'padding: 12px;'}
         }
       `;
     };
@@ -95,9 +104,9 @@ const Panel = props => {
     });
   };
 
-  const renderIcon = () => {
-    const icon = getIcon();
+  const icon = getIcon();
 
+  const renderIcon = () => {
     if (icon) {
       return jsx("div", {
         className: PanelSharedCssClassName.icon
@@ -112,7 +121,8 @@ const 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/es2019/react/nodes/tableCell.js

@@ -122,20 +122,11 @@ export const withSortableColumn = WrapperComponent => {
 
         if (keys.includes(event.key) && !IgnoreSorting.includes(tagName)) {
           event.preventDefault();
-          this.onClick(event);
+          this.sort();
         }
       });
 
-      _defineProperty(this, "onClick", event => {
-        // ignore sorting when specific elements are clicked
-        const {
-          tagName
-        } = event.target;
-
-        if (IgnoreSorting.includes(tagName)) {
-          return;
-        }
-
+      _defineProperty(this, "sort", () => {
         const {
           fireAnalyticsEvent,
           onSorting,
@@ -186,28 +177,18 @@ export const withSortableColumn = WrapperComponent => {
         return /*#__PURE__*/React.createElement(WrapperComponent, this.props);
       }
 
-      let className = RendererCssClassName.SORTABLE_COLUMN;
-
-      if (!onSorting) {
-        className = `${className} ${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: `${RendererCssClassName.SORTABLE_COLUMN_ICON} ${sortOrderedClassName}`
+        className: `${RendererCssClassName.SORTABLE_COLUMN_ICON_WRAPPER} ${sortOrderedClassName}`
       }, /*#__PURE__*/React.createElement(SortingIcon, {
         isSortingAllowed: !!onSorting,
-        sortOrdered: sortOrdered
+        sortOrdered: sortOrdered,
+        onClick: this.sort,
+        onKeyDown: this.onKeyPress
       }))));
     }