@atlaskit/editor-plugin-paste 4.1.1 → 4.1.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-paste
 
+## 4.1.2
+
+### Patch Changes
+
+- [#193268](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/193268)
+  [`4a345f374785e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4a345f374785e) -
+  [ux] ED-28208 Fix pasting table into selected table results in a nested table
+- Updated dependencies
+
 ## 4.1.1
 
 ### Patch Changes

package/dist/cjs/pm-plugins/main.js

@@ -23,6 +23,7 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = require("../editor-actions/actions");
 var _commands = require("../editor-commands/commands");
@@ -34,6 +35,9 @@ var _util = require("./util");
 var _handleVSCodeBlock = require("./util/edge-cases/handleVSCodeBlock");
 var _handlers = require("./util/handlers");
 var _tinyMCE = require("./util/tinyMCE");
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var isInsideBlockQuote = exports.isInsideBlockQuote = function isInsideBlockQuote(state) {
   var blockquote = state.schema.nodes.blockquote;
   return (0, _utils2.hasParentNodeOfType)(blockquote)(state.selection);
@@ -212,6 +216,25 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
             dispatchAnalyticsEvent(payload);
           }
         });
+        var getLastPastedSlice = function getLastPastedSlice(tr) {
+          var slice;
+          var _iterator = _createForOfIteratorHelper(tr.steps),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var step = _step.value;
+              var stepSlice = (0, _utils.extractSliceFromStep)(step);
+              if (stepSlice) {
+                slice = stepSlice;
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          return slice;
+        };
         // creating a custom dispatch because we want to add a meta whenever we do a paste.
         var dispatch = function dispatch(tr) {
           var _state$doc$resolve$no;
@@ -255,25 +278,50 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           // we make sure to call paste options toolbar
           // only for a valid paste action
           if (isDocChanged) {
-            var _input;
-            var pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
-            var pasteEndPos = tr.selection.to;
-            var contentPasted = {
-              pasteStartPos: pasteStartPos,
-              pasteEndPos: pasteEndPos,
-              text: text,
-              isShiftPressed: Boolean(
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
-              isPlainText: Boolean(isPlainText),
-              pastedSlice: tr.doc.slice(pasteStartPos, pasteEndPos),
-              pastedAt: Date.now(),
-              pasteSource: (0, _util.getPasteSource)(event)
-            };
-            tr.setMeta(_pluginFactory.pluginKey, {
-              type: _actions.PastePluginActionTypes.ON_PASTE,
-              contentPasted: contentPasted
-            });
+            if ((0, _expValEquals.expValEquals)('platform_editor_pasting_nested_table_fix', 'isEnabled', true)) {
+              var pastedSlice = getLastPastedSlice(tr);
+              if (pastedSlice) {
+                var _input;
+                var pasteStartPos = state.selection.from;
+                var pasteEndPos = tr.selection.to;
+                var contentPasted = {
+                  pasteStartPos: pasteStartPos,
+                  pasteEndPos: pasteEndPos,
+                  text: text,
+                  isShiftPressed: Boolean(
+                  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                  view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
+                  isPlainText: Boolean(isPlainText),
+                  pastedSlice: pastedSlice,
+                  pastedAt: Date.now(),
+                  pasteSource: (0, _util.getPasteSource)(event)
+                };
+                tr.setMeta(_pluginFactory.pluginKey, {
+                  type: _actions.PastePluginActionTypes.ON_PASTE,
+                  contentPasted: contentPasted
+                });
+              }
+            } else {
+              var _input2;
+              var _pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
+              var _pasteEndPos = tr.selection.to;
+              var _contentPasted = {
+                pasteStartPos: _pasteStartPos,
+                pasteEndPos: _pasteEndPos,
+                text: text,
+                isShiftPressed: Boolean(
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                view.shiftKey || ((_input2 = view.input) === null || _input2 === void 0 ? void 0 : _input2.shiftKey)),
+                isPlainText: Boolean(isPlainText),
+                pastedSlice: tr.doc.slice(_pasteStartPos, _pasteEndPos),
+                pastedAt: Date.now(),
+                pasteSource: (0, _util.getPasteSource)(event)
+              };
+              tr.setMeta(_pluginFactory.pluginKey, {
+                type: _actions.PastePluginActionTypes.ON_PASTE,
+                contentPasted: _contentPasted
+              });
+            }
           }
 
           // the handlePaste definition overrides the generic prosemirror behaviour which would previously

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

@@ -13,6 +13,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { contains, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { PastePluginActionTypes } from '../editor-actions/actions';
 import { splitParagraphs, upgradeTextToLists } from '../editor-commands/commands';
@@ -184,6 +185,16 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             dispatchAnalyticsEvent(payload);
           }
         });
+        const getLastPastedSlice = tr => {
+          let slice;
+          for (const step of tr.steps) {
+            const stepSlice = extractSliceFromStep(step);
+            if (stepSlice) {
+              slice = stepSlice;
+            }
+          }
+          return slice;
+        };
         // creating a custom dispatch because we want to add a meta whenever we do a paste.
         const dispatch = tr => {
           var _state$doc$resolve$no;
@@ -229,25 +240,50 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // we make sure to call paste options toolbar
           // only for a valid paste action
           if (isDocChanged) {
-            var _input;
-            const pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
-            const pasteEndPos = tr.selection.to;
-            const contentPasted = {
-              pasteStartPos,
-              pasteEndPos,
-              text,
-              isShiftPressed: Boolean(
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
-              isPlainText: Boolean(isPlainText),
-              pastedSlice: tr.doc.slice(pasteStartPos, pasteEndPos),
-              pastedAt: Date.now(),
-              pasteSource: getPasteSource(event)
-            };
-            tr.setMeta(stateKey, {
-              type: PastePluginActionTypes.ON_PASTE,
-              contentPasted
-            });
+            if (expValEquals('platform_editor_pasting_nested_table_fix', 'isEnabled', true)) {
+              const pastedSlice = getLastPastedSlice(tr);
+              if (pastedSlice) {
+                var _input;
+                const pasteStartPos = state.selection.from;
+                const pasteEndPos = tr.selection.to;
+                const contentPasted = {
+                  pasteStartPos,
+                  pasteEndPos,
+                  text,
+                  isShiftPressed: Boolean(
+                  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                  view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
+                  isPlainText: Boolean(isPlainText),
+                  pastedSlice,
+                  pastedAt: Date.now(),
+                  pasteSource: getPasteSource(event)
+                };
+                tr.setMeta(stateKey, {
+                  type: PastePluginActionTypes.ON_PASTE,
+                  contentPasted
+                });
+              }
+            } else {
+              var _input2;
+              const pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
+              const pasteEndPos = tr.selection.to;
+              const contentPasted = {
+                pasteStartPos,
+                pasteEndPos,
+                text,
+                isShiftPressed: Boolean(
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                view.shiftKey || ((_input2 = view.input) === null || _input2 === void 0 ? void 0 : _input2.shiftKey)),
+                isPlainText: Boolean(isPlainText),
+                pastedSlice: tr.doc.slice(pasteStartPos, pasteEndPos),
+                pastedAt: Date.now(),
+                pasteSource: getPasteSource(event)
+              };
+              tr.setMeta(stateKey, {
+                type: PastePluginActionTypes.ON_PASTE,
+                contentPasted
+              });
+            }
           }
 
           // the handlePaste definition overrides the generic prosemirror behaviour which would previously

package/dist/esm/pm-plugins/main.js

@@ -1,5 +1,8 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import uuid from 'uuid';
 import { ACTION, INPUT_METHOD, PasteTypes } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
@@ -15,6 +18,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { contains, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { PastePluginActionTypes } from '../editor-actions/actions';
 import { splitParagraphs, upgradeTextToLists } from '../editor-commands/commands';
@@ -204,6 +208,25 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             dispatchAnalyticsEvent(payload);
           }
         });
+        var getLastPastedSlice = function getLastPastedSlice(tr) {
+          var slice;
+          var _iterator = _createForOfIteratorHelper(tr.steps),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var step = _step.value;
+              var stepSlice = extractSliceFromStep(step);
+              if (stepSlice) {
+                slice = stepSlice;
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          return slice;
+        };
         // creating a custom dispatch because we want to add a meta whenever we do a paste.
         var dispatch = function dispatch(tr) {
           var _state$doc$resolve$no;
@@ -247,25 +270,50 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // we make sure to call paste options toolbar
           // only for a valid paste action
           if (isDocChanged) {
-            var _input;
-            var pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
-            var pasteEndPos = tr.selection.to;
-            var contentPasted = {
-              pasteStartPos: pasteStartPos,
-              pasteEndPos: pasteEndPos,
-              text: text,
-              isShiftPressed: Boolean(
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
-              isPlainText: Boolean(isPlainText),
-              pastedSlice: tr.doc.slice(pasteStartPos, pasteEndPos),
-              pastedAt: Date.now(),
-              pasteSource: getPasteSource(event)
-            };
-            tr.setMeta(stateKey, {
-              type: PastePluginActionTypes.ON_PASTE,
-              contentPasted: contentPasted
-            });
+            if (expValEquals('platform_editor_pasting_nested_table_fix', 'isEnabled', true)) {
+              var pastedSlice = getLastPastedSlice(tr);
+              if (pastedSlice) {
+                var _input;
+                var pasteStartPos = state.selection.from;
+                var pasteEndPos = tr.selection.to;
+                var contentPasted = {
+                  pasteStartPos: pasteStartPos,
+                  pasteEndPos: pasteEndPos,
+                  text: text,
+                  isShiftPressed: Boolean(
+                  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                  view.shiftKey || ((_input = view.input) === null || _input === void 0 ? void 0 : _input.shiftKey)),
+                  isPlainText: Boolean(isPlainText),
+                  pastedSlice: pastedSlice,
+                  pastedAt: Date.now(),
+                  pasteSource: getPasteSource(event)
+                };
+                tr.setMeta(stateKey, {
+                  type: PastePluginActionTypes.ON_PASTE,
+                  contentPasted: contentPasted
+                });
+              }
+            } else {
+              var _input2;
+              var _pasteStartPos = Math.min(state.selection.anchor, state.selection.head);
+              var _pasteEndPos = tr.selection.to;
+              var _contentPasted = {
+                pasteStartPos: _pasteStartPos,
+                pasteEndPos: _pasteEndPos,
+                text: text,
+                isShiftPressed: Boolean(
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                view.shiftKey || ((_input2 = view.input) === null || _input2 === void 0 ? void 0 : _input2.shiftKey)),
+                isPlainText: Boolean(isPlainText),
+                pastedSlice: tr.doc.slice(_pasteStartPos, _pasteEndPos),
+                pastedAt: Date.now(),
+                pasteSource: getPasteSource(event)
+              };
+              tr.setMeta(stateKey, {
+                type: PastePluginActionTypes.ON_PASTE,
+                contentPasted: _contentPasted
+              });
+            }
           }
 
           // the handlePaste definition overrides the generic prosemirror behaviour which would previously

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "4.1.1",
+	"version": "4.1.2",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,13 +46,13 @@
 		"@atlaskit/media-client": "^35.2.0",
 		"@atlaskit/media-common": "^12.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^9.17.0",
+		"@atlaskit/tmp-editor-statsig": "^9.18.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.12.0",
+		"@atlaskit/editor-common": "^107.14.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},