@atlaskit/editor-plugin-extension 2.0.1 → 2.0.3

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-extension
 
+## 2.0.3
+
+### Patch Changes
+
+- [#175651](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/175651)
+  [`26349f1048cb4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/26349f1048cb4) -
+  ED-25982 - Revert selection click handler slightly so non-LCM extension nodes are selectable
+  again.
+- Updated dependencies
+
+## 2.0.2
+
+### Patch Changes
+
+- [#169955](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169955)
+  [`3c2ffc27c518e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3c2ffc27c518e) -
+  ED-25863 add logic to stop the LCM inner editor losing focus. Tweak blur logic for extension to
+  fully remove current selection when clicking into the LCM.
+
 ## 2.0.1
 
 ### Patch Changes

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

@@ -234,10 +234,9 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
           if ((0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro')) {
             var currentTarget = event.relatedTarget;
             var source = event.target;
-            var selection = view.state.selection;
 
-            // If the focus is going from outside to inside an area designated as an editable area of an extension, and an extension is the current selection, then the extension selection is reset.
-            if (selection instanceof _state.NodeSelection && selection.node.type === view.state.schema.nodes.extension && currentTarget.closest('.extension-editable-area') && !source.closest('.extension-editable-area')) {
+            // If the focus is going from outside to inside an area designated as an editable area of an extension, then the extension selection is reset.
+            if (currentTarget.closest('.extension-editable-area') && !source.closest('.extension-editable-area')) {
               var emptySelection = new _state.TextSelection(view.state.doc.resolve(0));
               var tr = view.state.tr.setSelection(emptySelection);
               view.dispatch(tr);
@@ -345,7 +344,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
         return null;
       },
       handleClickOn: (0, _selection2.createSelectionClickHandler)(['extension', 'bodiedExtension', 'multiBodiedExtension'], function (target) {
-        return (0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro') ? !!target.closest('.extension-container') : !target.closest('.extension-content');
+        return (0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro') ? !target.closest('.extension-content') || !!target.closest('.extension-container') : !target.closest('.extension-content');
       },
       // It's to enable nested extensions selection
       {

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

@@ -158,10 +158,9 @@ const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProvid
           if (fg('platform_editor_legacy_content_macro')) {
             const currentTarget = event.relatedTarget;
             const source = event.target;
-            const selection = view.state.selection;
 
-            // If the focus is going from outside to inside an area designated as an editable area of an extension, and an extension is the current selection, then the extension selection is reset.
-            if (selection instanceof NodeSelection && selection.node.type === view.state.schema.nodes.extension && currentTarget.closest('.extension-editable-area') && !source.closest('.extension-editable-area')) {
+            // If the focus is going from outside to inside an area designated as an editable area of an extension, then the extension selection is reset.
+            if (currentTarget.closest('.extension-editable-area') && !source.closest('.extension-editable-area')) {
               const emptySelection = new TextSelection(view.state.doc.resolve(0));
               const tr = view.state.tr.setSelection(emptySelection);
               view.dispatch(tr);
@@ -280,7 +279,7 @@ const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProvid
         }
         return null;
       },
-      handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension', 'multiBodiedExtension'], target => fg('platform_editor_legacy_content_macro') ? !!target.closest('.extension-container') : !target.closest('.extension-content'),
+      handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension', 'multiBodiedExtension'], target => fg('platform_editor_legacy_content_macro') ? !target.closest('.extension-content') || !!target.closest('.extension-container') : !target.closest('.extension-content'),
       // It's to enable nested extensions selection
       {
         useLongPressSelection

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

@@ -208,10 +208,9 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
           if (fg('platform_editor_legacy_content_macro')) {
             var currentTarget = event.relatedTarget;
             var source = event.target;
-            var selection = view.state.selection;
 
-            // If the focus is going from outside to inside an area designated as an editable area of an extension, and an extension is the current selection, then the extension selection is reset.
-            if (selection instanceof NodeSelection && selection.node.type === view.state.schema.nodes.extension && currentTarget.closest('.extension-editable-area') && !source.closest('.extension-editable-area')) {
+            // If the focus is going from outside to inside an area designated as an editable area of an extension, then the extension selection is reset.
+            if (currentTarget.closest('.extension-editable-area') && !source.closest('.extension-editable-area')) {
               var emptySelection = new TextSelection(view.state.doc.resolve(0));
               var tr = view.state.tr.setSelection(emptySelection);
               view.dispatch(tr);
@@ -319,7 +318,7 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
         return null;
       },
       handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension', 'multiBodiedExtension'], function (target) {
-        return fg('platform_editor_legacy_content_macro') ? !!target.closest('.extension-container') : !target.closest('.extension-content');
+        return fg('platform_editor_legacy_content_macro') ? !target.closest('.extension-content') || !!target.closest('.extension-container') : !target.closest('.extension-content');
       },
       // It's to enable nested extensions selection
       {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-extension",
-	"version": "2.0.1",
+	"version": "2.0.3",
 	"description": "editor-plugin-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -30,7 +30,7 @@
 		"@atlaskit/button": "^20.3.0",
 		"@atlaskit/checkbox": "^15.2.0",
 		"@atlaskit/datetime-picker": "^15.9.0",
-		"@atlaskit/editor-common": "^96.2.0",
+		"@atlaskit/editor-common": "^96.3.0",
 		"@atlaskit/editor-json-transformer": "^8.21.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-context-identifier": "^1.3.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/empty-state": "^8.0.0",
 		"@atlaskit/form": "^10.6.0",
 		"@atlaskit/heading": "4.0.0",
-		"@atlaskit/icon": "^23.0.0",
+		"@atlaskit/icon": "^23.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/radio": "^6.6.0",