@atlaskit/editor-core 184.0.4 → 185.0.2

package/dist/es2019/plugins/panel/index.js

@@ -25,7 +25,7 @@ const insertPanelTypeWithAnalytics = (panelAttributes, state, insert) => {
   return tr;
 };
 const insertPanelType = (panelAttributes, state) => state.schema.nodes.panel.createChecked(panelAttributes, state.schema.nodes.paragraph.createChecked());
-const panelPlugin = (options = {}) => ({
+const panelPlugin = (options = {}, api) => ({
   name: 'panel',
   nodes() {
     const panelNode = panel(!!options.allowCustomPanel);
@@ -130,7 +130,7 @@ const panelPlugin = (options = {}) => ({
       }
       return quickInsertOptions;
     },
-    floatingToolbar: (state, intl, providerFactory) => getToolbarConfig(state, intl, options, providerFactory)
+    floatingToolbar: (state, intl, providerFactory) => getToolbarConfig(state, intl, options, providerFactory, api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration)
   }
 });
 export default panelPlugin;

package/dist/es2019/plugins/panel/toolbar.js

@@ -7,7 +7,6 @@ import ErrorIcon from '@atlaskit/icon/glyph/editor/error';
 import RemoveEmojiIcon from '@atlaskit/icon/glyph/editor/remove-emoji';
 import commonMessages from '../../messages';
 import { removePanel, changePanelType } from './actions';
-import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { panelBackgroundPalette } from '../../ui/ColorPalette/Palettes/panelBackgroundPalette';
 import { getPanelTypeBackgroundNoTokens } from '@atlaskit/editor-common/panel';
 import { findPanel } from './utils';
@@ -42,7 +41,7 @@ export const panelIconMap = {
     id: 'atlassian-tip'
   }
 };
-export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, activePanelType, activePanelColor, activePanelIcon, state) => {
+export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, hoverDecoration, activePanelType, activePanelColor, activePanelIcon, state) => {
   // TODO: ED-14403 investigate why these titles are not getting translated for the tooltips
   const items = [{
     id: 'editor.panel.info',
@@ -235,16 +234,16 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
     focusEditoronEnter: true,
     icon: RemoveIcon,
     onClick: removePanel(),
-    onMouseEnter: hoverDecoration(panelNodeType, true),
-    onMouseLeave: hoverDecoration(panelNodeType, false),
-    onFocus: hoverDecoration(panelNodeType, true),
-    onBlur: hoverDecoration(panelNodeType, false),
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, false),
     title: formatMessage(commonMessages.remove),
     tabIndex: null
   });
   return items;
 };
-export const getToolbarConfig = (state, intl, options = {}, providerFactory) => {
+export const getToolbarConfig = (state, intl, options = {}, providerFactory, hoverDecoration) => {
   const {
     formatMessage
   } = intl;
@@ -261,7 +260,7 @@ export const getToolbarConfig = (state, intl, options = {}, providerFactory) =>
     };
 
     // force toolbar to be turned on
-    const items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined, state);
+    const items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, hoverDecoration, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined, state);
     const getDomRef = editorView => {
       const domAtPos = editorView.domAtPos.bind(editorView);
       const element = findDomRefAtPos(panelObject.pos, domAtPos);

package/dist/es2019/plugins/placeholder-text/index.js

@@ -10,7 +10,7 @@ import PlaceholderFloatingToolbar from './ui/PlaceholderFloatingToolbar';
 import { hidePlaceholderFloatingToolbar, insertPlaceholderTextAtSelection } from './actions';
 import { PlaceholderTextNodeView } from './placeholder-text-nodeview';
 import { pluginKey } from './plugin-key';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { isSelectionAtPlaceholder } from './selection-utils';
 import { createInternalTypeAheadTools } from '../type-ahead/api';
@@ -175,7 +175,7 @@ const basePlaceholderTextPlugin = options => ({
     });
   }
 });
