@atlaskit/editor-core 178.1.1 → 178.1.2

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

@@ -5,7 +5,6 @@ export const selectCaptionFromMediaSinglePos = (mediaSingleNodePos, mediaSingleN
   if (mediaSingleNode.childCount !== 2) {
     return false;
   }
-
   if (dispatch) {
     const media = mediaSingleNode.child(0);
     const caption = mediaSingleNode.child(1);
@@ -14,16 +13,15 @@ export const selectCaptionFromMediaSinglePos = (mediaSingleNodePos, mediaSingleN
     tr.setMeta('scrollIntoView', false);
     dispatch(tr);
   }
-
   return true;
 };
 export const insertAndSelectCaptionFromMediaSinglePos = (mediaSingleNodePos, mediaSingleNode) => (state, dispatch) => {
-  let tr = state.tr; // node should have one child, media
+  let tr = state.tr;
 
+  // node should have one child, media
   if (mediaSingleNode.childCount !== 1) {
     return false;
   }
-
   if (dispatch) {
     const schema = state.schema;
     const media = mediaSingleNode.child(0);
@@ -39,10 +37,8 @@ export const insertAndSelectCaptionFromMediaSinglePos = (mediaSingleNodePos, med
     });
     dispatch(tr);
   }
-
   return true;
 };
-
 const setSelectionAtEndOfCaption = (tr, mediaSingleNodePos, mediaNodeSize, captionNodeSize) => {
   return setTextSelection(mediaSingleNodePos + mediaNodeSize + captionNodeSize)(tr);
 };

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

@@ -3,24 +3,23 @@ import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 export const findMediaSingleNode = (mediaPluginState, id) => {
   const {
     mediaNodes
-  } = mediaPluginState; // Array#find... no IE support
+  } = mediaPluginState;
 
