@atlaskit/editor-common 111.8.2 → 111.8.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-common
 
+## 111.8.3
+
+### Patch Changes
+
+- [`ef0c088fb17f6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ef0c088fb17f6) -
+  [ux] Fix the flickering extensions icon issue in the table's floating toolbar `View more` dropdown
+  options.
+- Updated dependencies
+
 ## 111.8.2
 
 ### Patch Changes

package/dist/cjs/floating-toolbar/DropdownMenuExtensionItems.js

@@ -8,14 +8,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.DropdownMenuExtensionItems = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactLoadable = _interopRequireDefault(require("react-loadable"));
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _extensions = require("../extensions");
 var _utils = require("../utils");
 var _DropdownMenuItem = require("./DropdownMenuItem");
 var _DropdownSeparator = require("./DropdownSeparator");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var noop = function noop() {
   return null;
 };
@@ -53,7 +57,8 @@ var convertExtensionToDropdownMenuItem = function convertExtensionToDropdownMenu
   var item = _ref2.item,
     disabled = _ref2.disabled,
     node = _ref2.node,
-    extension = _ref2.extension;
+    extension = _ref2.extension,
+    IconComponent = _ref2.IconComponent;
   var ButtonIcon = item.icon ? (0, _reactLoadable.default)({
     // Ignored via go/ees005
     // eslint-disable-next-line require-await
@@ -85,11 +90,20 @@ var convertExtensionToDropdownMenuItem = function convertExtensionToDropdownMenu
     title = item.ariaLabel;
   }
   item.disabled = (disabled === null || disabled === void 0 ? void 0 : disabled(item.key)) || false;
+  var getIcon = function getIcon() {
+    var label = item.label || '';
+    if ((0, _expValEquals.expValEquals)('platform_editor_table_toolbar_icon_ext_fix_exp', 'isEnabled', true)) {
+      return IconComponent ? /*#__PURE__*/_react.default.createElement(IconComponent, {
+        label: label
+      }) : undefined;
+    }
+    return ButtonIcon ? /*#__PURE__*/_react.default.createElement(ButtonIcon, {
+      label: label
+    }) : undefined;
+  };
   return {
     title: title,
-    icon: ButtonIcon ? /*#__PURE__*/_react.default.createElement(ButtonIcon, {
-      label: item.label || ''
-    }) : undefined,
+    icon: getIcon(),
     disabled: item.disabled,
     onClick: function onClick() {
       if (typeof item.action !== 'function') {
@@ -102,18 +116,47 @@ var convertExtensionToDropdownMenuItem = function convertExtensionToDropdownMenu
   };
 };
 var DropdownMenuExtensionItem = function DropdownMenuExtensionItem(_ref3) {
+  var _iconRef$current;
   var item = _ref3.item,
     editorView = _ref3.editorView,
     disabled = _ref3.disabled,
     node = _ref3.node,
     extension = _ref3.extension,
     dropdownOptions = _ref3.dropdownOptions;
-  var dropdownItem = convertExtensionToDropdownMenuItem({
+  // Use ref to keep icon component stable across renders
+  var iconRef = (0, _react.useRef)(null);
+  if (!iconRef.current && item.icon && (0, _expValEquals.expValEquals)('platform_editor_table_toolbar_icon_ext_fix_exp', 'isEnabled', true)) {
+    iconRef.current = (0, _reactLoadable.default)({
+      // Ignored via go/ees005
+      // eslint-disable-next-line require-await
+      loader: function () {
+        var _loader2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+          return _regenerator.default.wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                return _context3.abrupt("return", resolveExtensionIcon(item.icon));
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        function loader() {
+          return _loader2.apply(this, arguments);
+        }
+        return loader;
+      }(),
+      loading: noop
+    });
+  }
+  var dropdownItem = convertExtensionToDropdownMenuItem(_objectSpread({
     item: item,
     disabled: disabled,
     node: node,
     extension: extension
-  });
+  }, (0, _expValEquals.expValEquals)('platform_editor_table_toolbar_icon_ext_fix_exp', 'isEnabled', true) ? {
+    IconComponent: (_iconRef$current = iconRef.current) !== null && _iconRef$current !== void 0 ? _iconRef$current : undefined
+  } : {}));
   if (!dropdownItem) {
     return null;
   }
@@ -147,30 +190,30 @@ var DropdownMenuExtensionItems = exports.DropdownMenuExtensionItems = function D
       return _getExtensions.apply(this, arguments);
     }
     function _getExtensions() {
-      _getExtensions = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      _getExtensions = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
         var provider;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return extension.extensionProvider;
             case 2:
-              provider = _context3.sent;
+              provider = _context4.sent;
               if (!provider) {
-                _context3.next = 9;
+                _context4.next = 9;
                 break;
               }
-              _context3.t0 = setExtensions;
-              _context3.next = 7;
+              _context4.t0 = setExtensions;
+              _context4.next = 7;
               return provider.getExtensions();
             case 7:
-              _context3.t1 = _context3.sent;
-              (0, _context3.t0)(_context3.t1);
+              _context4.t1 = _context4.sent;
+              (0, _context4.t0)(_context4.t1);
             case 9:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3);
+        }, _callee4);
       }));
       return _getExtensions.apply(this, arguments);
     }

package/dist/cjs/monitoring/error.js

@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "111.8.1";
+var packageVersion = "0.0.0-development";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "111.8.1";
+var packageVersion = "0.0.0-development";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/es2019/floating-toolbar/DropdownMenuExtensionItems.js

@@ -1,5 +1,6 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import Loadable from 'react-loadable';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getContextualToolbarItemsFromModule } from '../extensions';
 import { nodeToJSON } from '../utils';
 import { DropdownMenuItem } from './DropdownMenuItem';
@@ -19,7 +20,8 @@ const convertExtensionToDropdownMenuItem = ({
   item,
   disabled,
   node,
-  extension
+  extension,
+  IconComponent
 }) => {
   const ButtonIcon = item.icon ? Loadable({
     // Ignored via go/ees005
@@ -36,11 +38,20 @@ const convertExtensionToDropdownMenuItem = ({
     title = item.ariaLabel;
   }
   item.disabled = (disabled === null || disabled === void 0 ? void 0 : disabled(item.key)) || false;
+  const getIcon = () => {
+    const label = item.label || '';
+    if (expValEquals('platform_editor_table_toolbar_icon_ext_fix_exp', 'isEnabled', true)) {
+      return IconComponent ? /*#__PURE__*/React.createElement(IconComponent, {
+        label: label
+      }) : undefined;
+    }
+    return ButtonIcon ? /*#__PURE__*/React.createElement(ButtonIcon, {
+      label: label
+    }) : undefined;
+  };
   return {
     title,
-    icon: ButtonIcon ? /*#__PURE__*/React.createElement(ButtonIcon, {
-      label: item.label || ''
-    }) : undefined,
+    icon: getIcon(),
     disabled: item.disabled,
     onClick: () => {
       if (typeof item.action !== 'function') {
@@ -60,11 +71,25 @@ const DropdownMenuExtensionItem = ({
   extension,
   dropdownOptions
 }) => {
+  var _iconRef$current;
+  // Use ref to keep icon component stable across renders
+  const iconRef = useRef(null);
+  if (!iconRef.current && item.icon && expValEquals('platform_editor_table_toolbar_icon_ext_fix_exp', 'isEnabled', true)) {
+    iconRef.current = Loadable({
+      // Ignored via go/ees005
+      // eslint-disable-next-line require-await
+      loader: async () => resolveExtensionIcon(item.icon),
+      loading: noop
+    });
+  }
   const dropdownItem = convertExtensionToDropdownMenuItem({
     item,
     disabled,
     node,
-    extension
+    extension,
+    ...(expValEquals('platform_editor_table_toolbar_icon_ext_fix_exp', 'isEnabled', true) ? {
+      IconComponent: (_iconRef$current = iconRef.current) !== null && _iconRef$current !== void 0 ? _iconRef$current : undefined
+    } : {})
   });
   if (!dropdownItem) {
     return null;

package/dist/es2019/monitoring/error.js

@@ -4,7 +4,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "111.8.1";
+const packageVersion = "0.0.0-development";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "111.8.1";
+const packageVersion = "0.0.0-development";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/esm/floating-toolbar/DropdownMenuExtensionItems.js

@@ -1,8 +1,12 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import Loadable from 'react-loadable';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getContextualToolbarItemsFromModule } from '../extensions';
 import { nodeToJSON } from '../utils';
 import { DropdownMenuItem } from './DropdownMenuItem';
@@ -44,7 +48,8 @@ var convertExtensionToDropdownMenuItem = function convertExtensionToDropdownMenu
   var item = _ref2.item,
     disabled = _ref2.disabled,
     node = _ref2.node,
-    extension = _ref2.extension;
+    extension = _ref2.extension,
+    IconComponent = _ref2.IconComponent;
   var ButtonIcon = item.icon ? Loadable({
     // Ignored via go/ees005
     // eslint-disable-next-line require-await
@@ -76,11 +81,20 @@ var convertExtensionToDropdownMenuItem = function convertExtensionToDropdownMenu
     title = item.ariaLabel;
   }
   item.disabled = (disabled === null || disabled === void 0 ? void 0 : disabled(item.key)) || false;
+  var getIcon = function getIcon() {
+    var label = item.label || '';
+    if (expValEquals('platform_editor_table_toolbar_icon_ext_fix_exp', 'isEnabled', true)) {
+      return IconComponent ? /*#__PURE__*/React.createElement(IconComponent, {
+        label: label
+      }) : undefined;
+    }
+    return ButtonIcon ? /*#__PURE__*/React.createElement(ButtonIcon, {
+      label: label
+    }) : undefined;
+  };
   return {
     title: title,
-    icon: ButtonIcon ? /*#__PURE__*/React.createElement(ButtonIcon, {
-      label: item.label || ''
-    }) : undefined,
+    icon: getIcon(),
     disabled: item.disabled,
     onClick: function onClick() {
       if (typeof item.action !== 'function') {
@@ -93,18 +107,47 @@ var convertExtensionToDropdownMenuItem = function convertExtensionToDropdownMenu
   };
 };
 var DropdownMenuExtensionItem = function DropdownMenuExtensionItem(_ref3) {
+  var _iconRef$current;
   var item = _ref3.item,
     editorView = _ref3.editorView,
     disabled = _ref3.disabled,
     node = _ref3.node,
     extension = _ref3.extension,
     dropdownOptions = _ref3.dropdownOptions;
-  var dropdownItem = convertExtensionToDropdownMenuItem({
+  // Use ref to keep icon component stable across renders
+  var iconRef = useRef(null);
+  if (!iconRef.current && item.icon && expValEquals('platform_editor_table_toolbar_icon_ext_fix_exp', 'isEnabled', true)) {
+    iconRef.current = Loadable({
+      // Ignored via go/ees005
+      // eslint-disable-next-line require-await
+      loader: function () {
+        var _loader2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+          return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                return _context3.abrupt("return", resolveExtensionIcon(item.icon));
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        function loader() {
+          return _loader2.apply(this, arguments);
+        }
+        return loader;
+      }(),
+      loading: noop
+    });
+  }
+  var dropdownItem = convertExtensionToDropdownMenuItem(_objectSpread({
     item: item,
     disabled: disabled,
     node: node,
     extension: extension
-  });
+  }, expValEquals('platform_editor_table_toolbar_icon_ext_fix_exp', 'isEnabled', true) ? {
+    IconComponent: (_iconRef$current = iconRef.current) !== null && _iconRef$current !== void 0 ? _iconRef$current : undefined
+  } : {}));
   if (!dropdownItem) {
     return null;
   }
@@ -138,30 +181,30 @@ export var DropdownMenuExtensionItems = function DropdownMenuExtensionItems(prop
       return _getExtensions.apply(this, arguments);
     }
     function _getExtensions() {
-      _getExtensions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      _getExtensions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
         var provider;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return extension.extensionProvider;
             case 2:
-              provider = _context3.sent;
+              provider = _context4.sent;
               if (!provider) {
-                _context3.next = 9;
+                _context4.next = 9;
                 break;
               }
-              _context3.t0 = setExtensions;
-              _context3.next = 7;
+              _context4.t0 = setExtensions;
+              _context4.next = 7;
               return provider.getExtensions();
             case 7:
-              _context3.t1 = _context3.sent;
-              (0, _context3.t0)(_context3.t1);
+              _context4.t1 = _context4.sent;
+              (0, _context4.t0)(_context4.t1);
             case 9:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3);
+        }, _callee4);
       }));
       return _getExtensions.apply(this, arguments);
     }

package/dist/esm/monitoring/error.js

@@ -10,7 +10,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "111.8.1";
+var packageVersion = "0.0.0-development";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "111.8.1";
+var packageVersion = "0.0.0-development";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "111.8.2",
+	"version": "111.8.3",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -81,7 +81,7 @@
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/textfield": "^8.2.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.22.0",
+		"@atlaskit/tmp-editor-statsig": "^16.23.0",
 		"@atlaskit/tokens": "^9.1.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/width-detector": "^5.0.0",