@atlaskit/editor-core 172.0.5 → 172.1.0

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

@@ -3,6 +3,7 @@ import { NodeSelection } from 'prosemirror-state';
 import { removeSelectedNode, findDomRefAtPos } from 'prosemirror-utils';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
+import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, addAnalytics } from '../analytics';
 import { linkToolbarMessages, linkMessages } from '../../messages';
@@ -17,9 +18,10 @@ import { isSafeUrl } from '@atlaskit/adf-schema';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
 import { messages } from './messages';
 import buildLayoutButtons from '../../ui/MediaAndEmbedsToolbar';
-import { buildVisitedLinkPayload } from '../../utils/linking-utils';
+import { buildOpenedSettingsPayload, buildVisitedLinkPayload } from '../../utils/linking-utils';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME } from './styles';
 import { getCopyButtonConfig, showCopyButton } from '../copy-button/toolbar';
+import { getFeatureFlags } from '../feature-flags-context';
 export const removeCard = (state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
@@ -64,6 +66,73 @@ export const visitCardLink = (state, dispatch) => {
 
   return true;
 };
+export const openLinkSettings = (state, dispatch) => {
+  if (!(state.selection instanceof NodeSelection)) {
+    return false;
+  }
+
+  window.open('https://id.atlassian.com/manage-profile/link-preferences');
+
+  if (dispatch) {
+    const {
+      type
+    } = state.selection.node;
+    dispatch(addAnalytics(state, state.tr, buildOpenedSettingsPayload(type.name)));
+  }
+
+  return true;
+};
+export const floatingToolbar = (cardOptions, platform, linkPickerOptions) => {
+  return (state, intl, providerFactory) => {
+    const {
+      inlineCard,
+      blockCard,
+      embedCard
+    } = state.schema.nodes;
+    const nodeType = [inlineCard, blockCard, embedCard];
+    const pluginState = pluginKey.getState(state);
+
+    if (!(state.selection instanceof NodeSelection)) {
+      return;
+    }
+
+    const selectedNode = state.selection.node;
+
+    if (!selectedNode) {
+      return;
+    }
+
+    const isEmbedCard = appearanceForNodeType(selectedNode.type) === 'embed';
+    /* add an offset to embeds due to extra padding */
+
+    const toolbarOffset = isEmbedCard ? {
+      offset: [0, 24]
+    } : {}; // Applies padding override for when link picker is currently displayed
+
+    const className = pluginState.showLinkingToolbar ? FLOATING_TOOLBAR_LINKPICKER_CLASSNAME : undefined;
+    return {
+      title: intl.formatMessage(messages.card),
+      className,
+      nodeType,
+      ...toolbarOffset,
+      getDomRef: view => {
+        const element = findDomRefAtPos(view.state.selection.from, view.domAtPos.bind(view));
+
+        if (!element) {
+          return undefined;
+        }
+
+        if (isEmbedCard) {
+          return element.querySelector(`.${richMediaClassName}`);
+        }
+
+        return element;
+      },
+      items: generateToolbarItems(state, intl, providerFactory, cardOptions, platform, linkPickerOptions),
+      ...(pluginState.showLinkingToolbar ? editLinkToolbarConfig : {})
+    };
+  };
+};
 
 const unlinkCard = (node, state) => {
   const displayInfo = displayInfoForCard(node, findCardInfo(state));
@@ -80,42 +149,6 @@ const buildAlignmentOptions = (state, intl) => {
   return buildLayoutButtons(state, intl, state.schema.nodes.embedCard, true, true);
 };
 
-const generateDeleteButton = (node, state, intl) => {
-  const {
-    inlineCard
-  } = state.schema.nodes;
-  const removeButton = {
-    id: 'editor.link.delete',
-    type: 'button',
-    appearance: 'danger',
-    icon: RemoveIcon,
-    onMouseEnter: hoverDecoration(node.type, true),
-    onMouseLeave: hoverDecoration(node.type, false),
-    onFocus: hoverDecoration(node.type, true),
-    onBlur: hoverDecoration(node.type, false),
-    title: intl.formatMessage(commonMessages.remove),
-    onClick: removeCard
-  };
-  const copyButton = [...(state && showCopyButton(state) ? [getCopyButtonConfig(state, intl.formatMessage, node.type), {
-    type: 'separator'
-  }] : [])];
-
-  if (node.type === inlineCard) {
-    const unlinkButtonWithSeparator = [{
-      id: 'editor.link.unlink',
-      type: 'button',
-      title: intl.formatMessage(linkToolbarMessages.unlink),
-      icon: UnlinkIcon,
-      onClick: unlinkCard(node, state)
-    }, {
-      type: 'separator'
-    }];
-    return [...unlinkButtonWithSeparator, ...copyButton, removeButton];
-  }
-
-  return [...copyButton, removeButton];
-};
-
 const generateToolbarItems = (state, intl, providerFactory, cardOptions, platform, linkPicker) => node => {
   const {
     url
@@ -145,6 +178,9 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, platfor
       node
     })];
   } else {
+    const {
+      inlineCard
+    } = state.schema.nodes;
     const toolbarItems = [{
       id: 'editor.link.edit',
       type: 'button',
@@ -166,7 +202,18 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, platfor
       onClick: visitCardLink
     }, {
       type: 'separator'
-    }, ...generateDeleteButton(node, state, intl)];
+    }, ...getUnlinkButtonGroup(state, intl, node, inlineCard), ...getCopyButtonGroup(state, intl, node), ...getSettingsButtonGroup(state, intl), {
+      id: 'editor.link.delete',
+      type: 'button',
+      appearance: 'danger',
+      icon: RemoveIcon,
+      onMouseEnter: hoverDecoration(node.type, true),
+      onMouseLeave: hoverDecoration(node.type, false),
+      onFocus: hoverDecoration(node.type, true),
+      onBlur: hoverDecoration(node.type, false),
+      title: intl.formatMessage(commonMessages.remove),
+      onClick: removeCard
+    }];
 
     if (currentAppearance === 'embed') {
       const alignmentOptions = buildAlignmentOptions(state, intl);
@@ -208,54 +255,35 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, platfor
   }
 };
 
