@atlaskit/editor-core 185.16.5 → 185.16.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 185.16.6
+
+### Patch Changes
+
+- [`1901ebeafcb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1901ebeafcb) - [ux] Fix expand title selection bug
+
 ## 185.16.5
 
 ### Patch Changes

package/dist/cjs/plugins/expand/commands.js

@@ -143,7 +143,7 @@ var focusTitle = function focusTitle(pos) {
       var dom = editorView.domAtPos(pos);
       var expandWrapper = dom.node.parentElement;
       if (expandWrapper) {
-        setSelectionInsideExpand(state, dispatch, editorView);
+        setSelectionInsideExpand(pos)(state, dispatch, editorView);
         var input = expandWrapper.querySelector('input');
         if (input) {
           input.focus();
@@ -157,16 +157,19 @@ var focusTitle = function focusTitle(pos) {
 
 // Used to clear any node or cell selection when expand title is focused
 exports.focusTitle = focusTitle;
-var setSelectionInsideExpand = function setSelectionInsideExpand(state, dispatch, editorView) {
-  var tr = state.tr,
-    doc = state.doc,
-    selection = state.selection;
-  if (editorView && !editorView.hasFocus()) {
-    editorView.focus();
-  }
-  if (dispatch) {
-    dispatch(tr.setSelection(_prosemirrorState.TextSelection.create(doc, selection.from)));
-  }
-  return true;
+var setSelectionInsideExpand = function setSelectionInsideExpand(expandPos) {
+  return function (state, dispatch, editorView) {
+    if (editorView) {
+      if (!editorView.hasFocus()) {
+        editorView.focus();
+      }
+      var sel = _prosemirrorState.Selection.findFrom(editorView.state.doc.resolve(expandPos), 1, true);
+      if (sel && dispatch) {
+        dispatch(editorView.state.tr.setSelection(sel));
+      }
+      return true;
+    }
+    return false;
+  };
 };
 exports.setSelectionInsideExpand = setSelectionInsideExpand;

package/dist/cjs/plugins/expand/nodeviews/index.js

@@ -72,7 +72,10 @@ var ExpandNodeView = /*#__PURE__*/function () {
           state = _this$view.state,
           dispatch = _this$view.dispatch;
         (0, _commands2.setSelectionRelativeToNode)(_types.RelativeSelectionPos.Start)(state, dispatch);
-        (0, _commands.setSelectionInsideExpand)(state, dispatch, _this.view);
+        var pos = _this.getPos();
+        if (typeof pos === 'number') {
+          (0, _commands.setSelectionInsideExpand)(pos)(state, dispatch, _this.view);
+        }
         _this.input.focus();
       }
     });

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 = "185.16.5";
+var version = "185.16.6";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

package/dist/es2019/plugins/expand/commands.js

@@ -1,4 +1,4 @@
-import { TextSelection } from 'prosemirror-state';
+import { Selection } from 'prosemirror-state';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE, PLATFORMS, MODE } from '../analytics';
 import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
@@ -120,7 +120,7 @@ export const focusTitle = pos => (state, dispatch, editorView) => {
     const dom = editorView.domAtPos(pos);
     const expandWrapper = dom.node.parentElement;
     if (expandWrapper) {
-      setSelectionInsideExpand(state, dispatch, editorView);
+      setSelectionInsideExpand(pos)(state, dispatch, editorView);
       const input = expandWrapper.querySelector('input');
       if (input) {
         input.focus();
@@ -132,17 +132,16 @@ export const focusTitle = pos => (state, dispatch, editorView) => {
 };
 
 // Used to clear any node or cell selection when expand title is focused
-export const setSelectionInsideExpand = (state, dispatch, editorView) => {
-  const {
-    tr,
-    doc,
-    selection
-  } = state;
-  if (editorView && !editorView.hasFocus()) {
-    editorView.focus();
-  }
-  if (dispatch) {
-    dispatch(tr.setSelection(TextSelection.create(doc, selection.from)));
+export const setSelectionInsideExpand = expandPos => (state, dispatch, editorView) => {
+  if (editorView) {
+    if (!editorView.hasFocus()) {
+      editorView.focus();
+    }
+    const sel = Selection.findFrom(editorView.state.doc.resolve(expandPos), 1, true);
+    if (sel && dispatch) {
+      dispatch(editorView.state.tr.setSelection(sel));
+    }
+    return true;
   }
-  return true;
+  return false;
 };

package/dist/es2019/plugins/expand/nodeviews/index.js

@@ -59,7 +59,10 @@ export class ExpandNodeView {
           dispatch
         } = this.view;
         setSelectionRelativeToNode(RelativeSelectionPos.Start)(state, dispatch);
-        setSelectionInsideExpand(state, dispatch, this.view);
+        const pos = this.getPos();
+        if (typeof pos === 'number') {
+          setSelectionInsideExpand(pos)(state, dispatch, this.view);
+        }
         this.input.focus();
       }
     });

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "185.16.5";
+export const version = "185.16.6";
 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": "185.16.5",
+	"version": "185.16.6",
 	"sideEffects": false
 }

package/dist/esm/plugins/expand/commands.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import { TextSelection } from 'prosemirror-state';
+import { Selection } from 'prosemirror-state';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE, PLATFORMS, MODE } from '../analytics';
 import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
@@ -129,7 +129,7 @@ export var focusTitle = function focusTitle(pos) {
       var dom = editorView.domAtPos(pos);
       var expandWrapper = dom.node.parentElement;
       if (expandWrapper) {
-        setSelectionInsideExpand(state, dispatch, editorView);
+        setSelectionInsideExpand(pos)(state, dispatch, editorView);
         var input = expandWrapper.querySelector('input');
         if (input) {
           input.focus();
@@ -142,15 +142,18 @@ export var focusTitle = function focusTitle(pos) {
 };
 
 // Used to clear any node or cell selection when expand title is focused
-export var setSelectionInsideExpand = function setSelectionInsideExpand(state, dispatch, editorView) {
-  var tr = state.tr,
-    doc = state.doc,
-    selection = state.selection;
-  if (editorView && !editorView.hasFocus()) {
-    editorView.focus();
-  }
-  if (dispatch) {
-    dispatch(tr.setSelection(TextSelection.create(doc, selection.from)));
-  }
-  return true;
+export var setSelectionInsideExpand = function setSelectionInsideExpand(expandPos) {
+  return function (state, dispatch, editorView) {
+    if (editorView) {
+      if (!editorView.hasFocus()) {
+        editorView.focus();
+      }
+      var sel = Selection.findFrom(editorView.state.doc.resolve(expandPos), 1, true);
+      if (sel && dispatch) {
+        dispatch(editorView.state.tr.setSelection(sel));
+      }
+      return true;
+    }
+    return false;
+  };
 };

package/dist/esm/plugins/expand/nodeviews/index.js

@@ -64,7 +64,10 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           state = _this$view.state,
           dispatch = _this$view.dispatch;
         setSelectionRelativeToNode(RelativeSelectionPos.Start)(state, dispatch);
-        setSelectionInsideExpand(state, dispatch, _this.view);
+        var pos = _this.getPos();
+        if (typeof pos === 'number') {
+          setSelectionInsideExpand(pos)(state, dispatch, _this.view);
+        }
         _this.input.focus();
       }
     });

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "185.16.5";
+export var version = "185.16.6";
 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": "185.16.5",
+	"version": "185.16.6",
 	"sideEffects": false
 }

package/dist/types/plugins/expand/commands.d.ts

@@ -9,4 +9,4 @@ export declare const toggleExpandExpanded: (pos: number, nodeType: NodeType) =>
 export declare const createExpandNode: (state: EditorState) => PMNode | null;
 export declare const insertExpand: Command;
 export declare const focusTitle: (pos: number) => Command;
-export declare const setSelectionInsideExpand: Command;
+export declare const setSelectionInsideExpand: (expandPos: number) => Command;

package/dist/types-ts4.5/plugins/expand/commands.d.ts

@@ -9,4 +9,4 @@ export declare const toggleExpandExpanded: (pos: number, nodeType: NodeType) =>
 export declare const createExpandNode: (state: EditorState) => PMNode | null;
 export declare const insertExpand: Command;
 export declare const focusTitle: (pos: number) => Command;
-export declare const setSelectionInsideExpand: Command;
+export declare const setSelectionInsideExpand: (expandPos: number) => Command;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "185.16.5",
+  "version": "185.16.6",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"