@atlaskit/editor-core 178.1.1 → 179.0.0

package/dist/es2019/plugins/jira-issue/index.js

@@ -4,7 +4,6 @@ import { confluenceJiraIssue } from '@atlaskit/adf-schema';
 import { ReactNodeView } from '../../nodeviews';
 import ReactJIRAIssueNode from './nodeviews/jira-issue';
 export const pluginKey = new PluginKey('jiraIssuePlugin');
-
 const createPlugin = ({
   portalProviderAPI,
   eventDispatcher
@@ -18,24 +17,19 @@ const createPlugin = ({
     }
   });
 };
-
 const jiraIssuePlugin = () => ({
   name: 'confluenceJiraIssue',
-
   nodes() {
     return [{
       name: 'confluenceJiraIssue',
       node: confluenceJiraIssue
     }];
   },
-
   pmPlugins() {
     return [{
       name: 'jiraIssue',
       plugin: createPlugin
     }];
   }
-
 });
-
 export default jiraIssuePlugin;

package/dist/es2019/plugins/layout/actions.js

@@ -10,72 +10,58 @@ import { pluginKey } from './pm-plugins/plugin-key';
 export const ONE_COL_LAYOUTS = ['single'];
 export const TWO_COL_LAYOUTS = ['two_equal', 'two_left_sidebar', 'two_right_sidebar'];
 export const THREE_COL_LAYOUTS = ['three_equal', 'three_with_sidebars'];
-
 const getWidthsForPreset = presetLayout => {
   switch (presetLayout) {
     case 'single':
       return [100];
-
     case 'two_equal':
       return [50, 50];
-
     case 'three_equal':
       return [33.33, 33.33, 33.33];
-
     case 'two_left_sidebar':
       return [33.33, 66.66];
-
     case 'two_right_sidebar':
       return [66.66, 33.33];
-
     case 'three_with_sidebars':
       return [25, 50, 25];
   }
 };
+
 /**
  * Finds layout preset based on the width attrs of all the layoutColumn nodes
  * inside the layoutSection node
  */
-
-
 export const getPresetLayout = section => {
   const widths = mapChildren(section, column => column.attrs.width).join(',');
-
   switch (widths) {
     case '100':
       return 'single';
-
     case '33.33,33.33,33.33':
       return 'three_equal';
-
     case '25,50,25':
       return 'three_with_sidebars';
-
     case '50,50':
       return 'two_equal';
-
     case '33.33,66.66':
       return 'two_left_sidebar';
-
     case '66.66,33.33':
       return 'two_right_sidebar';
   }
-
   return;
 };
 export const getSelectedLayout = (maybeLayoutSection, current) => {
   if (maybeLayoutSection && getPresetLayout(maybeLayoutSection)) {
     return getPresetLayout(maybeLayoutSection) || current;
   }
-
   return current;
 };
 export const createDefaultLayoutSection = state => {
   const {
     layoutSection,
     layoutColumn
-  } = state.schema.nodes; // create a 50-50 layout by default
+  } = state.schema.nodes;
 
