@atlaskit/editor-core 180.0.0 → 180.1.0

package/dist/esm/plugins/hyperlink/ui/EditorLinkPicker/index.js

@@ -1,12 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["view", "onCancel", "invokeMethod"];
+var _excluded = ["view", "onCancel", "invokeMethod", "editorAppearance"];
 import React, { useCallback, useMemo } from 'react';
 import { LinkPicker } from '@atlaskit/link-picker';
 import { hideLinkToolbar as cardHideLinkToolbar } from '../../../card/pm-plugins/actions';
 import { hideLinkToolbar } from '../../commands';
 import { useEscapeClickaway } from './useEscapeClickaway';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
+import { getAnalyticsEditorAppearance } from '@atlaskit/editor-common/utils';
 
 /**
  * Returns a type that matches T but where keys (K) are now optional
@@ -17,6 +18,7 @@ export var EditorLinkPicker = function EditorLinkPicker(_ref) {
     onCancel = _ref.onCancel,
     _ref$invokeMethod = _ref.invokeMethod,
     invokeMethod = _ref$invokeMethod === void 0 ? '_unknown' : _ref$invokeMethod,
+    editorAppearance = _ref.editorAppearance,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var onEscape = useCallback(function () {
     hideLinkToolbar()(view.state, view.dispatch);
@@ -28,13 +30,17 @@ export var EditorLinkPicker = function EditorLinkPicker(_ref) {
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   }, [view, onCancel]);
   var ref = useEscapeClickaway(onEscape, onClickAway);
+  var analyticsEditorAppearance = getAnalyticsEditorAppearance(editorAppearance);
   var analyticsData = useMemo(function () {
     return {
       attributes: {
-        invokeMethod: invokeMethod
-      }
+        invokeMethod: invokeMethod,
+        location: analyticsEditorAppearance
+      },
+      // Below is added for the future implementation of Linking Platform namespaced analytic context
+      location: analyticsEditorAppearance
     };
-  }, [invokeMethod]);
+  }, [invokeMethod, analyticsEditorAppearance]);
   return /*#__PURE__*/React.createElement("div", {
     ref: ref
   }, /*#__PURE__*/React.createElement(AnalyticsContext, {

package/dist/esm/plugins/hyperlink/ui/HyperlinkAddToolbar/HyperlinkAddToolbar.js

@@ -30,7 +30,7 @@ import { linkToolbarMessages as linkToolbarCommonMessages } from '../../../../me
 import PanelTextInput from '../../../../ui/PanelTextInput';
 import LinkSearchList from '../../../../ui/LinkSearch/LinkSearchList';
 import { container, containerWithProvider, inputWrapper } from '../../../../ui/LinkSearch/ToolbarComponents';
-import { INPUT_METHOD, fireAnalyticsEvent, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../../../analytics';
+import { INPUT_METHOD, fireAnalyticsEvent, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { normalizeUrl } from '../../utils';
 import { filterUniqueItems } from '../../../../utils/array';
 import debounce from 'lodash/debounce';

package/dist/esm/plugins/hyperlink/ui/HyperlinkAddToolbar/index.js

@@ -9,7 +9,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import HyperlinkAddToolbarComp from './HyperlinkAddToolbar';
-import { INPUT_METHOD } from '../../../analytics';
+import { INPUT_METHOD } from '../../../analytics/types';
 import { stateKey as pluginKey } from '../../pm-plugins/main';
 import WithPluginState from '../../../../ui/WithPluginState';
 import { getFeatureFlags } from '../../../feature-flags-context';
@@ -67,7 +67,8 @@ var HyperlinkAddToolbar = /*#__PURE__*/function (_React$PureComponent) {
                   view: view,
                   invokeMethod: // Provide `invokeMethod` prop as preferred value (card plugin passes as prop) otherwise assume this
                   // is being used from inside the hyperlink plugin and use inputMethod from plugin state
-                  invokeMethod !== null && invokeMethod !== void 0 ? invokeMethod : hyperlinkPluginState === null || hyperlinkPluginState === void 0 ? void 0 : hyperlinkPluginState.inputMethod
+                  invokeMethod !== null && invokeMethod !== void 0 ? invokeMethod : hyperlinkPluginState === null || hyperlinkPluginState === void 0 ? void 0 : hyperlinkPluginState.inputMethod,
+                  editorAppearance: hyperlinkPluginState === null || hyperlinkPluginState === void 0 ? void 0 : hyperlinkPluginState.editorAppearance
                 }, linkPickerOptions, {
                   url: displayUrl,
                   displayText: displayText,

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-element-browser.js

@@ -26,6 +26,7 @@ export var BlockInsertElementBrowser = function BlockInsertElementBrowser(props)
     selected: props.open,
     disabled: props.disabled,
     onClick: props.onClick,
+    onKeyDown: props.onKeyDown,
     spacing: props.spacing,
     label: props.label,
     "aria-keyshortcuts": "/"

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu-legacy.js

@@ -27,6 +27,7 @@ export var BlockInsertMenuLegacy = function BlockInsertMenuLegacy(props) {
     selected: props.open,
     disabled: props.disabled,
     onClick: props.onClick,
+    onKeyDown: props.onKeyDown,
     spacing: props.spacing,
     label: props.label,
     "aria-keyshortcuts": "/"

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu.js

@@ -14,6 +14,7 @@ export var BlockInsertMenu = function BlockInsertMenu(props) {
       selected: props.open,
       disabled: props.disabled,
       onClick: props.onClick,
+      onKeyDown: props.onKeyDown,
       spacing: props.spacing,
       label: props.label,
       "aria-keyshortcuts": "/"
@@ -26,6 +27,7 @@ export var BlockInsertMenu = function BlockInsertMenu(props) {
       items: props.items,
       label: props.label,
       onClick: props.onClick,
+      onKeyDown: props.onKeyDown,
       onInsert: props.onInsert,
       onRef: props.onPlusButtonRef,
       open: props.open,
@@ -43,6 +45,7 @@ export var BlockInsertMenu = function BlockInsertMenu(props) {
     items: props.items,
     label: props.label,
     onClick: props.onClick,
+    onKeyDown: props.onKeyDown,
     onItemActivated: props.onItemActivated,
     onOpenChange: props.onOpenChange,
     onRef: props.onRef,

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/dropdown-button.js

@@ -24,6 +24,7 @@ export var DropDownButton = /*#__PURE__*/React.memo(function (props) {
     selected: props.selected,
     disabled: props.disabled,
     onClick: props.onClick,
+    onKeyDown: props.onKeyDown,
     spacing: props.spacing,
     "aria-expanded": props['aria-expanded'],
     "aria-haspopup": props['aria-haspopup'],

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -57,6 +57,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     _defineProperty(_assertThisInitialized(_this), "state", {
       isPlusMenuOpen: false,
       emojiPickerOpen: false,
+      isOpenedByKeyboard: false,
       buttons: [],
       dropdownItems: []
     });
@@ -156,6 +157,15 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     _defineProperty(_assertThisInitialized(_this), "handleClick", function () {
       _this.togglePlusMenuVisibility();
     });
+    _defineProperty(_assertThisInitialized(_this), "handleOpenByKeyboard", function (event) {
+      if (event.key === 'Enter' || event.key === ' ') {
+        _this.setState(_objectSpread(_objectSpread({}, _this.state), {}, {
+          isOpenedByKeyboard: true
+        }));
+        event.preventDefault();
+        _this.togglePlusMenuVisibility();
+      }
+    });
     _defineProperty(_assertThisInitialized(_this), "toggleLinkPanel", function (inputMethod) {
       var editorView = _this.props.editorView;
       showLinkToolbar(inputMethod)(editorView.state, editorView.dispatch);
@@ -378,6 +388,17 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
           emojiPickerOpen: false
         });
       }
+      if (this.state.isOpenedByKeyboard) {
+        var _this$dropdownButtonR;
+        var downArrowEvent = new KeyboardEvent('keydown', {
+          bubbles: true,
+          key: 'ArrowDown'
+        });
+        (_this$dropdownButtonR = this.dropdownButtonRef) === null || _this$dropdownButtonR === void 0 ? void 0 : _this$dropdownButtonR.dispatchEvent(downArrowEvent);
+        this.setState(_objectSpread(_objectSpread({}, this.state), {}, {
+          isOpenedByKeyboard: false
+        }));
+      }
     }
   }, {
     key: "renderPopup",
@@ -463,6 +484,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         onRef: this.handleDropDownButtonRef,
         onPlusButtonRef: this.handlePlusButtonRef,
         onClick: this.handleClick,
+        onKeyDown: this.handleOpenByKeyboard,
         onItemActivated: this.insertInsertMenuItem,
         onInsert: this.insertInsertMenuItem,
         onOpenChange: this.onOpenChange,

package/dist/esm/plugins/media/commands/helpers.js

@@ -3,6 +3,11 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import { stateKey as mediaPluginKey } from '../pm-plugins/plugin-key';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+/**
+ * Note that Media Inline is inserted like a media single node into the media plugin state.
+ * Though it is not of type mediaSingle, it shares the same `findMediaSingleNode` method
+ *
+ */
 export var findMediaSingleNode = function findMediaSingleNode(mediaPluginState, id) {
   var mediaNodes = mediaPluginState.mediaNodes;
 
@@ -18,52 +23,21 @@ export var findMediaSingleNode = function findMediaSingleNode(mediaPluginState,
     return memo;
   }, null);
 };
-
-/**
- * Finds the media inline node with the given id.
- * Media Inline is inserted like a media single node into the media plugin state.
- * However it is not of type mediaSingle.
- *
- * @param mediaPluginState
- * @param id
- * @param isMediaSingle
- * @returns {MediaNodeWithPosHandler | null}
- */
-export var findMediaInlineNode = function findMediaInlineNode(mediaPluginState, id, isMediaSingle) {
-  if (!isMediaSingle) {
-    return findMediaSingleNode(mediaPluginState, id);
-  }
-  return null;
-};
 export var findAllMediaSingleNodes = function findAllMediaSingleNodes(mediaPluginState, id) {
   var mediaNodes = mediaPluginState.mediaNodes;
   return mediaNodes.filter(function (nodeWithHandler) {
     return nodeWithHandler.node.attrs.id === id;
   });
 };
-export var findMediaNode = function findMediaNode(mediaPluginState, id, isMediaSingle) {
-  var mediaNodeWithPos = isMediaSingle ? findMediaSingleNode(mediaPluginState, id) : mediaPluginState.mediaGroupNodes[id];
-
-  // Should attempt to find media inline node if media single node or media group node is not found
-  if (!mediaNodeWithPos) {
-    return findMediaInlineNode(mediaPluginState, id, isMediaSingle);
-  }
-  return mediaNodeWithPos;
-};
 export var isMediaNode = function isMediaNode(pos, state) {
   var node = state.doc.nodeAt(pos);
   return node && ['media', 'mediaInline'].includes(node.type.name);
 };
-export var updateAllMediaNodesAttrs = function updateAllMediaNodesAttrs(id, attrs, isMediaSingle) {
+export var updateAllMediaSingleNodesAttrs = function updateAllMediaSingleNodesAttrs(id, attrs) {
   return function (state, dispatch) {
     var mediaPluginState = mediaPluginKey.getState(state);
     var mediaNodes;
-    if (isMediaSingle) {
-      mediaNodes = findAllMediaSingleNodes(mediaPluginState, id);
-    } else {
-      var mediaGroupNode = findMediaNode(mediaPluginState, id, isMediaSingle);
-      mediaNodes = mediaGroupNode ? [mediaGroupNode] : [];
-    }
+    mediaNodes = findAllMediaSingleNodes(mediaPluginState, id);
     var validMediaNodePositions = mediaNodes.reduce(function (acc, _ref) {
       var getPos = _ref.getPos;
       var pos = getPos();
@@ -102,10 +76,10 @@ export var updateCurrentMediaNodeAttrs = function updateCurrentMediaNodeAttrs(at
     return true;
   };
 };
-export var updateMediaNodeAttrs = function updateMediaNodeAttrs(id, attrs, isMediaSingle) {
+export var updateMediaSingleNodeAttrs = function updateMediaSingleNodeAttrs(id, attrs) {
   return function (state, dispatch) {
     var mediaPluginState = mediaPluginKey.getState(state);
-    var mediaNodeWithPos = findMediaNode(mediaPluginState, id, isMediaSingle);
+    var mediaNodeWithPos = findMediaSingleNode(mediaPluginState, id);
     if (!mediaNodeWithPos) {
       return false;
     }

package/dist/esm/plugins/media/commands/index.js

@@ -1 +1 @@
-export { updateMediaNodeAttrs, updateAllMediaNodesAttrs, replaceExternalMedia } from './helpers';
+export { updateMediaSingleNodeAttrs, updateAllMediaSingleNodesAttrs, replaceExternalMedia } from './helpers';

package/dist/esm/plugins/media/nodeviews/mediaGroup.js

@@ -70,7 +70,6 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
         var getPos = function getPos() {
           return props.getPos() + childOffset + 1;
         };
-        _this.mediaPluginState.setMediaGroupNode(item, getPos);
         _this.mediaNodes.push(item);
         if (updatedAttrs) {
           _this.updateNodeAttrs(props, item, getPos);
@@ -159,7 +158,7 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
       this.updateMediaClientConfig();
       this.mediaNodes.forEach( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(node) {
-          var _this2$props, view, mediaProvider, contextIdentifierProvider, mediaNodeUpdater, contextId, hasDifferentContextId;
+          var _this2$props, view, mediaProvider, contextIdentifierProvider, mediaNodeUpdater, getPos, contextId, hasDifferentContextId;
           return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
@@ -178,27 +177,30 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
                     node: node,
                     isMediaSingle: false
                   });
+                  getPos = function getPos() {
+                    return _this2.props.getPos() + 1;
+                  };
                   contextId = mediaNodeUpdater.getNodeContextId();
                   if (contextId) {
-                    _context.next = 8;
+                    _context.next = 9;
                     break;
                   }
-                  _context.next = 8;
-                  return mediaNodeUpdater.updateContextId();
-                case 8:
-                  _context.next = 10;
+                  _context.next = 9;
+                  return mediaNodeUpdater.updateNodeContextId(getPos);
+                case 9:
+                  _context.next = 11;
                   return mediaNodeUpdater.hasDifferentContextId();
-                case 10:
+                case 11:
                   hasDifferentContextId = _context.sent;
                   if (!hasDifferentContextId) {
-                    _context.next = 14;
+                    _context.next = 15;
                     break;
                   }
-                  _context.next = 14;
-                  return mediaNodeUpdater.copyNode({
+                  _context.next = 15;
+                  return mediaNodeUpdater.copyNodeFromPos(getPos, {
                     traceId: node.attrs.__mediaTraceId
                   });
-                case 14:
+                case 15:
                 case "end":
                   return _context.stop();
               }

package/dist/esm/plugins/media/nodeviews/mediaInline.js

@@ -85,7 +85,7 @@ export var updateMediaNodeAttributes = /*#__PURE__*/function () {
             return _context.abrupt("return");
           case 23:
             _context.next = 25;
-            return mediaNodeUpdater.updateFileAttrs();
+            return mediaNodeUpdater.updateMediaSingleFileAttrs();
           case 25:
           case "end":
             return _context.stop();