@atlaskit/editor-common 74.3.0 → 74.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 74.4.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`d9fe34b3f2b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d9fe34b3f2b) - [ux] The ResizerNext component now supports a new property handleAlignmentMethod which defaults to "sticky". This means the resizer handles wil stick to the top/bottom bounds of the browser viewport if the component extends beyond and the user scrolls down. An alternative "center" value can be set which means the handles will just center to their content and not stick.
8
+ - [`f3d2c08d61b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f3d2c08d61b) - Adds new datasource attribute to existing blockCard node
9
+
10
+ ### Patch Changes
11
+
12
+ - Updated dependencies
13
+
14
+ ## 74.3.1
15
+
16
+ ### Patch Changes
17
+
18
+ - Updated dependencies
19
+
3
20
  ## 74.3.0
4
21
 
5
22
  ### Minor Changes
@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
16
16
  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; }
17
17
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
18
18
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
19
- var packageVersion = "74.3.0";
19
+ var packageVersion = "74.4.0";
20
20
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
21
21
  // Remove URL as it has UGC
22
22
  // TODO: Sanitise the URL instead of just removing it
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.resizerStyles = exports.resizerItemClassName = exports.resizerHandlerSmallClassName = exports.resizerHandlerMediumClassName = exports.resizerHandlerLargeClassName = exports.resizerHandlerClassName = exports.resizerHandleZIndex = exports.resizerHandleRightClassName = exports.resizerHandlePadding = exports.resizerHandleLeftClassName = void 0;
7
+ exports.resizerStyles = exports.resizerItemClassName = exports.resizerHandlerSmallClassName = exports.resizerHandlerMediumClassName = exports.resizerHandlerLargeClassName = exports.resizerHandlerClassName = exports.resizerHandleZIndex = exports.resizerHandleStickyClassName = exports.resizerHandleRightClassName = exports.resizerHandlePadding = exports.resizerHandleLeftClassName = void 0;
8
8
  var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
9
9
  var _react = require("@emotion/react");
10
10
  var _colors = require("@atlaskit/theme/colors");
@@ -19,9 +19,11 @@ exports.resizerItemClassName = resizerItemClassName;
19
19
  var resizerHandleRightClassName = 'resizer-handle-right';
20
20
  exports.resizerHandleRightClassName = resizerHandleRightClassName;
21
21
  var resizerHandleLeftClassName = 'resizer-handle-left';
22
+ exports.resizerHandleLeftClassName = resizerHandleLeftClassName;
23
+ var resizerHandleStickyClassName = 'resizer-handle-sticky';
22
24
 
23
25
  // akEditorSelectedNodeClassName from '@atlaskit/editor-shared-styles';
24
- exports.resizerHandleLeftClassName = resizerHandleLeftClassName;
26
+ exports.resizerHandleStickyClassName = resizerHandleStickyClassName;
25
27
  var akEditorSelectedNodeClassName = 'ak-editor-selected-node';
26
28
  var resizerHandlePadding = 13;
27
29
  exports.resizerHandlePadding = resizerHandlePadding;
@@ -39,5 +41,5 @@ var resizerHandlerClassName = {
39
41
  large: resizerHandlerLargeClassName
40
42
  };
41
43
  exports.resizerHandlerClassName = resizerHandlerClassName;