+  // Array#find... no IE support
   return mediaNodes.reduce((memo, nodeWithPos) => {
     if (memo) {
       return memo;
     }
-
     const {
       node
     } = nodeWithPos;
-
     if (node.attrs.id === id) {
       return nodeWithPos;
     }
-
     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.
@@ -31,12 +30,10 @@ export const findMediaSingleNode = (mediaPluginState, id) => {
  * @param isMediaSingle
  * @returns {MediaNodeWithPosHandler | null}
  */
-
 export const findMediaInlineNode = (mediaPluginState, id, isMediaSingle) => {
   if (!isMediaSingle) {
     return findMediaSingleNode(mediaPluginState, id);
   }
-
   return null;
 };
 export const findAllMediaSingleNodes = (mediaPluginState, id) => {
@@ -46,12 +43,12 @@ export const findAllMediaSingleNodes = (mediaPluginState, id) => {
   return mediaNodes.filter(nodeWithHandler => nodeWithHandler.node.attrs.id === id);
 };
 export const findMediaNode = (mediaPluginState, id, isMediaSingle) => {
-  const 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
+  const 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 const isMediaNode = (pos, state) => {
@@ -61,98 +58,76 @@ export const isMediaNode = (pos, state) => {
 export const updateAllMediaNodesAttrs = (id, attrs, isMediaSingle) => (state, dispatch) => {
   const mediaPluginState = mediaPluginKey.getState(state);
   let mediaNodes;
-
   if (isMediaSingle) {
     mediaNodes = findAllMediaSingleNodes(mediaPluginState, id);
   } else {
     const mediaGroupNode = findMediaNode(mediaPluginState, id, isMediaSingle);
     mediaNodes = mediaGroupNode ? [mediaGroupNode] : [];
   }
-
   const validMediaNodePositions = mediaNodes.reduce((acc, {
     getPos
   }) => {
     const pos = getPos();
-
     if (isNaN(pos) || typeof pos === 'number' && !isMediaNode(pos, state)) {
       return acc;
     }
-
     acc.push(pos);
     return acc;
   }, []);
-
   if (validMediaNodePositions.length === 0) {
     return false;
   }
-
   const tr = state.tr;
   validMediaNodePositions.forEach(pos => tr.step(new SetAttrsStep(pos, attrs)));
   tr.setMeta('addToHistory', false);
-
   if (dispatch) {
     dispatch(tr);
   }
-
   return true;
 };
 export const updateCurrentMediaNodeAttrs = (attrs, mediaNode) => (state, dispatch) => {
   const pos = mediaNode.getPos();
-
   if (isNaN(pos) || typeof pos === 'number' && !isMediaNode(pos, state)) {
     return false;
   }
-
   const tr = state.tr;
   tr.step(new SetAttrsStep(pos, attrs));
   tr.setMeta('addToHistory', false);
-
   if (dispatch) {
     dispatch(tr);
   }
-
   return true;
 };
 export const updateMediaNodeAttrs = (id, attrs, isMediaSingle) => (state, dispatch) => {
   const mediaPluginState = mediaPluginKey.getState(state);
   const mediaNodeWithPos = findMediaNode(mediaPluginState, id, isMediaSingle);
-
   if (!mediaNodeWithPos) {
     return false;
   }
-
   const tr = state.tr;
   const pos = mediaNodeWithPos.getPos();
-
   if (!isMediaNode(pos, state)) {
     return false;
   }
-
   tr.step(new SetAttrsStep(pos, attrs)).setMeta('addToHistory', false);
-
   if (dispatch) {
     dispatch(tr);
   }
-
   return true;
 };
 export const replaceExternalMedia = (pos, attrs) => (state, dispatch) => {
   const tr = state.tr;
   const node = tr.doc.nodeAt(pos);
-
   if (!node || node.type.name !== 'media') {
     return false;
   }
-
   tr.step(new SetAttrsStep(pos, {
     type: 'file',
     url: null,
     ...attrs
   })).setMeta('addToHistory', false);
-
   if (dispatch) {
     dispatch(tr);
   }
-
   return true;
 };

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

@@ -8,37 +8,31 @@ import { checkMediaType } from '../utils/check-media-type';
 import { getMediaPluginState } from '../pm-plugins/main';
 export const showLinkingToolbar = createMediaLinkingCommand(state => {
   const mediaLinkingState = getMediaLinkingState(state);
-
   if (mediaLinkingState && mediaLinkingState.mediaPos !== null) {
     const mediaSingle = state.doc.nodeAt(mediaLinkingState.mediaPos);
-
     if (mediaSingle) {
       return {
         type: MediaLinkingActionsTypes.showToolbar
       };
     }
   }
-
   return false;
 });
 export const showLinkingToolbarWithMediaTypeCheck = (editorState, dispatch, editorView) => {
   if (dispatch && editorView) {
     const mediaNode = currentMediaNode(editorState);
-
     if (!mediaNode) {
       return false;
     }
-
     const {
       mediaClientConfig
     } = getMediaPluginState(editorState);
-
     if (!mediaClientConfig) {
       return false;
     }
-
     checkMediaType(mediaNode, mediaClientConfig).then(mediaType => {
-      if ((mediaType === 'external' || mediaType === 'image') && // We make sure the selection and the node hasn't changed.
+      if ((mediaType === 'external' || mediaType === 'image') &&
+      // We make sure the selection and the node hasn't changed.
       currentMediaNode(editorView.state) === mediaNode) {
         dispatch(editorView.state.tr.setMeta(mediaLinkingPluginKey, {
           type: MediaLinkingActionsTypes.showToolbar
@@ -46,66 +40,53 @@ export const showLinkingToolbarWithMediaTypeCheck = (editorState, dispatch, edit
       }
     });
   }
-
   return true;
 };
 const hideLinkingToolbarCommand = createMediaLinkingCommand({
   type: MediaLinkingActionsTypes.hideToolbar
 });
 export const hideLinkingToolbar = (state, dispatch, view) => {
-  hideLinkingToolbarCommand(state, dispatch, view); // restore focus on the editor so keyboard shortcuts aren't lost to the browser
+  hideLinkingToolbarCommand(state, dispatch, view);
 
+  // restore focus on the editor so keyboard shortcuts aren't lost to the browser
   if (view) {
     view.focus();
   }
 };
-
 function getCurrentUrl(state) {
   const {
     link: linkType
   } = state.schema.marks;
   const mediaLinkingState = getMediaLinkingState(state);
-
   if (!mediaLinkingState || mediaLinkingState.mediaPos === null) {
     return;
   }
-
   const $pos = state.doc.resolve(mediaLinkingState.mediaPos);
   const node = state.doc.nodeAt($pos.pos);
-
   if (!node) {
     return;
   }
-
   const hasLink = linkType.isInSet(node.marks);
-
   if (!hasLink) {
     return;
   }
-
   const link = node.marks.find(mark => mark.type === linkType); // Already check exist
-
   const url = link.attrs.href;
   return url;
 }
-
 function toggleLinkMark(tr, state, {
   forceRemove = false,
   url
 }) {
   const mediaLinkingState = getMediaLinkingState(state);
-
   if (!mediaLinkingState || mediaLinkingState.mediaPos === null) {
     return tr;
   }
-
   const $pos = state.doc.resolve(mediaLinkingState.mediaPos);
   const node = state.doc.nodeAt($pos.pos);
-
   if (!node) {
     return tr;
   }
-
   const linkMark = state.schema.marks.link;
   const {
     media
@@ -119,9 +100,7 @@ function toggleLinkMark(tr, state, {
     if (forceRemove) {
       return false;
     }
-
     const href = normalizeUrl(url);
-
     if (prevAttrs && prevAttrs.href === href) {
       return; //No op
     }
@@ -130,14 +109,14 @@ function toggleLinkMark(tr, state, {
       return false; // remove
     }
 
-    return { ...prevAttrs,
+    return {
+      ...prevAttrs,
       href: href
     };
   }, [media]);
   toggleBlockLinkMark($pos.pos, $pos.pos + node.nodeSize, tr, state);
   return tr;
 }
-
 const fireAnalyticForMediaLink = (tr, state, action, attributes = undefined) => {
   return addAnalytics(state, tr, {
     action,
@@ -147,7 +126,6 @@ const fireAnalyticForMediaLink = (tr, state, action, attributes = undefined) =>
     attributes
   });
 };
-
 export const unlink = createMediaLinkingCommand({
   type: MediaLinkingActionsTypes.unlink
 }, (tr, state) => {
@@ -156,29 +134,23 @@ export const unlink = createMediaLinkingCommand({
   });
   return fireAnalyticForMediaLink(transaction, state, ACTION.DELETED);
 });
-
 const getAction = (newUrl, state) => {
   const currentUrl = getCurrentUrl(state);
-
   if (!currentUrl) {
     return ACTION.ADDED;
   } else if (newUrl !== currentUrl) {
     return ACTION.EDITED;
   }
-
   return undefined;
 };
-
 export const setUrlToMedia = (url, inputMethod) => createMediaLinkingCommand({
   type: MediaLinkingActionsTypes.setUrl,
   payload: normalizeUrl(url)
 }, (tr, state) => {
   const action = getAction(url, state);
-
   if (!action) {
     return tr;
   }
-
   try {
     const toggleLinkMarkResult = toggleLinkMark(tr, state, {
       url: url

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

@@ -22,10 +22,8 @@ import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { ReactMediaNode } from './nodeviews/mediaNodeView';
 import { ReactMediaInlineNode } from './nodeviews/mediaInline';
 export { insertMediaSingleNode } from './utils/media-single';
-
 const mediaPlugin = options => ({
   name: 'media',
-
   nodes() {
     const {
       allowMediaGroup = true,
@@ -51,19 +49,15 @@ const mediaPlugin = options => ({
       if (node.name === 'mediaGroup') {
         return allowMediaGroup;
       }
-
       if (node.name === 'mediaSingle') {
         return allowMediaSingle;
       }
-
       if (node.name === 'mediaInline') {
         return allowMediaInline;
       }
-
       return true;
     });
   },
-
   pmPlugins() {
     const pmPlugins = [{
       name: 'media',
@@ -98,7 +92,6 @@ const mediaPlugin = options => ({
       name: 'mediaKeymap',
       plugin: () => keymapPlugin(options)
     }];
-
     if (options && options.allowMediaSingle) {
       pmPlugins.push({
         name: 'mediaSingleKeymap',
@@ -107,7 +100,6 @@ const mediaPlugin = options => ({
         }) => keymapMediaSinglePlugin(schema)
       });
     }
-
     if (options && options.allowAltTextOnImages) {
       pmPlugins.push({
         name: 'mediaAltText',
@@ -120,7 +112,6 @@ const mediaPlugin = options => ({
         }) => keymapMediaAltTextPlugin(schema)
       });
     }
-
     if (options && options.allowLinking) {
       pmPlugins.push({
         name: 'mediaLinking',
@@ -135,7 +126,6 @@ const mediaPlugin = options => ({
         }) => keymapLinkingPlugin(schema)
       });
     }
-
     pmPlugins.push({
       name: 'mediaSelectionHandler',
       plugin: () => {
@@ -148,23 +138,21 @@ const mediaPlugin = options => ({
                   selection
                 }
               } = view;
-
               if (!(selection instanceof NodeSelection) || selection.node.type.name !== 'media') {
                 return false;
               }
-
               const {
                 node,
                 offset
               } = view.domAtPos(selection.from);
-
-              if ( // Is the media element mounted already?
+              if (
+              // Is the media element mounted already?
               offset === node.childNodes.length) {
                 // Media is not ready, so stop the scroll request
                 return true;
-              } // Media is ready, keep the scrolling request
-
+              }
 
+              // Media is ready, keep the scrolling request
               return false;
             }
           }
@@ -174,7 +162,6 @@ const mediaPlugin = options => ({
     });
     return pmPlugins;
   },
-
   contentComponent({
     editorView,
     appearance
@@ -193,7 +180,6 @@ const mediaPlugin = options => ({
       })
     }));
   },
-
   secondaryToolbarComponent({
     editorView,
     eventDispatcher,
@@ -207,7 +193,6 @@ const mediaPlugin = options => ({
       isReducedSpacing: true
     });
   },
-
   pluginsOptions: {
     quickInsert: ({
       formatMessage
@@ -218,7 +203,6 @@ const mediaPlugin = options => ({
       priority: 400,
       keywords: ['attachment', 'gif', 'media', 'picture', 'image', 'video'],
       icon: () => /*#__PURE__*/React.createElement(IconImages, null),
-
       action(insert, state) {
         const pluginState = pluginKey.getState(state);
         pluginState.showMediaPicker();
@@ -232,7 +216,6 @@ const mediaPlugin = options => ({
           eventType: EVENT_TYPE.UI
         });
       }
-
     }],
     floatingToolbar: (state, intl, providerFactory) => floatingToolbar(state, intl, {
       providerFactory,
@@ -246,5 +229,4 @@ const mediaPlugin = options => ({
     })
   }
 });
-
 export default mediaPlugin;

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

@@ -14,31 +14,24 @@ import { MediaNodeUpdater } from './mediaNodeUpdater';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { injectIntl } from 'react-intl-next';
 import { messages } from './messages';
-
 const isMediaGroupSelectedFromProps = props => {
   return isNodeSelectedOrInRange(props.anchorPos, props.headPos, props.getPos(), props.node.nodeSize);
 };
-
 const hasSelectionChanged = (oldProps, newProps) => {
   if (isMediaGroupSelectedFromProps(oldProps) !== isMediaGroupSelectedFromProps(newProps)) {
     return true;
   }
-
   if (isMediaGroupSelectedFromProps(newProps) === SelectedState.selectedInside) {
     return oldProps.anchorPos !== newProps.anchorPos;
   }
-
   return false;
 };
-
 class MediaGroup extends React.Component {
   constructor(_props) {
     super(_props);
-
     _defineProperty(this, "state", {
       viewMediaClientConfig: undefined
     });
-
     _defineProperty(this, "updateNodeAttrs", (props, node, getPos) => {
       const {
         view,
@@ -54,7 +47,6 @@ class MediaGroup extends React.Component {
       });
       mediaNodeUpdater.updateNodeAttrs(getPos);
     });
-
     _defineProperty(this, "setMediaItems", (props, updatedAttrs = false) => {
       const {
         node
@@ -63,17 +55,14 @@ class MediaGroup extends React.Component {
       this.mediaNodes = [];
       node.forEach((item, childOffset) => {
         const getPos = () => props.getPos() + childOffset + 1;
-
         this.mediaPluginState.setMediaGroupNode(item, getPos);
         this.mediaNodes.push(item);
-
         if (updatedAttrs) {
           this.updateNodeAttrs(props, item, getPos);
         }
       });
       this.mediaPluginState.handleMediaGroupUpdate(oldMediaNodes, this.mediaNodes);
     });
-
     _defineProperty(this, "getIdentifier", item => {
       if (item.attrs.type === 'external') {
         return {
@@ -81,28 +70,22 @@ class MediaGroup extends React.Component {
           dataURI: item.attrs.url
         };
       }
-
       return {
         id: item.attrs.id,
         mediaItemType: 'file',
         collectionName: item.attrs.collection
       };
     });
-
     _defineProperty(this, "isNodeSelected", nodePos => {
       const selected = isMediaGroupSelectedFromProps(this.props);
-
       if (selected === SelectedState.selectedInRange) {
         return true;
       }
-
       if (selected === SelectedState.selectedInside && this.props.anchorPos === nodePos) {
         return true;
       }
-
       return false;
     });
-
     _defineProperty(this, "renderChildNodes", () => {
       const {
         viewMediaClientConfig
@@ -117,9 +100,9 @@ class MediaGroup extends React.Component {
         // We declared this to get a fresh position every time
         const getNodePos = () => {
           return getPos() + idx + 1;
-        }; // Media Inline creates a floating toolbar with the same options, excludes these options if enabled
-
+        };
 
+        // Media Inline creates a floating toolbar with the same options, excludes these options if enabled
         const mediaInlineOptions = (allowMediaInline = false) => {
           if (!allowMediaInline) {
             return {
@@ -133,7 +116,6 @@ class MediaGroup extends React.Component {
             };
           }
         };
-
         return {
           identifier: this.getIdentifier(item),
           isLazy: allowLazyLoading,
@@ -150,7 +132,6 @@ class MediaGroup extends React.Component {
         featureFlags: mediaOptions.featureFlags
       });
     });
-
     this.mediaNodes = [];
     this.mediaPluginState = mediaStateKey.getState(_props.view.state);
     this.setMediaItems(_props);
@@ -158,14 +139,12 @@ class MediaGroup extends React.Component {
       viewMediaClientConfig: undefined
     };
   }
-
   componentDidMount() {
     this.updateMediaClientConfig();
     this.mediaNodes.forEach(async node => {
       if (node.attrs.type === 'external') {
         return;
       }
-
       const {
         view,
         mediaProvider,
@@ -179,13 +158,10 @@ class MediaGroup extends React.Component {
         isMediaSingle: false
       });
       const contextId = mediaNodeUpdater.getNodeContextId();
-
       if (!contextId) {
         await mediaNodeUpdater.updateContextId();
       }
-
       const hasDifferentContextId = await mediaNodeUpdater.hasDifferentContextId();
-
       if (hasDifferentContextId) {
         await mediaNodeUpdater.copyNode({
           traceId: node.attrs.__mediaTraceId
@@ -193,24 +169,19 @@ class MediaGroup extends React.Component {
       }
     });
   }
-
   componentWillUnmount() {
     this.mediaPluginState.handleMediaGroupUpdate(this.mediaNodes, []);
   }
-
   UNSAFE_componentWillReceiveProps(props) {
     this.updateMediaClientConfig();
     this.setMediaItems(props, props.isCopyPasteEnabled || props.isCopyPasteEnabled === undefined);
   }
-
   shouldComponentUpdate(nextProps) {
     if (hasSelectionChanged(this.props, nextProps) || this.props.node !== nextProps.node || this.state.viewMediaClientConfig !== this.mediaPluginState.mediaClientConfig) {
       return true;
     }
-
     return false;
   }
-
   updateMediaClientConfig() {
     const {
       viewMediaClientConfig
@@ -218,25 +189,19 @@ class MediaGroup extends React.Component {
     const {
       mediaClientConfig
     } = this.mediaPluginState;
-
     if (!viewMediaClientConfig && mediaClientConfig) {
       this.setState({
         viewMediaClientConfig: mediaClientConfig
       });
     }
   }
-
   render() {
     return this.renderChildNodes();
   }
-
 }
-
 _defineProperty(MediaGroup, "displayName", 'MediaGroup');
-
 const IntlMediaGroup = injectIntl(MediaGroup);
 export default IntlMediaGroup;
-
 class MediaGroupNodeView extends ReactNodeView {
   render(props, forwardRef) {
     const {
@@ -257,7 +222,6 @@ class MediaGroupNodeView extends ReactNodeView {
           if (!mediaProvider) {
             return null;
           }
-
           return /*#__PURE__*/React.createElement(IntlMediaGroup, {
             node: this.node,
             getPos: getPos,
@@ -273,7 +237,6 @@ class MediaGroupNodeView extends ReactNodeView {
             mediaOptions: mediaOptions
           });
         };
-
         return /*#__PURE__*/React.createElement(WithPluginState, {
           editorView: this.view,
           plugins: {
@@ -285,9 +248,7 @@ class MediaGroupNodeView extends ReactNodeView {
       }
     });
   }
-
 }
-
 export const ReactMediaGroupNode = (portalProviderAPI, eventDispatcher, providerFactory, mediaOptions = {}) => (node, view, getPos) => {
   const hasIntlContext = true;
   return new MediaGroupNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {