@atlaskit/editor-plugin-table 10.12.1 → 10.12.3

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.
Files changed (6) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/ui/toolbar.js +8 -6
  3. package/dist/es2019/ui/toolbar.js +7 -5
  4. package/dist/esm/ui/toolbar.js +8 -6
  5. package/package.json +9 -6
  6. package/src/ui/toolbar.tsx +8 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-plugin-table
2
2
 
3
+ ## 10.12.3
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 10.12.2
10
+
11
+ ### Patch Changes
12
+
13
+ - [#170385](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/170385)
14
+ [`f7c9e4e0133f0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f7c9e4e0133f0) -
15
+ [ux] ED-27236: Added separator in the table overflow dropdown
16
+
3
17
  ## 10.12.1
4
18
 
5
19
  ### Patch Changes
package/dist/cjs/ui/toolbar.js CHANGED
@@ -407,6 +407,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
407
407
  // We don't want to show floating toolbar while resizing the table
408
408
  var isWidthResizing = tableWidthState === null || tableWidthState === void 0 ? void 0 : tableWidthState.resizing;
409
409
  if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
410
+ var _api$extension, _api$extension2;
410
411
  var isNested = pluginState.tablePos && (0, _nodes.isTableNested)(state, pluginState.tablePos);
411
412
  var isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
412
413
  var areTableColumWidthsFixed = tableObject.node.attrs.displayMode === 'fixed';
@@ -498,6 +499,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
498
499
  // testId is required to show focus on trigger button on ESC key press
499
500
  // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
500
501
  var overflowDropdownTestId = (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_8') ? 'table-overflow-dropdown-trigger' : undefined;
502
+ var extensionState = api === null || api === void 0 || (_api$extension = api.extension) === null || _api$extension === void 0 || (_api$extension = _api$extension.sharedState) === null || _api$extension === void 0 ? void 0 : _api$extension.currentState();
503
+ var extensionApi = api === null || api === void 0 || (_api$extension2 = api.extension) === null || _api$extension2 === void 0 ? void 0 : _api$extension2.actions.api();
501
504
  return {
502
505
  title: toolbarTitle,
503
506
  getDomRef: getDomRef,
@@ -524,12 +527,9 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
524
527
  type: 'custom',
525
528
  fallback: [],
526
529
  render: function render(editorView, dropdownOptions) {
527
- var _api$extension, _api$extension2, _api$extension3;
528
530
  if (!editorView) {
529
531
  return null;
530
532
  }
531
- var extensionState = api === null || api === void 0 || (_api$extension = api.extension) === null || _api$extension === void 0 || (_api$extension = _api$extension.sharedState) === null || _api$extension === void 0 ? void 0 : _api$extension.currentState();
532
- var extensionApi = api === null || api === void 0 || (_api$extension2 = api.extension) === null || _api$extension2 === void 0 ? void 0 : _api$extension2.actions.api();
533
533
  if (!extensionApi || !(extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider)) {
534
534
  return null;
535
535
  }
@@ -538,7 +538,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
538
538
  editorView: editorView,
539
539
  extension: {
540
540
  extensionProvider: extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider ? Promise.resolve(extensionState.extensionProvider) : undefined,
541
- extensionApi: api === null || api === void 0 || (_api$extension3 = api.extension) === null || _api$extension3 === void 0 ? void 0 : _api$extension3.actions.api()
541
+ extensionApi: extensionApi
542
542
  },
543
543
  dropdownOptions: dropdownOptions,
544
544
  disabled: function disabled(key) {
@@ -546,7 +546,9 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
546
546
  }
547
547
  });
548
548
  }
549
- }, _objectSpread({
549
+ }].concat((0, _toConsumableArray2.default)(extensionApi && extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_13') ? [{
550
+ type: 'separator'
551
+ }] : []), [_objectSpread({
550
552
  title: intl.formatMessage(_messages.default.copyToClipboard),
551
553
  onClick: function onClick() {
552
554
  var _api$core, _api$floatingToolbar;
@@ -563,7 +565,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
563
565
  icon: (0, _react.jsx)(_deleteEditorRemove.default, {
564
566
  label: intl.formatMessage(_messages.default.delete)
565
567
  })
566
- }, hoverTableProps(true))]
568
+ }, hoverTableProps(true))])
567
569
  }])),
568
570
  scrollable: true
569
571
  };
package/dist/es2019/ui/toolbar.js CHANGED
@@ -386,6 +386,7 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
386
386
  // We don't want to show floating toolbar while resizing the table
387
387
  const isWidthResizing = tableWidthState === null || tableWidthState === void 0 ? void 0 : tableWidthState.resizing;
388
388
  if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
389
+ var _api$extension, _api$extension$shared, _api$extension2;
389
390
  const isNested = pluginState.tablePos && isTableNested(state, pluginState.tablePos);
390
391
  const isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
391
392
  const areTableColumWidthsFixed = tableObject.node.attrs.displayMode === 'fixed';
@@ -468,6 +469,8 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
468
469
  // testId is required to show focus on trigger button on ESC key press
469
470
  // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
470
471
  const overflowDropdownTestId = fg('platform_editor_controls_patch_8') ? 'table-overflow-dropdown-trigger' : undefined;
472
+ const extensionState = api === null || api === void 0 ? void 0 : (_api$extension = api.extension) === null || _api$extension === void 0 ? void 0 : (_api$extension$shared = _api$extension.sharedState) === null || _api$extension$shared === void 0 ? void 0 : _api$extension$shared.currentState();
473
+ const extensionApi = api === null || api === void 0 ? void 0 : (_api$extension2 = api.extension) === null || _api$extension2 === void 0 ? void 0 : _api$extension2.actions.api();
471
474
  return {
472
475
  title: toolbarTitle,
473
476
  getDomRef,
@@ -494,12 +497,9 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
494
497
  type: 'custom',
495
498
  fallback: [],
496
499
  render: (editorView, dropdownOptions) => {
497
- var _api$extension, _api$extension$shared, _api$extension2, _api$extension3;
498
500
  if (!editorView) {
499
501
  return null;
500
502
  }
501
- const extensionState = api === null || api === void 0 ? void 0 : (_api$extension = api.extension) === null || _api$extension === void 0 ? void 0 : (_api$extension$shared = _api$extension.sharedState) === null || _api$extension$shared === void 0 ? void 0 : _api$extension$shared.currentState();
502
- const extensionApi = api === null || api === void 0 ? void 0 : (_api$extension2 = api.extension) === null || _api$extension2 === void 0 ? void 0 : _api$extension2.actions.api();
503
503
  if (!extensionApi || !(extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider)) {
504
504
  return null;
505
505
  }
@@ -508,7 +508,7 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
508
508
  editorView: editorView,
509
509
  extension: {
510
510
  extensionProvider: extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider ? Promise.resolve(extensionState.extensionProvider) : undefined,
511
- extensionApi: api === null || api === void 0 ? void 0 : (_api$extension3 = api.extension) === null || _api$extension3 === void 0 ? void 0 : _api$extension3.actions.api()
511
+ extensionApi: extensionApi
512
512
  },
513
513
  dropdownOptions: dropdownOptions,
514
514
  disabled: key => {
@@ -516,7 +516,9 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
516
516
  }
517
517
  });
518
518
  }
519
- }, {
519
+ }, ...(extensionApi && extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider && fg('platform_editor_controls_patch_13') ? [{
520
+ type: 'separator'
521
+ }] : []), {
520
522
  title: intl.formatMessage(commonMessages.copyToClipboard),
521
523
  onClick: () => {
522
524
  var _api$core, _api$floatingToolbar;
package/dist/esm/ui/toolbar.js CHANGED
@@ -400,6 +400,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
400
400
  // We don't want to show floating toolbar while resizing the table
401
401
  var isWidthResizing = tableWidthState === null || tableWidthState === void 0 ? void 0 : tableWidthState.resizing;
402
402
  if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
403
+ var _api$extension, _api$extension2;
403
404
  var isNested = pluginState.tablePos && isTableNested(state, pluginState.tablePos);
404
405
  var isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
405
406
  var areTableColumWidthsFixed = tableObject.node.attrs.displayMode === 'fixed';
@@ -491,6 +492,8 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
491
492
  // testId is required to show focus on trigger button on ESC key press
492
493
  // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
493
494
  var overflowDropdownTestId = fg('platform_editor_controls_patch_8') ? 'table-overflow-dropdown-trigger' : undefined;
495
+ var extensionState = api === null || api === void 0 || (_api$extension = api.extension) === null || _api$extension === void 0 || (_api$extension = _api$extension.sharedState) === null || _api$extension === void 0 ? void 0 : _api$extension.currentState();
496
+ var extensionApi = api === null || api === void 0 || (_api$extension2 = api.extension) === null || _api$extension2 === void 0 ? void 0 : _api$extension2.actions.api();
494
497
  return {
495
498
  title: toolbarTitle,
496
499
  getDomRef: getDomRef,
@@ -517,12 +520,9 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
517
520
  type: 'custom',
518
521
  fallback: [],
519
522
  render: function render(editorView, dropdownOptions) {
520
- var _api$extension, _api$extension2, _api$extension3;
521
523
  if (!editorView) {
522
524
  return null;
523
525
  }
524
- var extensionState = api === null || api === void 0 || (_api$extension = api.extension) === null || _api$extension === void 0 || (_api$extension = _api$extension.sharedState) === null || _api$extension === void 0 ? void 0 : _api$extension.currentState();
525
- var extensionApi = api === null || api === void 0 || (_api$extension2 = api.extension) === null || _api$extension2 === void 0 ? void 0 : _api$extension2.actions.api();
526
526
  if (!extensionApi || !(extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider)) {
527
527
  return null;
528
528
  }
@@ -531,7 +531,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
531
531
  editorView: editorView,
532
532
  extension: {
533
533
  extensionProvider: extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider ? Promise.resolve(extensionState.extensionProvider) : undefined,
534
- extensionApi: api === null || api === void 0 || (_api$extension3 = api.extension) === null || _api$extension3 === void 0 ? void 0 : _api$extension3.actions.api()
534
+ extensionApi: extensionApi
535
535
  },
536
536
  dropdownOptions: dropdownOptions,
537
537
  disabled: function disabled(key) {
@@ -539,7 +539,9 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
539
539
  }
540
540
  });
541
541
  }
542
- }, _objectSpread({
542
+ }].concat(_toConsumableArray(extensionApi && extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider && fg('platform_editor_controls_patch_13') ? [{
543
+ type: 'separator'
544
+ }] : []), [_objectSpread({
543
545
  title: intl.formatMessage(commonMessages.copyToClipboard),
544
546
  onClick: function onClick() {
545
547
  var _api$core, _api$floatingToolbar;
@@ -556,7 +558,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
556
558
  icon: jsx(DeleteIcon, {
557
559
  label: intl.formatMessage(commonMessages.delete)
558
560
  })
559
- }, hoverTableProps(true))]
561
+ }, hoverTableProps(true))])
560
562
  }])),
561
563
  scrollable: true
562
564
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-table",
3
- "version": "10.12.1",
3
+ "version": "10.12.3",
4
4
  "description": "Table plugin for the @atlaskit/editor",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -32,14 +32,14 @@
32
32
  "@atlaskit/adf-schema": "^47.6.0",
33
33
  "@atlaskit/button": "^23.2.0",
34
34
  "@atlaskit/custom-steps": "^0.11.0",
35
- "@atlaskit/editor-common": "^106.6.0",
35
+ "@atlaskit/editor-common": "^106.9.0",
36
36
  "@atlaskit/editor-palette": "^2.1.0",
37
37
  "@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
38
38
  "@atlaskit/editor-plugin-analytics": "^2.3.0",
39
39
  "@atlaskit/editor-plugin-batch-attribute-updates": "^2.1.0",
40
40
  "@atlaskit/editor-plugin-content-insertion": "^2.1.0",
41
41
  "@atlaskit/editor-plugin-editor-viewmode": "^4.0.0",
42
- "@atlaskit/editor-plugin-extension": "5.5.6",
42
+ "@atlaskit/editor-plugin-extension": "5.5.7",
43
43
  "@atlaskit/editor-plugin-guideline": "^2.0.0",
44
44
  "@atlaskit/editor-plugin-interaction": "^2.0.0",
45
45
  "@atlaskit/editor-plugin-selection": "^2.2.0",
@@ -47,7 +47,7 @@
47
47
  "@atlaskit/editor-prosemirror": "7.0.0",
48
48
  "@atlaskit/editor-shared-styles": "^3.4.0",
49
49
  "@atlaskit/editor-tables": "^2.9.0",
50
- "@atlaskit/icon": "^26.4.0",
50
+ "@atlaskit/icon": "^27.0.0",
51
51
  "@atlaskit/menu": "^8.0.0",
52
52
  "@atlaskit/platform-feature-flags": "^1.1.0",
53
53
  "@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
@@ -55,9 +55,9 @@
55
55
  "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
56
56
  "@atlaskit/primitives": "^14.8.0",
57
57
  "@atlaskit/theme": "^18.0.0",
58
- "@atlaskit/tmp-editor-statsig": "^7.0.0",
58
+ "@atlaskit/tmp-editor-statsig": "^7.1.0",
59
59
  "@atlaskit/toggle": "^15.0.0",
60
- "@atlaskit/tokens": "^5.1.0",
60
+ "@atlaskit/tokens": "^5.2.0",
61
61
  "@atlaskit/tooltip": "^20.3.0",
62
62
  "@babel/runtime": "^7.0.0",
63
63
  "@emotion/react": "^11.7.1",
@@ -154,6 +154,9 @@
154
154
  "platform_editor_nested_tables_sticky_header_bug": {
155
155
  "type": "boolean"
156
156
  },
157
+ "platform_editor_controls_patch_13": {
158
+ "type": "boolean"
159
+ },
157
160
  "platform_editor_sort_decoration_fix_on_live_page": {
158
161
  "type": "boolean"
159
162
  },
package/src/ui/toolbar.tsx CHANGED
@@ -681,6 +681,8 @@ export const getToolbarConfig =
681
681
  const overflowDropdownTestId = fg('platform_editor_controls_patch_8')
682
682
  ? 'table-overflow-dropdown-trigger'
683
683
  : undefined;
684
+ const extensionState = api?.extension?.sharedState?.currentState();
685
+ const extensionApi = api?.extension?.actions.api();
684
686
 
685
687
  return {
686
688
  title: toolbarTitle,
@@ -722,9 +724,6 @@ export const getToolbarConfig =
722
724
  return null;
723
725
  }
724
726
 
725
- const extensionState = api?.extension?.sharedState?.currentState();
726
- const extensionApi = api?.extension?.actions.api();
727
-
728
727
  if (!extensionApi || !extensionState?.extensionProvider) {
729
728
  return null;
730
729
  }
@@ -737,7 +736,7 @@ export const getToolbarConfig =
737
736
  extensionProvider: extensionState?.extensionProvider
738
737
  ? Promise.resolve(extensionState.extensionProvider)
739
738
  : undefined,
740
- extensionApi: api?.extension?.actions.api(),
739
+ extensionApi: extensionApi,
741
740
  }}
742
741
  dropdownOptions={dropdownOptions}
743
742
  disabled={(key: string) => {
@@ -750,6 +749,11 @@ export const getToolbarConfig =
750
749
  );
751
750
  },
752
751
  },
752
+ ...(extensionApi &&
753
+ extensionState?.extensionProvider &&
754
+ fg('platform_editor_controls_patch_13')
755
+ ? [{ type: 'separator' }]
756
+ : []),
753
757
  {
754
758
  title: intl.formatMessage(commonMessages.copyToClipboard),
755
759
  onClick: () => {