+  // create a 50-50 layout by default
   const columns = Fragment.fromArray([layoutColumn.createAndFill({
     width: 50
   }), layoutColumn.createAndFill({
@@ -87,7 +73,6 @@ export const insertLayoutColumns = (state, dispatch) => {
   if (dispatch) {
     dispatch(safeInsert(createDefaultLayoutSection(state))(state.tr));
   }
-
   return true;
 };
 export const insertLayoutColumnsWithAnalytics = inputMethod => withAnalytics({
@@ -99,16 +84,15 @@ export const insertLayoutColumnsWithAnalytics = inputMethod => withAnalytics({
   },
   eventType: EVENT_TYPE.TRACK
 })(insertLayoutColumns);
+
 /**
  * Add a column to the right of existing layout
  */
-
 function addColumn(schema, pos) {
   return tr => {
     tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos), schema.nodes.layoutColumn.createAndFill());
   };
 }
-
 function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
   return tr => {
     if (isEmptyDocument(column)) {
@@ -118,59 +102,63 @@ function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
     }
   };
 }
-
 const fromTwoColsToThree = addColumn;
 const fromOneColToTwo = addColumn;
 const fromTwoColsToOne = removeLastColumnInLayout;
 const fromThreeColsToTwo = removeLastColumnInLayout;
-
 const fromOneColToThree = (schema, pos) => {
   return tr => {
     addColumn(schema, pos)(tr);
     addColumn(schema, pos)(tr);
   };
 };
-
 const fromThreeColstoOne = (node, tr, insideRightEdgePos) => {
   const thirdColumn = node.content.child(2);
   fromThreeColsToTwo(thirdColumn, insideRightEdgePos - thirdColumn.nodeSize, insideRightEdgePos)(tr);
   const secondColumn = node.content.child(1);
   fromTwoColsToOne(secondColumn, insideRightEdgePos - thirdColumn.nodeSize - secondColumn.nodeSize, insideRightEdgePos)(tr);
 };
+
 /**
  * Handles switching from 2 -> 3 cols, or 3 -> 2 cols
  * Switching from 2 -> 3 just adds a new one at the end
  * Switching from 3 -> 2 moves all the content of the third col inside the second before
  * removing it
  */
-
-
 function forceColumnStructure(state, node, pos, presetLayout) {
   const tr = state.tr;
   const insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
-  const numCols = node.childCount; // 3 columns -> 2 columns
+  const numCols = node.childCount;
 
+  // 3 columns -> 2 columns
   if (TWO_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 3) {
     const thirdColumn = node.content.child(2);
     const columnPos = insideRightEdgeOfLayoutSection - thirdColumn.nodeSize;
-    fromThreeColsToTwo(thirdColumn, columnPos, insideRightEdgeOfLayoutSection)(tr); // 2 columns -> 3 columns
+    fromThreeColsToTwo(thirdColumn, columnPos, insideRightEdgeOfLayoutSection)(tr);
+
+    // 2 columns -> 3 columns
   } else if (THREE_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 2) {
-    fromTwoColsToThree(state.schema, insideRightEdgeOfLayoutSection)(tr); // 2 columns -> 1 column
+    fromTwoColsToThree(state.schema, insideRightEdgeOfLayoutSection)(tr);
+
+    // 2 columns -> 1 column
   } else if (ONE_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 2) {
     const secondColumn = node.content.child(1);
     const columnPos = insideRightEdgeOfLayoutSection - secondColumn.nodeSize;
-    fromTwoColsToOne(secondColumn, columnPos, insideRightEdgeOfLayoutSection)(tr); // 3 columns -> 1 column
+    fromTwoColsToOne(secondColumn, columnPos, insideRightEdgeOfLayoutSection)(tr);
+
+    // 3 columns -> 1 column
   } else if (ONE_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 3) {
-    fromThreeColstoOne(node, tr, insideRightEdgeOfLayoutSection); // 1 column -> 2 columns
+    fromThreeColstoOne(node, tr, insideRightEdgeOfLayoutSection);
+
+    // 1 column -> 2 columns
   } else if (TWO_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 1) {
-    fromOneColToTwo(state.schema, insideRightEdgeOfLayoutSection)(tr); // 1 column -> 3 columns
+    fromOneColToTwo(state.schema, insideRightEdgeOfLayoutSection)(tr);
+    // 1 column -> 3 columns
   } else if (THREE_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 1) {
     fromOneColToThree(state.schema, insideRightEdgeOfLayoutSection)(tr);
   }
-
   return tr;
 }
-
 function columnWidth(node, schema, widths) {
   const {
     layoutColumn
@@ -178,7 +166,8 @@ function columnWidth(node, schema, widths) {
   const truncatedWidths = widths.map(w => Number(w.toFixed(2)));
   return flatmap(node.content, (column, idx) => {
     if (column.type === layoutColumn) {
-      return layoutColumn.create({ ...column.attrs,
+      return layoutColumn.create({
+        ...column.attrs,
         width: truncatedWidths[idx]
       }, column.content, column.marks);
     } else {
@@ -186,22 +175,19 @@ function columnWidth(node, schema, widths) {
     }
   });
 }
-
 function forceColumnWidths(state, tr, pos, presetLayout) {
   const node = tr.doc.nodeAt(pos);
-
   if (!node) {
     return tr;
   }
-
   return tr.replaceWith(pos + 1, pos + node.nodeSize - 1, columnWidth(node, state.schema, getWidthsForPreset(presetLayout)));
 }
-
 export function forceSectionToPresetLayout(state, node, pos, presetLayout) {
-  let tr = forceColumnStructure(state, node, pos, presetLayout); // save the selection here, since forcing column widths causes a change over the
+  let tr = forceColumnStructure(state, node, pos, presetLayout);
+
+  // save the selection here, since forcing column widths causes a change over the
   // entire layoutSection, which remaps selection to the end. not remapping here
   // is safe because the structure is no longer changing.
-
   const selection = tr.selection;
   tr = forceColumnWidths(state, tr, pos, presetLayout);
   const selectionPos$ = tr.doc.resolve(selection.$from.pos);
@@ -212,19 +198,14 @@ export const setPresetLayout = layout => (state, dispatch) => {
     pos,
     selectedLayout
   } = pluginKey.getState(state);
-
   if (selectedLayout === layout || pos === null) {
     return false;
   }
-
   const node = state.doc.nodeAt(pos);
-
   if (!node) {
     return false;
   }
-
   let tr = forceSectionToPresetLayout(state, node, pos, layout);
-
   if (tr) {
     tr = addAnalytics(state, tr, {
       action: ACTION.CHANGED_LAYOUT,
@@ -236,27 +217,21 @@ export const setPresetLayout = layout => (state, dispatch) => {
       eventType: EVENT_TYPE.TRACK
     });
     tr.setMeta('scrollIntoView', false);
-
     if (dispatch) {
       dispatch(tr);
     }
-
     return true;
   }
-
   return false;
 };
-
 function layoutNeedChanges(node) {
   return !getPresetLayout(node);
 }
-
 function getLayoutChange(node, pos, schema) {
   if (node.type === schema.nodes.layoutSection) {
     if (!layoutNeedChanges(node)) {
       return;
     }
-
     const presetLayout = node.childCount === 2 ? 'two_equal' : node.childCount === 3 ? 'three_equal' : 'single';
     const fixedColumns = columnWidth(node, schema, getWidthsForPreset(presetLayout));
     return {
@@ -266,46 +241,39 @@ function getLayoutChange(node, pos, schema) {
     };
   }
 }
-
 export const fixColumnSizes = (changedTr, state) => {
   const {
     layoutSection
   } = state.schema.nodes;
   let change;
   const range = getStepRange(changedTr);
-
   if (!range) {
     return undefined;
   }
-
   changedTr.doc.nodesBetween(range.from, range.to, (node, pos) => {
     if (node.type !== layoutSection) {
       return true; // Check all internal nodes expect for layout section
-    } // Node is a section
-
-
+    }
+    // Node is a section
     if (layoutNeedChanges(node)) {
       change = getLayoutChange(node, pos, state.schema);
     }
-
     return false; // We dont go deep, We dont accept nested layouts
-  }); // Hack to prevent: https://product-fabric.atlassian.net/browse/ED-7523
+  });
+
+  // Hack to prevent: https://product-fabric.atlassian.net/browse/ED-7523
   // By default prosemirror try to recreate the node with the default attributes
   // The default attribute is invalid adf though. when this happen the node after
   // current position is a layout section
-
   const $pos = changedTr.doc.resolve(range.to);
-
   if ($pos.depth > 0) {
     // 'range.to' position could resolve to doc, in this ResolvedPos.after will throws
     const pos = $pos.after();
     const node = changedTr.doc.nodeAt(pos);
-
     if (node && node.type === layoutSection && layoutNeedChanges(node)) {
       change = getLayoutChange(node, pos, state.schema);
     }
   }
-
   return change;
 };
 export const fixColumnStructure = state => {
@@ -313,15 +281,12 @@ export const fixColumnStructure = state => {
     pos,
     selectedLayout
   } = pluginKey.getState(state);
-
   if (pos !== null && selectedLayout) {
     const node = state.doc.nodeAt(pos);
-
     if (node && node.childCount !== getWidthsForPreset(selectedLayout).length) {
       return forceSectionToPresetLayout(state, node, pos, selectedLayout);
     }
   }
-
   return;
 };
 export const deleteActiveLayoutNode = (state, dispatch) => {
@@ -329,10 +294,8 @@ export const deleteActiveLayoutNode = (state, dispatch) => {
     pos,
     selectedLayout
   } = pluginKey.getState(state);
-
   if (pos !== null) {
     const node = state.doc.nodeAt(pos);
-
     if (dispatch) {
       let tr = state.tr.delete(pos, pos + node.nodeSize);
       tr = addAnalytics(state, tr, {
@@ -345,30 +308,22 @@ export const deleteActiveLayoutNode = (state, dispatch) => {
       });
       dispatch(tr);
     }
-
     return true;
   }
-
   return false;
 };
-
 const formatLayoutName = layout => {
   switch (layout) {
     case 'single':
       return LAYOUT_TYPE.SINGLE_COL;
-
     case 'two_equal':
       return LAYOUT_TYPE.TWO_COLS_EQUAL;
-
     case 'three_equal':
       return LAYOUT_TYPE.THREE_COLS_EQUAL;
-
     case 'two_left_sidebar':
       return LAYOUT_TYPE.LEFT_SIDEBAR;
-
     case 'two_right_sidebar':
       return LAYOUT_TYPE.RIGHT_SIDEBAR;
-
     case 'three_with_sidebars':
       return LAYOUT_TYPE.THREE_WITH_SIDEBARS;
   }

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

@@ -8,10 +8,8 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, IN
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { pluginKey } from './pm-plugins/plugin-key';
 export { pluginKey };
-
 const layoutPlugin = (options = {}) => ({
   name: 'layout',
-
   nodes() {
     return [{
       name: 'layoutSection',
@@ -21,14 +19,12 @@ const layoutPlugin = (options = {}) => ({
       node: layoutColumn
     }];
   },
-
   pmPlugins() {
     return [{
       name: 'layout',
       plugin: () => createLayoutPlugin(options)
     }];
   },
-
   pluginsOptions: {
     floatingToolbar(state, intl) {
       const {
@@ -37,14 +33,11 @@ const layoutPlugin = (options = {}) => ({
         addSidebarLayouts,
         allowSingleColumnLayout
       } = pluginKey.getState(state);
-
       if (pos !== null) {
         return buildToolbar(state, intl, pos, allowBreakout, addSidebarLayouts, allowSingleColumnLayout);
       }
-
       return undefined;
     },
-
     quickInsert: ({
       formatMessage
     }) => [{
@@ -54,7 +47,6 @@ const layoutPlugin = (options = {}) => ({
       keywords: ['column', 'section'],
       priority: 1100,
       icon: () => /*#__PURE__*/React.createElement(IconLayout, null),
-
       action(insert, state) {
         const tr = insert(createDefaultLayoutSection(state));
         return addAnalytics(state, tr, {
@@ -67,9 +59,7 @@ const layoutPlugin = (options = {}) => ({
           eventType: EVENT_TYPE.TRACK
         });
       }
-
     }]
   }
 });
-
 export default layoutPlugin;

package/dist/es2019/plugins/layout/pm-plugins/main.js

@@ -8,19 +8,15 @@ import { createSelectionClickHandler } from '../../selection/utils';
 import { fixColumnSizes, fixColumnStructure, getSelectedLayout } from '../actions';
 import { pluginKey } from './plugin-key';
 export const DEFAULT_LAYOUT = 'two_equal';
-
 const isWholeSelectionInsideLayoutColumn = state => {
   // Since findParentNodeOfType doesn't check if selection.to shares the parent, we do this check ourselves
   const fromParent = findParentNodeOfType(state.schema.nodes.layoutColumn)(state.selection);
-
   if (fromParent) {
     const isToPosInsideSameLayoutColumn = state.selection.from < fromParent.pos + fromParent.node.nodeSize;
     return isToPosInsideSameLayoutColumn;
   }
-
   return false;
 };
-
 const moveCursorToNextColumn = (state, dispatch) => {
   const {
     selection
@@ -35,24 +31,20 @@ const moveCursorToNextColumn = (state, dispatch) => {
   } = state;
   const section = findParentNodeOfType(layoutSection)(selection);
   const column = findParentNodeOfType(layoutColumn)(selection);
-
   if (column.node !== section.node.lastChild) {
     const $nextColumn = state.doc.resolve(column.pos + column.node.nodeSize);
     const shiftedSelection = TextSelection.findFrom($nextColumn, 1);
-
     if (dispatch) {
       dispatch(state.tr.setSelection(shiftedSelection));
     }
   }
-
   return true;
-}; // TODO: Look at memoize-one-ing this fn
-
+};
 
+// TODO: Look at memoize-one-ing this fn
 const getNodeDecoration = (pos, node) => [Decoration.node(pos, pos + node.nodeSize, {
   class: 'selected'
 })];
-
 const getInitialPluginState = (options, state) => {
   const maybeLayoutSection = findParentNodeOfType(state.schema.nodes.layoutSection)(state.selection);
   const allowBreakout = options.allowBreakout || false;
@@ -68,7 +60,6 @@ const getInitialPluginState = (options, state) => {
     allowSingleColumnLayout
   };
 };
-
 export default (options => new SafePlugin({
   key: pluginKey,
   state: {
@@ -84,27 +75,24 @@ export default (options => new SafePlugin({
           selection
         } = newState;
         const maybeLayoutSection = findParentNodeOfType(layoutSection)(selection) || findSelectedNodeOfType([layoutSection])(selection);
-        const newPluginState = { ...pluginState,
+        const newPluginState = {
+          ...pluginState,
           pos: maybeLayoutSection ? maybeLayoutSection.pos : null,
           selectedLayout: getSelectedLayout(maybeLayoutSection && maybeLayoutSection.node, pluginState.selectedLayout)
         };
         return newPluginState;
       }
-
       return pluginState;
     }
   },
   props: {
     decorations(state) {
       const layoutState = pluginKey.getState(state);
-
       if (layoutState.pos !== null) {
         return DecorationSet.create(state.doc, getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)));
       }
-
       return undefined;
     },
-
     handleKeyDown: keydownHandler({
       Tab: filter(isWholeSelectionInsideLayoutColumn, moveCursorToNextColumn)
     }),
@@ -123,36 +111,33 @@ export default (options => new SafePlugin({
           to: prevTr.mapping.map(change.to),
           slice: change.slice
         };
-      }); // don't consider transactions that don't mutate
+      });
 
+      // don't consider transactions that don't mutate
       if (!prevTr.docChanged) {
         return;
       }
-
       const change = fixColumnSizes(prevTr, newState);
-
       if (change) {
         changes.push(change);
       }
     });
-
     if (changes.length) {
       let tr = newState.tr;
       const selection = newState.selection.toJSON();
       changes.forEach(change => {
         tr.replaceRange(change.from, change.to, change.slice);
-      }); // selecting and deleting across columns in 3 col layouts can remove
-      // a layoutColumn so we fix the structure here
+      });
 
+      // selecting and deleting across columns in 3 col layouts can remove
+      // a layoutColumn so we fix the structure here
       tr = fixColumnStructure(newState) || tr;
-
       if (tr.docChanged) {
         tr.setSelection(Selection.fromJSON(tr.doc, selection));
         tr.setMeta('addToHistory', false);
         return tr;
       }
     }
-
     return;
   }
 }));

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

@@ -43,7 +43,6 @@ const SIDEBAR_LAYOUT_TYPES = [{
   title: toolbarMessages.threeColumnsWithSidebars,
   icon: LayoutThreeWithSidebarsIcon
 }];
-
 const buildLayoutButton = (intl, item, currentLayout) => ({
   id: item.id,
   type: 'button',
@@ -54,11 +53,9 @@ const buildLayoutButton = (intl, item, currentLayout) => ({
   selected: !!currentLayout && currentLayout === item.type,
   tabIndex: null
 });
-
 export const layoutToolbarTitle = 'Layout floating controls';
 export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout) => {
   const node = state.doc.nodeAt(pos);
-
   if (node) {
     const currentLayout = getPresetLayout(node);
     const separator = {
@@ -96,6 +93,5 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
       scrollable: true
     };
   }
-
   return;
 };