@atlaskit/editor-plugin-expand 7.4.13 → 7.4.14

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-expand
 
+## 7.4.14
+
+### Patch Changes
+
+- [`f1f7fc05afab1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f1f7fc05afab1) -
+  [ux] EDITOR-2461 Set selection in expand title when using arrow key to navigate into expand
+- Updated dependencies
+
 ## 7.4.13
 
 ### Patch Changes

package/dist/cjs/legacyExpand/pm-plugins/keymap.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.expandKeymap = expandKeymap;
+var _expand2 = require("@atlaskit/editor-common/expand");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _selection = require("@atlaskit/editor-common/selection");
 var _transforms = require("@atlaskit/editor-common/transforms");
@@ -11,6 +12,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-tables/utils");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _commands = require("../commands");
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -143,6 +145,12 @@ function expandKeymap(api, options) {
       var $from = selection.$from;
       return (0, _commands.focusTitle)($from.pos + 1)(state, dispatch, editorView);
     }
+    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_navigation_fixes', 'isEnabled', true)) {
+      var nextExpandPos = (0, _expand2.getNextNodeExpandPos)(editorView, selection);
+      if (nextExpandPos !== undefined) {
+        return (0, _commands.focusTitle)(nextExpandPos)(state, dispatch, editorView);
+      }
+    }
     if (editorView.endOfTextblock('down')) {
       var _$from2 = state.selection.$from;
       if (_$from2.depth === 0) {

package/dist/cjs/singlePlayerExpand/plugin.js

@@ -73,9 +73,7 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
       }, {
         name: 'expandKeymap',
         plugin: function plugin() {
-          return (0, _keymap.expandKeymap)(api, {
-            __livePage: options.__livePage
-          });
+          return (0, _keymap.expandKeymap)(api);
         }
       }];
     },

package/dist/cjs/singlePlayerExpand/pm-plugins/keymap.js

@@ -12,6 +12,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-tables/utils");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _commands = require("../commands");
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -19,7 +20,7 @@ var isExpandNode = function isExpandNode(node) {
 var isExpandSelected = function isExpandSelected(selection) {
   return selection instanceof _state.NodeSelection && isExpandNode(selection.node);
 };
-function expandKeymap(api, options) {
+function expandKeymap(api) {
   var list = {};
   (0, _keymaps.bindKeymapWithCommand)(
   // Ignored via go/ees005
@@ -144,6 +145,12 @@ function expandKeymap(api, options) {
       var $from = selection.$from;
       return (0, _commands.focusTitle)($from.pos + 1)(state, dispatch, editorView);
     }
+    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_navigation_fixes', 'isEnabled', true)) {
+      var nextExpandPos = (0, _expand2.getNextNodeExpandPos)(editorView, selection);
+      if (nextExpandPos !== undefined) {
+        return (0, _commands.focusTitle)(nextExpandPos)(state, dispatch, editorView);
+      }
+    }
     if (editorView.endOfTextblock('down')) {
       var _$from2 = state.selection.$from;
       if (_$from2.depth === 0) {

package/dist/es2019/legacyExpand/pm-plugins/keymap.js

@@ -1,3 +1,4 @@
+import { getNextNodeExpandPos } from '@atlaskit/editor-common/expand';
 import { backspace, bindKeymapWithCommand, moveDown, moveLeft, moveRight, moveUp, tab } from '@atlaskit/editor-common/keymaps';
 import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor-common/selection';
 import { findExpand } from '@atlaskit/editor-common/transforms';
@@ -5,6 +6,7 @@ import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/uti
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isInTable } from '@atlaskit/editor-tables/utils';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 const isExpandNode = node => {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -160,6 +162,12 @@ export function expandKeymap(api, options) {
       } = selection;
       return focusTitle($from.pos + 1)(state, dispatch, editorView);
     }
+    if (expValEqualsNoExposure('platform_editor_lovability_navigation_fixes', 'isEnabled', true)) {
+      const nextExpandPos = getNextNodeExpandPos(editorView, selection);
+      if (nextExpandPos !== undefined) {
+        return focusTitle(nextExpandPos)(state, dispatch, editorView);
+      }
+    }
     if (editorView.endOfTextblock('down')) {
       const {
         $from

package/dist/es2019/singlePlayerExpand/plugin.js

@@ -65,9 +65,7 @@ export let expandPlugin = ({
         }
       }, {
         name: 'expandKeymap',
-        plugin: () => expandKeymap(api, {
-          __livePage: options.__livePage
-        })
+        plugin: () => expandKeymap(api)
       }];
     },
     pluginsOptions: {

package/dist/es2019/singlePlayerExpand/pm-plugins/keymap.js

@@ -1,4 +1,4 @@
-import { isExpandCollapsed } from '@atlaskit/editor-common/expand';
+import { getNextNodeExpandPos, isExpandCollapsed } from '@atlaskit/editor-common/expand';
 import { backspace, bindKeymapWithCommand, moveDown, moveLeft, moveRight, moveUp, tab } from '@atlaskit/editor-common/keymaps';
 import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor-common/selection';
 import { findExpand } from '@atlaskit/editor-common/transforms';
@@ -6,12 +6,13 @@ import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/uti
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isInTable } from '@atlaskit/editor-tables/utils';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 const isExpandNode = node => {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
 };
 const isExpandSelected = selection => selection instanceof NodeSelection && isExpandNode(selection.node);
-export function expandKeymap(api, options) {
+export function expandKeymap(api) {
   const list = {};
   bindKeymapWithCommand(
   // Ignored via go/ees005
@@ -161,6 +162,12 @@ export function expandKeymap(api, options) {
       } = selection;
       return focusTitle($from.pos + 1)(state, dispatch, editorView);
     }
+    if (expValEqualsNoExposure('platform_editor_lovability_navigation_fixes', 'isEnabled', true)) {
+      const nextExpandPos = getNextNodeExpandPos(editorView, selection);
+      if (nextExpandPos !== undefined) {
+        return focusTitle(nextExpandPos)(state, dispatch, editorView);
+      }
+    }
     if (editorView.endOfTextblock('down')) {
       const {
         $from

package/dist/esm/legacyExpand/pm-plugins/keymap.js

@@ -1,3 +1,4 @@
+import { getNextNodeExpandPos } from '@atlaskit/editor-common/expand';
 import { backspace, bindKeymapWithCommand, moveDown, moveLeft, moveRight, moveUp, tab } from '@atlaskit/editor-common/keymaps';
 import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor-common/selection';
 import { findExpand } from '@atlaskit/editor-common/transforms';
@@ -5,6 +6,7 @@ import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/uti
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isInTable } from '@atlaskit/editor-tables/utils';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -137,6 +139,12 @@ export function expandKeymap(api, options) {
       var $from = selection.$from;
       return focusTitle($from.pos + 1)(state, dispatch, editorView);
     }
+    if (expValEqualsNoExposure('platform_editor_lovability_navigation_fixes', 'isEnabled', true)) {
+      var nextExpandPos = getNextNodeExpandPos(editorView, selection);
+      if (nextExpandPos !== undefined) {
+        return focusTitle(nextExpandPos)(state, dispatch, editorView);
+      }
+    }
     if (editorView.endOfTextblock('down')) {
       var _$from2 = state.selection.$from;
       if (_$from2.depth === 0) {

package/dist/esm/singlePlayerExpand/plugin.js

@@ -67,9 +67,7 @@ export var expandPlugin = function expandPlugin(_ref) {
       }, {
         name: 'expandKeymap',
         plugin: function plugin() {
-          return expandKeymap(api, {
-            __livePage: options.__livePage
-          });
+          return expandKeymap(api);
         }
       }];
     },

package/dist/esm/singlePlayerExpand/pm-plugins/keymap.js

@@ -1,4 +1,4 @@
-import { isExpandCollapsed } from '@atlaskit/editor-common/expand';
+import { getNextNodeExpandPos, isExpandCollapsed } from '@atlaskit/editor-common/expand';
 import { backspace, bindKeymapWithCommand, moveDown, moveLeft, moveRight, moveUp, tab } from '@atlaskit/editor-common/keymaps';
 import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor-common/selection';
 import { findExpand } from '@atlaskit/editor-common/transforms';
@@ -6,6 +6,7 @@ import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/uti
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isInTable } from '@atlaskit/editor-tables/utils';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -13,7 +14,7 @@ var isExpandNode = function isExpandNode(node) {
 var isExpandSelected = function isExpandSelected(selection) {
   return selection instanceof NodeSelection && isExpandNode(selection.node);
 };
-export function expandKeymap(api, options) {
+export function expandKeymap(api) {
   var list = {};
   bindKeymapWithCommand(
   // Ignored via go/ees005
@@ -138,6 +139,12 @@ export function expandKeymap(api, options) {
       var $from = selection.$from;
       return focusTitle($from.pos + 1)(state, dispatch, editorView);
     }
+    if (expValEqualsNoExposure('platform_editor_lovability_navigation_fixes', 'isEnabled', true)) {
+      var nextExpandPos = getNextNodeExpandPos(editorView, selection);
+      if (nextExpandPos !== undefined) {
+        return focusTitle(nextExpandPos)(state, dispatch, editorView);
+      }
+    }
     if (editorView.endOfTextblock('down')) {
       var _$from2 = state.selection.$from;
       if (_$from2.depth === 0) {

package/dist/types/singlePlayerExpand/pm-plugins/keymap.d.ts

@@ -1,6 +1,4 @@
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { ExpandPlugin } from '../../types';
-export declare function expandKeymap(api: ExtractInjectionAPI<ExpandPlugin> | undefined, options: {
-    __livePage?: boolean;
-}): SafePlugin;
+export declare function expandKeymap(api: ExtractInjectionAPI<ExpandPlugin> | undefined): SafePlugin;

package/dist/types-ts4.5/singlePlayerExpand/pm-plugins/keymap.d.ts

@@ -1,6 +1,4 @@
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { ExpandPlugin } from '../../types';
-export declare function expandKeymap(api: ExtractInjectionAPI<ExpandPlugin> | undefined, options: {
-    __livePage?: boolean;
-}): SafePlugin;
+export declare function expandKeymap(api: ExtractInjectionAPI<ExpandPlugin> | undefined): SafePlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "7.4.13",
+	"version": "7.4.14",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/icon-lab": "^5.12.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^14.5.0",
+		"@atlaskit/tmp-editor-statsig": "^14.7.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@babel/runtime": "^7.0.0",