@atlaskit/editor-core 151.3.0 → 151.3.1

package/dist/cjs/create-editor/ReactEditorView.js

@@ -539,8 +539,30 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
           transformer: _this.contentTransformer
         });
 
+        if (_this.props.editorProps.shouldFocus && view.props.editable && view.props.editable(view.state)) {
+          _this.focusTimeoutId = handleEditorFocus(view);
+        }
+
         if (_this.featureFlags.ufo) {
+          _this.experienceStore = _ufo.ExperienceStore.getInstance(view);
+
+          _this.experienceStore.start(_ufo.EditorExperience.editSession);
+
+          _this.experienceStore.addMetadata(_ufo.EditorExperience.editSession, {
+            reliabilityInterval: _ufo.RELIABILITY_INTERVAL
+          });
+
           _this.reliabilityInterval = window.setInterval(function () {
+            var _this$experienceStore11, _this$experienceStore12;
+
+            (_this$experienceStore11 = _this.experienceStore) === null || _this$experienceStore11 === void 0 ? void 0 : (_this$experienceStore12 = _this$experienceStore11.success(_ufo.EditorExperience.editSession)) === null || _this$experienceStore12 === void 0 ? void 0 : _this$experienceStore12.finally(function () {
+              var _this$experienceStore13, _this$experienceStore14;
+
+              (_this$experienceStore13 = _this.experienceStore) === null || _this$experienceStore13 === void 0 ? void 0 : _this$experienceStore13.start(_ufo.EditorExperience.editSession);
+              (_this$experienceStore14 = _this.experienceStore) === null || _this$experienceStore14 === void 0 ? void 0 : _this$experienceStore14.addMetadata(_ufo.EditorExperience.editSession, {
+                reliabilityInterval: _ufo.RELIABILITY_INTERVAL
+              });
+            });
             var reliabilityEvent = {
               action: _analytics.ACTION.UFO_SESSION_COMPLETE,
               actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
@@ -552,14 +574,6 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
 
             _this.dispatchAnalyticsEvent(reliabilityEvent);
           }, _ufo.RELIABILITY_INTERVAL);
-        }
-
-        if (_this.props.editorProps.shouldFocus && view.props.editable && view.props.editable(view.state)) {
-          _this.focusTimeoutId = handleEditorFocus(view);
-        }
-
-        if (_this.featureFlags.ufo) {
-          _this.experienceStore = _ufo.ExperienceStore.getInstance(view);
         } // Force React to re-render so consumers get a reference to the editor view
 
 

package/dist/cjs/create-editor/create-plugins-list.js

@@ -129,8 +129,6 @@ function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEvent) {
 
 
 function createPluginsList(props, prevProps, createAnalyticsEvent) {
-  var _props$featureFlags;
-
   var appearance = props.appearance;
   var isMobile = appearance === 'mobile';
   var isComment = appearance === 'comment';
@@ -298,8 +296,8 @@ function createPluginsList(props, prevProps, createAnalyticsEvent) {
   if (props.allowPanel) {
     preset.add([_plugins.panelPlugin, {
       useLongPressSelection: false,
-      UNSAFE_allowCustomPanel: props.allowPanel.UNSAFE_allowCustomPanel,
-      UNSAFE_allowCustomPanelEdit: props.allowPanel.UNSAFE_allowCustomPanelEdit
+      allowCustomPanel: props.allowPanel.allowCustomPanel,
+      allowCustomPanelEdit: props.allowPanel.allowCustomPanelEdit
     }]);
   }
 
@@ -396,20 +394,38 @@ function createPluginsList(props, prevProps, createAnalyticsEvent) {
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false
   }]);
 
-  if (((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.showAvatarGroupAsPlugin) === true) {
+  var hasBeforePrimaryToolbar = function hasBeforePrimaryToolbar(components) {
+    if (components && 'before' in components) {
+      return !!components.before;
+    }
+
+    return false;
+  };
+
+  if (hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
+    preset.add([_plugins.beforePrimaryToolbarPlugin, {
+      beforePrimaryToolbarComponents: props.primaryToolbarComponents.before
+    }]);
+  }
+
+  if (featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
     preset.add([_plugins.avatarGroupPlugin, {
-      collabEdit: props.collabEdit
+      collabEdit: props.collabEdit,
+      takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
     }]);
   }
 
   if (props.allowFindReplace) {
-    var _props$featureFlags2;
-
     preset.add([_plugins.findReplacePlugin, {
-      takeFullWidth: !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.showAvatarGroupAsPlugin) === false
+      takeFullWidth: !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+      twoLineEditorToolbar: !!featureFlags.twoLineEditorToolbar
     }]);
   }
 
+  if (props.UNSAFE_allowFragmentMark) {
+    preset.add(_plugins.fragmentMarkPlugin);
+  }
+
   if (featureFlags.enableViewUpdateSubscription) {
     preset.add([_plugins.viewUpdateSubscriptionPlugin]);
   }

package/dist/cjs/labs/next/presets/cxhtml.js

@@ -46,8 +46,7 @@ function useCXHTMLPreset(_ref) {
     }
   }]);
   preset.add([_plugins.panelPlugin, {
-    UNSAFE_allowCustomPanel: true,
-    UNSAFE_allowCustomPanelEdit: true
+    allowCustomPanel: true
   }]);
   preset.add(_plugins.listPlugin);
   preset.add(_plugins.textColorPlugin);

