@atlaskit/editor-plugin-block-controls 3.13.1 → 3.13.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.13.3
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.13.2
+
+### Patch Changes
+
+- [#149332](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/149332)
+  [`592aba2930c2a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/592aba2930c2a) -
+  Fix cursor not show issue when tabbing from page title
+- Updated dependencies
+
 ## 3.13.1
 
 ### Patch Changes

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

@@ -11,6 +11,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _browser = require("@atlaskit/editor-common/browser");
 var _performanceMeasures = require("@atlaskit/editor-common/performance-measures");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
@@ -350,6 +351,10 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
     shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
   }
+  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7')) {
+    // Remove handle dec when editor is blurred
+    shouldRemoveHandle = shouldRemoveHandle || (meta === null || meta === void 0 ? void 0 : meta.editorBlurred);
+  }
   if (shouldRemoveHandle) {
     var _activeNode5, _activeNode6;
     var oldHandle = (0, _decorationsDragHandle.findHandleDec)(decorations, (_activeNode5 = activeNode) === null || _activeNode5 === void 0 ? void 0 : _activeNode5.pos, (_activeNode6 = activeNode) === null || _activeNode6 === void 0 ? void 0 : _activeNode6.pos);
@@ -648,6 +653,26 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
               isShiftDown: false
             })));
           }
+        },
+        blur: function blur(view, event) {
+          if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7')) {
+            var _api$core2;
+            var isChildOfEditor = event.relatedTarget instanceof HTMLElement && event.relatedTarget.closest("#".concat(_ui.EDIT_AREA_ID)) !== null;
+
+            // don't do anything if the event target is a child of the editor or if the editor has focus
+            if (isChildOfEditor || view.hasFocus()) {
+              return false;
+            }
+            api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref6) {
+              var tr = _ref6.tr;
+              var currMeta = tr.getMeta(key);
+              tr.setMeta(key, _objectSpread(_objectSpread({}, currMeta), {}, {
+                editorBlurred: true
+              }));
+              return tr;
+            });
+            return false;
+          }
         }
       }
     },

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

@@ -3,6 +3,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { browser } from '@atlaskit/editor-common/browser';
 import { isMeasuring, startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { EDIT_AREA_ID } from '@atlaskit/editor-common/ui';
 import { isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
@@ -348,6 +349,10 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
     shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
   }
+  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+    // Remove handle dec when editor is blurred
+    shouldRemoveHandle = shouldRemoveHandle || (meta === null || meta === void 0 ? void 0 : meta.editorBlurred);
+  }
   if (shouldRemoveHandle) {
     var _activeNode5, _activeNode6;
     const oldHandle = findHandleDec(decorations, (_activeNode5 = activeNode) === null || _activeNode5 === void 0 ? void 0 : _activeNode5.pos, (_activeNode6 = activeNode) === null || _activeNode6 === void 0 ? void 0 : _activeNode6.pos);
@@ -656,6 +661,28 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
               isShiftDown: false
             }));
           }
+        },
+        blur(view, event) {
+          if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+            var _api$core2;
+            const isChildOfEditor = event.relatedTarget instanceof HTMLElement && event.relatedTarget.closest(`#${EDIT_AREA_ID}`) !== null;
+
+            // don't do anything if the event target is a child of the editor or if the editor has focus
+            if (isChildOfEditor || view.hasFocus()) {
+              return false;
+            }
+            api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
+              tr
+            }) => {
+              const currMeta = tr.getMeta(key);
+              tr.setMeta(key, {
+                ...currMeta,
+                editorBlurred: true
+              });
+              return tr;
+            });
+            return false;
+          }
         }
       }
     },

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

@@ -6,6 +6,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { browser } from '@atlaskit/editor-common/browser';
 import { isMeasuring, startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { EDIT_AREA_ID } from '@atlaskit/editor-common/ui';
 import { isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
@@ -343,6 +344,10 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
     shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
   }
+  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+    // Remove handle dec when editor is blurred
+    shouldRemoveHandle = shouldRemoveHandle || (meta === null || meta === void 0 ? void 0 : meta.editorBlurred);
+  }
   if (shouldRemoveHandle) {
     var _activeNode5, _activeNode6;
     var oldHandle = findHandleDec(decorations, (_activeNode5 = activeNode) === null || _activeNode5 === void 0 ? void 0 : _activeNode5.pos, (_activeNode6 = activeNode) === null || _activeNode6 === void 0 ? void 0 : _activeNode6.pos);
@@ -642,6 +647,26 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
               isShiftDown: false
             })));
           }
+        },
+        blur: function blur(view, event) {
+          if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+            var _api$core2;
+            var isChildOfEditor = event.relatedTarget instanceof HTMLElement && event.relatedTarget.closest("#".concat(EDIT_AREA_ID)) !== null;
+
+            // don't do anything if the event target is a child of the editor or if the editor has focus
+            if (isChildOfEditor || view.hasFocus()) {
+              return false;
+            }
+            api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref6) {
+              var tr = _ref6.tr;
+              var currMeta = tr.getMeta(key);
+              tr.setMeta(key, _objectSpread(_objectSpread({}, currMeta), {}, {
+                editorBlurred: true
+              }));
+              return tr;
+            });
+            return false;
+          }
         }
       }
     },

package/dist/types/blockControlsPluginType.d.ts

@@ -116,5 +116,6 @@ export type BlockControlsMeta = {
     dom: HTMLElement;
     editorHeight: number;
     nodeMoved: boolean;
+    editorBlurred: boolean;
 };
 export type MoveNodeMethod = INPUT_METHOD.DRAG_AND_DROP | INPUT_METHOD.SHORTCUT;

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

@@ -116,5 +116,6 @@ export type BlockControlsMeta = {
     dom: HTMLElement;
     editorHeight: number;
     nodeMoved: boolean;
+    editorBlurred: boolean;
 };
 export type MoveNodeMethod = INPUT_METHOD.DRAG_AND_DROP | INPUT_METHOD.SHORTCUT;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.13.1",
+	"version": "3.13.3",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^103.22.0",
+		"@atlaskit/editor-common": "^104.0.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
@@ -53,9 +53,9 @@
 		"@atlaskit/pragmatic-drag-and-drop": "^1.6.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.1.0",
-		"@atlaskit/primitives": "^14.6.0",
+		"@atlaskit/primitives": "^14.7.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.15.0",
+		"@atlaskit/tmp-editor-statsig": "^4.16.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -172,6 +172,9 @@
 		"platform_editor_controls_patch_5": {
 			"type": "boolean"
 		},
+		"platform_editor_controls_patch_7": {
+			"type": "boolean"
+		},
 		"platform_editor_user_intent_plugin": {
 			"type": "boolean"
 		},