@atlaskit/editor-plugin-block-controls 1.4.32 → 1.4.33

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 1.4.33
+
+### Patch Changes
+
+- [#111344](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/111344)
+  [`a89589001c3b1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a89589001c3b1) -
+  [ED-23591] Select media node when there is only one within mediaGroup
+- [#114726](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114726)
+  [`3735569cbd151`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3735569cbd151) -
+  ED-23811 Set selection when command+shift+up is pressed in blocks plugin
+- Updated dependencies
+
 ## 1.4.32
 
 ### Patch Changes

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

@@ -10,6 +10,7 @@ var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -299,6 +300,22 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
             (0, _handleMouseOver.handleMouseOver)(view, event, api);
           }
           return false;
+        },
+        keydown: function keydown(view, event) {
+          // Command + Shift + ArrowUp to select was broken with the plugin enabled so this manually sets the selection
+          var _view$state = view.state,
+            selection = _view$state.selection,
+            doc = _view$state.doc,
+            tr = _view$state.tr;
+          var metaKey = _utils.browser.mac ? event.metaKey : event.ctrlKey;
+          if (event.key === 'ArrowUp' && event.shiftKey && metaKey) {
+            if (selection instanceof _state.TextSelection || selection instanceof _state.NodeSelection) {
+              var newSelection = _state.TextSelection.create(doc, selection.head, 1);
+              view.dispatch(tr.setSelection(newSelection));
+              return true;
+            }
+          }
+          return false;
         }
       }
     },

package/dist/cjs/utils/getSelection.js

@@ -15,6 +15,10 @@ var getSelection = exports.getSelection = function getSelection(tr, start) {
   // decisionList node is not selectable, but we want to select the whole node not just text
   if (isNodeSelection || (node === null || node === void 0 ? void 0 : node.type.name) === 'decisionList') {
     return new _state.NodeSelection($startPos);
+    // TODO: support multiple nodes selection
+  } else if ((node === null || node === void 0 ? void 0 : node.type.name) === 'mediaGroup' && node.childCount === 1) {
+    var $mediaStartPos = tr.doc.resolve(start + 1);
+    return new _state.NodeSelection($mediaStartPos);
   } else {
     // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
     // Find the first inline node in the node

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

@@ -2,7 +2,8 @@ import rafSchedule from 'raf-schd';
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { browser } from '@atlaskit/editor-common/utils';
+import { NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
@@ -294,6 +295,23 @@ export const createPlugin = api => {
             handleMouseOver(view, event, api);
           }
           return false;
+        },
+        keydown(view, event) {
+          // Command + Shift + ArrowUp to select was broken with the plugin enabled so this manually sets the selection
+          const {
+            selection,
+            doc,
+            tr
+          } = view.state;
+          const metaKey = browser.mac ? event.metaKey : event.ctrlKey;
+          if (event.key === 'ArrowUp' && event.shiftKey && metaKey) {
+            if (selection instanceof TextSelection || selection instanceof NodeSelection) {
+              const newSelection = TextSelection.create(doc, selection.head, 1);
+              view.dispatch(tr.setSelection(newSelection));
+              return true;
+            }
+          }
+          return false;
         }
       }
     },

package/dist/es2019/utils/getSelection.js

@@ -9,6 +9,10 @@ export const getSelection = (tr, start) => {
   // decisionList node is not selectable, but we want to select the whole node not just text
   if (isNodeSelection || (node === null || node === void 0 ? void 0 : node.type.name) === 'decisionList') {
     return new NodeSelection($startPos);
+    // TODO: support multiple nodes selection
+  } else if ((node === null || node === void 0 ? void 0 : node.type.name) === 'mediaGroup' && node.childCount === 1) {
+    const $mediaStartPos = tr.doc.resolve(start + 1);
+    return new NodeSelection($mediaStartPos);
   } else {
     // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
     // Find the first inline node in the node

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

@@ -3,7 +3,8 @@ import rafSchedule from 'raf-schd';
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { browser } from '@atlaskit/editor-common/utils';
+import { NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
@@ -292,6 +293,22 @@ export var createPlugin = function createPlugin(api) {
             handleMouseOver(view, event, api);
           }
           return false;
+        },
+        keydown: function keydown(view, event) {
+          // Command + Shift + ArrowUp to select was broken with the plugin enabled so this manually sets the selection
+          var _view$state = view.state,
+            selection = _view$state.selection,
+            doc = _view$state.doc,
+            tr = _view$state.tr;
+          var metaKey = browser.mac ? event.metaKey : event.ctrlKey;
+          if (event.key === 'ArrowUp' && event.shiftKey && metaKey) {
+            if (selection instanceof TextSelection || selection instanceof NodeSelection) {
+              var newSelection = TextSelection.create(doc, selection.head, 1);
+              view.dispatch(tr.setSelection(newSelection));
+              return true;
+            }
+          }
+          return false;
         }
       }
     },

package/dist/esm/utils/getSelection.js

@@ -9,6 +9,10 @@ export var getSelection = function getSelection(tr, start) {
   // decisionList node is not selectable, but we want to select the whole node not just text
   if (isNodeSelection || (node === null || node === void 0 ? void 0 : node.type.name) === 'decisionList') {
     return new NodeSelection($startPos);
+    // TODO: support multiple nodes selection
+  } else if ((node === null || node === void 0 ? void 0 : node.type.name) === 'mediaGroup' && node.childCount === 1) {
+    var $mediaStartPos = tr.doc.resolve(start + 1);
+    return new NodeSelection($mediaStartPos);
   } else {
     // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
     // Find the first inline node in the node

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "1.4.32",
+	"version": "1.4.33",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/editor-shared-styles": "^2.12.0",
 		"@atlaskit/editor-tables": "^2.7.0",
-		"@atlaskit/icon": "^22.4.0",
+		"@atlaskit/icon": "^22.5.0",
 		"@atlaskit/platform-feature-flags": "^0.2.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.3.0",