package/dist/cjs/nodeviews/ReactNodeView.js

@@ -191,10 +191,10 @@ var ReactNodeView = /*#__PURE__*/function () {
     }
   }, {
     key: "update",
-    value: function update(node, _decorations) {
+    value: function update(node, _decorations, _innerDecorations) {
       var _this4 = this;
 
-      var validUpdate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {
+      var validUpdate = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : function () {
         return true;
       };
       // @see https://github.com/ProseMirror/prosemirror/issues/648

package/dist/cjs/nodeviews/SelectionBasedNodeView.js

@@ -108,6 +108,12 @@ var SelectionBasedNodeView = /*#__PURE__*/function (_ReactNodeView) {
           to = _this$view$state$sele2.to;
       return _this.isSelectedNode(_this.view.state.selection) || _this.isSelectionInsideNode(from, to);
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "nodeInsideSelection", function () {
+      var selection = _this.view.state.selection;
+      var from = selection.from,
+          to = selection.to;
+      return _this.isSelectedNode(selection) || _this.isNodeInsideSelection(from, to);
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onSelectionChange", function () {
       _this.update(_this.node, []);
     });

package/dist/cjs/plugins/analytics/types/enums.js

@@ -63,6 +63,7 @@ exports.ACTION = ACTION;
   ACTION["INITIALISED"] = "initialised";
   ACTION["INPUT_PERF_SAMPLING"] = "inputPerfSampling";
   ACTION["INSERTED"] = "inserted";
+  ACTION["INVALID_DOCUMENT_ENCOUNTERED"] = "invalidDocumentEncountered";
   ACTION["INVOKED"] = "invoked";
   ACTION["LANGUAGE_SELECTED"] = "languageSelected";
   ACTION["LIST_ITEM_JOINED"] = "listItemJoined";

package/dist/cjs/plugins/annotation/utils.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSelectionPositions = getSelectionPositions;
-exports.hasWhitespaceNode = hasWhitespaceNode;
+exports.hasInvalidWhitespaceNode = hasInvalidWhitespaceNode;
 exports.hasAnnotationMark = hasAnnotationMark;
 exports.annotationExists = annotationExists;
 exports.containsAnyAnnotations = containsAnyAnnotations;
@@ -316,7 +316,7 @@ var isSelectionValid = function isSelectionValid(state) {
     return _types.AnnotationSelectionType.DISABLED;
   }
 
-  if (disallowOnWhitespace && hasWhitespaceNode(selection)) {
+  if (disallowOnWhitespace && hasInvalidWhitespaceNode(selection)) {
     return _types.AnnotationSelectionType.INVALID;
   }
 
@@ -372,16 +372,27 @@ function isEmptyTextSelection(selection, schema) {
  */
 
 
-function hasWhitespaceNode(selection) {
-  var foundWhitespace = false;
-  selection.content().content.descendants(function (node) {
+function hasInvalidWhitespaceNode(selection) {
+  var foundInvalidWhitespace = false;
+  var content = selection.content().content;
+  content.descendants(function (node) {
     if (node.textContent.trim() === '') {
-      foundWhitespace = true;
+      // Trailing new lines do not result in the annotation spanning into
+      // the trailing new line so can be ignored when looking for invalid
+      // whitespace nodes.
+      var nodeIsTrailingNewLine = // it is the final node
+      node.eq(content.lastChild) && // and there are multiple nodes
+      !node.eq(content.firstChild) && // and it is a paragraph node
+      node.type.name === 'paragraph';
+
+      if (!nodeIsTrailingNewLine) {
+        foundInvalidWhitespace = true;
+      }
     }
 
-    return !foundWhitespace;
+    return !foundInvalidWhitespace;
   });
-  return foundWhitespace;
+  return foundInvalidWhitespace;
 }
 /*
  * verifies if node contains annotation mark

package/dist/cjs/plugins/avatar-group/index.js

@@ -27,7 +27,8 @@ var avatarGroup = function avatarGroup(props) {
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
         editorView: editorView,
         eventDispatcher: eventDispatcher,
-        collabEdit: props.collabEdit
+        collabEdit: props.collabEdit,
+        takeFullWidth: props.takeFullWidth
       });
     }
   };

package/dist/cjs/plugins/avatar-group/ui/AvatarGroupPluginWrapper.js

@@ -25,7 +25,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var ToolbarButtonWrapper = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-grow: 1;\n  justify-content: flex-end;\n  align-items: center;\n  & > div {\n    margin-right: 0;\n  }\n"])));
+var ToolbarButtonWrapper = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-grow: ", ";\n  justify-content: flex-end;\n  align-items: center;\n  & > div {\n    margin-right: 0;\n  }\n"])), function (props) {
+  return props.takeFullWidth ? 1 : 0;
+});
 
 var AvatarGroupPluginWrapper = function AvatarGroupPluginWrapper(props) {
   var dispatchAnalyticsEvent = props.dispatchAnalyticsEvent;
@@ -43,7 +45,8 @@ var AvatarGroupPluginWrapper = function AvatarGroupPluginWrapper(props) {
   }, [dispatchAnalyticsEvent]);
   return /*#__PURE__*/_react.default.createElement(ToolbarButtonWrapper, {
     "aria-label": "Editors",
-    "data-testid": 'avatar-group-in-plugin'
+    "data-testid": 'avatar-group-in-plugin',
+    takeFullWidth: props.takeFullWidth
   }, /*#__PURE__*/_react.default.createElement(_avatarsWithPluginState.default, {
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,

package/dist/cjs/plugins/before-primaryToolbar/index.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _BeforePrimaryToolbarWrapper = require("./ui/BeforePrimaryToolbarWrapper");
+
+var beforePrimaryToolbar = function beforePrimaryToolbar(props) {
+  return {
+    name: 'beforePrimaryToolbar',
+    primaryToolbarComponent: function primaryToolbarComponent() {
+      return /*#__PURE__*/_react.default.createElement(_BeforePrimaryToolbarWrapper.BeforePrimaryToolbarWrapper, {
+        beforePrimaryToolbarComponents: props.beforePrimaryToolbarComponents
+      });
+    }
+  };
+};
+
+var _default = beforePrimaryToolbar;
+exports.default = _default;

package/dist/cjs/plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper.js

@@ -0,0 +1,28 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BeforePrimaryToolbarWrapper = exports.BeforePrimaryToolbarPluginWrapper = void 0;
+
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
+var _templateObject;
+
+var BeforePrimaryToolbarPluginWrapper = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  margin-right: 8px;\n  flex-grow: 1;\n  justify-content: flex-end;\n  align-items: center;\n"])));
+
+exports.BeforePrimaryToolbarPluginWrapper = BeforePrimaryToolbarPluginWrapper;
+
+var BeforePrimaryToolbarWrapper = function BeforePrimaryToolbarWrapper(props) {
+  return /*#__PURE__*/_react.default.createElement(BeforePrimaryToolbarPluginWrapper, {
+    "data-testid": 'before-primary-toolbar-components-plugin'
+  }, props.beforePrimaryToolbarComponents);
+};
+
+exports.BeforePrimaryToolbarWrapper = BeforePrimaryToolbarWrapper;

package/dist/cjs/plugins/extension/extension-api.js

@@ -11,6 +11,8 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _prosemirrorModel = require("prosemirror-model");
 
+var _prosemirrorState = require("prosemirror-state");
+
 var _macro = require("../macro");
 
 var _pluginKey = require("../macro/plugin-key");
@@ -61,7 +63,7 @@ var extensionAPICallPayload = function extensionAPICallPayload(functionName) {
 
 var createExtensionAPI = function createExtensionAPI(options) {
   var doc = {
-    insertAfter: function insertAfter(localId, adf) {
+    insertAfter: function insertAfter(localId, adf, opt) {
       var editorView = options.editorView;
       var dispatch = editorView.dispatch; // Be extra cautious since 3rd party devs can use regular JS without type safety
 
@@ -101,7 +103,8 @@ var createExtensionAPI = function createExtensionAPI(options) {
         throw new Error('insertAfter(): Could not create a node for given ADFEntity.');
       }
 
-      tr.insert(nodePos.pos + nodePos.node.nodeSize, newNode); // Validate if the document is valid at this point
+      var insertPosition = nodePos.pos + nodePos.node.nodeSize;
+      tr.insert(insertPosition, newNode); // Validate if the document is valid at this point
 
       try {
         tr.doc.check();
@@ -145,6 +148,11 @@ var createExtensionAPI = function createExtensionAPI(options) {
         };
         (0, _analytics.addAnalytics)(state, tr, payload);
       });
+
+      if (opt && opt.allowSelectionToNewNode) {
+        tr.setSelection(new _prosemirrorState.NodeSelection(tr.doc.resolve(insertPosition)));
+      }
+
       dispatch(tr);
     },
     scrollTo: function scrollTo(localId) {

package/dist/cjs/plugins/extension/ui/styles.js

@@ -15,5 +15,5 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
 var _templateObject;
 
-var extensionStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .extensionView-content-wrap,\n  .bodiedExtensionView-content-wrap {\n    margin: ", " 0;\n\n    &:first-of-type {\n      margin-top: 0;\n    }\n\n    &:last-of-type {\n      margin-bottom: 0;\n    }\n\n    &:not(.danger).", " {\n      & > span > .extension-container {\n        ", "\n      }\n    }\n\n    &.danger > span > .extension-container {\n      box-shadow: 0 0 0 ", "px ", ";\n      background-color: ", ";\n    }\n\n    &.inline {\n      word-wrap: break-all;\n    }\n  }\n\n  .extensionView-content-wrap .extension-container {\n    overflow: hidden;\n  }\n"])), _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedBorderSize, _editorSharedStyles.akEditorDeleteBorder, _editorSharedStyles.akEditorDeleteBackground);
+var extensionStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .extensionView-content-wrap,\n  .bodiedExtensionView-content-wrap {\n    margin: ", " 0;\n\n    &:first-of-type {\n      margin-top: 0;\n    }\n\n    &:last-of-type {\n      margin-bottom: 0;\n    }\n\n    &:not(.danger).", " {\n      & > span > .extension-container {\n        ", "\n      }\n    }\n\n    &.danger > span > .extension-container {\n      box-shadow: 0 0 0 ", "px ", ";\n      background-color: ", ";\n    }\n\n    &.inline {\n      word-wrap: break-all;\n    }\n  }\n\n  .extensionView-content-wrap .extension-container {\n    overflow: hidden;\n  }\n\n  .bodiedExtensionView-content-wrap\n    .extensionView-content-wrap\n    .extension-container {\n    width: 100%;\n  }\n"])), _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedBorderSize, _editorSharedStyles.akEditorDeleteBorder, _editorSharedStyles.akEditorDeleteBackground);
 exports.extensionStyles = extensionStyles;

package/dist/cjs/plugins/feature-flags-context/feature-flags-from-props.js

@@ -24,7 +24,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * which is used by both current and archv3 editors.
  */
 function createFeatureFlagsFromProps(props) {
-  var _props$allowTextColor, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$allowTables, _props$featureFlags4, _props$featureFlags5, _props$allowTables2, _props$featureFlags6, _props$featureFlags7, _props$allowTables3, _props$featureFlags8, _props$featureFlags9, _props$allowTables4, _props$featureFlags10, _props$featureFlags11, _props$allowTables5, _props$allowExtension, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29;
+  var _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$allowTables, _props$featureFlags4, _props$featureFlags5, _props$allowTables2, _props$featureFlags6, _props$featureFlags7, _props$allowTables3, _props$featureFlags8, _props$featureFlags9, _props$allowTables4, _props$featureFlags10, _props$featureFlags11, _props$allowTables5, _props$allowExtension, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31;
 
   var normalizedFeatureFlags = (0, _normalizeFeatureFlags.normalizeFeatureFlags)(props.featureFlags);
   return _objectSpread(_objectSpread({}, normalizedFeatureFlags), {}, {
@@ -37,6 +37,7 @@ function createFeatureFlagsFromProps(props) {
     findReplaceMatchCase: (0, _typeof2.default)(props.allowFindReplace) === 'object' && Boolean(props.allowFindReplace.allowMatchCase),
     keyboardAccessibleDatepicker: typeof props.allowKeyboardAccessibleDatepicker === 'boolean' ? props.allowKeyboardAccessibleDatepicker : false,
     addColumnWithCustomStep: !props.allowTables || typeof props.allowTables === 'boolean' ? false : Boolean(props.allowTables.allowAddColumnWithCustomStep),
+    singleLayout: (0, _typeof2.default)(props.allowLayouts) === 'object' && !!((_props$allowLayouts = props.allowLayouts) !== null && _props$allowLayouts !== void 0 && _props$allowLayouts.UNSAFE_allowSingleColumnLayout),
     undoRedoButtons: props.UNSAFE_allowUndoRedoButtons,
     catchAllTracking: (_props$performanceTra = props.performanceTracking) === null || _props$performanceTra === void 0 ? void 0 : (_props$performanceTra2 = _props$performanceTra.catchAllTracking) === null || _props$performanceTra2 === void 0 ? void 0 : _props$performanceTra2.enabled,
     nextEmojiNodeView: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.nextEmojiNodeView) === true,
@@ -55,6 +56,7 @@ function createFeatureFlagsFromProps(props) {
     collabAvatarScroll: Boolean(typeof ((_props$featureFlags24 = props.featureFlags) === null || _props$featureFlags24 === void 0 ? void 0 : _props$featureFlags24.collabAvatarScroll) === 'boolean' ? !!((_props$featureFlags25 = props.featureFlags) !== null && _props$featureFlags25 !== void 0 && _props$featureFlags25.collabAvatarScroll) : false),
     ufo: Boolean(typeof ((_props$featureFlags26 = props.featureFlags) === null || _props$featureFlags26 === void 0 ? void 0 : _props$featureFlags26.ufo) === 'boolean' ? !!((_props$featureFlags27 = props.featureFlags) !== null && _props$featureFlags27 !== void 0 && _props$featureFlags27.ufo) : false),
     codeBlockSyntaxHighlighting: Boolean(typeof normalizedFeatureFlags.codeBlockSyntaxHighlighting === 'boolean' ? !!normalizedFeatureFlags.codeBlockSyntaxHighlighting && !_editorCommon.browser.safari : false),
-    codeBidiWarnings: Boolean(typeof ((_props$featureFlags28 = props.featureFlags) === null || _props$featureFlags28 === void 0 ? void 0 : _props$featureFlags28.codeBidiWarnings) === 'boolean' ? !!((_props$featureFlags29 = props.featureFlags) !== null && _props$featureFlags29 !== void 0 && _props$featureFlags29.codeBidiWarnings) : true)
+    twoLineEditorToolbar: Boolean(typeof ((_props$featureFlags28 = props.featureFlags) === null || _props$featureFlags28 === void 0 ? void 0 : _props$featureFlags28.twoLineEditorToolbar) === 'boolean' ? !!((_props$featureFlags29 = props.featureFlags) !== null && _props$featureFlags29 !== void 0 && _props$featureFlags29.twoLineEditorToolbar) : false),
+    codeBidiWarnings: Boolean(typeof ((_props$featureFlags30 = props.featureFlags) === null || _props$featureFlags30 === void 0 ? void 0 : _props$featureFlags30.codeBidiWarnings) === 'boolean' ? !!((_props$featureFlags31 = props.featureFlags) !== null && _props$featureFlags31 !== void 0 && _props$featureFlags31.codeBidiWarnings) : true)
   });
 }

package/dist/cjs/plugins/find-replace/FindReplaceToolbarButtonWithState.js

@@ -0,0 +1,172 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _types = require("./types");
+
+var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
+
+var _commandsWithAnalytics = require("./commands-with-analytics");
+
+var _commands = require("./commands");
+
+var _FindReplaceToolbarButton = _interopRequireDefault(require("./ui/FindReplaceToolbarButton"));
+
+var _analytics = require("../analytics");
+
+var _featureFlagsContext = require("../feature-flags-context");
+
+var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(props) {
+  var popupsBoundariesElement = props.popupsBoundariesElement,
+      popupsMountPoint = props.popupsMountPoint,
+      popupsScrollableElement = props.popupsScrollableElement,
+      isToolbarReducedSpacing = props.isToolbarReducedSpacing,
+      editorView = props.editorView,
+      containerElement = props.containerElement,
+      dispatchAnalyticsEvent = props.dispatchAnalyticsEvent;
+
+  if (!editorView) {
+    return null;
+  } // we need the editor to be in focus for scrollIntoView() to work
+  // so we focus it while we run the command, then put focus back into
+  // whatever element was previously focused in find replace component
+
+
+  var runWithEditorFocused = function runWithEditorFocused(fn) {
+    var activeElement = document.activeElement;
+    editorView.focus();
+    fn();
+    activeElement === null || activeElement === void 0 ? void 0 : activeElement.focus();
+  };
+
+  var dispatchCommand = function dispatchCommand(cmd) {
+    var state = editorView.state,
+        dispatch = editorView.dispatch;
+    cmd(state, dispatch);
+  };
+
+  var handleActivate = function handleActivate() {
+    runWithEditorFocused(function () {
+      return dispatchCommand((0, _commandsWithAnalytics.activateWithAnalytics)({
+        triggerMethod: _analytics.TRIGGER_METHOD.TOOLBAR
+      }));
+    });
+  };
+
+  var handleFind = function handleFind(keyword) {
+    runWithEditorFocused(function () {
+      return dispatchCommand((0, _commandsWithAnalytics.findWithAnalytics)({
+        editorView: editorView,
+        containerElement: containerElement,
+        keyword: keyword
+      }));
+    });
+  };
+
+  var handleFindNext = function handleFindNext(_ref) {
+    var triggerMethod = _ref.triggerMethod;
+    runWithEditorFocused(function () {
+      return dispatchCommand((0, _commandsWithAnalytics.findNextWithAnalytics)({
+        triggerMethod: triggerMethod
+      }));
+    });
+  };
+
+  var handleFindPrev = function handleFindPrev(_ref2) {
+    var triggerMethod = _ref2.triggerMethod;
+    runWithEditorFocused(function () {
+      return dispatchCommand((0, _commandsWithAnalytics.findPrevWithAnalytics)({
+        triggerMethod: triggerMethod
+      }));
+    });
+  };
+
+  var handleReplace = function handleReplace(_ref3) {
+    var triggerMethod = _ref3.triggerMethod,
+        replaceText = _ref3.replaceText;
+    runWithEditorFocused(function () {
+      return dispatchCommand((0, _commandsWithAnalytics.replaceWithAnalytics)({
+        triggerMethod: triggerMethod,
+        replaceText: replaceText
+      }));
+    });
+  };
+
+  var handleReplaceAll = function handleReplaceAll(_ref4) {
+    var replaceText = _ref4.replaceText;
+    runWithEditorFocused(function () {
+      return dispatchCommand((0, _commandsWithAnalytics.replaceAllWithAnalytics)({
+        replaceText: replaceText
+      }));
+    });
+  };
+
+  var handleFindBlur = function handleFindBlur() {
+    dispatchCommand((0, _commands.blur)());
+  };
+
+  var handleCancel = function handleCancel(_ref5) {
+    var triggerMethod = _ref5.triggerMethod;
+    dispatchCommand((0, _commandsWithAnalytics.cancelSearchWithAnalytics)({
+      triggerMethod: triggerMethod
+    }));
+    editorView.focus();
+  };
+
+  var handleToggleMatchCase = function handleToggleMatchCase() {
+    dispatchCommand((0, _commands.toggleMatchCase)());
+  };
+
+  var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(editorView.state),
+      findReplaceMatchCase = _getFeatureFlags.findReplaceMatchCase;
+
+  return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
+    debounce: false,
+    plugins: {
+      findReplaceState: _types.findReplacePluginKey
+    },
+    render: function render(_ref6) {
+      var findReplaceState = _ref6.findReplaceState;
+
+      if (!findReplaceState) {
+        return null;
+      }
+
+      return /*#__PURE__*/_react.default.createElement(_FindReplaceToolbarButton.default, {
+        allowMatchCase: findReplaceMatchCase,
+        shouldMatchCase: findReplaceState.shouldMatchCase,
+        onToggleMatchCase: handleToggleMatchCase,
+        isActive: findReplaceState.isActive,
+        findText: findReplaceState.findText,
+        index: findReplaceState.index,
+        numMatches: findReplaceState.matches.length,
+        replaceText: findReplaceState.replaceText,
+        shouldFocus: findReplaceState.shouldFocus,
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsMountPoint: popupsMountPoint,
+        popupsScrollableElement: popupsScrollableElement,
+        isReducedSpacing: !!isToolbarReducedSpacing,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        onFindBlur: handleFindBlur,
+        onCancel: handleCancel,
+        onActivate: handleActivate,
+        onFind: handleFind,
+        onFindNext: handleFindNext,
+        onFindPrev: handleFindPrev,
+        onReplace: handleReplace,
+        onReplaceAll: handleReplaceAll,
+        takeFullWidth: !!props.takeFullWidth
+      });
+    }
+  });
+};
+
+var _default = FindReplaceToolbarButtonWithState;
+exports.default = _default;