@atlaskit/editor-common 109.1.0 → 109.1.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-common
 
+## 109.1.2
+
+### Patch Changes
+
+- [`6cbab7879c7ac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6cbab7879c7ac) -
+  [EDITOR-1433] Make sure isEmptySelectionAtStart can handle blockTaskItems
+- Updated dependencies
+
+## 109.1.1
+
+### Patch Changes
+
+- [`360b8c9d0b280`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/360b8c9d0b280) -
+  [ux] [ED-29055] selections with no text nodes will always return text formatting marks as active.
+  this is behind the aifc experiment and patch 3 experiment
+- Updated dependencies
+
 ## 109.1.0
 
 ### Minor Changes

package/dist/cjs/mark/text-formatting.js

@@ -8,6 +8,7 @@ exports.wholeSelectionHasMarks = exports.isMarkExcluded = exports.isMarkAllowedI
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -136,6 +137,10 @@ var wholeRangeHasMarks = function wholeRangeHasMarks(from, to, doc, markTypes) {
   var hasMarks = new Map(markTypes.map(function (markType) {
     return [markType, true];
   }));
+  var hasNoMarks = new Map(markTypes.map(function (markType) {
+    return [markType, false];
+  }));
+  var isTextContent = false;
   doc.nodesBetween(from, to, function (node) {
     if (allMarksAreRuledOut(hasMarks)) {
       // This won't be a true early exit, but will prevent diving into nodes and
@@ -145,6 +150,7 @@ var wholeRangeHasMarks = function wholeRangeHasMarks(from, to, doc, markTypes) {
     if (!node.type.isText) {
       return true; // continue traversing
     }
+    isTextContent = true;
     var _iterator3 = _createForOfIteratorHelper(hasMarks),
       _step3;
     try {
@@ -170,6 +176,9 @@ var wholeRangeHasMarks = function wholeRangeHasMarks(from, to, doc, markTypes) {
       _iterator3.f();
     }
   });
+  if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true)) {
+    return isTextContent ? hasMarks : hasNoMarks;
+  }
   return hasMarks;
 };
 var isMarkAllowedInRange = exports.isMarkAllowedInRange = function isMarkAllowedInRange(doc, ranges, type) {

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "109.0.0";
+var packageVersion = "109.1.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "109.0.0";
+var packageVersion = "109.1.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/cjs/utils/commands.js

@@ -269,10 +269,26 @@ var insertContentDeleteRange = exports.insertContentDeleteRange = function inser
   });
   tr.setSelection(new _state.TextSelection(getSelectionResolvedPos(tr)));
 };
+
+/**
+ * Check if the selection is empty and at the start of a task or list item
+ * @param state Editor state
+ * @returns true if selection is empty and at the start of a task or list item
+ */
 var isEmptySelectionAtStart = exports.isEmptySelectionAtStart = function isEmptySelectionAtStart(state) {
+  var blockTaskItem = state.schema.nodes.blockTaskItem;
   var _state$selection4 = state.selection,
     empty = _state$selection4.empty,
     $from = _state$selection4.$from;
+
+  // If blockTaskItem is in the schema & the selection is empty
+  if (blockTaskItem && empty && $from.parent.type === blockTaskItem) {
+    var blockTaskItemDepth = $from.depth - 1;
+    var firstPosInBlockTaskItem = $from.start(blockTaskItemDepth) + 1;
+
+    // Is the selection at the first possible position inside the blockTaskItem
+    return $from.pos === firstPosInBlockTaskItem;
+  }
   return empty && ($from.parentOffset === 0 || state.selection instanceof _selection.GapCursorSelection);
 };
 var isEmptySelectionAtEnd = exports.isEmptySelectionAtEnd = function isEmptySelectionAtEnd(state) {

package/dist/es2019/mark/text-formatting.js

@@ -1,5 +1,6 @@
 import { Mark } from '@atlaskit/editor-prosemirror/model';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 /**
  * Determine if a mark of a specific type exists anywhere in the selection.
@@ -96,6 +97,8 @@ const cellSelectionHasMarks = (doc, selection, markTypes) => {
 };
 const wholeRangeHasMarks = (from, to, doc, markTypes) => {
   const hasMarks = new Map(markTypes.map(markType => [markType, true]));
+  const hasNoMarks = new Map(markTypes.map(markType => [markType, false]));
+  let isTextContent = false;
   doc.nodesBetween(from, to, node => {
     if (allMarksAreRuledOut(hasMarks)) {
       // This won't be a true early exit, but will prevent diving into nodes and
@@ -105,6 +108,7 @@ const wholeRangeHasMarks = (from, to, doc, markTypes) => {
     if (!node.type.isText) {
       return true; // continue traversing
     }
+    isTextContent = true;
     for (const [markType, hasMark] of hasMarks) {
       if (!hasMark) {
         continue; // already ruled out the mark, skip further checks
@@ -113,6 +117,9 @@ const wholeRangeHasMarks = (from, to, doc, markTypes) => {
       hasMarks.set(markType, value);
     }
   });
+  if (expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true)) {
+    return isTextContent ? hasMarks : hasNoMarks;
+  }
   return hasMarks;
 };
 export const isMarkAllowedInRange = (doc, ranges, type) => {

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "109.0.0";
+const packageVersion = "109.1.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "109.0.0";
+const packageVersion = "109.1.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/es2019/utils/commands.js

@@ -269,11 +269,29 @@ export const insertContentDeleteRange = (tr, getSelectionResolvedPos, insertions
   });
   tr.setSelection(new TextSelection(getSelectionResolvedPos(tr)));
 };
+
+/**
+ * Check if the selection is empty and at the start of a task or list item
+ * @param state Editor state
+ * @returns true if selection is empty and at the start of a task or list item
+ */
 export const isEmptySelectionAtStart = state => {
+  const {
+    blockTaskItem
+  } = state.schema.nodes;
   const {
     empty,
     $from
   } = state.selection;
+
+  // If blockTaskItem is in the schema & the selection is empty
+  if (blockTaskItem && empty && $from.parent.type === blockTaskItem) {
+    const blockTaskItemDepth = $from.depth - 1;
+    const firstPosInBlockTaskItem = $from.start(blockTaskItemDepth) + 1;
+
+    // Is the selection at the first possible position inside the blockTaskItem
+    return $from.pos === firstPosInBlockTaskItem;
+  }
   return empty && ($from.parentOffset === 0 || state.selection instanceof GapCursorSelection);
 };
 export const isEmptySelectionAtEnd = state => {

package/dist/esm/mark/text-formatting.js

@@ -4,6 +4,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { Mark } from '@atlaskit/editor-prosemirror/model';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 /**
  * Determine if a mark of a specific type exists anywhere in the selection.
@@ -130,6 +131,10 @@ var wholeRangeHasMarks = function wholeRangeHasMarks(from, to, doc, markTypes) {
   var hasMarks = new Map(markTypes.map(function (markType) {
     return [markType, true];
   }));
+  var hasNoMarks = new Map(markTypes.map(function (markType) {
+    return [markType, false];
+  }));
+  var isTextContent = false;
   doc.nodesBetween(from, to, function (node) {
     if (allMarksAreRuledOut(hasMarks)) {
       // This won't be a true early exit, but will prevent diving into nodes and
@@ -139,6 +144,7 @@ var wholeRangeHasMarks = function wholeRangeHasMarks(from, to, doc, markTypes) {
     if (!node.type.isText) {
       return true; // continue traversing
     }
+    isTextContent = true;
     var _iterator3 = _createForOfIteratorHelper(hasMarks),
       _step3;
     try {
@@ -164,6 +170,9 @@ var wholeRangeHasMarks = function wholeRangeHasMarks(from, to, doc, markTypes) {
       _iterator3.f();
     }
   });
+  if (expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true)) {
+    return isTextContent ? hasMarks : hasNoMarks;
+  }
   return hasMarks;
 };
 export var isMarkAllowedInRange = function isMarkAllowedInRange(doc, ranges, type) {

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "109.0.0";
+var packageVersion = "109.1.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "109.0.0";
+var packageVersion = "109.1.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/esm/utils/commands.js

@@ -256,10 +256,26 @@ export var insertContentDeleteRange = function insertContentDeleteRange(tr, getS
   });
   tr.setSelection(new TextSelection(getSelectionResolvedPos(tr)));
 };
+
+/**
+ * Check if the selection is empty and at the start of a task or list item
+ * @param state Editor state
+ * @returns true if selection is empty and at the start of a task or list item
+ */
 export var isEmptySelectionAtStart = function isEmptySelectionAtStart(state) {
+  var blockTaskItem = state.schema.nodes.blockTaskItem;
   var _state$selection4 = state.selection,
     empty = _state$selection4.empty,
     $from = _state$selection4.$from;
+
+  // If blockTaskItem is in the schema & the selection is empty
+  if (blockTaskItem && empty && $from.parent.type === blockTaskItem) {
+    var blockTaskItemDepth = $from.depth - 1;
+    var firstPosInBlockTaskItem = $from.start(blockTaskItemDepth) + 1;
+
+    // Is the selection at the first possible position inside the blockTaskItem
+    return $from.pos === firstPosInBlockTaskItem;
+  }
   return empty && ($from.parentOffset === 0 || state.selection instanceof GapCursorSelection);
 };
 export var isEmptySelectionAtEnd = function isEmptySelectionAtEnd(state) {

package/dist/types/utils/commands.d.ts

@@ -37,6 +37,11 @@ export declare function atTheBeginningOfDoc(state: EditorState): boolean;
  */
 export declare const deleteEmptyParagraphAndMoveBlockUp: (canNextNodeMoveUp: (nextNode: PMNode) => boolean) => Command;
 export declare const insertContentDeleteRange: (tr: Transaction, getSelectionResolvedPos: (tr: Transaction) => ResolvedPos, insertions: [Fragment, number][], deletions: [number, number][]) => void;
+/**
+ * Check if the selection is empty and at the start of a task or list item
+ * @param state Editor state
+ * @returns true if selection is empty and at the start of a task or list item
+ */
 export declare const isEmptySelectionAtStart: (state: EditorState) => boolean;
 export declare const isEmptySelectionAtEnd: (state: EditorState) => boolean;
 export { filter as filterCommand };

package/dist/types-ts4.5/utils/commands.d.ts

@@ -43,6 +43,11 @@ export declare const insertContentDeleteRange: (tr: Transaction, getSelectionRes
     number,
     number
 ][]) => void;
+/**
+ * Check if the selection is empty and at the start of a task or list item
+ * @param state Editor state
+ * @returns true if selection is empty and at the start of a task or list item
+ */
 export declare const isEmptySelectionAtStart: (state: EditorState) => boolean;
 export declare const isEmptySelectionAtEnd: (state: EditorState) => boolean;
 export { filter as filterCommand };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "109.1.0",
+	"version": "109.1.2",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -151,7 +151,7 @@
 		"@atlaskit/icon-object": "^7.2.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/link-datasource": "^4.21.0",
-		"@atlaskit/link-picker": "^3.9.0",
+		"@atlaskit/link-picker": "^3.10.0",
 		"@atlaskit/media-card": "^79.5.0",
 		"@atlaskit/media-client": "^35.3.0",
 		"@atlaskit/media-client-react": "^4.1.0",
@@ -167,7 +167,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
 		"@atlaskit/popper": "^7.1.0",
 		"@atlaskit/primitives": "^14.14.0",
-		"@atlaskit/profilecard": "^24.11.0",
+		"@atlaskit/profilecard": "^24.12.0",
 		"@atlaskit/react-ufo": "^4.6.0",
 		"@atlaskit/section-message": "^8.7.0",
 		"@atlaskit/smart-card": "^40.22.0",
@@ -177,7 +177,7 @@
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^12.10.0",
+		"@atlaskit/tmp-editor-statsig": "^12.12.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -218,7 +218,7 @@
 		"@af/visual-regression": "workspace:^",
 		"@atlaskit/media-core": "^37.0.0",
 		"@atlaskit/media-test-helpers": "^39.0.0",
-		"@atlaskit/util-data-test": "^18.1.0",
+		"@atlaskit/util-data-test": "^18.2.0",
 		"@testing-library/dom": "^10.1.0",
 		"@testing-library/jest-dom": "^6.4.5",
 		"@testing-library/react": "^13.4.0",