42
- var resizerStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n .", " {\n background: ", ";\n }\n\n .", ", .", " {\n display: flex;\n flex-direction: column;\n\n /* vertical align */\n justify-content: center;\n }\n\n .", " {\n align-items: flex-end;\n /* padding-right: 12px; */\n /* margin-right: -", "px; */\n }\n\n .", " {\n align-items: flex-start;\n /* padding-left: 12px; */\n /* margin-left: -", "px; */\n }\n\n .", "::after,\n .", "::after {\n content: ' ';\n display: flex;\n width: 3px;\n height: 64px;\n\n border-radius: 6px;\n }\n\n .", ":hover\n .", "::after,\n .", ":hover\n .", "::after {\n background: ", ";\n }\n\n .", "\n .", "::after,\n .", "\n .", "::after,\n .", "\n .", ":hover::after,\n .", "\n .", ":hover::after,\n .", ".is-resizing\n .", "::after,\n .", ".is-resizing\n .", "::after {\n background: ", ";\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 64px;\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 43px;\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 96px;\n }\n"])), resizerItemClassName, "var(--ds-border-focused, ".concat(_colors.B200, ")"), resizerHandleRightClassName, resizerHandleLeftClassName, resizerHandleRightClassName, resizerHandlePadding, resizerHandleLeftClassName, resizerHandlePadding, resizerHandleRightClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, "var(--ds-border, ".concat(_colors.N60, ")"), akEditorSelectedNodeClassName, resizerHandleRightClassName, akEditorSelectedNodeClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, resizerItemClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, resizerItemClassName, resizerHandleLeftClassName, "var(--ds-border-focused, ".concat(_colors.B200, ")"), resizerHandleRightClassName, resizerHandlerClassName.medium, resizerHandleLeftClassName, resizerHandlerClassName.medium, resizerHandleRightClassName, resizerHandlerClassName.small, resizerHandleLeftClassName, resizerHandlerClassName.small, resizerHandleRightClassName, resizerHandlerClassName.large, resizerHandleLeftClassName, resizerHandlerClassName.large);
44
+ var resizerStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n .", " {\n background: ", ";\n }\n\n .", ", .", " {\n display: flex;\n flex-direction: column;\n justify-content: center;\n }\n\n .", " {\n align-items: flex-end;\n }\n\n .", " {\n align-items: flex-start;\n }\n\n .", "::after,\n .", "::after {\n content: ' ';\n display: flex;\n width: 3px;\n height: 64px;\n\n border-radius: 6px;\n }\n\n .", ":hover\n .", "::after,\n .", ":hover\n .", "::after {\n background: ", ";\n }\n\n .", "\n .", "::after,\n .", "\n .", "::after,\n .", "\n .", ":hover::after,\n .", "\n .", ":hover::after,\n .", ".is-resizing\n .", "::after,\n .", ".is-resizing\n .", "::after {\n background: ", ";\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 64px;\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 43px;\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 96px;\n }\n\n .", ".", "::after,\n .", ".", "::after {\n position: sticky;\n top: 10px;\n bottom: 10px;\n }\n"])), resizerItemClassName, "var(--ds-border-focused, ".concat(_colors.B200, ")"), resizerHandleRightClassName, resizerHandleLeftClassName, resizerHandleRightClassName, resizerHandleLeftClassName, resizerHandleRightClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, "var(--ds-border, ".concat(_colors.N60, ")"), akEditorSelectedNodeClassName, resizerHandleRightClassName, akEditorSelectedNodeClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, resizerItemClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, resizerItemClassName, resizerHandleLeftClassName, "var(--ds-border-focused, ".concat(_colors.B200, ")"), resizerHandleRightClassName, resizerHandlerClassName.medium, resizerHandleLeftClassName, resizerHandlerClassName.medium, resizerHandleRightClassName, resizerHandlerClassName.small, resizerHandleLeftClassName, resizerHandlerClassName.small, resizerHandleRightClassName, resizerHandlerClassName.large, resizerHandleLeftClassName, resizerHandlerClassName.large, resizerHandleRightClassName, resizerHandleStickyClassName, resizerHandleLeftClassName, resizerHandleStickyClassName);
43
45
  exports.resizerStyles = resizerStyles;
@@ -24,7 +24,7 @@ var _templateObject, _templateObject2, _templateObject3;
24
24
  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); }; }
25
25
  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 */
26
26
  var packageName = "@atlaskit/editor-common";
27
- var packageVersion = "74.3.0";
27
+ var packageVersion = "74.4.0";
28
28
  var halfFocusRing = 1;
29
29
  var dropOffset = '0, 8';
