@atlaskit/editor-common 74.25.2 → 74.26.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-common
 
+## 74.26.1
+
+### Patch Changes
+
+- [`e8885f55db6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e8885f55db6) - ED-18969 implement relative guides support
+
+## 74.26.0
+
+### Minor Changes
+
+- [`3920dcfd848`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3920dcfd848) - This removes the feature flag made for upgrading the `focus-trap` dependency and keeps `focus-trap` at it's original version.
+
 ## 74.25.2
 
 ### Patch Changes

package/dist/cjs/guideline/index.js

@@ -27,6 +27,13 @@ Object.defineProperty(exports, "getGuidelinesWithHighlights", {
     return _updateGuideline.getGuidelinesWithHighlights;
   }
 });
+Object.defineProperty(exports, "isVerticalPosition", {
+  enumerable: true,
+  get: function get() {
+    return _utils.isVerticalPosition;
+  }
+});
 var _dynamicGuideline = require("./dynamicGuideline");
 var _fixedGuideline = require("./fixedGuideline");
-var _updateGuideline = require("./updateGuideline");
+var _updateGuideline = require("./updateGuideline");
+var _utils = require("./utils");

package/dist/cjs/guideline/types.js

@@ -9,4 +9,16 @@ var WidthTypes = /*#__PURE__*/function (WidthTypes) {
   WidthTypes["PIXEL"] = "pixel";
   return WidthTypes;
 }({});
+/*
+ * When x is 0, a vertical line is displayed at the center of the editor
+ * a negative value will move the line to the left,
+ * a positive value will move the line to the right,
+ * The range is from -width/2 to width/2, outside will be ignored.
+ * Define as an object allows us add more options in the future.
+ *
+ * ────────────┬─────────── y=0
+ *             │
+ *             │
+ *            x=0
+ */
 exports.WidthTypes = WidthTypes;

package/dist/cjs/guideline/utils.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isVerticalPosition = exports.isNumber = void 0;
+var isNumber = function isNumber(x) {
+  return typeof x === 'number' && !isNaN(x) && isFinite(x);
+};
+exports.isNumber = isNumber;
+var isVerticalPosition = function isVerticalPosition(pos) {
+  return isNumber(pos.x);
+};
+exports.isVerticalPosition = isVerticalPosition;

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ 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 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 = "74.25.2";
+var packageVersion = "74.26.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -24,7 +24,7 @@ var _templateObject, _templateObject2, _templateObject3;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "74.25.2";
+var packageVersion = "74.26.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -19,12 +19,10 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _focusTrap = require("focus-trap");
-var _focusTrapV = _interopRequireDefault(require("focus-trap-v2"));
+var _focusTrap = _interopRequireDefault(require("focus-trap"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _reactDom = require("react-dom");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("./utils");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -77,11 +75,7 @@ var Popup = /*#__PURE__*/function (_React$Component) {
         fallbackFocus: popup,
         returnFocusOnDeactivate: false
       };
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.focus-trap-upgrade_p2cei')) {
-        _this.focusTrap = (0, _focusTrap.createFocusTrap)(popup, trapConfig);
-      } else {
-        _this.focusTrap = (0, _focusTrapV.default)(popup, trapConfig);
-      }
+      _this.focusTrap = (0, _focusTrap.default)(popup, trapConfig);
       _this.focusTrap.activate();
     }));
     return _this;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "74.25.2",
+	"version": "74.26.1",
 	"sideEffects": false
 }

package/dist/es2019/guideline/index.js

@@ -1,3 +1,4 @@
 export { generateDynamicGuidelines } from './dynamicGuideline';
 export { createFixedGuidelinesFromLengths, createGuidesFromLengths } from './fixedGuideline';
-export { getGuidelinesWithHighlights } from './updateGuideline';
+export { getGuidelinesWithHighlights } from './updateGuideline';
+export { isVerticalPosition } from './utils';

package/dist/es2019/guideline/types.js

@@ -2,4 +2,17 @@ export let WidthTypes = /*#__PURE__*/function (WidthTypes) {
   WidthTypes["PERCENTAGE"] = "percentage";
   WidthTypes["PIXEL"] = "pixel";
   return WidthTypes;
-}({});
+}({});
+
+/*
+ * When x is 0, a vertical line is displayed at the center of the editor
+ * a negative value will move the line to the left,
+ * a positive value will move the line to the right,
+ * The range is from -width/2 to width/2, outside will be ignored.
+ * Define as an object allows us add more options in the future.
+ *
+ * ────────────┬─────────── y=0
+ *             │
+ *             │
+ *            x=0
+ */

package/dist/es2019/guideline/utils.js

@@ -0,0 +1,4 @@
+export const isNumber = x => typeof x === 'number' && !isNaN(x) && isFinite(x);
+export const isVerticalPosition = pos => {
+  return isNumber(pos.x);
+};

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 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 = "74.25.2";
+const packageVersion = "74.26.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -8,7 +8,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "74.25.2";
+const packageVersion = "74.26.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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

@@ -1,11 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { createFocusTrap } from 'focus-trap';
-import createFocusTrapV2 from 'focus-trap-v2';
+import createFocusTrap from 'focus-trap';
 import rafSchedule from 'raf-schd';
 import { createPortal } from 'react-dom';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { calculatePlacement, calculatePosition, findOverflowScrollParent, validatePosition } from './utils';
 export default class Popup extends React.Component {
   constructor(...args) {
@@ -45,11 +43,7 @@ export default class Popup extends React.Component {
         fallbackFocus: popup,
         returnFocusOnDeactivate: false
       };
-      if (getBooleanFF('platform.design-system-team.focus-trap-upgrade_p2cei')) {
-        this.focusTrap = createFocusTrap(popup, trapConfig);
-      } else {
-        this.focusTrap = createFocusTrapV2(popup, trapConfig);
-      }
+      this.focusTrap = createFocusTrap(popup, trapConfig);
       this.focusTrap.activate();
     }));
   }

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "74.25.2",
+	"version": "74.26.1",
 	"sideEffects": false
 }

package/dist/esm/guideline/index.js

@@ -1,3 +1,4 @@
 export { generateDynamicGuidelines } from './dynamicGuideline';
 export { createFixedGuidelinesFromLengths, createGuidesFromLengths } from './fixedGuideline';
-export { getGuidelinesWithHighlights } from './updateGuideline';
+export { getGuidelinesWithHighlights } from './updateGuideline';
+export { isVerticalPosition } from './utils';

package/dist/esm/guideline/types.js

@@ -2,4 +2,17 @@ export var WidthTypes = /*#__PURE__*/function (WidthTypes) {
   WidthTypes["PERCENTAGE"] = "percentage";
   WidthTypes["PIXEL"] = "pixel";
   return WidthTypes;
-}({});
+}({});
+
+/*
+ * When x is 0, a vertical line is displayed at the center of the editor
+ * a negative value will move the line to the left,
+ * a positive value will move the line to the right,
+ * The range is from -width/2 to width/2, outside will be ignored.
+ * Define as an object allows us add more options in the future.
+ *
+ * ────────────┬─────────── y=0
+ *             │
+ *             │
+ *            x=0
+ */

package/dist/esm/guideline/utils.js

@@ -0,0 +1,6 @@
+export var isNumber = function isNumber(x) {
+  return typeof x === 'number' && !isNaN(x) && isFinite(x);
+};
+export var isVerticalPosition = function isVerticalPosition(pos) {
+  return isNumber(pos.x);
+};

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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 = "74.25.2";
+var packageVersion = "74.26.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -18,7 +18,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "74.25.2";
+var packageVersion = "74.26.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -10,12 +10,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import React from 'react';
-import { createFocusTrap } from 'focus-trap';
-import createFocusTrapV2 from 'focus-trap-v2';
+import createFocusTrap from 'focus-trap';
 import rafSchedule from 'raf-schd';
 import { createPortal } from 'react-dom';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { calculatePlacement, calculatePosition as _calculatePosition, findOverflowScrollParent, validatePosition } from './utils';
 var Popup = /*#__PURE__*/function (_React$Component) {
   _inherits(Popup, _React$Component);
@@ -64,11 +62,7 @@ var Popup = /*#__PURE__*/function (_React$Component) {
         fallbackFocus: popup,
         returnFocusOnDeactivate: false
       };
-      if (getBooleanFF('platform.design-system-team.focus-trap-upgrade_p2cei')) {
-        _this.focusTrap = createFocusTrap(popup, trapConfig);
-      } else {
-        _this.focusTrap = createFocusTrapV2(popup, trapConfig);
-      }
+      _this.focusTrap = createFocusTrap(popup, trapConfig);
       _this.focusTrap.activate();
     }));
     return _this;

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "74.25.2",
+	"version": "74.26.1",
 	"sideEffects": false
 }

package/dist/types/guideline/index.d.ts

@@ -1,3 +1,5 @@
 export { generateDynamicGuidelines } from './dynamicGuideline';
 export { createFixedGuidelinesFromLengths, createGuidesFromLengths, } from './fixedGuideline';
 export { getGuidelinesWithHighlights } from './updateGuideline';
+export type { WidthTypes, Position, GuidelineConfig, GuidelinePluginState, GuidelinePluginOptions, DisplayGuideline, DisplayGrid, VerticalPosition, HorizontalPosition, } from './types';
+export { isVerticalPosition } from './utils';

package/dist/types/guideline/types.d.ts

@@ -1,3 +1,5 @@
+import { EditorView } from 'prosemirror-view';
+import { CSSToken } from '@atlaskit/tokens';
 export declare enum WidthTypes {
     PERCENTAGE = "percentage",
     PIXEL = "pixel"
@@ -7,3 +9,34 @@ export type LengthGuide = {
     right: number;
     length: number;
 };
+export type Range = {
+    start: number;
+    end: number;
+};
+export type VerticalPosition = {
+    x: number;
+    y?: Range;
+};
+export type HorizontalPosition = {
+    x?: Range;
+    y: number;
+};
+export type Position = VerticalPosition | HorizontalPosition;
+export type GuidelineConfig = {
+    key: string;
+    position: Position;
+    active?: boolean;
+    show?: boolean;
+    style?: 'dashed' | 'solid';
+    color?: CSSToken;
+    styles?: {
+        capStyle?: 'line';
+    };
+};
+export type GuidelinePluginState = {
+    guidelines: GuidelineConfig[];
+};
+export interface GuidelinePluginOptions {
+}
+export type DisplayGrid = (props: Required<GuidelinePluginState>) => boolean;
+export type DisplayGuideline = (view: EditorView) => DisplayGrid;

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

@@ -0,0 +1,3 @@
+import { Position, VerticalPosition } from './types';
+export declare const isNumber: (x: unknown) => x is number;
+export declare const isVerticalPosition: (pos: Position) => pos is VerticalPosition;

package/dist/types/ui/Popup/index.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import { FocusTrap } from 'focus-trap';
 import { Position } from './utils';
 export interface Props {
     zIndex?: number;
@@ -70,7 +69,7 @@ export default class Popup extends React.Component<Props, State> {
     /**
      * Handle pausing, unpausing, and initialising (if not yet initialised) of the focus trap
      */
-    handleChangedFocusTrapProp(prevProps: Props): void | FocusTrap;
+    handleChangedFocusTrapProp(prevProps: Props): void;
     componentDidUpdate(prevProps: Props): void;
     componentDidMount(): void;
     componentWillUnmount(): void;

package/dist/types-ts4.5/guideline/index.d.ts

@@ -1,3 +1,5 @@
 export { generateDynamicGuidelines } from './dynamicGuideline';
 export { createFixedGuidelinesFromLengths, createGuidesFromLengths, } from './fixedGuideline';
 export { getGuidelinesWithHighlights } from './updateGuideline';
+export type { WidthTypes, Position, GuidelineConfig, GuidelinePluginState, GuidelinePluginOptions, DisplayGuideline, DisplayGrid, VerticalPosition, HorizontalPosition, } from './types';
+export { isVerticalPosition } from './utils';

package/dist/types-ts4.5/guideline/types.d.ts

@@ -1,3 +1,5 @@
+import { EditorView } from 'prosemirror-view';
+import { CSSToken } from '@atlaskit/tokens';
 export declare enum WidthTypes {
     PERCENTAGE = "percentage",
     PIXEL = "pixel"
@@ -7,3 +9,34 @@ export type LengthGuide = {
     right: number;
     length: number;
 };
+export type Range = {
+    start: number;
+    end: number;
+};
+export type VerticalPosition = {
+    x: number;
+    y?: Range;
+};
+export type HorizontalPosition = {
+    x?: Range;
+    y: number;
+};
+export type Position = VerticalPosition | HorizontalPosition;
+export type GuidelineConfig = {
+    key: string;
+    position: Position;
+    active?: boolean;
+    show?: boolean;
+    style?: 'dashed' | 'solid';
+    color?: CSSToken;
+    styles?: {
+        capStyle?: 'line';
+    };
+};
+export type GuidelinePluginState = {
+    guidelines: GuidelineConfig[];
+};
+export interface GuidelinePluginOptions {
+}
+export type DisplayGrid = (props: Required<GuidelinePluginState>) => boolean;
+export type DisplayGuideline = (view: EditorView) => DisplayGrid;

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

@@ -0,0 +1,3 @@
+import { Position, VerticalPosition } from './types';
+export declare const isNumber: (x: unknown) => x is number;
+export declare const isVerticalPosition: (pos: Position) => pos is VerticalPosition;

package/dist/types-ts4.5/ui/Popup/index.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import { FocusTrap } from 'focus-trap';
 import { Position } from './utils';
 export interface Props {
     zIndex?: number;
@@ -73,7 +72,7 @@ export default class Popup extends React.Component<Props, State> {
     /**
      * Handle pausing, unpausing, and initialising (if not yet initialised) of the focus trap
      */
-    handleChangedFocusTrapProp(prevProps: Props): void | FocusTrap;
+    handleChangedFocusTrapProp(prevProps: Props): void;
     componentDidUpdate(prevProps: Props): void;
     componentDidMount(): void;
     componentWillUnmount(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "74.25.2",
+  "version": "74.26.1",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -116,8 +116,7 @@
     "chromatism": "^2.6.0",
     "classnames": "^2.2.5",
     "date-fns": "^2.17.0",
-    "focus-trap": "^7.0.0",
-    "focus-trap-v2": "npm:focus-trap@^2.4.5",
+    "focus-trap": "^2.4.5",
     "linkify-it": "^2.0.3",
     "lodash": "^4.17.21",
     "markdown-it": "^12.3.2",
@@ -189,9 +188,6 @@
     "platform.design-system-team.menu-selected-state-change_0see9": {
       "type": "boolean"
     },
-    "platform.design-system-team.focus-trap-upgrade_p2cei": {
-      "type": "boolean"
-    },
     "platform.linking-platform.datasource-jira_issues": {
       "type": "boolean"
     }