@atlaskit/editor-core 187.8.3 → 187.8.7
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 +8 -0
- package/dist/cjs/create-editor/ReactEditorViewInternal.js +4 -5
- package/dist/cjs/plugins/annotation/commands/transform.js +2 -2
- package/dist/cjs/plugins/block-type/commands/block-type.js +2 -2
- package/dist/cjs/plugins/block-type/ui/ToolbarBlockType/index.js +2 -2
- package/dist/cjs/plugins/floating-toolbar/ui/Toolbar.js +2 -2
- package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu-legacy.js +2 -2
- package/dist/cjs/plugins/text-color/commands/toggle-color.js +2 -2
- package/dist/cjs/plugins/text-formatting/commands/text-formatting.js +9 -9
- package/dist/cjs/plugins/text-formatting/commands/transform-to-code.js +2 -2
- package/dist/cjs/plugins/text-formatting/pm-plugins/clear-formatting.js +2 -5
- package/dist/cjs/plugins/text-formatting/pm-plugins/input-rule.js +2 -2
- package/dist/cjs/plugins/text-formatting/pm-plugins/main.js +2 -1
- package/dist/cjs/plugins/text-formatting/ui/Toolbar/dropdown-menu.js +2 -2
- package/dist/cjs/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js +2 -3
- package/dist/cjs/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js +2 -2
- package/dist/cjs/ui/Appearance/Comment/Comment.js +5 -6
- package/dist/cjs/ui/Appearance/Comment/Toolbar.js +2 -2
- package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js +2 -2
- package/dist/cjs/ui/Appearance/FullPage/FullPageToolbar.js +5 -5
- package/dist/cjs/ui/Dropdown/index.js +1 -2
- package/dist/cjs/ui/styles.js +3 -5
- package/dist/cjs/utils/commands.js +8 -121
- package/dist/cjs/utils/index.js +0 -13
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/create-editor/ReactEditorViewInternal.js +3 -6
- package/dist/es2019/plugins/annotation/commands/transform.js +1 -1
- package/dist/es2019/plugins/block-type/commands/block-type.js +1 -1
- package/dist/es2019/plugins/block-type/ui/ToolbarBlockType/index.js +1 -1
- package/dist/es2019/plugins/floating-toolbar/ui/Toolbar.js +3 -5
- package/dist/es2019/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu-legacy.js +1 -1
- package/dist/es2019/plugins/text-color/commands/toggle-color.js +1 -1
- package/dist/es2019/plugins/text-formatting/commands/text-formatting.js +1 -1
- package/dist/es2019/plugins/text-formatting/commands/transform-to-code.js +1 -1
- package/dist/es2019/plugins/text-formatting/pm-plugins/clear-formatting.js +2 -2
- package/dist/es2019/plugins/text-formatting/pm-plugins/input-rule.js +1 -1
- package/dist/es2019/plugins/text-formatting/pm-plugins/main.js +2 -1
- package/dist/es2019/plugins/text-formatting/ui/Toolbar/dropdown-menu.js +1 -1
- package/dist/es2019/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js +1 -2
- package/dist/es2019/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js +1 -1
- package/dist/es2019/ui/Appearance/Comment/Comment.js +6 -5
- package/dist/es2019/ui/Appearance/Comment/Toolbar.js +3 -2
- package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js +2 -3
- package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js +2 -2
- package/dist/es2019/ui/Dropdown/index.js +1 -2
- package/dist/es2019/ui/ElementBrowser/InsertMenu.js +1 -0
- package/dist/es2019/ui/styles.js +0 -5
- package/dist/es2019/utils/commands.js +1 -113
- package/dist/es2019/utils/index.js +0 -12
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/es2019/version.json +1 -1
- package/dist/esm/create-editor/ReactEditorViewInternal.js +3 -6
- package/dist/esm/plugins/annotation/commands/transform.js +1 -1
- package/dist/esm/plugins/block-type/commands/block-type.js +1 -1
- package/dist/esm/plugins/block-type/ui/ToolbarBlockType/index.js +1 -1
- package/dist/esm/plugins/floating-toolbar/ui/Toolbar.js +3 -5
- package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu-legacy.js +1 -1
- package/dist/esm/plugins/text-color/commands/toggle-color.js +1 -1
- package/dist/esm/plugins/text-formatting/commands/text-formatting.js +1 -1
- package/dist/esm/plugins/text-formatting/commands/transform-to-code.js +1 -1
- package/dist/esm/plugins/text-formatting/pm-plugins/clear-formatting.js +2 -2
- package/dist/esm/plugins/text-formatting/pm-plugins/input-rule.js +1 -1
- package/dist/esm/plugins/text-formatting/pm-plugins/main.js +2 -1
- package/dist/esm/plugins/text-formatting/ui/Toolbar/dropdown-menu.js +1 -1
- package/dist/esm/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js +1 -2
- package/dist/esm/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js +1 -1
- package/dist/esm/ui/Appearance/Comment/Comment.js +4 -5
- package/dist/esm/ui/Appearance/Comment/Toolbar.js +3 -2
- package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js +2 -3
- package/dist/esm/ui/Appearance/FullPage/FullPageToolbar.js +2 -2
- package/dist/esm/ui/Dropdown/index.js +1 -2
- package/dist/esm/ui/ElementBrowser/InsertMenu.js +1 -0
- package/dist/esm/ui/styles.js +2 -3
- package/dist/esm/utils/commands.js +7 -118
- package/dist/esm/utils/index.js +0 -12
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/esm/version.json +1 -1
- package/dist/types/create-editor/ReactEditorViewInternal.d.ts +0 -1
- package/dist/types/plugins/block-type/commands/block-type.d.ts +1 -2
- package/dist/types/plugins/code-block/ide-ux/quote-handling.d.ts +1 -1
- package/dist/types/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu-legacy.d.ts +1 -1
- package/dist/types/plugins/insert-block/ui/ToolbarInsertBlock/create-items.d.ts +1 -1
- package/dist/types/plugins/insert-block/ui/ToolbarInsertBlock/item.d.ts +1 -1
- package/dist/types/plugins/insert-block/ui/ToolbarInsertBlock/sort-items.d.ts +1 -1
- package/dist/types/plugins/insert-block/ui/ToolbarInsertBlock/types.d.ts +1 -1
- package/dist/types/plugins/text-color/commands/toggle-color.d.ts +1 -1
- package/dist/types/plugins/text-formatting/pm-plugins/clear-formatting.d.ts +2 -2
- package/dist/types/plugins/text-formatting/pm-plugins/smart-input-rule.d.ts +1 -1
- package/dist/types/types/editor-appearance-component.d.ts +4 -4
- package/dist/types/types/editor-instance.d.ts +1 -1
- package/dist/types/types/editor-props.d.ts +5 -8
- package/dist/types/ui/Appearance/Comment/Comment.d.ts +2 -2
- package/dist/types/ui/Appearance/Comment/Toolbar.d.ts +1 -2
- package/dist/types/ui/Appearance/FullPage/StyledComponents.d.ts +1 -1
- package/dist/types/ui/ColorPickerButton/index.d.ts +1 -1
- package/dist/types/ui/ContentStyles/index.d.ts +2 -2
- package/dist/types/ui/ElementBrowser/InsertMenu.d.ts +1 -1
- package/dist/types/ui/ElementBrowser/components/StatelessElementBrowser.d.ts +1 -1
- package/dist/types/ui/ElementBrowser/types.d.ts +1 -1
- package/dist/types/ui/styles.d.ts +0 -1
- package/dist/types/utils/commands.d.ts +2 -12
- package/dist/types/utils/index.d.ts +0 -4
- package/dist/types-ts4.5/create-editor/ReactEditorViewInternal.d.ts +0 -1
- package/dist/types-ts4.5/plugins/block-type/commands/block-type.d.ts +1 -2
- package/dist/types-ts4.5/plugins/code-block/ide-ux/quote-handling.d.ts +1 -1
- package/dist/types-ts4.5/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu-legacy.d.ts +1 -1
- package/dist/types-ts4.5/plugins/insert-block/ui/ToolbarInsertBlock/create-items.d.ts +1 -1
- package/dist/types-ts4.5/plugins/insert-block/ui/ToolbarInsertBlock/item.d.ts +1 -1
- package/dist/types-ts4.5/plugins/insert-block/ui/ToolbarInsertBlock/sort-items.d.ts +1 -1
- package/dist/types-ts4.5/plugins/insert-block/ui/ToolbarInsertBlock/types.d.ts +1 -1
- package/dist/types-ts4.5/plugins/text-color/commands/toggle-color.d.ts +1 -1
- package/dist/types-ts4.5/plugins/text-formatting/pm-plugins/clear-formatting.d.ts +2 -2
- package/dist/types-ts4.5/plugins/text-formatting/pm-plugins/smart-input-rule.d.ts +1 -1
- package/dist/types-ts4.5/types/editor-appearance-component.d.ts +4 -4
- package/dist/types-ts4.5/types/editor-instance.d.ts +1 -1
- package/dist/types-ts4.5/types/editor-props.d.ts +5 -8
- package/dist/types-ts4.5/ui/Appearance/Comment/Comment.d.ts +2 -2
- package/dist/types-ts4.5/ui/Appearance/Comment/Toolbar.d.ts +1 -2
- package/dist/types-ts4.5/ui/Appearance/FullPage/StyledComponents.d.ts +1 -1
- package/dist/types-ts4.5/ui/ColorPickerButton/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/ContentStyles/index.d.ts +2 -2
- package/dist/types-ts4.5/ui/ElementBrowser/InsertMenu.d.ts +1 -1
- package/dist/types-ts4.5/ui/ElementBrowser/components/StatelessElementBrowser.d.ts +1 -1
- package/dist/types-ts4.5/ui/ElementBrowser/types.d.ts +1 -1
- package/dist/types-ts4.5/ui/styles.d.ts +0 -1
- package/dist/types-ts4.5/utils/commands.d.ts +2 -12
- package/dist/types-ts4.5/utils/index.d.ts +0 -4
- package/package.json +3 -3
- package/report.api.md +2 -10
- package/tmp/api-report-tmp.d.ts +2 -7
- package/dist/cjs/ui/Appearance/FullPage/messages.js +0 -25
- package/dist/cjs/ui/DropdownMenu/index.js +0 -31
- package/dist/cjs/ui/DropdownMenu/types.js +0 -5
- package/dist/cjs/ui/ToolbarArrowKeyNavigationProvider/index.js +0 -218
- package/dist/es2019/ui/Appearance/FullPage/messages.js +0 -18
- package/dist/es2019/ui/DropdownMenu/index.js +0 -18
- package/dist/es2019/ui/DropdownMenu/types.js +0 -1
- package/dist/es2019/ui/ToolbarArrowKeyNavigationProvider/index.js +0 -205
- package/dist/esm/ui/Appearance/FullPage/messages.js +0 -18
- package/dist/esm/ui/DropdownMenu/index.js +0 -20
- package/dist/esm/ui/DropdownMenu/types.js +0 -1
- package/dist/esm/ui/ToolbarArrowKeyNavigationProvider/index.js +0 -205
- package/dist/types/ui/Appearance/FullPage/messages.d.ts +0 -18
- package/dist/types/ui/DropdownMenu/index.d.ts +0 -3
- package/dist/types/ui/DropdownMenu/types.d.ts +0 -1
- package/dist/types/ui/ToolbarArrowKeyNavigationProvider/index.d.ts +0 -31
- package/dist/types-ts4.5/ui/Appearance/FullPage/messages.d.ts +0 -18
- package/dist/types-ts4.5/ui/DropdownMenu/index.d.ts +0 -3
- package/dist/types-ts4.5/ui/DropdownMenu/types.d.ts +0 -1
- package/dist/types-ts4.5/ui/ToolbarArrowKeyNavigationProvider/index.d.ts +0 -31
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 187.8.7
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`22e9c894ca1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/22e9c894ca1) - update test for numbered column table
|
|
8
|
+
- [`3a1cd78b42a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3a1cd78b42a) - [ED-19203] Moving some common logic, styles, and types to editor-common to make it easier to extract the text-formatting plugin from editor-core
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
3
11
|
## 187.8.3
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
|
@@ -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.ReactEditorView =
|
|
7
|
+
exports.ReactEditorView = void 0;
|
|
8
8
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
9
9
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
10
10
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
@@ -35,12 +35,13 @@ var _document = require("../utils/document");
|
|
|
35
35
|
var _createSchema = require("./create-schema");
|
|
36
36
|
var _pluginPerformanceObserver = require("../utils/performance/plugin-performance-observer");
|
|
37
37
|
var _getParticipantsCount = require("../plugins/collab-edit/get-participants-count");
|
|
38
|
-
var _countNodes2 = require("../utils/count-nodes");
|
|
39
38
|
var _trackTransactions = require("../utils/performance/track-transactions");
|
|
39
|
+
var _countNodes2 = require("../utils/count-nodes");
|
|
40
40
|
var _consts = require("./consts");
|
|
41
41
|
var _contextIdentifier = require("../plugins/base/pm-plugins/context-identifier");
|
|
42
42
|
var _ReactEditorViewContext = _interopRequireDefault(require("./ReactEditorViewContext"));
|
|
43
43
|
var _preset = require("@atlaskit/editor-common/preset");
|
|
44
|
+
var _ui = require("@atlaskit/editor-common/ui");
|
|
44
45
|
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; }
|
|
45
46
|
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; }
|
|
46
47
|
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); }; }
|
|
@@ -82,8 +83,6 @@ function handleEditorFocus(view) {
|
|
|
82
83
|
view.focus();
|
|
83
84
|
}, 0);
|
|
84
85
|
}
|
|
85
|
-
var EDIT_AREA_ID = 'ak-editor-textarea';
|
|
86
|
-
exports.EDIT_AREA_ID = EDIT_AREA_ID;
|
|
87
86
|
var ReactEditorView = /*#__PURE__*/function (_React$Component) {
|
|
88
87
|
(0, _inherits2.default)(ReactEditorView, _React$Component);
|
|
89
88
|
var _super = _createSuper(ReactEditorView);
|
|
@@ -529,7 +528,7 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
|
|
|
529
528
|
,
|
|
530
529
|
"aria-multiline": _this.props.editorProps.appearance !== 'mobile' ? true : false,
|
|
531
530
|
role: "textbox",
|
|
532
|
-
id: EDIT_AREA_ID
|
|
531
|
+
id: _ui.EDIT_AREA_ID
|
|
533
532
|
});
|
|
534
533
|
});
|
|
535
534
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "editor", _this.createEditor(_this.props.editorProps.assistiveLabel));
|
|
@@ -9,7 +9,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
|
|
|
9
9
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
10
10
|
var _utils = require("../../analytics/utils");
|
|
11
11
|
var _utils2 = require("../utils");
|
|
12
|
-
var
|
|
12
|
+
var _mark = require("@atlaskit/editor-common/mark");
|
|
13
13
|
var addAnnotationMark = function addAnnotationMark(id) {
|
|
14
14
|
return function (transaction, state) {
|
|
15
15
|
var inlineCommentState = (0, _utils2.getPluginState)(state);
|
|
@@ -22,7 +22,7 @@ var addAnnotationMark = function addAnnotationMark(id) {
|
|
|
22
22
|
type: _adfSchema.AnnotationTypes.INLINE_COMMENT
|
|
23
23
|
});
|
|
24
24
|
// Apply the mark only to text node in the range.
|
|
25
|
-
var tr = (0,
|
|
25
|
+
var tr = (0, _mark.applyMarkOnRange)(from, to, false, annotationMark, transaction);
|
|
26
26
|
// set selection back to the end of annotation once annotation mark is applied
|
|
27
27
|
tr.setSelection(_state.TextSelection.create(tr.doc, head));
|
|
28
28
|
return tr;
|
|
@@ -22,7 +22,7 @@ var _insert = require("@atlaskit/editor-common/insert");
|
|
|
22
22
|
var _analytics = require("../../analytics");
|
|
23
23
|
var _analytics2 = require("@atlaskit/editor-common/analytics");
|
|
24
24
|
var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
|
|
25
|
-
var
|
|
25
|
+
var _mark2 = require("@atlaskit/editor-common/mark");
|
|
26
26
|
var _adfSchema = require("@atlaskit/adf-schema");
|
|
27
27
|
var _editorTables = require("@atlaskit/editor-tables");
|
|
28
28
|
var _transformToCodeBlock = require("./transform-to-code-block");
|
|
@@ -78,7 +78,7 @@ function withCurrentHeadingLevel(fn) {
|
|
|
78
78
|
var _state$schema$nodes = state.schema.nodes,
|
|
79
79
|
heading = _state$schema$nodes.heading,
|
|
80
80
|
paragraph = _state$schema$nodes.paragraph;
|
|
81
|
-
var nodes = (0,
|
|
81
|
+
var nodes = (0, _mark2.filterChildrenBetween)(state.doc, state.selection.from, state.selection.to, function (node) {
|
|
82
82
|
return node.type === heading || node.type === paragraph;
|
|
83
83
|
});
|
|
84
84
|
|
|
@@ -16,7 +16,7 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
16
16
|
var _react2 = require("@emotion/react");
|
|
17
17
|
var _reactIntlNext = require("react-intl-next");
|
|
18
18
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
19
|
-
var
|
|
19
|
+
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
20
20
|
var _styles = require("@atlaskit/editor-common/styles");
|
|
21
21
|
var _styled = require("./styled");
|
|
22
22
|
var _keymaps = require("../../../../keymaps");
|
|
@@ -137,7 +137,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
137
137
|
var items = this.createItems();
|
|
138
138
|
return (0, _react2.jsx)("span", {
|
|
139
139
|
css: _styles.wrapperStyle
|
|
140
|
-
}, (0, _react2.jsx)(
|
|
140
|
+
}, (0, _react2.jsx)(_uiMenu.DropdownMenuWithKeyboardNavigation, {
|
|
141
141
|
items: items,
|
|
142
142
|
onOpenChange: this.onOpenChange,
|
|
143
143
|
onItemActivated: this.handleSelectBlockType,
|
|
@@ -37,7 +37,7 @@ var _reactIntlNext = require("react-intl-next");
|
|
|
37
37
|
var _messages = _interopRequireDefault(require("./messages"));
|
|
38
38
|
var _commands2 = require("@atlaskit/editor-plugin-table/commands");
|
|
39
39
|
var _ScrollButtons = _interopRequireDefault(require("./ScrollButtons"));
|
|
40
|
-
var
|
|
40
|
+
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
41
41
|
var _forceFocus = require("../pm-plugins/force-focus");
|
|
42
42
|
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13;
|
|
43
43
|
/** @jsx jsx */
|
|
@@ -454,7 +454,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
|
|
|
454
454
|
//Alt + F10 to reach first element in this floating toolbar
|
|
455
455
|
return event.altKey && (event.key === 'F10' || event.keyCode === 121);
|
|
456
456
|
};
|
|
457
|
-
return (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(
|
|
457
|
+
return (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
|
|
458
458
|
editorView: this.props.editorView,
|
|
459
459
|
handleEscape: this.handleEscape,
|
|
460
460
|
disableArrowKeyNavigation: !this.shouldHandleArrowKeys(),
|
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.BlockInsertMenuLegacy = void 0;
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
10
|
-
var
|
|
10
|
+
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
11
11
|
var _dropdownButton = require("./dropdown-button");
|
|
12
12
|
var BlockInsertMenuLegacy = function BlockInsertMenuLegacy(props) {
|
|
13
13
|
var items = props.items;
|
|
@@ -16,7 +16,7 @@ var BlockInsertMenuLegacy = function BlockInsertMenuLegacy(props) {
|
|
|
16
16
|
items: items
|
|
17
17
|
}];
|
|
18
18
|
}, [items]);
|
|
19
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
19
|
+
return /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownMenuWithKeyboardNavigation, {
|
|
20
20
|
items: dropdownItems,
|
|
21
21
|
onItemActivated: props.onItemActivated,
|
|
22
22
|
onOpenChange: props.onOpenChange,
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.toggleColor = void 0;
|
|
7
|
-
var
|
|
7
|
+
var _mark = require("@atlaskit/editor-common/mark");
|
|
8
8
|
var _main = require("../pm-plugins/main");
|
|
9
9
|
var _disabled = require("../utils/disabled");
|
|
10
10
|
var toggleColor = function toggleColor(color) {
|
|
@@ -26,7 +26,7 @@ var toggleColor = function toggleColor(color) {
|
|
|
26
26
|
color: color
|
|
27
27
|
});
|
|
28
28
|
state.tr.scrollIntoView();
|
|
29
|
-
(0,
|
|
29
|
+
(0, _mark.toggleMark)(textColor, {
|
|
30
30
|
color: color
|
|
31
31
|
})(state, dispatch);
|
|
32
32
|
}
|
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.toggleUnderlineWithAnalytics = exports.toggleUnderline = exports.toggleSuperscriptWithAnalytics = exports.toggleSuperscript = exports.toggleSubscriptWithAnalytics = exports.toggleSubscript = exports.toggleStrongWithAnalytics = exports.toggleStrong = exports.toggleStrikeWithAnalytics = exports.toggleStrike = exports.toggleEmWithAnalytics = exports.toggleEm = exports.toggleCodeWithAnalytics = exports.toggleCode = exports.moveRight = exports.moveLeft = exports.createInlineCodeFromTextInputWithAnalytics = void 0;
|
|
7
7
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
8
|
-
var
|
|
8
|
+
var _mark = require("@atlaskit/editor-common/mark");
|
|
9
9
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
10
10
|
var _utils = require("../utils");
|
|
11
11
|
var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
|
|
@@ -109,7 +109,7 @@ var toggleEm = function toggleEm() {
|
|
|
109
109
|
return function (state, dispatch) {
|
|
110
110
|
var em = state.schema.marks.em;
|
|
111
111
|
if (em) {
|
|
112
|
-
return (0,
|
|
112
|
+
return (0, _mark.toggleMark)(em)(state, dispatch);
|
|
113
113
|
}
|
|
114
114
|
return false;
|
|
115
115
|
};
|
|
@@ -134,7 +134,7 @@ var toggleStrike = function toggleStrike() {
|
|
|
134
134
|
return function (state, dispatch) {
|
|
135
135
|
var strike = state.schema.marks.strike;
|
|
136
136
|
if (strike) {
|
|
137
|
-
return (0,
|
|
137
|
+
return (0, _mark.toggleMark)(strike)(state, dispatch);
|
|
138
138
|
}
|
|
139
139
|
return false;
|
|
140
140
|
};
|
|
@@ -159,7 +159,7 @@ var toggleStrong = function toggleStrong() {
|
|
|
159
159
|
return function (state, dispatch) {
|
|
160
160
|
var strong = state.schema.marks.strong;
|
|
161
161
|
if (strong) {
|
|
162
|
-
return (0,
|
|
162
|
+
return (0, _mark.toggleMark)(strong)(state, dispatch);
|
|
163
163
|
}
|
|
164
164
|
return false;
|
|
165
165
|
};
|
|
@@ -184,7 +184,7 @@ var toggleUnderline = function toggleUnderline() {
|
|
|
184
184
|
return function (state, dispatch) {
|
|
185
185
|
var underline = state.schema.marks.underline;
|
|
186
186
|
if (underline) {
|
|
187
|
-
return (0,
|
|
187
|
+
return (0, _mark.toggleMark)(underline)(state, dispatch);
|
|
188
188
|
}
|
|
189
189
|
return false;
|
|
190
190
|
};
|
|
@@ -209,7 +209,7 @@ var toggleSuperscript = function toggleSuperscript() {
|
|
|
209
209
|
return function (state, dispatch) {
|
|
210
210
|
var subsup = state.schema.marks.subsup;
|
|
211
211
|
if (subsup) {
|
|
212
|
-
return (0,
|
|
212
|
+
return (0, _mark.toggleMark)(subsup, {
|
|
213
213
|
type: 'sup'
|
|
214
214
|
})(state, dispatch);
|
|
215
215
|
}
|
|
@@ -236,7 +236,7 @@ var toggleSubscript = function toggleSubscript() {
|
|
|
236
236
|
return function (state, dispatch) {
|
|
237
237
|
var subsup = state.schema.marks.subsup;
|
|
238
238
|
if (subsup) {
|
|
239
|
-
return (0,
|
|
239
|
+
return (0, _mark.toggleMark)(subsup, {
|
|
240
240
|
type: 'sub'
|
|
241
241
|
})(state, dispatch);
|
|
242
242
|
}
|
|
@@ -263,7 +263,7 @@ var toggleCode = function toggleCode() {
|
|
|
263
263
|
return function (state, dispatch) {
|
|
264
264
|
var code = state.schema.marks.code;
|
|
265
265
|
if (code) {
|
|
266
|
-
return (0,
|
|
266
|
+
return (0, _mark.toggleMark)(code)(state, dispatch);
|
|
267
267
|
}
|
|
268
268
|
return false;
|
|
269
269
|
};
|
|
@@ -297,7 +297,7 @@ var createInlineCodeFromTextInput = function createInlineCodeFromTextInput(from,
|
|
|
297
297
|
var tr = state.tr.replaceRangeWith(from - 1, to + 1, state.schema.text(text));
|
|
298
298
|
if (dispatch) {
|
|
299
299
|
var codeMark = state.schema.marks.code.create();
|
|
300
|
-
tr = (0,
|
|
300
|
+
tr = (0, _mark.applyMarkOnRange)(tr.mapping.map(from - 1), tr.mapping.map(to + 1), false, codeMark, tr).setStoredMarks([codeMark]);
|
|
301
301
|
dispatch(tr);
|
|
302
302
|
}
|
|
303
303
|
return true;
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.transformSmartCharsMentionsAndEmojis = void 0;
|
|
7
|
-
var
|
|
7
|
+
var _mark = require("@atlaskit/editor-common/mark");
|
|
8
8
|
var SMART_TO_ASCII = {
|
|
9
9
|
'…': '...',
|
|
10
10
|
'→': '->',
|
|
@@ -52,7 +52,7 @@ var transformSmartCharsMentionsAndEmojis = function transformSmartCharsMentionsA
|
|
|
52
52
|
text = _schema$nodes2.text,
|
|
53
53
|
emoji = _schema$nodes2.emoji;
|
|
54
54
|
// Traverse through all the nodes within the range and replace them with their plaintext counterpart
|
|
55
|
-
var children = (0,
|
|
55
|
+
var children = (0, _mark.filterChildrenBetween)(tr.doc, from, to, isNodeTextBlock(schema));
|
|
56
56
|
children.forEach(function (_ref) {
|
|
57
57
|
var node = _ref.node,
|
|
58
58
|
pos = _ref.pos;
|
|
@@ -1,19 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
6
|
exports.pluginKey = exports.plugin = void 0;
|
|
8
|
-
var
|
|
7
|
+
var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
|
|
9
8
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
10
9
|
var _utils = require("../utils");
|
|
11
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
12
|
-
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; }
|
|
13
10
|
var pluginKey = new _state.PluginKey('clearFormattingPlugin');
|
|
14
11
|
exports.pluginKey = pluginKey;
|
|
15
12
|
var plugin = function plugin(dispatch) {
|
|
16
|
-
return new
|
|
13
|
+
return new _safePlugin.SafePlugin({
|
|
17
14
|
state: {
|
|
18
15
|
init: function init(_config, state) {
|
|
19
16
|
return {
|
|
@@ -19,7 +19,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
19
19
|
var _inputRules = require("../../../utils/input-rules");
|
|
20
20
|
var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
|
|
21
21
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
22
|
-
var
|
|
22
|
+
var _mark = require("@atlaskit/editor-common/mark");
|
|
23
23
|
var _ValidCombinations;
|
|
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; } }
|
|
@@ -95,7 +95,7 @@ function addMark(markType, schema, char) {
|
|
|
95
95
|
return null;
|
|
96
96
|
}
|
|
97
97
|
if (markType.name === 'code') {
|
|
98
|
-
(0,
|
|
98
|
+
(0, _mark.transformSmartCharsMentionsAndEmojis)(tr.mapping.map(start), tr.mapping.map(end), tr);
|
|
99
99
|
}
|
|
100
100
|
var mappedStart = tr.mapping.map(start);
|
|
101
101
|
var mappedEnd = tr.mapping.map(end);
|
|
@@ -20,7 +20,8 @@ var _utils2 = require("../utils");
|
|
|
20
20
|
var _pluginKey = require("./plugin-key");
|
|
21
21
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
22
22
|
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; }
|
|
23
|
-
//
|
|
23
|
+
// TODO: Ideally this should use the custom toggleMark function from @atlaskit/editor-common so we also disable the options when selecting inline nodes but it disables the marks when the selection is empty at this point in time which is undesirable
|
|
24
|
+
// import { toggleMark } from '@atlaskit/editor-common/mark';
|
|
24
25
|
|
|
25
26
|
var getTextFormattingState = function getTextFormattingState(editorState, editorAnalyticsAPI) {
|
|
26
27
|
var _editorState$schema$m = editorState.schema.marks,
|
|
@@ -9,7 +9,7 @@ exports.FormattingTextDropdownMenu = void 0;
|
|
|
9
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
11
11
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
12
|
-
var
|
|
12
|
+
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
13
13
|
var _menuState = require("./hooks/menu-state");
|
|
14
14
|
var _moreButton = require("./more-button");
|
|
15
15
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
@@ -46,7 +46,7 @@ var FormattingTextDropdownMenu = /*#__PURE__*/_react.default.memo(function (_ref
|
|
|
46
46
|
closeMenu();
|
|
47
47
|
}
|
|
48
48
|
}, [editorView.state, editorView.dispatch, closeMenu]);
|
|
49
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
49
|
+
return /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownMenuWithKeyboardNavigation, {
|
|
50
50
|
mountTo: popupsMountPoint,
|
|
51
51
|
onOpenChange: closeMenu,
|
|
52
52
|
boundariesElement: popupsBoundariesElement,
|
|
@@ -16,9 +16,8 @@ var _toolbarMessages = require("../toolbar-messages");
|
|
|
16
16
|
var commands = _interopRequireWildcard(require("../../../commands/text-formatting"));
|
|
17
17
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
18
18
|
var _pluginKey = require("../../../pm-plugins/plugin-key");
|
|
19
|
-
var _keymaps = require("
|
|
19
|
+
var _keymaps = require("@atlaskit/editor-common/keymaps");
|
|
20
20
|
var _types = require("../types");
|
|
21
|
-
var _keymaps2 = require("@atlaskit/editor-common/keymaps");
|
|
22
21
|
var _IconsMarkSchema;
|
|
23
22
|
/** @jsx jsx */
|
|
24
23
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
@@ -108,7 +107,7 @@ var getIcon = function getIcon(_ref) {
|
|
|
108
107
|
isActive: isActive,
|
|
109
108
|
isDisabled: isDisabled,
|
|
110
109
|
'aria-label': tooltipKeymap ? (0, _keymaps.tooltip)(tooltipKeymap, String(content)) : String(content),
|
|
111
|
-
'aria-keyshortcuts': (0,
|
|
110
|
+
'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(tooltipKeymap)
|
|
112
111
|
};
|
|
113
112
|
};
|
|
114
113
|
var IconsMarkSchema = (_IconsMarkSchema = {}, (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.strong, 'strong'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.em, 'em'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.strike, 'strike'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.code, 'code'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.underline, 'underline'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.superscript, 'subsup'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.subscript, 'subsup'), _IconsMarkSchema);
|
|
@@ -12,7 +12,7 @@ var _reactIntlNext = require("react-intl-next");
|
|
|
12
12
|
var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
|
|
13
13
|
var _bulletList = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/bullet-list"));
|
|
14
14
|
var _keymaps = require("../../../keymaps");
|
|
15
|
-
var
|
|
15
|
+
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
16
16
|
var _ToolbarButton = _interopRequireDefault(require("../../../ui/ToolbarButton"));
|
|
17
17
|
var _styles = require("../../../ui/styles");
|
|
18
18
|
var _styles2 = require("@atlaskit/editor-common/styles");
|
|
@@ -69,7 +69,7 @@ function ToolbarDropdown(props) {
|
|
|
69
69
|
};
|
|
70
70
|
return (0, _react.jsx)("span", {
|
|
71
71
|
css: _styles2.wrapperStyle
|
|
72
|
-
}, (0, _react.jsx)(
|
|
72
|
+
}, (0, _react.jsx)(_uiMenu.DropdownMenuWithKeyboardNavigation, {
|
|
73
73
|
items: items,
|
|
74
74
|
onItemActivated: handleOnItemActivated,
|
|
75
75
|
mountTo: popupsMountPoint,
|
|
@@ -35,17 +35,16 @@ var _reactIntlNext = require("react-intl-next");
|
|
|
35
35
|
var _messages = _interopRequireDefault(require("../../../messages"));
|
|
36
36
|
var _Toolbar2 = require("./Toolbar");
|
|
37
37
|
var _ContentStyles = require("../../ContentStyles");
|
|
38
|
-
var
|
|
38
|
+
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
39
39
|
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
|
|
40
40
|
/** @jsx jsx */
|
|
41
41
|
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); }; }
|
|
42
42
|
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; } }
|
|
43
43
|
var CommentEditorMargin = 14;
|
|
44
|
-
var
|
|
45
|
-
var
|
|
46
|
-
var ContentArea = (0, _ContentStyles.createEditorContentStyle)((0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n flex-grow: 1;\n overflow-x: hidden;\n overflow-y: auto;\n line-height: 24px;\n\n /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/\n /** Hack for table controls. Otherwise margin collapse and controls are misplaced. **/\n .ProseMirror {\n margin: 12px ", "px ", "px;\n }\n\n .gridParent {\n margin-left: ", "px;\n margin-right: ", "px;\n width: calc(100% + ", "px);\n }\n\n padding: ", "px;\n\n ", ";\n"])), CommentEditorMargin, CommentEditorMargin, CommentEditorMargin - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, _Toolbar2.TableControlsPadding, _commonStyles.tableCommentEditorStyles));
|
|
44
|
+
var commentEditorStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n flex-direction: column;\n\n .less-margin .ProseMirror {\n margin: ", " ", "\n ", ";\n }\n\n min-width: 272px;\n /* Border + Toolbar + Footer + (Paragraph + ((Paragraph + Margin) * (DefaultLines - 1)) */\n /* calc(2px + 40px + 24px + ( 20px + (32px * 2))) */\n\n height: auto;\n background-color: ", ";\n border: 1px solid ", ";\n box-sizing: border-box;\n border-radius: ", "px;\n\n max-width: inherit;\n word-wrap: break-word;\n"])), "var(--ds-space-150, 12px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-background-input, white)", "var(--ds-border, ".concat(_colors.N40, ")"), (0, _constants.borderRadius)());
|
|
45
|
+
var ContentArea = (0, _ContentStyles.createEditorContentStyle)((0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n flex-grow: 1;\n overflow-x: hidden;\n overflow-y: auto;\n line-height: 24px;\n\n /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/\n /** Hack for table controls. Otherwise margin collapse and controls are misplaced. **/\n .ProseMirror {\n margin: ", " ", "px\n ", "px;\n }\n\n .gridParent {\n margin-left: ", "px;\n margin-right: ", "px;\n width: calc(100% + ", "px);\n }\n\n padding: ", "px;\n\n ", ";\n"])), "var(--ds-space-150, 12px)", CommentEditorMargin, CommentEditorMargin, CommentEditorMargin - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, _Toolbar2.TableControlsPadding, _commonStyles.tableCommentEditorStyles));
|
|
47
46
|
ContentArea.displayName = 'ContentArea';
|
|
48
|
-
var secondaryToolbarStyle = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n box-sizing: border-box;\n justify-content: flex-end;\n align-items: center;\n display: flex;\n padding:
|
|
47
|
+
var secondaryToolbarStyle = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n box-sizing: border-box;\n justify-content: flex-end;\n align-items: center;\n display: flex;\n padding: ", " 1px;\n"])), "var(--ds-space-150, 12px)");
|
|
49
48
|
var Editor = /*#__PURE__*/function (_React$Component) {
|
|
50
49
|
(0, _inherits2.default)(Editor, _React$Component);
|
|
51
50
|
var _super = _createSuper(Editor);
|
|
@@ -116,7 +115,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
|
|
|
116
115
|
ref: _this.wrapperElementRef
|
|
117
116
|
}, (0, _react2.jsx)(_Toolbar2.MainToolbar, {
|
|
118
117
|
useStickyToolbar: useStickyToolbar
|
|
119
|
-
}, (0, _react2.jsx)(
|
|
118
|
+
}, (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
|
|
120
119
|
editorView: editorView,
|
|
121
120
|
childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
|
|
122
121
|
isShortcutToFocusToolbar: isShortcutToFocusToolbar,
|
|
@@ -19,7 +19,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
19
19
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(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; }
|
|
20
20
|
var TableControlsPadding = 20;
|
|
21
21
|
exports.TableControlsPadding = TableControlsPadding;
|
|
22
|
-
var mainToolbarWrapperStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n position: relative;\n align-items: center;\n padding: ", " ", " 0;\n display: flex;\n height: auto;\n background-color: ", ";\n box-shadow: none;\n padding-left: ", "
|
|
22
|
+
var mainToolbarWrapperStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n position: relative;\n align-items: center;\n padding: ", " ", " 0;\n display: flex;\n height: auto;\n background-color: ", ";\n box-shadow: none;\n padding-left: ", ";\n\n & > div {\n > :first-child:not(style),\n > style:first-child + * {\n margin-left: 0;\n }\n }\n\n .block-type-btn {\n padding-left: 0;\n }\n"])), "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-surface, white)", "var(--ds-space-250, 20px)");
|
|
23
23
|
var stickyToolbarWrapperStyle = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n /* stylelint-disable declaration-block-no-duplicate-properties */\n position: relative;\n position: sticky;\n /* stylelint-enable declaration-block-no-duplicate-properties */\n padding-bottom: ", ";\n z-index: ", ";\n transition: box-shadow ease-in-out 0.2s;\n &.show-keyline {\n box-shadow: 0 ", "px 0 0\n ", ";\n }\n"])), "var(--ds-space-100, 8px)", _editorSharedStyles.akEditorMenuZIndex, _editorSharedStyles.akEditorToolbarKeylineHeight, "var(--ds-border, ".concat(_colors.N30, ")"));
|
|
24
24
|
var StickyToolbar = function StickyToolbar(props) {
|
|
25
25
|
var _useState = (0, _react.useState)(0),
|
|
@@ -87,5 +87,5 @@ var MainToolbar = function MainToolbar(_ref) {
|
|
|
87
87
|
return (0, _react2.jsx)(FixedToolbar, null, children);
|
|
88
88
|
};
|
|
89
89
|
exports.MainToolbar = MainToolbar;
|
|
90
|
-
var mainToolbarCustomComponentsSlotStyle = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n justify-content: flex-end;\n align-items: center;\n flex-grow: 1;\n padding-right: ", "
|
|
90
|
+
var mainToolbarCustomComponentsSlotStyle = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n justify-content: flex-end;\n align-items: center;\n flex-grow: 1;\n padding-right: ", ";\n > div {\n display: flex;\n flex-shrink: 0;\n }\n"])), "var(--ds-space-250, 20px)");
|
|
91
91
|
exports.mainToolbarCustomComponentsSlotStyle = mainToolbarCustomComponentsSlotStyle;
|
|
@@ -14,7 +14,7 @@ var _Addon = require("../../Addon");
|
|
|
14
14
|
var _ContextPanel = _interopRequireDefault(require("../../ContextPanel"));
|
|
15
15
|
var _PluginSlot = _interopRequireDefault(require("../../PluginSlot"));
|
|
16
16
|
var _StyledComponents = require("./StyledComponents");
|
|
17
|
-
var _messages =
|
|
17
|
+
var _messages = require("@atlaskit/editor-common/messages");
|
|
18
18
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
19
19
|
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; }
|
|
20
20
|
/** @jsx jsx */
|
|
@@ -58,7 +58,7 @@ var Content = /*#__PURE__*/_react2.default.forwardRef(function (props, ref) {
|
|
|
58
58
|
containerWidth: width
|
|
59
59
|
}),
|
|
60
60
|
role: "region",
|
|
61
|
-
"aria-label": props.intl.formatMessage(_messages.
|
|
61
|
+
"aria-label": props.intl.formatMessage(_messages.fullPageMessages.editableContentLabel),
|
|
62
62
|
ref: contentAreaRef
|
|
63
63
|
}, (0, _react.jsx)("div", {
|
|
64
64
|
css: _StyledComponents.editorContentGutterStyle,
|
|
@@ -16,8 +16,8 @@ var _BeforePrimaryToolbarWrapper = require("../../../plugins/before-primaryToolb
|
|
|
16
16
|
var _Toolbar = _interopRequireDefault(require("../../Toolbar"));
|
|
17
17
|
var _MainToolbar = require("./MainToolbar");
|
|
18
18
|
var _ui2 = require("@atlaskit/editor-common/ui");
|
|
19
|
-
var _messages =
|
|
20
|
-
var
|
|
19
|
+
var _messages = require("@atlaskit/editor-common/messages");
|
|
20
|
+
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
21
21
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
22
22
|
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; }
|
|
23
23
|
/** @jsx jsx */
|
|
@@ -97,7 +97,7 @@ var EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
|
|
|
97
97
|
return (0, _react2.jsx)(_ui2.ContextPanelConsumer, null, function (_ref) {
|
|
98
98
|
var _props$featureFlags8, _props$featureFlags9, _props$featureFlags10;
|
|
99
99
|
var contextPanelWidth = _ref.width;
|
|
100
|
-
return (0, _react2.jsx)(
|
|
100
|
+
return (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
|
|
101
101
|
editorView: props.editorView,
|
|
102
102
|
childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
|
|
103
103
|
isShortcutToFocusToolbar: isShortcutToFocusToolbar,
|
|
@@ -109,12 +109,12 @@ var EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
|
|
|
109
109
|
}, (0, _react2.jsx)("div", {
|
|
110
110
|
css: (0, _MainToolbar.mainToolbarFirstChildStyle)(!!((_props$featureFlags9 = props.featureFlags) !== null && _props$featureFlags9 !== void 0 && _props$featureFlags9.twoLineEditorToolbar)),
|
|
111
111
|
role: "toolbar",
|
|
112
|
-
"aria-label": props.intl.formatMessage(_messages.
|
|
112
|
+
"aria-label": props.intl.formatMessage(_messages.fullPageMessages.toolbarLabel)
|
|
113
113
|
}, shouldSplitToolbar ? customToolbar : nonCustomToolbar), (0, _react2.jsx)("div", {
|
|
114
114
|
css: (0, _MainToolbar.mainToolbarSecondChildStyle)(!!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.twoLineEditorToolbar)),
|
|
115
115
|
"data-testid": 'avatar-group-outside-plugin',
|
|
116
116
|
role: "region",
|
|
117
|
-
"aria-label": props.intl.formatMessage(_messages.
|
|
117
|
+
"aria-label": props.intl.formatMessage(_messages.fullPageMessages.pageActionsLabel)
|
|
118
118
|
}, shouldSplitToolbar ? nonCustomToolbar : customToolbar)));
|
|
119
119
|
});
|
|
120
120
|
});
|
|
@@ -11,14 +11,13 @@ var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/
|
|
|
11
11
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
12
12
|
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
13
13
|
var _react = _interopRequireWildcard(require("react"));
|
|
14
|
-
var _ToolbarArrowKeyNavigationProvider = require("../ToolbarArrowKeyNavigationProvider");
|
|
15
14
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
16
15
|
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
16
|
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; }
|
|
18
17
|
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; }
|
|
19
18
|
var Dropdown = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
20
19
|
var props = (0, _extends2.default)({}, ((0, _objectDestructuringEmpty2.default)(_ref), _ref));
|
|
21
|
-
var keyDownHandlerContext = (0, _react.useContext)(
|
|
20
|
+
var keyDownHandlerContext = (0, _react.useContext)(_uiMenu.KeyDownHandlerContext);
|
|
22
21
|
return (
|
|
23
22
|
/*#__PURE__*/
|
|
24
23
|
//This context is to handle the tab, Arrow Right/Left key events for dropdown.
|
package/dist/cjs/ui/styles.js
CHANGED
|
@@ -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.expandIconWrapperStyle = exports.clickSelectWrapperStyle = exports.
|
|
7
|
+
exports.expandIconWrapperStyle = exports.clickSelectWrapperStyle = exports.buttonContentStyle = exports.buttonContentReducedSpacingStyle = void 0;
|
|
8
8
|
Object.defineProperty(exports, "scrollbarStyles", {
|
|
9
9
|
enumerable: true,
|
|
10
10
|
get: function get() {
|
|
@@ -22,7 +22,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
|
|
|
22
22
|
var _react = require("@emotion/react");
|
|
23
23
|
var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
|
|
24
24
|
var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");
|
|
25
|
-
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5
|
|
25
|
+
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
|
|
26
26
|
var wrapperSmallStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n margin-left: ", ";\n min-width: 40px;\n"])), "var(--ds-space-050, 4px)");
|
|
27
27
|
exports.wrapperSmallStyle = wrapperSmallStyle;
|
|
28
28
|
var expandIconWrapperStyle = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n margin-left: -8px;\n"])));
|
|
@@ -32,6 +32,4 @@ exports.buttonContentStyle = buttonContentStyle;
|
|
|
32
32
|
var buttonContentReducedSpacingStyle = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n padding: ", ";\n"])), "var(--ds-space-100, 8px)");
|
|
33
33
|
exports.buttonContentReducedSpacingStyle = buttonContentReducedSpacingStyle;
|
|
34
34
|
var clickSelectWrapperStyle = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n user-select: all;\n"])));
|
|
35
|
-
exports.clickSelectWrapperStyle = clickSelectWrapperStyle;
|
|
36
|
-
var centeredToolbarContainer = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n width: 100%;\n align-items: center;\n"])));
|
|
37
|
-
exports.centeredToolbarContainer = centeredToolbarContainer;
|
|
35
|
+
exports.clickSelectWrapperStyle = clickSelectWrapperStyle;
|