30
30
  var DropList = /*#__PURE__*/function (_Component) {
@@ -5,18 +5,21 @@ Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
7
  exports.default = ResizerNext;
8
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
8
9
  var _react = _interopRequireDefault(require("react"));
9
- var _classnames = _interopRequireDefault(require("classnames"));
10
+ var _classnames3 = _interopRequireDefault(require("classnames"));
10
11
  var _reResizable = require("re-resizable");
11
12
  var _resizer = require("../../styles/shared/resizer");
12
- var _utils = require("./utils");
13
13
  function ResizerNext(props) {
14
+ var _classnames, _classnames2;
14
15
  var resizable = _react.default.useRef(null);
15
16
  var handleResize = props.handleResize,
16
17
  handleResizeStart = props.handleResizeStart,
17
18
  handleResizeStop = props.handleResizeStop,
18
19
  _props$handlerHeightS = props.handlerHeightSize,
19
- handlerHeightSize = _props$handlerHeightS === void 0 ? 'medium' : _props$handlerHeightS;
20
+ handlerHeightSize = _props$handlerHeightS === void 0 ? 'medium' : _props$handlerHeightS,
21
+ _props$handleAlignmen = props.handleAlignmentMethod,
22
+ handleAlignmentMethod = _props$handleAlignmen === void 0 ? 'center' : _props$handleAlignmen;
20
23
  var onResizeStart = _react.default.useCallback(function (event) {
21
24
  // prevent creating a drag event on Firefox
22
25
  event.preventDefault();
@@ -48,22 +51,10 @@ function ResizerNext(props) {
48
51
  };
49
52
  handleResizeStop(originalState, delta);
50
53
  }, [handleResizeStop]);
51
- var handles = {};
52
- if (props.handleClassName) {
53
- _utils.handleSides.forEach(function (side) {
54
- handles[side] = "".concat(props.handleClassName, "-").concat(side);
55
- });
56
- } else {
57
- handles = {
58
- left: _resizer.resizerHandleLeftClassName,
59
- right: _resizer.resizerHandleRightClassName
60
- };
61
- }
62
-
63
- // add handler height size classname to handleClasses
64
- Object.keys(handles).forEach(function (key) {
65
- handles[key] = (0, _classnames.default)(handles[key], _resizer.resizerHandlerClassName[handlerHeightSize]);
66
- });
54
+ var handles = {
55
+ left: (0, _classnames3.default)((_classnames = {}, (0, _defineProperty2.default)(_classnames, "".concat(props.handleClassName, "-left"), !!props.handleClassName), (0, _defineProperty2.default)(_classnames, _resizer.resizerHandleLeftClassName, !props.handleClassName), (0, _defineProperty2.default)(_classnames, _resizer.resizerHandlerClassName[handlerHeightSize], true), (0, _defineProperty2.default)(_classnames, _resizer.resizerHandleStickyClassName, handleAlignmentMethod === 'sticky'), _classnames)),
56
+ right: (0, _classnames3.default)((_classnames2 = {}, (0, _defineProperty2.default)(_classnames2, "".concat(props.handleClassName, "-right"), !!props.handleClassName), (0, _defineProperty2.default)(_classnames2, _resizer.resizerHandleRightClassName, !props.handleClassName), (0, _defineProperty2.default)(_classnames2, _resizer.resizerHandlerClassName[handlerHeightSize], true), (0, _defineProperty2.default)(_classnames2, _resizer.resizerHandleStickyClassName, handleAlignmentMethod === 'sticky'), _classnames2))
57
+ };
67
58
  var innerPadding = props.innerPadding || _resizer.resizerHandlePadding;
68
59
  var handleStyles = {
69
60
  left: {
@@ -79,7 +70,7 @@ function ResizerNext(props) {
79
70
  pointerEvents: 'auto'
80
71
  }
81
72
  };
82
- var className = (0, _classnames.default)(props.className, _resizer.resizerItemClassName);
73
+ var className = (0, _classnames3.default)(props.className, _resizer.resizerItemClassName);
83
74
  return /*#__PURE__*/_react.default.createElement(_reResizable.Resizable, {
84
75
  ref: resizable,
85
76
  size: {
@@ -299,7 +299,7 @@ var getValidNode = function getValidNode(originalNode) {
299
299
  case 'inlineCard':
300
300
  case 'blockCard':
301
301
  {
302
- if (attrs && (attrs.url && (0, _adfSchema.isSafeUrl)(attrs.url) || attrs.data && attrs.data.url && (0, _adfSchema.isSafeUrl)(attrs.data.url))) {
302
+ if (attrs && (attrs.datasource && !attrs.url || attrs.url && (0, _adfSchema.isSafeUrl)(attrs.url) || attrs.data && attrs.data.url && (0, _adfSchema.isSafeUrl)(attrs.data.url))) {
303
303
  return {
304
304
  type: type,
305
305
  attrs: attrs
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "74.3.0",
3
+ "version": "74.4.0",
4
4
  "sideEffects": false
5
5
  }
@@ -1,6 +1,6 @@
1
1
  const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
2
2
  const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
3
- const packageVersion = "74.3.0";
3
+ const packageVersion = "74.4.0";
4
4
  const sanitiseSentryEvents = (data, _hint) => {
5
5
  // Remove URL as it has UGC
6
6
  // TODO: Sanitise the URL instead of just removing it
@@ -8,6 +8,7 @@ import { B200, N60 } from '@atlaskit/theme/colors';
8
8
  export const resizerItemClassName = 'resizer-item';
9
9
  export const resizerHandleRightClassName = 'resizer-handle-right';
10
10
  export const resizerHandleLeftClassName = 'resizer-handle-left';
11
+ export const resizerHandleStickyClassName = 'resizer-handle-sticky';
11
12
 
12
13
  // akEditorSelectedNodeClassName from '@atlaskit/editor-shared-styles';
13
14
  const akEditorSelectedNodeClassName = 'ak-editor-selected-node';
@@ -29,21 +30,15 @@ export const resizerStyles = css`
29
30
  .${resizerHandleRightClassName}, .${resizerHandleLeftClassName} {
30
31
  display: flex;
31
32
  flex-direction: column;
32
-
33
- /* vertical align */
34
33
  justify-content: center;
35
34
  }
36
35
 
37
36
  .${resizerHandleRightClassName} {
38
37
  align-items: flex-end;
39
- /* padding-right: 12px; */
40
- /* margin-right: -${resizerHandlePadding}px; */
41
38
  }
42
39
 
43
40
  .${resizerHandleLeftClassName} {
44
41
  align-items: flex-start;
45
- /* padding-left: 12px; */
46
- /* margin-left: -${resizerHandlePadding}px; */
47
42
  }
48
43
 
49
44
  .${resizerHandleRightClassName}::after,
@@ -92,4 +87,11 @@ export const resizerStyles = css`
92
87
  .${resizerHandleLeftClassName}.${resizerHandlerClassName.large}::after {
93
88
  height: 96px;
94
89
  }
90
+
91
+ .${resizerHandleRightClassName}.${resizerHandleStickyClassName}::after,
92
+ .${resizerHandleLeftClassName}.${resizerHandleStickyClassName}::after {
93
+ position: sticky;
94
+ top: 10px;
95
+ bottom: 10px;
96
+ }
95
97
  `;
@@ -8,7 +8,7 @@ import { themed } from '@atlaskit/theme/components';
8
8
  import { borderRadius } from '@atlaskit/theme/constants';
9
9
  import Layer from '../Layer';
10
10
  const packageName = "@atlaskit/editor-common";
11
- const packageVersion = "74.3.0";
11
+ const packageVersion = "74.4.0";
12
12
  const halfFocusRing = 1;
13
13
  const dropOffset = '0, 8';
14
14
  class DropList extends Component {
@@ -1,15 +1,15 @@
1
1
  import React from 'react';
2
2
  import classnames from 'classnames';
3
3
  import { Resizable } from 're-resizable';
4
- import { resizerHandleLeftClassName, resizerHandlePadding, resizerHandlerClassName, resizerHandleRightClassName, resizerHandleZIndex, resizerItemClassName } from '../../styles/shared/resizer';
5
- import { handleSides } from './utils';
4
+ import { resizerHandleLeftClassName, resizerHandlePadding, resizerHandlerClassName, resizerHandleRightClassName, resizerHandleStickyClassName, resizerHandleZIndex, resizerItemClassName } from '../../styles/shared/resizer';
6
5
  export default function ResizerNext(props) {
7
6
  const resizable = React.useRef(null);
8
7
  const {
9
8
  handleResize,
10
9
  handleResizeStart,
11
10
  handleResizeStop,
12
- handlerHeightSize = 'medium'
11
+ handlerHeightSize = 'medium',
12
+ handleAlignmentMethod = 'center'
13
13
  } = props;
14
14
  const onResizeStart = React.useCallback(event => {
15
15
  // prevent creating a drag event on Firefox
@@ -42,22 +42,20 @@ export default function ResizerNext(props) {
42
42
  };
43
43
  handleResizeStop(originalState, delta);
44
44
  }, [handleResizeStop]);
45
- let handles = {};
46
- if (props.handleClassName) {
47
- handleSides.forEach(side => {
48
- handles[side] = `${props.handleClassName}-${side}`;
49
- });
50
- } else {
51
- handles = {
52
- left: resizerHandleLeftClassName,
53
- right: resizerHandleRightClassName
54
- };
55
- }
56
-
57
- // add handler height size classname to handleClasses
58
- Object.keys(handles).forEach(key => {
59
- handles[key] = classnames(handles[key], resizerHandlerClassName[handlerHeightSize]);
60
- });
45
+ const handles = {
46
+ left: classnames({
47
+ [`${props.handleClassName}-left`]: !!props.handleClassName,
48
+ [resizerHandleLeftClassName]: !props.handleClassName,
49
+ [resizerHandlerClassName[handlerHeightSize]]: true,
50
+ [resizerHandleStickyClassName]: handleAlignmentMethod === 'sticky'
51
+ }),
52
+ right: classnames({
53
+ [`${props.handleClassName}-right`]: !!props.handleClassName,
54
+ [resizerHandleRightClassName]: !props.handleClassName,
55
+ [resizerHandlerClassName[handlerHeightSize]]: true,
56
+ [resizerHandleStickyClassName]: handleAlignmentMethod === 'sticky'
57
+ })
58
+ };
61
59
  const innerPadding = props.innerPadding || resizerHandlePadding;
62
60
  const handleStyles = {
63
61
  left: {
@@ -273,7 +273,7 @@ export const getValidNode = (originalNode, schema = defaultSchema, adfStage = 'f
273
273
  case 'inlineCard':
274
274
  case 'blockCard':
275
275
  {
276
- if (attrs && (attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
276
+ if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
277
277
  return {
278
278
  type,
279
279
  attrs
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "74.3.0",
3
+ "version": "74.4.0",
4
4
  "sideEffects": false
5
5
  }
@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
6
6
  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; }
7
7
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
8
8
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
9
- var packageVersion = "74.3.0";
9
+ var packageVersion = "74.4.0";
10
10
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
11
11
  // Remove URL as it has UGC
12
12
  // TODO: Sanitise the URL instead of just removing it
@@ -10,6 +10,7 @@ import { B200, N60 } from '@atlaskit/theme/colors';
10
10
  export var resizerItemClassName = 'resizer-item';
11
11
  export var resizerHandleRightClassName = 'resizer-handle-right';
12
12
  export var resizerHandleLeftClassName = 'resizer-handle-left';
13
+ export var resizerHandleStickyClassName = 'resizer-handle-sticky';
13
14
 
14
15
  // akEditorSelectedNodeClassName from '@atlaskit/editor-shared-styles';
15
16
  var akEditorSelectedNodeClassName = 'ak-editor-selected-node';
@@ -23,4 +24,4 @@ export var resizerHandlerClassName = {
23
24
  medium: resizerHandlerMediumClassName,
24
25
  large: resizerHandlerLargeClassName
25
26
  };
26
- export var resizerStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n .", " {\n background: ", ";\n }\n\n .", ", .", " {\n display: flex;\n flex-direction: column;\n\n /* vertical align */\n justify-content: center;\n }\n\n .", " {\n align-items: flex-end;\n /* padding-right: 12px; */\n /* margin-right: -", "px; */\n }\n\n .", " {\n align-items: flex-start;\n /* padding-left: 12px; */\n /* margin-left: -", "px; */\n }\n\n .", "::after,\n .", "::after {\n content: ' ';\n display: flex;\n width: 3px;\n height: 64px;\n\n border-radius: 6px;\n }\n\n .", ":hover\n .", "::after,\n .", ":hover\n .", "::after {\n background: ", ";\n }\n\n .", "\n .", "::after,\n .", "\n .", "::after,\n .", "\n .", ":hover::after,\n .", "\n .", ":hover::after,\n .", ".is-resizing\n .", "::after,\n .", ".is-resizing\n .", "::after {\n background: ", ";\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 64px;\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 43px;\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 96px;\n }\n"])), resizerItemClassName, "var(--ds-border-focused, ".concat(B200, ")"), resizerHandleRightClassName, resizerHandleLeftClassName, resizerHandleRightClassName, resizerHandlePadding, resizerHandleLeftClassName, resizerHandlePadding, resizerHandleRightClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, "var(--ds-border, ".concat(N60, ")"), akEditorSelectedNodeClassName, resizerHandleRightClassName, akEditorSelectedNodeClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, resizerItemClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, resizerItemClassName, resizerHandleLeftClassName, "var(--ds-border-focused, ".concat(B200, ")"), resizerHandleRightClassName, resizerHandlerClassName.medium, resizerHandleLeftClassName, resizerHandlerClassName.medium, resizerHandleRightClassName, resizerHandlerClassName.small, resizerHandleLeftClassName, resizerHandlerClassName.small, resizerHandleRightClassName, resizerHandlerClassName.large, resizerHandleLeftClassName, resizerHandlerClassName.large);
27
+ export var resizerStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n .", " {\n background: ", ";\n }\n\n .", ", .", " {\n display: flex;\n flex-direction: column;\n justify-content: center;\n }\n\n .", " {\n align-items: flex-end;\n }\n\n .", " {\n align-items: flex-start;\n }\n\n .", "::after,\n .", "::after {\n content: ' ';\n display: flex;\n width: 3px;\n height: 64px;\n\n border-radius: 6px;\n }\n\n .", ":hover\n .", "::after,\n .", ":hover\n .", "::after {\n background: ", ";\n }\n\n .", "\n .", "::after,\n .", "\n .", "::after,\n .", "\n .", ":hover::after,\n .", "\n .", ":hover::after,\n .", ".is-resizing\n .", "::after,\n .", ".is-resizing\n .", "::after {\n background: ", ";\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 64px;\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 43px;\n }\n\n .", ".", "::after,\n .", ".", "::after {\n height: 96px;\n }\n\n .", ".", "::after,\n .", ".", "::after {\n position: sticky;\n top: 10px;\n bottom: 10px;\n }\n"])), resizerItemClassName, "var(--ds-border-focused, ".concat(B200, ")"), resizerHandleRightClassName, resizerHandleLeftClassName, resizerHandleRightClassName, resizerHandleLeftClassName, resizerHandleRightClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, "var(--ds-border, ".concat(N60, ")"), akEditorSelectedNodeClassName, resizerHandleRightClassName, akEditorSelectedNodeClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, resizerItemClassName, resizerHandleLeftClassName, resizerItemClassName, resizerHandleRightClassName, resizerItemClassName, resizerHandleLeftClassName, "var(--ds-border-focused, ".concat(B200, ")"), resizerHandleRightClassName, resizerHandlerClassName.medium, resizerHandleLeftClassName, resizerHandlerClassName.medium, resizerHandleRightClassName, resizerHandlerClassName.small, resizerHandleLeftClassName, resizerHandlerClassName.small, resizerHandleRightClassName, resizerHandlerClassName.large, resizerHandleLeftClassName, resizerHandlerClassName.large, resizerHandleRightClassName, resizerHandleStickyClassName, resizerHandleLeftClassName, resizerHandleStickyClassName);
@@ -18,7 +18,7 @@ import { themed } from '@atlaskit/theme/components';
18
18
  import { borderRadius } from '@atlaskit/theme/constants';
19
19
  import Layer from '../Layer';
20
20
  var packageName = "@atlaskit/editor-common";
21
- var packageVersion = "74.3.0";
21
+ var packageVersion = "74.4.0";
22
22
  var halfFocusRing = 1;
23
23
  var dropOffset = '0, 8';
24
24
  var DropList = /*#__PURE__*/function (_Component) {
@@ -1,15 +1,18 @@
1
+ import _defineProperty from "@babel/runtime/helpers/defineProperty";
1
2
  import React from 'react';
2
3
  import classnames from 'classnames';
3
4
  import { Resizable } from 're-resizable';
4
- import { resizerHandleLeftClassName, resizerHandlePadding, resizerHandlerClassName, resizerHandleRightClassName, resizerHandleZIndex, resizerItemClassName } from '../../styles/shared/resizer';
5
- import { handleSides } from './utils';
5
+ import { resizerHandleLeftClassName, resizerHandlePadding, resizerHandlerClassName, resizerHandleRightClassName, resizerHandleStickyClassName, resizerHandleZIndex, resizerItemClassName } from '../../styles/shared/resizer';
6
6
  export default function ResizerNext(props) {
7
+ var _classnames, _classnames2;
7
8
  var resizable = React.useRef(null);
8
9
  var handleResize = props.handleResize,
9
10
  handleResizeStart = props.handleResizeStart,
10
11
  handleResizeStop = props.handleResizeStop,
11
12
  _props$handlerHeightS = props.handlerHeightSize,
12
- handlerHeightSize = _props$handlerHeightS === void 0 ? 'medium' : _props$handlerHeightS;
13
+ handlerHeightSize = _props$handlerHeightS === void 0 ? 'medium' : _props$handlerHeightS,
14
+ _props$handleAlignmen = props.handleAlignmentMethod,
15
+ handleAlignmentMethod = _props$handleAlignmen === void 0 ? 'center' : _props$handleAlignmen;
13
16
  var onResizeStart = React.useCallback(function (event) {
14
17
  // prevent creating a drag event on Firefox
15
18
  event.preventDefault();
@@ -41,22 +44,10 @@ export default function ResizerNext(props) {
41
44
  };
42
45
  handleResizeStop(originalState, delta);
43
46
  }, [handleResizeStop]);
44
- var handles = {};
45
- if (props.handleClassName) {
46
- handleSides.forEach(function (side) {
47
- handles[side] = "".concat(props.handleClassName, "-").concat(side);
48
- });
49
- } else {
50
- handles = {
51
- left: resizerHandleLeftClassName,
52
- right: resizerHandleRightClassName
53
- };
54
- }
55
-
56
- // add handler height size classname to handleClasses
57
- Object.keys(handles).forEach(function (key) {
58
- handles[key] = classnames(handles[key], resizerHandlerClassName[handlerHeightSize]);
59
- });
47
+ var handles = {
48
+ left: classnames((_classnames = {}, _defineProperty(_classnames, "".concat(props.handleClassName, "-left"), !!props.handleClassName), _defineProperty(_classnames, resizerHandleLeftClassName, !props.handleClassName), _defineProperty(_classnames, resizerHandlerClassName[handlerHeightSize], true), _defineProperty(_classnames, resizerHandleStickyClassName, handleAlignmentMethod === 'sticky'), _classnames)),
49
+ right: classnames((_classnames2 = {}, _defineProperty(_classnames2, "".concat(props.handleClassName, "-right"), !!props.handleClassName), _defineProperty(_classnames2, resizerHandleRightClassName, !props.handleClassName), _defineProperty(_classnames2, resizerHandlerClassName[handlerHeightSize], true), _defineProperty(_classnames2, resizerHandleStickyClassName, handleAlignmentMethod === 'sticky'), _classnames2))
50
+ };
60
51
  var innerPadding = props.innerPadding || resizerHandlePadding;
61
52
  var handleStyles = {
62
53
  left: {
@@ -285,7 +285,7 @@ export var getValidNode = function getValidNode(originalNode) {
285
285
  case 'inlineCard':
286
286
  case 'blockCard':
287
287
  {
288
- if (attrs && (attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
288
+ if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
289
289
  return {
290
290
  type: type,
291
291
  attrs: attrs
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "74.3.0",
3
+ "version": "74.4.0",
4
4
  "sideEffects": false
5
5
  }
@@ -1,6 +1,7 @@
1
1
  export declare const resizerItemClassName = "resizer-item";
2
2
  export declare const resizerHandleRightClassName = "resizer-handle-right";
3
3
  export declare const resizerHandleLeftClassName = "resizer-handle-left";
4
+ export declare const resizerHandleStickyClassName = "resizer-handle-sticky";
4
5
  export declare const resizerHandlePadding = 13;
5
6
  export declare const resizerHandleZIndex = 99;
6
7
  export declare const resizerHandlerSmallClassName = "resizer-handler-small";
@@ -1,6 +1,6 @@
1
1
  import React, { PropsWithChildren } from 'react';
2
2
  import { HandleComponent } from 're-resizable';
3
- import { EnabledHandles, HandleResize, HandlerHeightSizeType } from './types';
3
+ import { EnabledHandles, HandleAlignmentMethod, HandleResize, HandlerHeightSizeType } from './types';
4
4
  export interface ResizableNumberSize {
5
5
  width: number;
6
6
  height: number;
@@ -19,5 +19,6 @@ export type ResizerProps = {
19
19
  handleWrapperStyle?: React.CSSProperties;
20
20
  handleComponent?: HandleComponent;
21
21
  handlerHeightSize?: HandlerHeightSizeType;
22
+ handleAlignmentMethod?: HandleAlignmentMethod;
22
23
  };
23
24
  export default function ResizerNext(props: PropsWithChildren<ResizerProps>): JSX.Element;
@@ -17,3 +17,4 @@ export type HandleStyles = {
17
17
  left?: React.CSSProperties;
18
18
  };
19
19
  export type HandlerHeightSizeType = 'small' | 'medium' | 'large';
20
+ export type HandleAlignmentMethod = 'center' | 'sticky';
@@ -1,6 +1,7 @@
1
1
  export declare const resizerItemClassName = "resizer-item";
2
2
  export declare const resizerHandleRightClassName = "resizer-handle-right";
3
3
  export declare const resizerHandleLeftClassName = "resizer-handle-left";
4
+ export declare const resizerHandleStickyClassName = "resizer-handle-sticky";
4
5
  export declare const resizerHandlePadding = 13;
5
6
  export declare const resizerHandleZIndex = 99;
6
7
  export declare const resizerHandlerSmallClassName = "resizer-handler-small";
@@ -1,6 +1,6 @@
1
1
  import React, { PropsWithChildren } from 'react';
2
2
  import { HandleComponent } from 're-resizable';
3
- import { EnabledHandles, HandleResize, HandlerHeightSizeType } from './types';
3
+ import { EnabledHandles, HandleAlignmentMethod, HandleResize, HandlerHeightSizeType } from './types';
4
4
  export interface ResizableNumberSize {
5
5
  width: number;
6
6
  height: number;
@@ -19,5 +19,6 @@ export type ResizerProps = {
19
19
  handleWrapperStyle?: React.CSSProperties;
20
20
  handleComponent?: HandleComponent;
21
21
  handlerHeightSize?: HandlerHeightSizeType;
22
+ handleAlignmentMethod?: HandleAlignmentMethod;
22
23
  };
23
24
  export default function ResizerNext(props: PropsWithChildren<ResizerProps>): JSX.Element;
@@ -17,3 +17,4 @@ export type HandleStyles = {
17
17
  left?: React.CSSProperties;
18
18
  };
19
19
  export type HandlerHeightSizeType = 'small' | 'medium' | 'large';
20
+ export type HandleAlignmentMethod = 'center' | 'sticky';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "74.3.0",
3
+ "version": "74.4.0",
4
4
  "description": "A package that contains common classes and components for editor and renderer",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -70,8 +70,8 @@
70
70
  },
71
71
  "dependencies": {
72
72
  "@atlaskit/activity-provider": "^2.4.0",
73
- "@atlaskit/adf-schema": "^25.7.0",
74
- "@atlaskit/adf-utils": "^18.2.0",
73
+ "@atlaskit/adf-schema": "^25.8.0",
74
+ "@atlaskit/adf-utils": "^18.3.0",
75
75
  "@atlaskit/analytics-listeners": "^8.7.0",
76
76
  "@atlaskit/analytics-namespaced-context": "^6.7.0",
77
77
  "@atlaskit/analytics-next": "^9.1.0",
@@ -79,7 +79,7 @@
79
79
  "@atlaskit/button": "^16.7.0",
80
80
  "@atlaskit/code": "^14.6.0",
81
81
  "@atlaskit/codemod-utils": "^4.2.0",
82
- "@atlaskit/collab-provider": "^9.0.0",
82
+ "@atlaskit/collab-provider": "^9.1.0",
83
83
  "@atlaskit/editor-json-transformer": "^8.9.0",
84
84
  "@atlaskit/editor-palette": "1.4.2",
85
85
  "@atlaskit/editor-shared-styles": "^2.4.0",
@@ -87,8 +87,8 @@
87
87
  "@atlaskit/icon": "^21.12.0",
88
88
  "@atlaskit/in-product-testing": "^0.2.0",
89
89
  "@atlaskit/media-card": "^76.0.0",
90
- "@atlaskit/media-client": "^22.0.0",
91
- "@atlaskit/media-picker": "^65.1.0",
90
+ "@atlaskit/media-client": "^23.0.0",
91
+ "@atlaskit/media-picker": "^66.0.0",
92
92
  "@atlaskit/mention": "^22.1.0",
93
93
  "@atlaskit/menu": "^1.7.0",
94
94
  "@atlaskit/platform-feature-flags": "^0.2.0",
@@ -135,7 +135,7 @@
135
135
  "react-intl-next": "npm:react-intl@^5.18.1"
136
136
  },
137
137
  "devDependencies": {
138
- "@atlaskit/editor-core": "^185.0.0",
138
+ "@atlaskit/editor-core": "^185.1.0",
139
139
  "@atlaskit/editor-json-transformer": "^8.9.0",
140
140
  "@atlaskit/editor-plugin-analytics": "^0.0.1",
141
141
  "@atlaskit/editor-plugin-content-insertion": "^0.0.1",