-export const floatingToolbar = (cardOptions, platform, linkPickerOptions) => {
-  return (state, intl, providerFactory) => {
-    const {
-      inlineCard,
-      blockCard,
-      embedCard
-    } = state.schema.nodes;
-    const nodeType = [inlineCard, blockCard, embedCard];
-    const pluginState = pluginKey.getState(state);
-
-    if (!(state.selection instanceof NodeSelection)) {
-      return;
-    }
-
-    const selectedNode = state.selection.node;
-
-    if (!selectedNode) {
-      return;
-    }
-
-    const isEmbedCard = appearanceForNodeType(selectedNode.type) === 'embed';
-    /* add an offset to embeds due to extra padding */
-
-    const toolbarOffset = isEmbedCard ? {
-      offset: [0, 24]
-    } : {}; // Applies padding override for when link picker is currently displayed
-
-    const className = pluginState.showLinkingToolbar ? FLOATING_TOOLBAR_LINKPICKER_CLASSNAME : undefined;
-    return {
-      title: intl.formatMessage(messages.card),
-      className,
-      nodeType,
-      ...toolbarOffset,
-      getDomRef: view => {
-        const element = findDomRefAtPos(view.state.selection.from, view.domAtPos.bind(view));
-
-        if (!element) {
-          return undefined;
-        }
+const getUnlinkButtonGroup = (state, intl, node, inlineCard) => {
+  return node.type === inlineCard ? [{
+    id: 'editor.link.unlink',
+    type: 'button',
+    title: intl.formatMessage(linkToolbarMessages.unlink),
+    icon: UnlinkIcon,
+    onClick: unlinkCard(node, state)
+  }, {
+    type: 'separator'
+  }] : [];
+};
 
-        if (isEmbedCard) {
-          return element.querySelector(`.${richMediaClassName}`);
-        }
+const getSettingsButtonGroup = (state, intl) => {
+  const {
+    floatingToolbarLinkSettingsButton
+  } = getFeatureFlags(state);
+  return floatingToolbarLinkSettingsButton === 'true' ? [{
+    id: 'editor.link.settings',
+    type: 'button',
+    icon: CogIcon,
+    title: intl.formatMessage(linkToolbarMessages.settingsLink),
+    onClick: openLinkSettings
+  }, {
+    type: 'separator'
+  }] : [];
+};
 
-        return element;
-      },
-      items: generateToolbarItems(state, intl, providerFactory, cardOptions, platform, linkPickerOptions),
-      ...(pluginState.showLinkingToolbar ? editLinkToolbarConfig : {})
-    };
-  };
+const getCopyButtonGroup = (state, intl, node) => {
+  return state && showCopyButton(state) ? [getCopyButtonConfig(state, intl.formatMessage, node.type), {
+    type: 'separator'
+  }] : [];
 };

package/dist/es2019/plugins/code-block/nodeviews/code-block.js

@@ -10,6 +10,9 @@ const MATCH_NEWLINES = new RegExp('\n', 'g');
 const toDOM = node => ['div', {
   class: 'code-block'
 }, ['div', {
+  class: codeBlockClassNames.start,
+  contenteditable: 'false'
+}], ['div', {
   class: codeBlockClassNames.gutter,
   contenteditable: 'false'
 }], ['div', {
@@ -17,8 +20,12 @@ const toDOM = node => ['div', {
 }, ['code', {
   'data-language': node.attrs.language || '',
   spellcheck: 'false',
-  contenteditable: 'true'
-}, 0]]];
+  contenteditable: 'true',
+  'data-testid': 'code-block--code'
+}, 0]], ['div', {
+  class: codeBlockClassNames.end,
+  contenteditable: 'false'
+}]];
 
 export class CodeBlockView {
   constructor(_node, view, getPos) {

package/dist/es2019/plugins/code-block/pm-plugins/ide-ux.js

@@ -1,5 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { TextSelection } from 'prosemirror-state';
+import { PluginKey, TextSelection } from 'prosemirror-state';
 import { keydownHandler } from 'prosemirror-keymap';
 import { setTextSelection } from 'prosemirror-utils';
 import { getCursor } from '../../../utils';
@@ -9,15 +9,53 @@ import { getAutoClosingBracketInfo, shouldAutoCloseBracket } from '../ide-ux/bra
 import { getAutoClosingQuoteInfo, shouldAutoCloseQuote } from '../ide-ux/quote-handling';
 import { getEndOfCurrentLine, getStartOfCurrentLine, isCursorInsideCodeBlock, isSelectionEntirelyInsideCodeBlock, getLineInfo } from '../ide-ux/line-handling';
 import { insertIndent, outdent, indent, insertNewlineWithIndent } from '../ide-ux/commands';
+const codeBlockIDEKeyBindingsKey = new PluginKey('codeBlockIDEKeyBindings');
 export default new SafePlugin({
+  key: codeBlockIDEKeyBindingsKey,
+  state: {
+    init: () => ({
+      isComposing: false
+    }),
+    apply: (tr, value) => {
+      const isComposing = tr.getMeta(codeBlockIDEKeyBindingsKey);
+
+      if (typeof isComposing === 'undefined') {
+        return value;
+      }
+
+      return {
+        isComposing
+      };
+    }
+  },
   props: {
+    handleDOMEvents: {
+      compositionstart: (view, event) => {
+        const {
+          tr
+        } = view.state;
+        tr.setMeta(codeBlockIDEKeyBindingsKey, true);
+        view.dispatch(tr);
+        return false;
+      },
+      compositionend: (view, event) => {
+        const {
+          tr
+        } = view.state;
+        tr.setMeta(codeBlockIDEKeyBindingsKey, false);
+        view.dispatch(tr);
+        return false;
+      }
+    },
+
     handleTextInput(view, from, to, text) {
       const {
         state,
         dispatch
       } = view;
+      const isComposing = codeBlockIDEKeyBindingsKey.getState(state).isComposing;
 
-      if (isCursorInsideCodeBlock(state)) {
+      if (isCursorInsideCodeBlock(state) && !isComposing) {
         const beforeText = getStartOfCurrentLine(state).text;
         const afterText = getEndOfCurrentLine(state).text; // If text is a closing bracket/quote and we've already inserted it, move the selection after
 

package/dist/es2019/plugins/code-block/toolbar.js

@@ -4,6 +4,7 @@ import CopyIcon from '@atlaskit/icon/glyph/copy';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { removeCodeBlock, changeLanguage, copyContentToClipboard, resetCopiedState } from './actions';
 import commonMessages from '../../messages';
+import { codeBlockCopyButtonMessages } from '@atlaskit/editor-common/messages';
 import { provideVisualFeedbackForCopyButton, removeVisualFeedbackForCopyButton } from './pm-plugins/codeBlockCopySelectionPlugin';
 import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { pluginKey } from './plugin-key';
@@ -64,7 +65,7 @@ export const getToolbarConfig = (allowCopyToClipboard = false) => (state, {
     // note: copyContentToClipboard contains logic that also removes the
     // visual feedback for the copy button
     onClick: copyContentToClipboard,
-    title: formatMessage(codeBlockState.contentCopied ? commonMessages.copiedToClipboard : commonMessages.copyToClipboard),
+    title: formatMessage(codeBlockState.contentCopied ? codeBlockCopyButtonMessages.copiedCodeToClipboard : codeBlockCopyButtonMessages.copyCodeToClipboard),
     onMouseEnter: provideVisualFeedbackForCopyButton,
     // note: resetCopiedState contains logic that also removes the
     // visual feedback for the copy button

package/dist/es2019/plugins/code-block/ui/class-names.js

@@ -1,5 +1,7 @@
 import { CodeBlockSharedCssClassName } from '@atlaskit/editor-common/styles';
 export const codeBlockClassNames = {
+  start: CodeBlockSharedCssClassName.CODEBLOCK_START,
+  end: CodeBlockSharedCssClassName.CODEBLOCK_END,
   gutter: CodeBlockSharedCssClassName.CODEBLOCK_LINE_NUMBER_GUTTER,
   content: CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
 };

package/dist/es2019/plugins/feature-flags-context/feature-flags-from-props.js

@@ -26,7 +26,7 @@ function getSpellCheck(featureFlags) {
 
 
 export function createFeatureFlagsFromProps(props) {
-  var _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$allowTables, _props$featureFlags3, _props$featureFlags4, _props$allowTables2, _props$featureFlags5, _props$featureFlags6, _props$allowTables3, _props$featureFlags7, _props$featureFlags8, _props$allowTables4, _props$featureFlags9, _props$featureFlags10, _props$allowTables5, _props$allowExtension, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _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$collabEdit, _props$collabEdit2, _props$featureFlags31, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38;
+  var _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$allowTables, _props$featureFlags3, _props$featureFlags4, _props$allowTables2, _props$featureFlags5, _props$featureFlags6, _props$allowTables3, _props$featureFlags7, _props$featureFlags8, _props$allowTables4, _props$allowTables5, _props$featureFlags9, _props$featureFlags10, _props$allowTables6, _props$allowExtension, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _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$collabEdit, _props$collabEdit2, _props$featureFlags31, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39;
 
   const normalizedFeatureFlags = normalizeFeatureFlags(props.featureFlags);
   return { ...normalizedFeatureFlags,
@@ -45,8 +45,8 @@ export function createFeatureFlagsFromProps(props) {
     stickyHeadersOptimization: typeof ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.stickyHeadersOptimization) === 'boolean' ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.stickyHeadersOptimization) : typeof props.allowTables === 'object' && !!((_props$allowTables = props.allowTables) !== null && _props$allowTables !== void 0 && _props$allowTables.stickyHeadersOptimization),
     initialRenderOptimization: typeof ((_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.initialRenderOptimization) === 'boolean' ? !!((_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.initialRenderOptimization) : typeof props.allowTables === 'object' && !!((_props$allowTables2 = props.allowTables) !== null && _props$allowTables2 !== void 0 && _props$allowTables2.initialRenderOptimization),
     mouseMoveOptimization: typeof ((_props$featureFlags5 = props.featureFlags) === null || _props$featureFlags5 === void 0 ? void 0 : _props$featureFlags5.mouseMoveOptimization) === 'boolean' ? !!((_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.mouseMoveOptimization) : typeof props.allowTables === 'object' && !!((_props$allowTables3 = props.allowTables) !== null && _props$allowTables3 !== void 0 && _props$allowTables3.mouseMoveOptimization),
-    tableRenderOptimization: typeof ((_props$featureFlags7 = props.featureFlags) === null || _props$featureFlags7 === void 0 ? void 0 : _props$featureFlags7.tableRenderOptimization) === 'boolean' ? !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.tableRenderOptimization) : typeof props.allowTables === 'object' && !!((_props$allowTables4 = props.allowTables) !== null && _props$allowTables4 !== void 0 && _props$allowTables4.tableRenderOptimization),
-    tableOverflowShadowsOptimization: typeof ((_props$featureFlags9 = props.featureFlags) === null || _props$featureFlags9 === void 0 ? void 0 : _props$featureFlags9.tableOverflowShadowsOptimization) === 'boolean' ? !!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.tableOverflowShadowsOptimization) : typeof props.allowTables === 'object' && !!((_props$allowTables5 = props.allowTables) !== null && _props$allowTables5 !== void 0 && _props$allowTables5.tableOverflowShadowsOptimization),
+    tableRenderOptimization: typeof ((_props$featureFlags7 = props.featureFlags) === null || _props$featureFlags7 === void 0 ? void 0 : _props$featureFlags7.tableRenderOptimization) === 'boolean' ? !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.tableRenderOptimization) : typeof props.allowTables === 'object' && typeof ((_props$allowTables4 = props.allowTables) === null || _props$allowTables4 === void 0 ? void 0 : _props$allowTables4.tableRenderOptimization) === 'boolean' ? (_props$allowTables5 = props.allowTables) === null || _props$allowTables5 === void 0 ? void 0 : _props$allowTables5.tableRenderOptimization : true,
+    tableOverflowShadowsOptimization: typeof ((_props$featureFlags9 = props.featureFlags) === null || _props$featureFlags9 === void 0 ? void 0 : _props$featureFlags9.tableOverflowShadowsOptimization) === 'boolean' ? !!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.tableOverflowShadowsOptimization) : typeof props.allowTables === 'object' && !!((_props$allowTables6 = props.allowTables) !== null && _props$allowTables6 !== void 0 && _props$allowTables6.tableOverflowShadowsOptimization),
     extendFloatingToolbar: Boolean(typeof props.allowExtension === 'object' && ((_props$allowExtension = props.allowExtension) === null || _props$allowExtension === void 0 ? void 0 : _props$allowExtension.allowExtendFloatingToolbars)),
     useUnpredictableInputRule: Boolean(typeof ((_props$featureFlags11 = props.featureFlags) === null || _props$featureFlags11 === void 0 ? void 0 : _props$featureFlags11.useUnpredictableInputRule) === 'boolean' ? !!((_props$featureFlags12 = props.featureFlags) !== null && _props$featureFlags12 !== void 0 && _props$featureFlags12.useUnpredictableInputRule) : props.UNSAFE_allowUndoRedoButtons ? false : true),
     showAvatarGroupAsPlugin: Boolean(typeof ((_props$featureFlags13 = props.featureFlags) === null || _props$featureFlags13 === void 0 ? void 0 : _props$featureFlags13.showAvatarGroupAsPlugin) === 'boolean' ? !!((_props$featureFlags14 = props.featureFlags) !== null && _props$featureFlags14 !== void 0 && _props$featureFlags14.showAvatarGroupAsPlugin) : false),
@@ -64,6 +64,7 @@ export function createFeatureFlagsFromProps(props) {
     showHoverPreview: Boolean(typeof ((_props$featureFlags33 = props.featureFlags) === null || _props$featureFlags33 === void 0 ? void 0 : _props$featureFlags33.showHoverPreview) === 'boolean' ? !!((_props$featureFlags34 = props.featureFlags) !== null && _props$featureFlags34 !== void 0 && _props$featureFlags34.showHoverPreview) : false),
     indentationButtonsInTheToolbar: Boolean(typeof normalizedFeatureFlags.indentationButtonsInTheToolbar === 'boolean' && !!normalizedFeatureFlags.indentationButtonsInTheToolbar || (typeof ((_props$featureFlags35 = props.featureFlags) === null || _props$featureFlags35 === void 0 ? void 0 : _props$featureFlags35.indentationButtonsInTheToolbar) === 'boolean' ? !!((_props$featureFlags36 = props.featureFlags) !== null && _props$featureFlags36 !== void 0 && _props$featureFlags36.indentationButtonsInTheToolbar) : false)),
     floatingToolbarCopyButton: Boolean(typeof normalizedFeatureFlags.floatingToolbarCopyButton === 'boolean' && !!normalizedFeatureFlags.floatingToolbarCopyButton || (typeof ((_props$featureFlags37 = props.featureFlags) === null || _props$featureFlags37 === void 0 ? void 0 : _props$featureFlags37.floatingToolbarCopyButton) === 'boolean' ? !!((_props$featureFlags38 = props.featureFlags) !== null && _props$featureFlags38 !== void 0 && _props$featureFlags38.floatingToolbarCopyButton) : false)),
+    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags39 = props.featureFlags) === null || _props$featureFlags39 === void 0 ? void 0 : _props$featureFlags39['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
     disableSpellcheckByBrowser: getSpellCheck(props.featureFlags)
   };
 }

package/dist/es2019/plugins/floating-toolbar/ui/EmojiPickerButton.js

@@ -3,10 +3,11 @@ import { css, jsx } from '@emotion/react';
 import React from 'react';
 import Button from '@atlaskit/button';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
-import { Popup, withOuterListeners } from '@atlaskit/editor-common/ui';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { EmojiPicker } from '@atlaskit/emoji';
 import Tooltip from '@atlaskit/tooltip';
-import EditorEmojiAddIcon from './EditorEmojiAddIcon'; // helps adjusts position of popup
+import EditorEmojiAddIcon from './EditorEmojiAddIcon';
+import withOuterListeners from '../../../ui/with-outer-listeners'; // helps adjusts position of popup
 
 const emojiPickerButtonWrapper = css`
   position: relative;

package/dist/es2019/plugins/floating-toolbar/ui/Toolbar.js

@@ -21,6 +21,7 @@ import Announcer from '../../../utils/announcer/announcer';
 import { injectIntl } from 'react-intl-next';
 import messages from './messages';
 import { token } from '@atlaskit/tokens';
+import { decorationStateKey, ACTIONS } from '../../base/pm-plugins/decoration';
 const akGridSize = gridSize();
 
 const toolbarContainer = theme => css`
@@ -107,6 +108,42 @@ export const areSameItems = (leftArr, rightArr) => {
 };
 
 class Toolbar extends Component {
+  // remove any decorations added by toolbar buttons i.e danger and selected styling
+  // this prevents https://product-fabric.atlassian.net/browse/ED-10207
+  resetStyling({
+    table
+  }) {
+    if (this.props.editorView) {
+      const {
+        state,
+        dispatch
+      } = this.props.editorView; // tables use their own decorations
+      // TODO fix for tables https://product-fabric.atlassian.net/jira/servicedesk/projects/DTR/queues/issue/DTR-617
+
+      if (table) {
+        return null;
+      }
+
+      dispatch(state.tr.setMeta(decorationStateKey, {
+        action: ACTIONS.DECORATION_REMOVE
+      }));
+    }
+  }
+
+  componentDidUpdate(prevProps) {
+    if (this.props.node !== prevProps.node) {
+      this.resetStyling({
+        table: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.node.type.name) === 'table'
+      });
+    }
+  }
+
+  componentWillUnmount() {
+    this.resetStyling({
+      table: this.props.node.type.name === 'table'
+    });
+  }
+
   render() {
     const {
       items,

package/dist/es2019/plugins/hyperlink/Toolbar.js

@@ -3,6 +3,7 @@ import { stateKey } from './pm-plugins/main';
 import { removeLink, editInsertedLink, updateLink, insertLinkWithAnalytics } from './commands';
 import HyperlinkAddToolbar from './ui/HyperlinkAddToolbar';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
+import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
 import { normalizeUrl } from './utils';
 import { linkToolbarMessages as linkToolbarCommonMessages, linkMessages } from '../../messages';
@@ -10,19 +11,28 @@ import { isSafeUrl } from '@atlaskit/adf-schema';
 import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '../../ui/LinkSearch/ToolbarComponents';
 import { HyperlinkToolbarAppearance } from './HyperlinkToolbarAppearance';
 import { addAnalytics, ACTION_SUBJECT_ID } from '../analytics';
-import { buildVisitedLinkPayload } from '../../utils/linking-utils';
+import { buildVisitedLinkPayload, buildOpenedSettingsPayload } from '../../utils/linking-utils';
 import { getCopyButtonConfig, showCopyButton } from '../copy-button/toolbar';
-
+import { getFeatureFlags } from '../feature-flags-context';
 /* type guard for edit links */
+
 function isEditLink(linkMark) {
   return linkMark.pos !== undefined;
 }
 
-const visitHyperlink = () => (state, dispatch) => {
+const dispatchAnalytics = (dispatch, state, analyticsBuilder) => {
   if (dispatch) {
-    dispatch(addAnalytics(state, state.tr, buildVisitedLinkPayload(ACTION_SUBJECT_ID.HYPERLINK)));
+    dispatch(addAnalytics(state, state.tr, analyticsBuilder(ACTION_SUBJECT_ID.HYPERLINK)));
   }
+};
+
+const visitHyperlink = () => (state, dispatch) => {
+  dispatchAnalytics(dispatch, state, buildVisitedLinkPayload);
+  return true;
+};
 
+const openLinkSettings = () => (state, dispatch) => {
+  dispatchAnalytics(dispatch, state, buildOpenedSettingsPayload);
   return true;
 };
 
@@ -42,6 +52,29 @@ function getLinkText(activeLinkMark, state) {
   return activeLinkMark.node.text;
 }
 
+const getCopyButtonGroup = (state, intl, nodeType) => {
+  return state && showCopyButton(state) ? [{
+    type: 'separator'
+  }, getCopyButtonConfig(state, intl.formatMessage, nodeType)] : [];
+};
+
+const getSettingsButtonGroup = (state, intl) => {
+  const {
+    floatingToolbarLinkSettingsButton
+  } = getFeatureFlags(state);
+  return floatingToolbarLinkSettingsButton === 'true' ? [{
+    type: 'separator'
+  }, {
+    id: 'editor.link.settings',
+    type: 'button',
+    icon: CogIcon,
+    title: intl.formatMessage(linkToolbarCommonMessages.settingsLink),
+    onClick: openLinkSettings(),
+    href: 'https://id.atlassian.com/manage-profile/link-preferences',
+    target: '_blank'
+  }] : [];
+};
+
 export const getToolbarConfig = options => (state, intl, providerFactory) => {
   const {
     formatMessage
@@ -97,8 +130,8 @@ export const getToolbarConfig = options => (state, intl, providerFactory) => {
                   editorView: editorView,
                   editorState: state,
                   cardOptions: options === null || options === void 0 ? void 0 : options.cardOptions,
-                  providerFactory: providerFactory // platform={} // TODO: pass platform
-
+                  providerFactory: providerFactory,
+                  platform: options === null || options === void 0 ? void 0 : options.platform
                 });
               }
             }, {
@@ -134,9 +167,7 @@ export const getToolbarConfig = options => (state, intl, providerFactory) => {
               title: labelUnlink,
               icon: UnlinkIcon,
               tabIndex: null
-            }, ...(state && showCopyButton(state) ? [{
-              type: 'separator'
-            }, getCopyButtonConfig(state, intl.formatMessage, hyperLinkToolbar.nodeType)] : [])]
+            }, ...getCopyButtonGroup(state, intl, hyperLinkToolbar.nodeType), ...getSettingsButtonGroup(state, intl)]
           };
         }
 

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

@@ -54,8 +54,6 @@ export const findMediaNode = (mediaPluginState, id, isMediaSingle) => {
 
   return mediaNodeWithPos;
 };
-export const isMobileUploadCompleted = (mediaPluginState, mediaId) => !!mediaPluginState.mediaOptions && // This flag tells us that it's a 'mobile' env.
-!!mediaPluginState.mediaOptions.allowMarkingUploadsAsIncomplete && typeof mediaPluginState.mobileUploadComplete[mediaId] === 'boolean' ? mediaPluginState.mobileUploadComplete[mediaId] : undefined;
 export const isMediaNode = (pos, state) => {
   const node = state.doc.nodeAt(pos);
   return node && ['media', 'mediaInline'].includes(node.type.name);

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

@@ -178,7 +178,7 @@ const mediaPlugin = options => ({
       title: formatMessage(messages.filesAndImages),
       description: formatMessage(messages.filesAndImagesDescription),
       priority: 400,
-      keywords: ['attachment', 'gif', 'media', 'picture'],
+      keywords: ['attachment', 'gif', 'media', 'picture', 'image', 'video'],
       icon: () => /*#__PURE__*/React.createElement(IconImages, null),
 
       action(insert, state) {

package/dist/es2019/plugins/media/nodeviews/mediaNodeView/index.js

@@ -7,8 +7,6 @@ import React from 'react';
 import { SelectionBasedNodeView } from '../../../../nodeviews';
 import WithPluginState from '../../../../ui/WithPluginState';
 import { pluginKey as widthPluginKey } from '../../../width';
-import { isMobileUploadCompleted } from '../../commands/helpers';
-import { stateKey as mediaStateKey } from '../../pm-plugins/plugin-key';
 import MediaNode from './media';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { isMediaBlobUrlFromAttrs } from '../../utils/media-common';
@@ -71,7 +69,6 @@ class MediaNodeView extends SelectionBasedNodeView {
           url: url,
           mediaProvider: mediaProvider,
           contextIdentifierProvider: contextIdentifierProvider,
-          uploadComplete: this.uploadComplete(),
           mediaOptions: mediaOptions
         });
       };
@@ -136,10 +133,6 @@ class MediaNodeView extends SelectionBasedNodeView {
     return isMediaBlobUrlFromAttrs(attrs);
   }
 
-  uploadComplete() {
-    return isMobileUploadCompleted(mediaStateKey.getState(this.view.state), this.node.attrs.id);
-  }
-
   render() {
     const {
       providerFactory

package/dist/es2019/plugins/media/nodeviews/mediaNodeView/media.js

@@ -76,7 +76,7 @@ export class MediaNode extends Component {
   shouldComponentUpdate(nextProps, nextState) {
     const hasNewViewMediaClientConfig = !this.state.viewMediaClientConfig && nextState.viewMediaClientConfig;
 
-    if (this.props.selected !== nextProps.selected || this.props.uploadComplete !== nextProps.uploadComplete || this.props.node.attrs.id !== nextProps.node.attrs.id || this.props.node.attrs.collection !== nextProps.node.attrs.collection || this.props.maxDimensions.height !== nextProps.maxDimensions.height || this.props.maxDimensions.width !== nextProps.maxDimensions.width || this.props.contextIdentifierProvider !== nextProps.contextIdentifierProvider || this.props.isLoading !== nextProps.isLoading || this.props.mediaProvider !== nextProps.mediaProvider || hasNewViewMediaClientConfig) {
+    if (this.props.selected !== nextProps.selected || this.props.node.attrs.id !== nextProps.node.attrs.id || this.props.node.attrs.collection !== nextProps.node.attrs.collection || this.props.maxDimensions.height !== nextProps.maxDimensions.height || this.props.maxDimensions.width !== nextProps.maxDimensions.width || this.props.contextIdentifierProvider !== nextProps.contextIdentifierProvider || this.props.isLoading !== nextProps.isLoading || this.props.mediaProvider !== nextProps.mediaProvider || hasNewViewMediaClientConfig) {
       return true;
     }
 
@@ -115,7 +115,6 @@ export class MediaNode extends Component {
     const {
       node,
       selected,
-      uploadComplete,
       originalDimensions,
       isLoading,
       maxDimensions,
@@ -133,7 +132,7 @@ export class MediaNode extends Component {
       alt
     } = node.attrs;
 
-    if (isLoading || type !== 'external' && (!viewMediaClientConfig || typeof uploadComplete === 'boolean' && !uploadComplete)) {
+    if (isLoading || type !== 'external' && !viewMediaClientConfig) {
       return /*#__PURE__*/React.createElement(MediaCardWrapper, {
         dimensions: originalDimensions
       }, /*#__PURE__*/React.createElement(CardLoading, null));

package/dist/es2019/plugins/media/picker-facade.js

@@ -27,6 +27,7 @@ export default class PickerFacade {
         fileName: file.name,
         fileSize: file.size,
         fileMimeType: file.type,
+        collection: file.collectionName,
         dimensions,
         scaleFactor,
         status: isErroredFile ? 'error' : undefined