@atlaskit/editor-core 153.1.2 → 153.1.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 153.1.3
+
+### Patch Changes
+
+- [`fa87054a61a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fa87054a61a) - workaround issue where prosemirrors new drag selection delay logic breaks safaris table selections.
+
 ## 153.1.2
 
 ### Patch Changes

package/dist/cjs/plugins/table/index.js

@@ -9,9 +9,11 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _utils = require("@atlaskit/editor-common/utils");
+
 var _pmPlugins = require("@atlaskit/editor-tables/pm-plugins");
 
-var _utils = require("@atlaskit/editor-tables/utils");
+var _utils2 = require("@atlaskit/editor-tables/utils");
 
 var _adfSchema = require("@atlaskit/adf-schema");
 
@@ -29,6 +31,8 @@ var _createPluginConfig = require("./create-plugin-config");
 
 var _tableLocalId = require("./pm-plugins/table-local-id");
 
+var _safariDelayedDomSelectionSyncingWorkaround = require("./pm-plugins/safari-delayed-dom-selection-syncing-workaround");
+
 var _plugin = require("./pm-plugins/decorations/plugin");
 
 var _keymap = require("./pm-plugins/keymap");
@@ -55,7 +59,7 @@ var _FloatingInsertButton = _interopRequireDefault(require("./ui/FloatingInsertB
 
 var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
 
-var _utils2 = require("./utils");
+var _utils3 = require("./utils");
 
 var _featureFlagsContext = require("../feature-flags-context");
 
@@ -80,7 +84,7 @@ var tablesPlugin = function tablesPlugin(options) {
       }];
     },
     pmPlugins: function pmPlugins() {
-      return [{
+      var plugins = [{
         name: 'table',
         plugin: function plugin(_ref) {
           var dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
@@ -150,7 +154,20 @@ var tablesPlugin = function tablesPlugin(options) {
           var dispatch = _ref6.dispatch;
           return (0, _tableLocalId.createPlugin)(dispatch);
         }
-      }];
+      }]; // workaround for prosemirrors delayed dom selection syncing during pointer drag
+      // causing issues with table selections in Safari
+      // https://github.com/ProseMirror/prosemirror-view/commit/885258b80551ac87b81601d3ed25f552aeb22293
+
+      if (_utils.browser.safari) {
+        plugins.push({
+          name: 'tableSafariDelayedDomSelectionSyncingWorkaround',
+          plugin: function plugin() {
+            return (0, _safariDelayedDomSelectionSyncingWorkaround.createPlugin)();
+          }
+        });
+      }
+
+      return plugins;
     },
     contentComponent: function contentComponent(_ref7) {
       var editorView = _ref7.editorView,
@@ -234,7 +251,7 @@ var tablesPlugin = function tablesPlugin(options) {
             scrollableElement: popupsScrollableElement,
             stickyHeaders: stickyHeader,
             isNumberColumnEnabled: tableNode && tableNode.attrs.isNumberColumnEnabled
-          }), (0, _utils2.isLayoutSupported)(state) && options && options.breakoutEnabled && /*#__PURE__*/_react.default.createElement(_LayoutButton.default, {
+          }), (0, _utils3.isLayoutSupported)(state) && options && options.breakoutEnabled && /*#__PURE__*/_react.default.createElement(_LayoutButton.default, {
             editorView: editorView,
             mountPoint: popupsMountPoint,
             boundariesElement: popupsBoundariesElement,
@@ -261,7 +278,7 @@ var tablesPlugin = function tablesPlugin(options) {
             return /*#__PURE__*/_react.default.createElement(_assets.IconTable, null);
           },
           action: function action(insert, state) {
-            var tr = insert((0, _utils.createTable)({
+            var tr = insert((0, _utils2.createTable)({
               schema: state.schema
             }));
             return (0, _analytics.addAnalytics)(state, tr, {

package/dist/cjs/plugins/table/pm-plugins/safari-delayed-dom-selection-syncing-workaround.js

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.tableSafariDelayedDomSelectionSyncingWorkaroundKey = exports.createPlugin = void 0;
+
+var _prosemirrorState = require("prosemirror-state");
+
+var tableSafariDelayedDomSelectionSyncingWorkaroundKey = new _prosemirrorState.PluginKey('tableSafariDelayedDomSelectionSyncingWorkaround');
+exports.tableSafariDelayedDomSelectionSyncingWorkaroundKey = tableSafariDelayedDomSelectionSyncingWorkaroundKey;
+
+var createPlugin = function createPlugin() {
+  // From a review of the prosemirror-view source code,
+  // the only places where a view relies on the presence
+  // of view.mouseDown are;
+  //   - when checking it's presence in selectionToDOM
+  //     to delay drag selections
+  //   - to ensure it is cleaned up when the mouseup
+  //     event is not fired in a previous mousedown event
+  // Because we are manually wiping the view.mouseDown,
+  // we manage this custom cleanup ourselves
+  var prevMouseDownDone = null;
+  return new _prosemirrorState.Plugin({
+    key: tableSafariDelayedDomSelectionSyncingWorkaroundKey,
+    props: {
+      handleDOMEvents: {
+        mousedown: function mousedown(view) {
+          // Workaround issue in safari where table selections
+          //  do not work correctly since prosemirror delayed
+          // DOM selection syncing during pointer drag.
+          //
+          // https://github.com/ProseMirror/prosemirror-view/commit/885258b80551ac87b81601d3ed25f552aeb22293
+          // This fix removes the selectionToDOM from the view
+          // prior to selectionToDOM being called.
+          // selectionToDOM checks if there is an "active"
+          // mouseDown, and if so, it delays running logic
+          // which causes the table selections issue.
+          // The handleDOMEvents are called before ProseMirror
+          // events fired on the editable DOM element.
+          // This means the view.mouseView will not yet be
+          // created when the mousedown event starts.
+          // https://prosemirror.net/docs/ref/#view.EditorProps.handleDOMEvents
+          //
+          // Because selectionToDOM is only added to the script
+          // tasks queue following the mousedown event, we can
+          // prepend a task which will clear the mouseDown from
+          // the view. We do this using a setTimout with no
+          // interval.
+          if (prevMouseDownDone) {
+            // avoid memory leaks when the mouseup event is not fired
+            // in a previous mousedown event
+            prevMouseDownDone();
+          }
+
+          setTimeout(function () {
+            // the ts-ignores here are required due to the
+            // view.mouseDown being an internal which is
+            // not part of the views type signature
+            // @ts-ignore
+            if (view.mouseDown) {
+              // @ts-ignore
+              prevMouseDownDone = view.mouseDown.done.bind(view.mouseDown); // @ts-ignore
+
+              view.mouseDown = null;
+            }
+          });
+          return false;
+        }
+      }
+    }
+  });
+};
+
+exports.createPlugin = createPlugin;

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "153.1.2";
+var version = "153.1.3";
 exports.version = version;
 
 var nextMajorVersion = function nextMajorVersion() {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "153.1.2",
+	"version": "153.1.3",
 	"sideEffects": false
 }

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import { browser } from '@atlaskit/editor-common/utils';
 import { tableEditing } from '@atlaskit/editor-tables/pm-plugins';
 import { createTable } from '@atlaskit/editor-tables/utils';
 import { table, tableCell, tableHeader, tableRow } from '@atlaskit/adf-schema';
@@ -9,6 +10,7 @@ import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { IconTable } from '../quick-insert/assets';
 import { pluginConfig } from './create-plugin-config';
 import { createPlugin as createTableLocalIdPlugin } from './pm-plugins/table-local-id';
+import { createPlugin as createTableSafariDelayedDomSelectionSyncingWorkaroundPlugin } from './pm-plugins/safari-delayed-dom-selection-syncing-workaround';
 import { createPlugin as createDecorationsPlugin } from './pm-plugins/decorations/plugin';
 import { keymapPlugin } from './pm-plugins/keymap';
 import { tableSelectionKeymapPlugin } from './pm-plugins/table-selection-keymap';
@@ -46,7 +48,7 @@ const tablesPlugin = options => ({
   },
 
   pmPlugins() {
-    return [{
+    const plugins = [{
       name: 'table',
       plugin: ({
         dispatchAnalyticsEvent,
@@ -106,7 +108,20 @@ const tablesPlugin = options => ({
       plugin: ({
         dispatch
       }) => createTableLocalIdPlugin(dispatch)
-    }];
+    }]; // workaround for prosemirrors delayed dom selection syncing during pointer drag
+    // causing issues with table selections in Safari
+    // https://github.com/ProseMirror/prosemirror-view/commit/885258b80551ac87b81601d3ed25f552aeb22293
+
+    if (browser.safari) {
+      plugins.push({
+        name: 'tableSafariDelayedDomSelectionSyncingWorkaround',
+        plugin: () => {
+          return createTableSafariDelayedDomSelectionSyncingWorkaroundPlugin();
+        }
+      });
+    }
+
+    return plugins;
   },
 
   contentComponent({

package/dist/es2019/plugins/table/pm-plugins/safari-delayed-dom-selection-syncing-workaround.js

@@ -0,0 +1,63 @@
+import { PluginKey, Plugin } from 'prosemirror-state';
+export const tableSafariDelayedDomSelectionSyncingWorkaroundKey = new PluginKey('tableSafariDelayedDomSelectionSyncingWorkaround');
+export const createPlugin = () => {
+  // From a review of the prosemirror-view source code,
+  // the only places where a view relies on the presence
+  // of view.mouseDown are;
+  //   - when checking it's presence in selectionToDOM
+  //     to delay drag selections
+  //   - to ensure it is cleaned up when the mouseup
+  //     event is not fired in a previous mousedown event
+  // Because we are manually wiping the view.mouseDown,
+  // we manage this custom cleanup ourselves
+  let prevMouseDownDone = null;
+  return new Plugin({
+    key: tableSafariDelayedDomSelectionSyncingWorkaroundKey,
+    props: {
+      handleDOMEvents: {
+        mousedown: view => {
+          // Workaround issue in safari where table selections
+          //  do not work correctly since prosemirror delayed
+          // DOM selection syncing during pointer drag.
+          //
+          // https://github.com/ProseMirror/prosemirror-view/commit/885258b80551ac87b81601d3ed25f552aeb22293
+          // This fix removes the selectionToDOM from the view
+          // prior to selectionToDOM being called.
+          // selectionToDOM checks if there is an "active"
+          // mouseDown, and if so, it delays running logic
+          // which causes the table selections issue.
+          // The handleDOMEvents are called before ProseMirror
+          // events fired on the editable DOM element.
+          // This means the view.mouseView will not yet be
+          // created when the mousedown event starts.
+          // https://prosemirror.net/docs/ref/#view.EditorProps.handleDOMEvents
+          //
+          // Because selectionToDOM is only added to the script
+          // tasks queue following the mousedown event, we can
+          // prepend a task which will clear the mouseDown from
+          // the view. We do this using a setTimout with no
+          // interval.
+          if (prevMouseDownDone) {
+            // avoid memory leaks when the mouseup event is not fired
+            // in a previous mousedown event
+            prevMouseDownDone();
+          }
+
+          setTimeout(() => {
+            // the ts-ignores here are required due to the
+            // view.mouseDown being an internal which is
+            // not part of the views type signature
+            // @ts-ignore
+            if (view.mouseDown) {
+              // @ts-ignore
+              prevMouseDownDone = view.mouseDown.done.bind(view.mouseDown); // @ts-ignore
+
+              view.mouseDown = null;
+            }
+          });
+          return false;
+        }
+      }
+    }
+  });
+};

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "153.1.2";
+export const version = "153.1.3";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "153.1.2",
+	"version": "153.1.3",
 	"sideEffects": false
 }

package/dist/esm/plugins/table/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { browser } from '@atlaskit/editor-common/utils';
 import { tableEditing } from '@atlaskit/editor-tables/pm-plugins';
 import { createTable } from '@atlaskit/editor-tables/utils';
 import { table, tableCell, tableHeader, tableRow } from '@atlaskit/adf-schema';
@@ -9,6 +10,7 @@ import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { IconTable } from '../quick-insert/assets';
 import { pluginConfig } from './create-plugin-config';
 import { createPlugin as createTableLocalIdPlugin } from './pm-plugins/table-local-id';
+import { createPlugin as createTableSafariDelayedDomSelectionSyncingWorkaroundPlugin } from './pm-plugins/safari-delayed-dom-selection-syncing-workaround';
 import { createPlugin as createDecorationsPlugin } from './pm-plugins/decorations/plugin';
 import { keymapPlugin } from './pm-plugins/keymap';
 import { tableSelectionKeymapPlugin } from './pm-plugins/table-selection-keymap';
@@ -45,7 +47,7 @@ var tablesPlugin = function tablesPlugin(options) {
       }];
     },
     pmPlugins: function pmPlugins() {
-      return [{
+      var plugins = [{
         name: 'table',
         plugin: function plugin(_ref) {
           var dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
@@ -115,7 +117,20 @@ var tablesPlugin = function tablesPlugin(options) {
           var dispatch = _ref6.dispatch;
           return createTableLocalIdPlugin(dispatch);
         }
-      }];
+      }]; // workaround for prosemirrors delayed dom selection syncing during pointer drag
+      // causing issues with table selections in Safari
+      // https://github.com/ProseMirror/prosemirror-view/commit/885258b80551ac87b81601d3ed25f552aeb22293
+
+      if (browser.safari) {
+        plugins.push({
+          name: 'tableSafariDelayedDomSelectionSyncingWorkaround',
+          plugin: function plugin() {
+            return createTableSafariDelayedDomSelectionSyncingWorkaroundPlugin();
+          }
+        });
+      }
+
+      return plugins;
     },
     contentComponent: function contentComponent(_ref7) {
       var editorView = _ref7.editorView,

package/dist/esm/plugins/table/pm-plugins/safari-delayed-dom-selection-syncing-workaround.js

@@ -0,0 +1,63 @@
+import { PluginKey, Plugin } from 'prosemirror-state';
+export var tableSafariDelayedDomSelectionSyncingWorkaroundKey = new PluginKey('tableSafariDelayedDomSelectionSyncingWorkaround');
+export var createPlugin = function createPlugin() {
+  // From a review of the prosemirror-view source code,
+  // the only places where a view relies on the presence
+  // of view.mouseDown are;
+  //   - when checking it's presence in selectionToDOM
+  //     to delay drag selections
+  //   - to ensure it is cleaned up when the mouseup
+  //     event is not fired in a previous mousedown event
+  // Because we are manually wiping the view.mouseDown,
+  // we manage this custom cleanup ourselves
+  var prevMouseDownDone = null;
+  return new Plugin({
+    key: tableSafariDelayedDomSelectionSyncingWorkaroundKey,
+    props: {
+      handleDOMEvents: {
+        mousedown: function mousedown(view) {
+          // Workaround issue in safari where table selections
+          //  do not work correctly since prosemirror delayed
+          // DOM selection syncing during pointer drag.
+          //
+          // https://github.com/ProseMirror/prosemirror-view/commit/885258b80551ac87b81601d3ed25f552aeb22293
+          // This fix removes the selectionToDOM from the view
+          // prior to selectionToDOM being called.
+          // selectionToDOM checks if there is an "active"
+          // mouseDown, and if so, it delays running logic
+          // which causes the table selections issue.
+          // The handleDOMEvents are called before ProseMirror
+          // events fired on the editable DOM element.
+          // This means the view.mouseView will not yet be
+          // created when the mousedown event starts.
+          // https://prosemirror.net/docs/ref/#view.EditorProps.handleDOMEvents
+          //
+          // Because selectionToDOM is only added to the script
+          // tasks queue following the mousedown event, we can
+          // prepend a task which will clear the mouseDown from
+          // the view. We do this using a setTimout with no
+          // interval.
+          if (prevMouseDownDone) {
+            // avoid memory leaks when the mouseup event is not fired
+            // in a previous mousedown event
+            prevMouseDownDone();
+          }
+
+          setTimeout(function () {
+            // the ts-ignores here are required due to the
+            // view.mouseDown being an internal which is
+            // not part of the views type signature
+            // @ts-ignore
+            if (view.mouseDown) {
+              // @ts-ignore
+              prevMouseDownDone = view.mouseDown.done.bind(view.mouseDown); // @ts-ignore
+
+              view.mouseDown = null;
+            }
+          });
+          return false;
+        }
+      }
+    }
+  });
+};

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "153.1.2";
+export var version = "153.1.3";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "153.1.2",
+	"version": "153.1.3",
 	"sideEffects": false
 }

package/dist/types/plugins/table/pm-plugins/safari-delayed-dom-selection-syncing-workaround.d.ts

@@ -0,0 +1,3 @@
+import { PluginKey, Plugin } from 'prosemirror-state';
+export declare const tableSafariDelayedDomSelectionSyncingWorkaroundKey: PluginKey<any, any>;
+export declare const createPlugin: () => Plugin<any, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "153.1.2",
+  "version": "153.1.3",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -50,7 +50,7 @@
     "@atlaskit/emoji": "^64.0.0",
     "@atlaskit/empty-state": "^7.3.0",
     "@atlaskit/form": "^8.4.0",
-    "@atlaskit/icon": "^21.9.2",
+    "@atlaskit/icon": "^21.10.0",
     "@atlaskit/icon-object": "^6.2.0",
     "@atlaskit/item": "^12.0.0",
     "@atlaskit/locale": "^2.3.0",
@@ -75,10 +75,10 @@
     "@atlaskit/task-decision": "^17.2.0",
     "@atlaskit/textarea": "^4.2.0",
     "@atlaskit/textfield": "^5.1.0",
-    "@atlaskit/theme": "^12.0.0",
-    "@atlaskit/toggle": "^12.3.0",
+    "@atlaskit/theme": "^12.1.0",
+    "@atlaskit/toggle": "^12.4.0",
     "@atlaskit/tooltip": "^17.5.0",
-    "@atlaskit/user-picker": "^8.2.0",
+    "@atlaskit/user-picker": "^8.3.0",
     "@atlaskit/util-service-support": "^6.0.0",
     "@atlaskit/width-detector": "^3.0.0",
     "@babel/runtime": "^7.0.0",
@@ -138,7 +138,7 @@
   },
   "devDependencies": {
     "@atlaskit/atlassian-navigation": "^2.0.0",
-    "@atlaskit/breadcrumbs": "11.4.1",
+    "@atlaskit/breadcrumbs": "11.5.0",
     "@atlaskit/code": "^14.3.0",
     "@atlaskit/collab-provider": "7.1.3",
     "@atlaskit/docs": "*",
@@ -147,7 +147,7 @@
     "@atlaskit/editor-bitbucket-transformer": "^7.2.0",
     "@atlaskit/editor-extension-dropbox": "^0.2.0",
     "@atlaskit/editor-test-helpers": "^16.0.0",
-    "@atlaskit/flag": "^14.4.0",
+    "@atlaskit/flag": "^14.5.0",
     "@atlaskit/inline-dialog": "^13.2.0",
     "@atlaskit/lozenge": "^11.1.0",
     "@atlaskit/media-core": "^32.2.0",
@@ -155,7 +155,7 @@
     "@atlaskit/media-test-helpers": "^29.0.0",
     "@atlaskit/menu": "^1.2.0",
     "@atlaskit/page-layout": "^1.0.1",
-    "@atlaskit/profilecard": "^16.0.0",
+    "@atlaskit/profilecard": "^16.2.0",
     "@atlaskit/pubsub": "^6.0.0",
     "@atlaskit/renderer": "^84.1.0",
     "@atlaskit/section-message": "^6.1.0",
@@ -163,10 +163,10 @@
     "@atlaskit/smart-card": "^17.0.0",
     "@atlaskit/synchrony-test-helpers": "^2.3.0",
     "@atlaskit/textarea": "^4.2.0",
-    "@atlaskit/toggle": "^12.3.0",
+    "@atlaskit/toggle": "^12.4.0",
     "@atlaskit/ufo": "^0.0.6",
-    "@atlaskit/user-picker": "^8.2.0",
-    "@atlaskit/util-data-test": "^17.0.0",
+    "@atlaskit/user-picker": "^8.3.0",
+    "@atlaskit/util-data-test": "^17.1.0",
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",