@atlaskit/editor-plugin-selection-extension 3.4.4 → 3.4.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-selection-extension
 
+## 3.4.5
+
+### Patch Changes
+
+- [`fa1ff19077d8b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fa1ff19077d8b) -
+  Update getSelectionAdf api to return adf fragment under flag
+
 ## 3.4.4
 
 ### Patch Changes

package/dist/cjs/pm-plugins/utils/index.js

@@ -4,14 +4,22 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateSelectedNode = exports.getSelectionTextInfo = exports.getSelectionAdfInfo = void 0;
+exports.getFragmentInfoFromSelection = void 0;
+exports.getSelectionAdfInfo = getSelectionAdfInfo;
+exports.validateSelectedNode = exports.getSelectionTextInfo = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _editorTables = require("@atlaskit/editor-tables");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _getBoundingBoxFromSelection = require("../../ui/getBoundingBoxFromSelection");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var getSelectedRect = function getSelectedRect(selection) {
   var $anchorCell = selection.$anchorCell,
     $headCell = selection.$headCell;
@@ -33,7 +41,7 @@ var getSelectionInfoFromSameNode = function getSelectionInfoFromSameNode(selecti
       },
       end: {
         pointer: "/content/".concat($from.index(), "/text"),
-        position: $to.parentOffset - 1
+        position: $to.parentOffset
       }
     }],
     nodePos: $from.before() // position before the selection
@@ -80,11 +88,32 @@ var getSelectionTextInfo = exports.getSelectionTextInfo = function getSelectionT
     coords: coords
   };
 };
-var getSelectionAdfInfo = exports.getSelectionAdfInfo = function getSelectionAdfInfo(state) {
+var getFragmentInfoFromSelection = exports.getFragmentInfoFromSelection = function getFragmentInfoFromSelection(state) {
+  var schema = state.schema,
+    selection = state.selection;
+  var slice = selection.content();
+  var newDoc;
+  try {
+    var _schema = state.schema;
+    var doc = _schema.node('doc', null, [_schema.node('paragraph', null, [])]);
+    var transform = new _transform.Transform(doc);
+    newDoc = transform.replaceRange(0, 2, slice).doc;
+  } catch (error) {
+    newDoc = schema.nodes.doc.createChecked({}, _model.Fragment.empty);
+    (0, _monitoring.logException)(error, {
+      location: 'editor-plugin-selection-extension'
+    });
+  }
+  var serializer = new _editorJsonTransformer.JSONTransformer();
+  var selectedNodeAdf = serializer.encodeNode(newDoc);
+  return {
+    selectedNodeAdf: selectedNodeAdf
+  };
+};
+function getSelectionAdfInfo(state) {
   var selection = state.selection;
   var selectionInfo = {
     selectedNode: selection.$from.node(),
-    selectionRanges: [],
     nodePos: selection.$from.before() // default to the position before the selection
   };
   if (selection instanceof _state.TextSelection) {
@@ -99,18 +128,11 @@ var getSelectionAdfInfo = exports.getSelectionAdfInfo = function getSelectionAdf
     selectionInfo = getSelectionInfoFromCellSelection(selection);
   }
   var serializer = new _editorJsonTransformer.JSONTransformer();
-  var _selectionInfo = selectionInfo,
-    selectionRanges = _selectionInfo.selectionRanges,
-    selectedNode = _selectionInfo.selectedNode,
-    nodePos = _selectionInfo.nodePos;
-  var selectedNodeAdf = serializer.encodeNode(selectedNode);
-  return {
-    selectedNodeAdf: selectedNodeAdf,
-    selectionRanges: selectionRanges,
-    selectedNode: selectedNode,
-    nodePos: nodePos
-  };
-};
+  var selectedNodeAdf = serializer.encodeNode(selectionInfo.selectedNode);
+  return _objectSpread(_objectSpread({}, selectionInfo), {}, {
+    selectedNodeAdf: selectedNodeAdf
+  });
+}
 var validateSelectedNode = exports.validateSelectedNode = function validateSelectedNode(selectedNodeAdf, selectedNode) {
   var serializer = new _editorJsonTransformer.JSONTransformer();
   var selectedNodeAdfFromState = serializer.encodeNode(selectedNode);

package/dist/cjs/selectionExtensionPlugin.js

@@ -127,6 +127,17 @@ var selectionExtensionPlugin = exports.selectionExtensionPlugin = function selec
           selectionRanges: selectionRanges
         };
       },
+      getDocumentFromSelection: function getDocumentFromSelection() {
+        if (!editorViewRef.current) {
+          return null;
+        }
+        var state = editorViewRef.current.state;
+        var _getFragmentInfoFromS = (0, _utils.getFragmentInfoFromSelection)(state),
+          selectedNodeAdf = _getFragmentInfoFromS.selectedNodeAdf;
+        return {
+          selectedNodeAdf: selectedNodeAdf
+        };
+      },
       getSelectionText: function getSelectionText() {
         if (!editorViewRef.current) {
           return null;

package/dist/es2019/pm-plugins/utils/index.js

@@ -1,6 +1,9 @@
 import isEqual from 'lodash/isEqual';
+import { logException } from '@atlaskit/editor-common/monitoring';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { Transform } from '@atlaskit/editor-prosemirror/transform';
 import { akEditorFullPageToolbarHeight } from '@atlaskit/editor-shared-styles';
 import { CellSelection, TableMap } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -30,7 +33,7 @@ const getSelectionInfoFromSameNode = selection => {
       },
       end: {
         pointer: `/content/${$from.index()}/text`,
-        position: $to.parentOffset - 1
+        position: $to.parentOffset
       }
     }],
     nodePos: $from.before() // position before the selection
@@ -81,11 +84,36 @@ export const getSelectionTextInfo = (view, api) => {
     coords
   };
 };
-export const getSelectionAdfInfo = state => {
+export const getFragmentInfoFromSelection = state => {
+  const {
+    schema,
+    selection
+  } = state;
+  const slice = selection.content();
+  let newDoc;
+  try {
+    const {
+      schema
+    } = state;
+    const doc = schema.node('doc', null, [schema.node('paragraph', null, [])]);
+    const transform = new Transform(doc);
+    newDoc = transform.replaceRange(0, 2, slice).doc;
+  } catch (error) {
+    newDoc = schema.nodes.doc.createChecked({}, Fragment.empty);
+    logException(error, {
+      location: 'editor-plugin-selection-extension'
+    });
+  }
+  const serializer = new JSONTransformer();
+  const selectedNodeAdf = serializer.encodeNode(newDoc);
+  return {
+    selectedNodeAdf
+  };
+};
+export function getSelectionAdfInfo(state) {
   const selection = state.selection;
   let selectionInfo = {
     selectedNode: selection.$from.node(),
-    selectionRanges: [],
     nodePos: selection.$from.before() // default to the position before the selection
   };
   if (selection instanceof TextSelection) {
@@ -102,19 +130,12 @@ export const getSelectionAdfInfo = state => {
     selectionInfo = getSelectionInfoFromCellSelection(selection);
   }
   const serializer = new JSONTransformer();
-  const {
-    selectionRanges,
-    selectedNode,
-    nodePos
-  } = selectionInfo;
-  const selectedNodeAdf = serializer.encodeNode(selectedNode);
+  const selectedNodeAdf = serializer.encodeNode(selectionInfo.selectedNode);
   return {
-    selectedNodeAdf,
-    selectionRanges,
-    selectedNode,
-    nodePos
+    ...selectionInfo,
+    selectedNodeAdf
   };
-};
+}
 export const validateSelectedNode = (selectedNodeAdf, selectedNode) => {
   const serializer = new JSONTransformer();
   const selectedNodeAdfFromState = serializer.encodeNode(selectedNode);

package/dist/es2019/selectionExtensionPlugin.js

@@ -6,7 +6,7 @@ import { insertSmartLinks } from './pm-plugins/actions';
 import { insertAdfAtEndOfDoc } from './pm-plugins/actions/insertAdfAtEndOfDoc';
 import { replaceWithAdf } from './pm-plugins/actions/replaceWithAdf';
 import { createPlugin, selectionExtensionPluginKey } from './pm-plugins/main';
-import { getSelectionAdfInfo, getSelectionTextInfo } from './pm-plugins/utils';
+import { getFragmentInfoFromSelection, getSelectionAdfInfo, getSelectionTextInfo } from './pm-plugins/utils';
 import { SelectionExtensionActionTypes } from './types';
 import { SelectionExtensionComponentWrapper } from './ui/extension/SelectionExtensionComponentWrapper';
 import { getMenuItemExtensions, getToolbarItemExtensions } from './ui/extensions';
@@ -120,6 +120,20 @@ export const selectionExtensionPlugin = ({
           selectionRanges
         };
       },
+      getDocumentFromSelection: () => {
+        if (!editorViewRef.current) {
+          return null;
+        }
+        const {
+          state
+        } = editorViewRef.current;
+        const {
+          selectedNodeAdf
+        } = getFragmentInfoFromSelection(state);
+        return {
+          selectedNodeAdf
+        };
+      },
       getSelectionText: () => {
         if (!editorViewRef.current) {
           return null;

package/dist/esm/pm-plugins/utils/index.js

@@ -1,6 +1,12 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import isEqual from 'lodash/isEqual';
+import { logException } from '@atlaskit/editor-common/monitoring';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { Transform } from '@atlaskit/editor-prosemirror/transform';
 import { akEditorFullPageToolbarHeight } from '@atlaskit/editor-shared-styles';
 import { CellSelection, TableMap } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -26,7 +32,7 @@ var getSelectionInfoFromSameNode = function getSelectionInfoFromSameNode(selecti
       },
       end: {
         pointer: "/content/".concat($from.index(), "/text"),
-        position: $to.parentOffset - 1
+        position: $to.parentOffset
       }
     }],
     nodePos: $from.before() // position before the selection
@@ -73,11 +79,32 @@ export var getSelectionTextInfo = function getSelectionTextInfo(view, api) {
     coords: coords
   };
 };
-export var getSelectionAdfInfo = function getSelectionAdfInfo(state) {
+export var getFragmentInfoFromSelection = function getFragmentInfoFromSelection(state) {
+  var schema = state.schema,
+    selection = state.selection;
+  var slice = selection.content();
+  var newDoc;
+  try {
+    var _schema = state.schema;
+    var doc = _schema.node('doc', null, [_schema.node('paragraph', null, [])]);
+    var transform = new Transform(doc);
+    newDoc = transform.replaceRange(0, 2, slice).doc;
+  } catch (error) {
+    newDoc = schema.nodes.doc.createChecked({}, Fragment.empty);
+    logException(error, {
+      location: 'editor-plugin-selection-extension'
+    });
+  }
+  var serializer = new JSONTransformer();
+  var selectedNodeAdf = serializer.encodeNode(newDoc);
+  return {
+    selectedNodeAdf: selectedNodeAdf
+  };
+};
+export function getSelectionAdfInfo(state) {
   var selection = state.selection;
   var selectionInfo = {
     selectedNode: selection.$from.node(),
-    selectionRanges: [],
     nodePos: selection.$from.before() // default to the position before the selection
   };
   if (selection instanceof TextSelection) {
@@ -92,18 +119,11 @@ export var getSelectionAdfInfo = function getSelectionAdfInfo(state) {
     selectionInfo = getSelectionInfoFromCellSelection(selection);
   }
   var serializer = new JSONTransformer();
-  var _selectionInfo = selectionInfo,
-    selectionRanges = _selectionInfo.selectionRanges,
-    selectedNode = _selectionInfo.selectedNode,
-    nodePos = _selectionInfo.nodePos;
-  var selectedNodeAdf = serializer.encodeNode(selectedNode);
-  return {
-    selectedNodeAdf: selectedNodeAdf,
-    selectionRanges: selectionRanges,
-    selectedNode: selectedNode,
-    nodePos: nodePos
-  };
-};
+  var selectedNodeAdf = serializer.encodeNode(selectionInfo.selectedNode);
+  return _objectSpread(_objectSpread({}, selectionInfo), {}, {
+    selectedNodeAdf: selectedNodeAdf
+  });
+}
 export var validateSelectedNode = function validateSelectedNode(selectedNodeAdf, selectedNode) {
   var serializer = new JSONTransformer();
   var selectedNodeAdfFromState = serializer.encodeNode(selectedNode);

package/dist/esm/selectionExtensionPlugin.js

@@ -7,7 +7,7 @@ import { insertSmartLinks as _insertSmartLinks } from './pm-plugins/actions';
 import { insertAdfAtEndOfDoc as _insertAdfAtEndOfDoc } from './pm-plugins/actions/insertAdfAtEndOfDoc';
 import { replaceWithAdf as _replaceWithAdf } from './pm-plugins/actions/replaceWithAdf';
 import { createPlugin, selectionExtensionPluginKey } from './pm-plugins/main';
-import { getSelectionAdfInfo, getSelectionTextInfo } from './pm-plugins/utils';
+import { getFragmentInfoFromSelection, getSelectionAdfInfo, getSelectionTextInfo } from './pm-plugins/utils';
 import { SelectionExtensionActionTypes } from './types';
 import { SelectionExtensionComponentWrapper } from './ui/extension/SelectionExtensionComponentWrapper';
 import { getMenuItemExtensions, getToolbarItemExtensions } from './ui/extensions';
@@ -120,6 +120,17 @@ export var selectionExtensionPlugin = function selectionExtensionPlugin(_ref) {
           selectionRanges: selectionRanges
         };
       },
+      getDocumentFromSelection: function getDocumentFromSelection() {
+        if (!editorViewRef.current) {
+          return null;
+        }
+        var state = editorViewRef.current.state;
+        var _getFragmentInfoFromS = getFragmentInfoFromSelection(state),
+          selectedNodeAdf = _getFragmentInfoFromS.selectedNodeAdf;
+        return {
+          selectedNodeAdf: selectedNodeAdf
+        };
+      },
       getSelectionText: function getSelectionText() {
         if (!editorViewRef.current) {
           return null;

package/dist/types/pm-plugins/utils/index.d.ts

@@ -1,6 +1,6 @@
 import { type ADFEntity } from '@atlaskit/adf-utils/types';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { type EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { SelectionExtensionPlugin } from '../../selectionExtensionPluginType';
@@ -8,11 +8,14 @@ import type { SelectionExtensionSelectionInfo } from '../../types';
 import { type SelectionRange } from '../../types';
 type SelectionInfo = {
     selectedNodeAdf: ADFEntity;
-    selectionRanges: SelectionRange[];
+    selectionRanges?: SelectionRange[];
     selectedNode: PMNode;
     nodePos: number;
 };
 export declare const getSelectionTextInfo: (view: EditorView, api?: ExtractInjectionAPI<SelectionExtensionPlugin>) => SelectionExtensionSelectionInfo;
-export declare const getSelectionAdfInfo: (state: EditorState) => SelectionInfo;
+export declare const getFragmentInfoFromSelection: (state: EditorState) => {
+    selectedNodeAdf: ADFEntity;
+};
+export declare function getSelectionAdfInfo(state: EditorState): SelectionInfo;
 export declare const validateSelectedNode: (selectedNodeAdf: ADFEntity, selectedNode: PMNode) => boolean;
 export {};

package/dist/types/selectionExtensionPluginType.d.ts

@@ -31,6 +31,9 @@ export type SelectionExtensionPlugin = NextEditorPlugin<'selectionExtension', {
         replaceWithAdf: (nodeAdf: ADFEntity) => ReplaceWithAdfResult;
         insertAdfAtEndOfDoc: (nodeAdf: ADFEntity) => InsertAdfAtEndOfDocResult;
         getSelectionAdf: () => SelectionAdfResult;
+        getDocumentFromSelection: () => {
+            selectedNodeAdf?: ADFEntity;
+        } | null;
         getSelectionText: () => SelectionTextResult;
     };
 }>;

package/dist/types/types/index.d.ts

@@ -48,7 +48,7 @@ export type SelectionRange = {
 };
 export type SelectionExtensionFnOptions = {
     selectedNodeAdf: ADFEntity;
-    selectionRanges: SelectionRange[];
+    selectionRanges?: SelectionRange[];
 };
 export type SelectionExtensionFn = ({ selectedNodeAdf, selectionRanges, }: SelectionExtensionFnOptions) => DynamicSelectionExtension;
 export type SelectionExtensionConfig = SelectionExtension | SelectionExtensionFn;

package/dist/types-ts4.5/pm-plugins/utils/index.d.ts

@@ -1,6 +1,6 @@
 import { type ADFEntity } from '@atlaskit/adf-utils/types';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { type EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { SelectionExtensionPlugin } from '../../selectionExtensionPluginType';
@@ -8,11 +8,14 @@ import type { SelectionExtensionSelectionInfo } from '../../types';
 import { type SelectionRange } from '../../types';
 type SelectionInfo = {
     selectedNodeAdf: ADFEntity;
-    selectionRanges: SelectionRange[];
+    selectionRanges?: SelectionRange[];
     selectedNode: PMNode;
     nodePos: number;
 };
 export declare const getSelectionTextInfo: (view: EditorView, api?: ExtractInjectionAPI<SelectionExtensionPlugin>) => SelectionExtensionSelectionInfo;
-export declare const getSelectionAdfInfo: (state: EditorState) => SelectionInfo;
+export declare const getFragmentInfoFromSelection: (state: EditorState) => {
+    selectedNodeAdf: ADFEntity;
+};
+export declare function getSelectionAdfInfo(state: EditorState): SelectionInfo;
 export declare const validateSelectedNode: (selectedNodeAdf: ADFEntity, selectedNode: PMNode) => boolean;
 export {};

package/dist/types-ts4.5/selectionExtensionPluginType.d.ts

@@ -31,6 +31,9 @@ export type SelectionExtensionPlugin = NextEditorPlugin<'selectionExtension', {
         replaceWithAdf: (nodeAdf: ADFEntity) => ReplaceWithAdfResult;
         insertAdfAtEndOfDoc: (nodeAdf: ADFEntity) => InsertAdfAtEndOfDocResult;
         getSelectionAdf: () => SelectionAdfResult;
+        getDocumentFromSelection: () => {
+            selectedNodeAdf?: ADFEntity;
+        } | null;
         getSelectionText: () => SelectionTextResult;
     };
 }>;

package/dist/types-ts4.5/types/index.d.ts

@@ -48,7 +48,7 @@ export type SelectionRange = {
 };
 export type SelectionExtensionFnOptions = {
     selectedNodeAdf: ADFEntity;
-    selectionRanges: SelectionRange[];
+    selectionRanges?: SelectionRange[];
 };
 export type SelectionExtensionFn = ({ selectedNodeAdf, selectionRanges, }: SelectionExtensionFnOptions) => DynamicSelectionExtension;
 export type SelectionExtensionConfig = SelectionExtension | SelectionExtensionFn;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-extension",
-	"version": "3.4.4",
+	"version": "3.4.5",
 	"description": "editor-plugin-selection-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",