-const decorateWithPluginOptions = (plugin, options) => {
+const decorateWithPluginOptions = (plugin, options, api) => {
   if (!options.allowInserting) {
     return plugin;
   }
@@ -192,11 +192,12 @@ const decorateWithPluginOptions = (plugin, options) => {
         label: ""
       }),
       action(insert, state) {
+        var _api$dependencies$ana;
         const tr = state.tr;
         tr.setMeta(pluginKey, {
           showInsertPanelAt: tr.selection.anchor
         });
-        return addAnalytics(state, tr, {
+        api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions.attachAnalyticsEvent({
           action: ACTION.INSERTED,
           actionSubject: ACTION_SUBJECT.DOCUMENT,
           actionSubjectId: ACTION_SUBJECT_ID.PLACEHOLDER_TEXT,
@@ -204,11 +205,12 @@ const decorateWithPluginOptions = (plugin, options) => {
             inputMethod: INPUT_METHOD.QUICK_INSERT
           },
           eventType: EVENT_TYPE.TRACK
-        });
+        })(tr);
+        return tr;
       }
     }]
   };
   return plugin;
 };
-const placeholderTextPlugin = (options, api) => decorateWithPluginOptions(basePlaceholderTextPlugin(options, api), options);
+const placeholderTextPlugin = (options, api) => decorateWithPluginOptions(basePlaceholderTextPlugin(options, api), options, api);
 export default placeholderTextPlugin;

package/dist/es2019/plugins/type-ahead/ui/TypeAheadPopup.js

@@ -182,6 +182,27 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
       element === null || element === void 0 ? void 0 : element.removeEventListener('focusout', focusOut);
     };
   }, [ref, cancel]);
