@atlaskit/editor-plugin-toolbar 3.4.9 → 3.4.11

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 3.4.11
+
+### Patch Changes
+
+- [`4d676bbdb3ce6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4d676bbdb3ce6) -
+  ts-ignore added temporarily to unblock local consumption for help-center, will be removed once
+  project refs are setup
+- Updated dependencies
+
+## 3.4.10
+
+### Patch Changes
+
+- [`7af1ad7f6bb6b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7af1ad7f6bb6b) -
+  Fix toolbar experience tracking failures
+- Updated dependencies
+
 ## 3.4.9
 
 ### Patch Changes

package/dist/cjs/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -23,36 +23,47 @@ var ABORT_REASON = {
  * This experience tracks when the selection toolbar is opened.
  *
  * Start: When user makes a selection via mouseup or shift+arrow key down
- * Success: When the selection toolbar is added to the DOM within 500ms of start
- * Failure: When 500ms passes without the selection toolbar being added to the DOM
- * Abort: When selection transition to empty or block menu is opened
+ * Success: When the selection toolbar is added to the DOM within 1000ms of start
+ * Failure: When 1000ms passes without the selection toolbar being added to the DOM
+ * Abort: When selection transitions to empty or block menu is opened
  */
 var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExperiencePlugin = function getSelectionToolbarOpenExperiencePlugin(_ref) {
   var refs = _ref.refs,
     dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
+  var editorView;
   var targetEl;
-  var editorViewEl;
+  var shiftArrowKeyPressed = false;
+  var mouseDownPos;
   var getTarget = function getTarget() {
     if (!targetEl) {
-      targetEl = refs.popupsMountPoint || (0, _experiences.getPopupContainerFromEditorView)(editorViewEl);
+      var _editorView;
+      targetEl = refs.popupsMountPoint || (0, _experiences.getPopupContainerFromEditorView)((_editorView = editorView) === null || _editorView === void 0 ? void 0 : _editorView.dom);
     }
     return targetEl;
   };
   var experience = new _experiences.Experience('selection-toolbar-open', {
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
-      durationMs: 500,
+      durationMs: 1000,
       onTimeout: function onTimeout() {
+        var _editorView2;
         if (isBlockMenuWithinNode(getTarget())) {
           return {
             status: 'abort',
             reason: ABORT_REASON.BLOCK_MENU_OPENED
           };
+        } else if (isSelectionWithoutTextContent((_editorView2 = editorView) === null || _editorView2 === void 0 ? void 0 : _editorView2.state.selection)) {
+          return {
+            status: 'abort',
+            reason: ABORT_REASON.SELECTION_CLEARED
+          };
         }
       }
     }), new _experiences.ExperienceCheckDomMutation({
       onDomMutation: function onDomMutation(_ref2) {
         var mutations = _ref2.mutations;
+        // @ts-ignore - Workaround for help-center local consumption
+
         if (mutations.some(isSelectionToolbarAddedInMutation)) {
           return {
             status: 'success'
@@ -75,37 +86,63 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
       init: function init() {
         return {};
       },
+      // @ts-ignore - Workaround for help-center local consumption
+
       apply: function apply(_tr, pluginState, oldState, newState) {
-        if (!oldState.selection.empty && newState.selection.empty) {
+        if (!oldState.selection.empty && isSelectionWithoutTextContent(newState.selection)) {
           experience.abort({
             reason: ABORT_REASON.SELECTION_CLEARED
           });
         }
+        if (shiftArrowKeyPressed && !newState.selection.eq(oldState.selection) && !isSelectionWithoutTextContent(newState.selection)) {
+          experience.start({
+            method: START_METHOD.KEY_DOWN
+          });
+          shiftArrowKeyPressed = false;
+        }
         return pluginState;
       }
     },
     props: {
+      // @ts-ignore - Workaround for help-center local consumption
+
       handleDOMEvents: {
-        mouseup: function mouseup(view) {
-          if (!view.state.selection.empty && !isSelectionToolbarWithinNode(getTarget())) {
+        mousedown: function mousedown(_view, e) {
+          mouseDownPos = {
+            x: e.clientX,
+            y: e.clientY
+          };
+        },
+        mouseup: function mouseup(view, e) {
+          if (!mouseDownPos || isSelectionWithoutTextContent(view.state.selection) || isSelectionWithinCodeBlock(view.state.selection) || isSelectionToolbarWithinNode(getTarget())) {
+            return;
+          }
+          if (e.clientX !== mouseDownPos.x || e.clientY !== mouseDownPos.y) {
             experience.start({
               method: START_METHOD.MOUSE_UP
             });
           }
         },
+        dblclick: function dblclick(view, e) {
+          if (isSelectionWithoutTextContent(view.state.selection) || isSelectionWithinCodeBlock(view.state.selection) || isSelectionToolbarWithinNode(getTarget())) {
+            return;
+          }
+          experience.start({
+            method: START_METHOD.MOUSE_UP
+          });
+        },
         keydown: function keydown(_view, _ref3) {
           var shiftKey = _ref3.shiftKey,
             key = _ref3.key;
-          if (shiftKey && key.includes('Arrow') && !isSelectionToolbarWithinNode(getTarget())) {
-            experience.start({
-              method: START_METHOD.KEY_DOWN
-            });
-          }
+          shiftArrowKeyPressed = shiftKey && key.includes('Arrow') && !isSelectionToolbarWithinNode(getTarget());
+        },
+        keyup: function keyup() {
+          shiftArrowKeyPressed = false;
         }
       }
     },
     view: function view(_view2) {
-      editorViewEl = _view2.dom;
+      editorView = _view2;
       return {
         destroy: function destroy() {
           experience.abort({
@@ -119,6 +156,8 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
 var isSelectionToolbarAddedInMutation = function isSelectionToolbarAddedInMutation(_ref4) {
   var type = _ref4.type,
     addedNodes = _ref4.addedNodes;
+  // @ts-ignore - Workaround for help-center local consumption
+
   return type === 'childList' && (0, _toConsumableArray2.default)(addedNodes).some(isSelectionToolbarWithinNode);
 };
 var isSelectionToolbarWithinNode = function isSelectionToolbarWithinNode(node) {
@@ -126,4 +165,26 @@ var isSelectionToolbarWithinNode = function isSelectionToolbarWithinNode(node) {
 };
 var isBlockMenuWithinNode = function isBlockMenuWithinNode(node) {
   return (0, _experiences.containsPopupWithNestedElement)(node, '[data-testid="editor-block-menu"]');
+};
+var isSelectionWithoutTextContent = function isSelectionWithoutTextContent(selection) {
+  if (!selection || selection.empty) {
+    return true;
+  }
+  var hasText = false;
+  selection.$from.doc.nodesBetween(selection.from, selection.to, function (node) {
+    if (hasText) {
+      return false;
+    }
+    if (node.isText && node.text && node.text.length > 0) {
+      hasText = true;
+      return false;
+    }
+    return true;
+  });
+  return !hasText;
+};
+var isSelectionWithinCodeBlock = function isSelectionWithinCodeBlock(selection) {
+  var $from = selection.$from,
+    $to = selection.$to;
+  return $from.sameParent($to) && $from.parent.type.name === 'codeBlock';
 };

package/dist/cjs/toolbarPlugin.js

@@ -30,6 +30,8 @@ function getSelectedNode(editorState) {
       node: selection.node,
       pos: selection.from,
       nodeType: selection.node.type.name,
+      // @ts-ignore - Workaround for help-center local consumption
+
       marks: selection.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -42,6 +44,8 @@ function getSelectedNode(editorState) {
       node: selectedNode.node,
       pos: selectedNode.pos,
       nodeType: selectedNode.node.type.name,
+      // @ts-ignore - Workaround for help-center local consumption
+
       marks: selectedNode.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -53,6 +57,8 @@ function getSelectedNode(editorState) {
       node: parentNode.node,
       pos: parentNode.pos,
       nodeType: parentNode.node.type.name,
+      // @ts-ignore - Workaround for help-center local consumption
+
       marks: parentNode.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -63,6 +69,8 @@ function getSelectedNode(editorState) {
     node: $pos.parent,
     pos: $pos.pos,
     nodeType: $pos.parent.type.name,
+    // @ts-ignore - Workaround for help-center local consumption
+
     marks: $pos.marks().map(function (mark) {
       return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
     })
@@ -117,12 +125,14 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
           return new _safePlugin.SafePlugin({
             key: _pluginKey.editorToolbarPluginKey,
             state: {
+              // @ts-ignore - Workaround for help-center local consumption
               init: function init(_, editorState) {
                 return {
                   shouldShowToolbar: false,
                   selectedNode: getSelectedNode(editorState)
                 };
               },
+              // @ts-ignore - Workaround for help-center local consumption
               apply: function apply(tr, pluginState, _, newState) {
                 var meta = tr.getMeta(_pluginKey.editorToolbarPluginKey);
                 var newPluginState = _objectSpread({}, pluginState);
@@ -143,6 +153,7 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
                 return newPluginState;
               }
             },
+            // @ts-ignore - Workaround for help-center local consumption
             view: function view(_view) {
               var unbind = (0, _bindEventListener.bind)(_view.root, {
                 type: 'mouseup',
@@ -171,6 +182,7 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
                 }
               });
               return {
+                // @ts-ignore - Workaround for help-center local consumption
                 destroy: function destroy() {
                   unbind();
                   unbindEditorViewFocus();
@@ -178,7 +190,11 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
               };
             },
             props: {
+              // @ts-ignore - Workaround for help-center local consumption
+
               handleDOMEvents: {
+                // @ts-ignore - Workaround for help-center local consumption
+
                 mousedown: function mousedown(view) {
                   view.dispatch(view.state.tr.setMeta(_pluginKey.editorToolbarPluginKey, {
                     shouldShowToolbar: false

package/dist/es2019/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -15,38 +15,49 @@ const ABORT_REASON = {
  * This experience tracks when the selection toolbar is opened.
  *
  * Start: When user makes a selection via mouseup or shift+arrow key down
- * Success: When the selection toolbar is added to the DOM within 500ms of start
- * Failure: When 500ms passes without the selection toolbar being added to the DOM
- * Abort: When selection transition to empty or block menu is opened
+ * Success: When the selection toolbar is added to the DOM within 1000ms of start
+ * Failure: When 1000ms passes without the selection toolbar being added to the DOM
+ * Abort: When selection transitions to empty or block menu is opened
  */
 export const getSelectionToolbarOpenExperiencePlugin = ({
   refs,
   dispatchAnalyticsEvent
 }) => {
+  let editorView;
   let targetEl;
-  let editorViewEl;
+  let shiftArrowKeyPressed = false;
+  let mouseDownPos;
   const getTarget = () => {
     if (!targetEl) {
-      targetEl = refs.popupsMountPoint || getPopupContainerFromEditorView(editorViewEl);
+      var _editorView;
+      targetEl = refs.popupsMountPoint || getPopupContainerFromEditorView((_editorView = editorView) === null || _editorView === void 0 ? void 0 : _editorView.dom);
     }
     return targetEl;
   };
   const experience = new Experience('selection-toolbar-open', {
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
-      durationMs: 500,
+      durationMs: 1000,
       onTimeout: () => {
+        var _editorView2;
         if (isBlockMenuWithinNode(getTarget())) {
           return {
             status: 'abort',
             reason: ABORT_REASON.BLOCK_MENU_OPENED
           };
+        } else if (isSelectionWithoutTextContent((_editorView2 = editorView) === null || _editorView2 === void 0 ? void 0 : _editorView2.state.selection)) {
+          return {
+            status: 'abort',
+            reason: ABORT_REASON.SELECTION_CLEARED
+          };
         }
       }
     }), new ExperienceCheckDomMutation({
       onDomMutation: ({
         mutations
       }) => {
+        // @ts-ignore - Workaround for help-center local consumption
+
         if (mutations.some(isSelectionToolbarAddedInMutation)) {
           return {
             status: 'success'
@@ -65,38 +76,64 @@ export const getSelectionToolbarOpenExperiencePlugin = ({
     key: pluginKey,
     state: {
       init: () => ({}),
+      // @ts-ignore - Workaround for help-center local consumption
+
       apply: (_tr, pluginState, oldState, newState) => {
-        if (!oldState.selection.empty && newState.selection.empty) {
+        if (!oldState.selection.empty && isSelectionWithoutTextContent(newState.selection)) {
           experience.abort({
             reason: ABORT_REASON.SELECTION_CLEARED
           });
         }
+        if (shiftArrowKeyPressed && !newState.selection.eq(oldState.selection) && !isSelectionWithoutTextContent(newState.selection)) {
+          experience.start({
+            method: START_METHOD.KEY_DOWN
+          });
+          shiftArrowKeyPressed = false;
+        }
         return pluginState;
       }
     },
     props: {
+      // @ts-ignore - Workaround for help-center local consumption
+
       handleDOMEvents: {
-        mouseup: view => {
-          if (!view.state.selection.empty && !isSelectionToolbarWithinNode(getTarget())) {
+        mousedown: (_view, e) => {
+          mouseDownPos = {
+            x: e.clientX,
+            y: e.clientY
+          };
+        },
+        mouseup: (view, e) => {
+          if (!mouseDownPos || isSelectionWithoutTextContent(view.state.selection) || isSelectionWithinCodeBlock(view.state.selection) || isSelectionToolbarWithinNode(getTarget())) {
+            return;
+          }
+          if (e.clientX !== mouseDownPos.x || e.clientY !== mouseDownPos.y) {
             experience.start({
               method: START_METHOD.MOUSE_UP
             });
           }
         },
+        dblclick: (view, e) => {
+          if (isSelectionWithoutTextContent(view.state.selection) || isSelectionWithinCodeBlock(view.state.selection) || isSelectionToolbarWithinNode(getTarget())) {
+            return;
+          }
+          experience.start({
+            method: START_METHOD.MOUSE_UP
+          });
+        },
         keydown: (_view, {
           shiftKey,
           key
         }) => {
-          if (shiftKey && key.includes('Arrow') && !isSelectionToolbarWithinNode(getTarget())) {
-            experience.start({
-              method: START_METHOD.KEY_DOWN
-            });
-          }
+          shiftArrowKeyPressed = shiftKey && key.includes('Arrow') && !isSelectionToolbarWithinNode(getTarget());
+        },
+        keyup: () => {
+          shiftArrowKeyPressed = false;
         }
       }
     },
     view: view => {
-      editorViewEl = view.dom;
+      editorView = view;
       return {
         destroy: () => {
           experience.abort({
@@ -111,6 +148,8 @@ const isSelectionToolbarAddedInMutation = ({
   type,
   addedNodes
 }) => {
+  // @ts-ignore - Workaround for help-center local consumption
+
   return type === 'childList' && [...addedNodes].some(isSelectionToolbarWithinNode);
 };
 const isSelectionToolbarWithinNode = node => {
@@ -118,4 +157,28 @@ const isSelectionToolbarWithinNode = node => {
 };
 const isBlockMenuWithinNode = node => {
   return containsPopupWithNestedElement(node, '[data-testid="editor-block-menu"]');
+};
+const isSelectionWithoutTextContent = selection => {
+  if (!selection || selection.empty) {
+    return true;
+  }
+  let hasText = false;
+  selection.$from.doc.nodesBetween(selection.from, selection.to, node => {
+    if (hasText) {
+      return false;
+    }
+    if (node.isText && node.text && node.text.length > 0) {
+      hasText = true;
+      return false;
+    }
+    return true;
+  });
+  return !hasText;
+};
+const isSelectionWithinCodeBlock = selection => {
+  const {
+    $from,
+    $to
+  } = selection;
+  return $from.sameParent($to) && $from.parent.type.name === 'codeBlock';
 };

package/dist/es2019/toolbarPlugin.js

@@ -21,6 +21,8 @@ function getSelectedNode(editorState) {
       node: selection.node,
       pos: selection.from,
       nodeType: selection.node.type.name,
+      // @ts-ignore - Workaround for help-center local consumption
+
       marks: selection.node.marks.map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
     };
   }
@@ -33,6 +35,8 @@ function getSelectedNode(editorState) {
       node: selectedNode.node,
       pos: selectedNode.pos,
       nodeType: selectedNode.node.type.name,
+      // @ts-ignore - Workaround for help-center local consumption
+
       marks: selectedNode.node.marks.map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
     };
   }
@@ -42,6 +46,8 @@ function getSelectedNode(editorState) {
       node: parentNode.node,
       pos: parentNode.pos,
       nodeType: parentNode.node.type.name,
+      // @ts-ignore - Workaround for help-center local consumption
+
       marks: parentNode.node.marks.map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
     };
   }
@@ -50,6 +56,8 @@ function getSelectedNode(editorState) {
     node: $pos.parent,
     pos: $pos.pos,
     nodeType: $pos.parent.type.name,
+    // @ts-ignore - Workaround for help-center local consumption
+
     marks: $pos.marks().map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
   };
 }
@@ -102,12 +110,16 @@ export const toolbarPlugin = ({
           return new SafePlugin({
             key: editorToolbarPluginKey,
             state: {
+              // @ts-ignore - Workaround for help-center local consumption
+
               init(_, editorState) {
                 return {
                   shouldShowToolbar: false,
                   selectedNode: getSelectedNode(editorState)
                 };
               },
+              // @ts-ignore - Workaround for help-center local consumption
+
               apply(tr, pluginState, _, newState) {
                 const meta = tr.getMeta(editorToolbarPluginKey);
                 let newPluginState = {
@@ -133,6 +145,8 @@ export const toolbarPlugin = ({
                 return newPluginState;
               }
             },
+            // @ts-ignore - Workaround for help-center local consumption
+
             view(view) {
               const unbind = bind(view.root, {
                 type: 'mouseup',
@@ -161,6 +175,8 @@ export const toolbarPlugin = ({
                 }
               });
               return {
+                // @ts-ignore - Workaround for help-center local consumption
+
                 destroy() {
                   unbind();
                   unbindEditorViewFocus();
@@ -168,7 +184,11 @@ export const toolbarPlugin = ({
               };
             },
             props: {
+              // @ts-ignore - Workaround for help-center local consumption
+
               handleDOMEvents: {
+                // @ts-ignore - Workaround for help-center local consumption
+
                 mousedown: view => {
                   view.dispatch(view.state.tr.setMeta(editorToolbarPluginKey, {
                     shouldShowToolbar: false

package/dist/esm/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -16,36 +16,47 @@ var ABORT_REASON = {
  * This experience tracks when the selection toolbar is opened.
  *
  * Start: When user makes a selection via mouseup or shift+arrow key down
- * Success: When the selection toolbar is added to the DOM within 500ms of start
- * Failure: When 500ms passes without the selection toolbar being added to the DOM
- * Abort: When selection transition to empty or block menu is opened
+ * Success: When the selection toolbar is added to the DOM within 1000ms of start
+ * Failure: When 1000ms passes without the selection toolbar being added to the DOM
+ * Abort: When selection transitions to empty or block menu is opened
  */
 export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolbarOpenExperiencePlugin(_ref) {
   var refs = _ref.refs,
     dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
+  var editorView;
   var targetEl;
-  var editorViewEl;
+  var shiftArrowKeyPressed = false;
+  var mouseDownPos;
   var getTarget = function getTarget() {
     if (!targetEl) {
-      targetEl = refs.popupsMountPoint || getPopupContainerFromEditorView(editorViewEl);
+      var _editorView;
+      targetEl = refs.popupsMountPoint || getPopupContainerFromEditorView((_editorView = editorView) === null || _editorView === void 0 ? void 0 : _editorView.dom);
     }
     return targetEl;
   };
   var experience = new Experience('selection-toolbar-open', {
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
-      durationMs: 500,
+      durationMs: 1000,
       onTimeout: function onTimeout() {
+        var _editorView2;
         if (isBlockMenuWithinNode(getTarget())) {
           return {
             status: 'abort',
             reason: ABORT_REASON.BLOCK_MENU_OPENED
           };
+        } else if (isSelectionWithoutTextContent((_editorView2 = editorView) === null || _editorView2 === void 0 ? void 0 : _editorView2.state.selection)) {
+          return {
+            status: 'abort',
+            reason: ABORT_REASON.SELECTION_CLEARED
+          };
         }
       }
     }), new ExperienceCheckDomMutation({
       onDomMutation: function onDomMutation(_ref2) {
         var mutations = _ref2.mutations;
+        // @ts-ignore - Workaround for help-center local consumption
+
         if (mutations.some(isSelectionToolbarAddedInMutation)) {
           return {
             status: 'success'
@@ -68,37 +79,63 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
       init: function init() {
         return {};
       },
+      // @ts-ignore - Workaround for help-center local consumption
+
       apply: function apply(_tr, pluginState, oldState, newState) {
-        if (!oldState.selection.empty && newState.selection.empty) {
+        if (!oldState.selection.empty && isSelectionWithoutTextContent(newState.selection)) {
           experience.abort({
             reason: ABORT_REASON.SELECTION_CLEARED
           });
         }
+        if (shiftArrowKeyPressed && !newState.selection.eq(oldState.selection) && !isSelectionWithoutTextContent(newState.selection)) {
+          experience.start({
+            method: START_METHOD.KEY_DOWN
+          });
+          shiftArrowKeyPressed = false;
+        }
         return pluginState;
       }
     },
     props: {
+      // @ts-ignore - Workaround for help-center local consumption
+
       handleDOMEvents: {
-        mouseup: function mouseup(view) {
-          if (!view.state.selection.empty && !isSelectionToolbarWithinNode(getTarget())) {
+        mousedown: function mousedown(_view, e) {
+          mouseDownPos = {
+            x: e.clientX,
+            y: e.clientY
+          };
+        },
+        mouseup: function mouseup(view, e) {
+          if (!mouseDownPos || isSelectionWithoutTextContent(view.state.selection) || isSelectionWithinCodeBlock(view.state.selection) || isSelectionToolbarWithinNode(getTarget())) {
+            return;
+          }
+          if (e.clientX !== mouseDownPos.x || e.clientY !== mouseDownPos.y) {
             experience.start({
               method: START_METHOD.MOUSE_UP
             });
           }
         },
+        dblclick: function dblclick(view, e) {
+          if (isSelectionWithoutTextContent(view.state.selection) || isSelectionWithinCodeBlock(view.state.selection) || isSelectionToolbarWithinNode(getTarget())) {
+            return;
+          }
+          experience.start({
+            method: START_METHOD.MOUSE_UP
+          });
+        },
         keydown: function keydown(_view, _ref3) {
           var shiftKey = _ref3.shiftKey,
             key = _ref3.key;
-          if (shiftKey && key.includes('Arrow') && !isSelectionToolbarWithinNode(getTarget())) {
-            experience.start({
-              method: START_METHOD.KEY_DOWN
-            });
-          }
+          shiftArrowKeyPressed = shiftKey && key.includes('Arrow') && !isSelectionToolbarWithinNode(getTarget());
+        },
+        keyup: function keyup() {
+          shiftArrowKeyPressed = false;
         }
       }
     },
     view: function view(_view2) {
-      editorViewEl = _view2.dom;
+      editorView = _view2;
       return {
         destroy: function destroy() {
           experience.abort({
@@ -112,6 +149,8 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
 var isSelectionToolbarAddedInMutation = function isSelectionToolbarAddedInMutation(_ref4) {
   var type = _ref4.type,
     addedNodes = _ref4.addedNodes;
+  // @ts-ignore - Workaround for help-center local consumption
+
   return type === 'childList' && _toConsumableArray(addedNodes).some(isSelectionToolbarWithinNode);
 };
 var isSelectionToolbarWithinNode = function isSelectionToolbarWithinNode(node) {
@@ -119,4 +158,26 @@ var isSelectionToolbarWithinNode = function isSelectionToolbarWithinNode(node) {
 };
 var isBlockMenuWithinNode = function isBlockMenuWithinNode(node) {
   return containsPopupWithNestedElement(node, '[data-testid="editor-block-menu"]');
+};
+var isSelectionWithoutTextContent = function isSelectionWithoutTextContent(selection) {
+  if (!selection || selection.empty) {
+    return true;
+  }
+  var hasText = false;
+  selection.$from.doc.nodesBetween(selection.from, selection.to, function (node) {
+    if (hasText) {
+      return false;
+    }
+    if (node.isText && node.text && node.text.length > 0) {
+      hasText = true;
+      return false;
+    }
+    return true;
+  });
+  return !hasText;
+};
+var isSelectionWithinCodeBlock = function isSelectionWithinCodeBlock(selection) {
+  var $from = selection.$from,
+    $to = selection.$to;
+  return $from.sameParent($to) && $from.parent.type.name === 'codeBlock';
 };

package/dist/esm/toolbarPlugin.js

@@ -23,6 +23,8 @@ function getSelectedNode(editorState) {
       node: selection.node,
       pos: selection.from,
       nodeType: selection.node.type.name,
+      // @ts-ignore - Workaround for help-center local consumption
+
       marks: selection.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -35,6 +37,8 @@ function getSelectedNode(editorState) {
       node: selectedNode.node,
       pos: selectedNode.pos,
       nodeType: selectedNode.node.type.name,
+      // @ts-ignore - Workaround for help-center local consumption
+
       marks: selectedNode.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -46,6 +50,8 @@ function getSelectedNode(editorState) {
       node: parentNode.node,
       pos: parentNode.pos,
       nodeType: parentNode.node.type.name,
+      // @ts-ignore - Workaround for help-center local consumption
+
       marks: parentNode.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -56,6 +62,8 @@ function getSelectedNode(editorState) {
     node: $pos.parent,
     pos: $pos.pos,
     nodeType: $pos.parent.type.name,
+    // @ts-ignore - Workaround for help-center local consumption
+
     marks: $pos.marks().map(function (mark) {
       return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
     })
@@ -110,12 +118,14 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
           return new SafePlugin({
             key: editorToolbarPluginKey,
             state: {
+              // @ts-ignore - Workaround for help-center local consumption
               init: function init(_, editorState) {
                 return {
                   shouldShowToolbar: false,
                   selectedNode: getSelectedNode(editorState)
                 };
               },
+              // @ts-ignore - Workaround for help-center local consumption
               apply: function apply(tr, pluginState, _, newState) {
                 var meta = tr.getMeta(editorToolbarPluginKey);
                 var newPluginState = _objectSpread({}, pluginState);
@@ -136,6 +146,7 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
                 return newPluginState;
               }
             },
+            // @ts-ignore - Workaround for help-center local consumption
             view: function view(_view) {
               var unbind = bind(_view.root, {
                 type: 'mouseup',
@@ -164,6 +175,7 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
                 }
               });
               return {
+                // @ts-ignore - Workaround for help-center local consumption
                 destroy: function destroy() {
                   unbind();
                   unbindEditorViewFocus();
@@ -171,7 +183,11 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
               };
             },
             props: {
+              // @ts-ignore - Workaround for help-center local consumption
+
               handleDOMEvents: {
+                // @ts-ignore - Workaround for help-center local consumption
+
                 mousedown: function mousedown(view) {
                   view.dispatch(view.state.tr.setMeta(editorToolbarPluginKey, {
                     shouldShowToolbar: false

package/dist/types/pm-plugins/experiences/selection-toolbar-open-experience.d.ts

@@ -10,9 +10,9 @@ type SelectionToolbarOpenExperienceOptions = {
  * This experience tracks when the selection toolbar is opened.
  *
  * Start: When user makes a selection via mouseup or shift+arrow key down
- * Success: When the selection toolbar is added to the DOM within 500ms of start
- * Failure: When 500ms passes without the selection toolbar being added to the DOM
- * Abort: When selection transition to empty or block menu is opened
+ * Success: When the selection toolbar is added to the DOM within 1000ms of start
+ * Failure: When 1000ms passes without the selection toolbar being added to the DOM
+ * Abort: When selection transitions to empty or block menu is opened
  */
 export declare const getSelectionToolbarOpenExperiencePlugin: ({ refs, dispatchAnalyticsEvent, }: SelectionToolbarOpenExperienceOptions) => SafePlugin<{}>;
 export {};

package/dist/types-ts4.5/pm-plugins/experiences/selection-toolbar-open-experience.d.ts

@@ -10,9 +10,9 @@ type SelectionToolbarOpenExperienceOptions = {
  * This experience tracks when the selection toolbar is opened.
  *
  * Start: When user makes a selection via mouseup or shift+arrow key down
- * Success: When the selection toolbar is added to the DOM within 500ms of start
- * Failure: When 500ms passes without the selection toolbar being added to the DOM
- * Abort: When selection transition to empty or block menu is opened
+ * Success: When the selection toolbar is added to the DOM within 1000ms of start
+ * Failure: When 1000ms passes without the selection toolbar being added to the DOM
+ * Abort: When selection transitions to empty or block menu is opened
  */
 export declare const getSelectionToolbarOpenExperiencePlugin: ({ refs, dispatchAnalyticsEvent, }: SelectionToolbarOpenExperienceOptions) => SafePlugin<{}>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "3.4.9",
+	"version": "3.4.11",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,13 +40,13 @@
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
-		"@atlaskit/tmp-editor-statsig": "^13.38.0",
+		"@atlaskit/tmp-editor-statsig": "^13.42.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.32.0",
+		"@atlaskit/editor-common": "^110.34.0",
 		"react": "^18.2.0"
 	},
 	"platform-feature-flags": {