+
+  // ED-17443 When you press escape on typeahead panel, it should remove focus and close the panel
+  // This is the expected keyboard behaviour advised by the Accessibility team
+  useLayoutEffect(() => {
+    const escape = event => {
+      if (event.key === 'Escape') {
+        cancel({
+          addPrefixTrigger: true,
+          setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
+          forceFocusOnEditor: true
+        });
+      }
+    };
+    const {
+      current: element
+    } = ref;
+    element === null || element === void 0 ? void 0 : element.addEventListener('keydown', escape);
+    return () => {
+      element === null || element === void 0 ? void 0 : element.removeEventListener('keydown', escape);
+    };
+  }, [ref, cancel]);
   return jsx(Popup, {
     zIndex: akEditorFloatingDialogZIndex,
     target: anchorElement,

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

@@ -3,7 +3,6 @@ import { IntlProviderIfMissingWrapper } from '@atlaskit/editor-common/ui';
 import React from 'react';
 import Editor from '../../editor';
 import EditorNext from '../../editor-next';
-import EditorMigrationComponent from '../../editor-next/editor-migration-component';
 import EditorWithActions from '../../labs/EditorWithActions';
 import ChromeCollapsed from '../ChromeCollapsed';
 export default class CollapsedEditor extends React.Component {
@@ -25,7 +24,7 @@ export default class CollapsedEditor extends React.Component {
   }
   render() {
     const child = React.Children.only(this.props.children);
-    if (child.type !== Editor && child.type !== EditorWithActions && child.type !== EditorNext && child.type !== EditorMigrationComponent) {
+    if (child.type !== Editor && child.type !== EditorWithActions && child.type !== EditorNext) {
       throw new Error('Expected child to be of type `Editor`');
     }
     if (!this.props.isExpanded) {

package/dist/es2019/ui/ElementBrowser/components/StatelessElementBrowser.js

@@ -152,18 +152,20 @@ function StatelessElementBrowser(props) {
   /* Only for hitting enter to select item when focused on search bar,
    * The actual enter key press is handled on individual items level.
    */
+  const selectedItem = items[selectedItemIndex];
   const onItemsEnterKeyPress = useCallback(e => {
     if (e.key !== 'Enter') {
       return;
     }
-    props.onInsertItem(items[selectedItemIndex]);
-  }, [props, items, selectedItemIndex]);
+    if (onSelectItem && selectedItem != null) {
+      onSelectItem(selectedItem);
+    }
+  }, [onSelectItem, selectedItem]);
 
   /**
    * On arrow key selection and clicks the selectedItemIndex will change.
    * Making sure to update parent component.
    */
-  const selectedItem = items[selectedItemIndex];
   useEffect(() => {
     if (onSelectItem && selectedItem != null) {
       onSelectItem(selectedItem);

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "184.0.4";
+export const version = "185.0.2";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "184.0.4",
+	"version": "185.0.2",
 	"sideEffects": false
 }

package/dist/esm/create-editor/feature-flags-from-props.js

@@ -25,7 +25,7 @@ function getSpellCheck(featureFlags) {
  * which is used by both current and archv3 editors.
  */
 export function createFeatureFlagsFromProps(props) {
-  var _props$featureFlags, _ref, _props$featureFlags$u, _props$featureFlags2, _props$featureFlags3, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags4, _props$featureFlags5, _props$allowTables, _props$featureFlags6, _props$featureFlags7, _props$allowTables2, _props$featureFlags8, _props$featureFlags9, _props$allowTables3, _props$featureFlags10, _props$featureFlags11, _props$allowTables4, _props$allowTables5, _props$featureFlags12, _props$featureFlags13, _props$allowTables6, _props$allowExtension, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$collabEdit, _props$collabEdit2, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40, _props$featureFlags41, _props$featureFlags42, _props$featureFlags43, _props$featureFlags44, _props$featureFlags45, _props$featureFlags46, _props$featureFlags47;
+  var _props$featureFlags, _ref, _props$featureFlags$u, _props$featureFlags2, _props$featureFlags3, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags4, _props$featureFlags5, _props$allowTables, _props$featureFlags6, _props$featureFlags7, _props$allowTables2, _props$featureFlags8, _props$featureFlags9, _props$allowTables3, _props$featureFlags10, _props$featureFlags11, _props$allowTables4, _props$allowTables5, _props$featureFlags12, _props$featureFlags13, _props$allowTables6, _props$allowExtension, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$collabEdit, _props$collabEdit2, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40, _props$featureFlags41, _props$featureFlags42, _props$featureFlags43, _props$featureFlags44, _props$featureFlags45, _props$featureFlags46;
   var normalizedFeatureFlags = normalizeFeatureFlags(props.featureFlags);
   var tableCellOptionsInFloatingToolbar = normalizedFeatureFlags.tableCellOptionsInFloatingToolbar || ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.tableCellOptionsInFloatingToolbar) || undefined;
 
@@ -72,7 +72,6 @@ export function createFeatureFlagsFromProps(props) {
     useSomewhatSemanticTextColorNames: Boolean(typeof normalizedFeatureFlags.useSomewhatSemanticTextColorNames === 'boolean' && !!normalizedFeatureFlags.useSomewhatSemanticTextColorNames || (typeof ((_props$featureFlags43 = props.featureFlags) === null || _props$featureFlags43 === void 0 ? void 0 : _props$featureFlags43.useSomewhatSemanticTextColorNames) === 'boolean' ? !!((_props$featureFlags44 = props.featureFlags) !== null && _props$featureFlags44 !== void 0 && _props$featureFlags44.useSomewhatSemanticTextColorNames) : false)),
     lpLinkPickerFocusTrap: Boolean(normalizedFeatureFlags.lpLinkPickerFocusTrap),
     preventPopupOverflow: Boolean(typeof ((_props$featureFlags45 = props.featureFlags) === null || _props$featureFlags45 === void 0 ? void 0 : _props$featureFlags45['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags46 = props.featureFlags) !== null && _props$featureFlags46 !== void 0 && _props$featureFlags46['prevent-popup-overflow']) : false),
-    useEditorNext: normalizedFeatureFlags.useEditorNext === true || ((_props$featureFlags47 = props.featureFlags) === null || _props$featureFlags47 === void 0 ? void 0 : _props$featureFlags47.useEditorNext) === true,
     // duplicated logic from `create-plugins-list.ts` due to presets not being finalised
     useBetterTypeaheadNavigation: Boolean(typeof pseudoNormalisedUseBetterTypeaheadNavigation === 'boolean' ? !!pseudoNormalisedUseBetterTypeaheadNavigation : true)
   });

package/dist/esm/editor-next/index.js

@@ -12,13 +12,14 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /** @jsx jsx */
 
 import { WithCreateAnalyticsEvent } from '@atlaskit/editor-common/ui';
-import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
+// import { getAnalyticsAppearance } from '@atlaskit/editor-common/utils';
 import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';
 import React from 'react';
-import { name, version } from '../version-wrapper';
-import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-import uuid from 'uuid/v4';
+// import { name, version } from '../version-wrapper';
+
+// import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
+// import uuid from 'uuid/v4';
 import EditorActions from '../actions';
 import { fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import EditorInternal from './editor-internal';
@@ -31,6 +32,8 @@ import { basePlugin } from '../plugins';
 var EditorNext = /*#__PURE__*/function (_React$Component) {
   _inherits(EditorNext, _React$Component);
   var _super = _createSuper(EditorNext);
+  // private editorSessionId: string;
+
   function EditorNext(props, context) {
     var _this;
     _classCallCheck(this, EditorNext);
@@ -50,7 +53,7 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
     });
     deprecationWarnings(props);
     _this.editorActions = (context || {}).editorActions || new EditorActions();
-    _this.editorSessionId = uuid();
+    // this.editorSessionId = uuid();
     _this.startTime = performance.now();
     _this.onEditorCreated = _this.onEditorCreated.bind(_assertThisInitialized(_this));
     _this.onEditorDestroyed = _this.onEditorDestroyed.bind(_assertThisInitialized(_this));
@@ -93,38 +96,44 @@ var EditorNext = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this3 = this;
-      return jsx(FabricEditorAnalyticsContext, {
-        data: {
-          packageName: name,
-          packageVersion: version,
-          componentName: 'editorCore',
-          appearance: getAnalyticsAppearance(this.props.appearance),
-          editorSessionId: this.editorSessionId
-        }
-      }, jsx(WithCreateAnalyticsEvent, {
-        render: function render(createAnalyticsEvent) {
-          return (_this3.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
-            props: _this3.props,
-            handleAnalyticsEvent: _this3.handleAnalyticsEvent,
-            createAnalyticsEvent: _this3.createAnalyticsEvent,
-            preset: _this3.props.preset,
-            handleSave: _this3.handleSave,
-            editorActions: _this3.editorActions,
-            getExperienceStore: _this3.getExperienceStore,
-            onEditorCreated: _this3.onEditorCreated,
-            onEditorDestroyed: _this3.onEditorDestroyed
-          });
-        }
-      }));
+      // TODO: https://product-fabric.atlassian.net/browse/ED-16979
+      // Move `FabricEditorAnalyticsContext` back into `EditorNext`
+      // This was moved out here to workaround the issue that the analytics
+      // context does not wrap the Preset (and therefore does not pass this context
+      // information to analytics calls within plugins). After this cleanup task ^ we will
+      // not have to generate the `createAnalyticsEvent` outside the Preset
+      // and we can move this back into `EditorNext`.
+      return (
+        // <FabricEditorAnalyticsContext
+        //   data={{
+        //     packageName: name,
+        //     packageVersion: version,
+        //     componentName: 'editorCore',
+        //     appearance: getAnalyticsAppearance(this.props.appearance),
+        //     editorSessionId: this.editorSessionId,
+        //   }}
+        // >
+        jsx(WithCreateAnalyticsEvent, {
+          render: function render(createAnalyticsEvent) {
+            return (_this3.createAnalyticsEvent = createAnalyticsEvent) && jsx(EditorInternal, {
+              props: _this3.props,
+              handleAnalyticsEvent: _this3.handleAnalyticsEvent,
+              createAnalyticsEvent: _this3.createAnalyticsEvent,
+              preset: _this3.props.preset,
+              handleSave: _this3.handleSave,
+              editorActions: _this3.editorActions,
+              getExperienceStore: _this3.getExperienceStore,
+              onEditorCreated: _this3.onEditorCreated,
+              onEditorDestroyed: _this3.onEditorDestroyed
+            });
+          }
+        })
+        // </FabricEditorAnalyticsContext>
+      );
     }
   }]);
   return EditorNext;
 }(React.Component);
-/**
- * WARNING: Code should be shared between Editor + EditorNext
- * If you are making changes that affect both, consider making them
- * in editor-next/editor-internal.tsx or editor-next/editor-utils.ts
- */
 _defineProperty(EditorNext, "defaultProps", defaultProps);
 _defineProperty(EditorNext, "contextTypes", {
   editorActions: PropTypes.object