@atlaskit/editor-plugin-floating-toolbar 4.2.2 → 4.2.5

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 (8) hide show
  1. package/CHANGELOG.md +21 -0
  2. package/dist/cjs/floatingToolbarPlugin.js +8 -16
  3. package/dist/cjs/ui/Toolbar.js +2 -2
  4. package/dist/es2019/floatingToolbarPlugin.js +8 -16
  5. package/dist/es2019/ui/Toolbar.js +2 -2
  6. package/dist/esm/floatingToolbarPlugin.js +8 -16
  7. package/dist/esm/ui/Toolbar.js +2 -2
  8. package/package.json +6 -9
package/CHANGELOG.md CHANGED
@@ -1,5 +1,26 @@
1
1
  # @atlaskit/editor-plugin-floating-toolbar
2
2
 
3
+ ## 4.2.5
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 4.2.4
10
+
11
+ ### Patch Changes
12
+
13
+ - [#170734](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/170734)
14
+ [`85e062c13a08a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/85e062c13a08a) -
15
+ [ED-28213] Clean up platform_editor_user_intent_plugin and
16
+ platform_editor_user_intent_plugin_follow_up
17
+
18
+ ## 4.2.3
19
+
20
+ ### Patch Changes
21
+
22
+ - Updated dependencies
23
+
3
24
  ## 4.2.2
4
25
 
5
26
  ### Patch Changes
package/dist/cjs/floatingToolbarPlugin.js CHANGED
@@ -241,23 +241,15 @@ function ContentComponent(_ref5) {
241
241
  if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
242
242
  return null;
243
243
  }
244
- if ((0, _platformFeatureFlags.fg)('platform_editor_user_intent_plugin')) {
245
- if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
246
- return null;
247
- }
248
-
249
- // TODO: ED-27539 - This feature is unreleased and rendering logic needs to be move userIntentState which is not ready yet
250
- // if (blockControlsState?.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
251
- // return null;
252
- // }
253
- } else {
254
- if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
255
- return null;
256
- }
257
- if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
258
- return null;
259
- }
244
+ if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
245
+ return null;
260
246
  }
247
+
248
+ // TODO: ED-27539 - This feature is unreleased and rendering logic needs to be move userIntentState which is not ready yet
249
+ // if (blockControlsState?.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
250
+ // return null;
251
+ // }
252
+
261
253
  var config = configWithNodeInfo.config,
262
254
  node = configWithNodeInfo.node;
263
255
  var items = config.items;
package/dist/cjs/ui/Toolbar.js CHANGED
@@ -62,7 +62,7 @@ function groupItems(items) {
62
62
  } else {
63
63
  finalOutput.push(item);
64
64
  }
65
- } else if (item.type === 'separator' && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6')) {
65
+ } else if (item.type === 'separator' && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
66
66
  var _items;
67
67
  var isLeadingSeparator = i === 0;
68
68
  var isTrailingSeparator = i === items.length - 1;
@@ -341,7 +341,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
341
341
  scrollable: scrollable
342
342
  });
343
343
  case 'separator':
344
- if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6')) {
344
+ if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
345
345
  return item.fullHeight ? (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
346
346
  key: idx,
347
347
  fullHeight: true
package/dist/es2019/floatingToolbarPlugin.js CHANGED
@@ -231,23 +231,15 @@ export function ContentComponent({
231
231
  if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
232
232
  return null;
233
233
  }
234
- if (fg('platform_editor_user_intent_plugin')) {
235
- if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
236
- return null;
237
- }
238
-
239
- // TODO: ED-27539 - This feature is unreleased and rendering logic needs to be move userIntentState which is not ready yet
240
- // if (blockControlsState?.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
241
- // return null;
242
- // }
243
- } else {
244
- if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
245
- return null;
246
- }
247
- if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
248
- return null;
249
- }
234
+ if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
235
+ return null;
250
236
  }
237
+
238
+ // TODO: ED-27539 - This feature is unreleased and rendering logic needs to be move userIntentState which is not ready yet
239
+ // if (blockControlsState?.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
240
+ // return null;
241
+ // }
242
+
251
243
  const {
252
244
  config,
253
245
  node
package/dist/es2019/ui/Toolbar.js CHANGED
@@ -51,7 +51,7 @@ export function groupItems(items) {
51
51
  } else {
52
52
  finalOutput.push(item);
53
53
  }
54
- } else if (item.type === 'separator' && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_6')) {
54
+ } else if (item.type === 'separator' && editorExperiment('platform_editor_controls', 'variant1')) {
55
55
  var _items;
56
56
  const isLeadingSeparator = i === 0;
57
57
  const isTrailingSeparator = i === items.length - 1;
@@ -315,7 +315,7 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
315
315
  scrollable: scrollable
316
316
  });
317
317
  case 'separator':
318
- if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_6')) {
318
+ if (editorExperiment('platform_editor_controls', 'variant1')) {
319
319
  return item.fullHeight ? jsx(Separator, {
320
320
  key: idx,
321
321
  fullHeight: true
package/dist/esm/floatingToolbarPlugin.js CHANGED
@@ -232,23 +232,15 @@ export function ContentComponent(_ref5) {
232
232
  if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
233
233
  return null;
234
234
  }
235
- if (fg('platform_editor_user_intent_plugin')) {
236
- if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
237
- return null;
238
- }
239
-
240
- // TODO: ED-27539 - This feature is unreleased and rendering logic needs to be move userIntentState which is not ready yet
241
- // if (blockControlsState?.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
242
- // return null;
243
- // }
244
- } else {
245
- if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
246
- return null;
247
- }
248
- if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
249
- return null;
250
- }
235
+ if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
236
+ return null;
251
237
  }
238
+
239
+ // TODO: ED-27539 - This feature is unreleased and rendering logic needs to be move userIntentState which is not ready yet
240
+ // if (blockControlsState?.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
241
+ // return null;
242
+ // }
243
+
252
244
  var config = configWithNodeInfo.config,
253
245
  node = configWithNodeInfo.node;
254
246
  var items = config.items;
package/dist/esm/ui/Toolbar.js CHANGED
@@ -56,7 +56,7 @@ export function groupItems(items) {
56
56
  } else {
57
57
  finalOutput.push(item);
58
58
  }
59
- } else if (item.type === 'separator' && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_6')) {
59
+ } else if (item.type === 'separator' && editorExperiment('platform_editor_controls', 'variant1')) {
60
60
  var _items;
61
61
  var isLeadingSeparator = i === 0;
62
62
  var isTrailingSeparator = i === items.length - 1;
@@ -335,7 +335,7 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
335
335
  scrollable: scrollable
336
336
  });
337
337
  case 'separator':
338
- if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_6')) {
338
+ if (editorExperiment('platform_editor_controls', 'variant1')) {
339
339
  return item.fullHeight ? jsx(Separator, {
340
340
  key: idx,
341
341
  fullHeight: true
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-floating-toolbar",
3
- "version": "4.2.2",
3
+ "version": "4.2.5",
4
4
  "description": "Floating toolbar plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -28,13 +28,13 @@
28
28
  "@atlaskit/adf-utils": "^19.20.0",
29
29
  "@atlaskit/button": "^23.2.0",
30
30
  "@atlaskit/checkbox": "^17.1.0",
31
- "@atlaskit/editor-common": "^106.6.0",
31
+ "@atlaskit/editor-common": "^107.0.0",
32
32
  "@atlaskit/editor-palette": "^2.1.0",
33
33
  "@atlaskit/editor-plugin-analytics": "^2.3.0",
34
34
  "@atlaskit/editor-plugin-context-panel": "^4.1.0",
35
35
  "@atlaskit/editor-plugin-copy-button": "^2.0.0",
36
36
  "@atlaskit/editor-plugin-decorations": "^2.0.0",
37
- "@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
37
+ "@atlaskit/editor-plugin-editor-disabled": "^2.1.0",
38
38
  "@atlaskit/editor-plugin-editor-viewmode": "^4.0.0",
39
39
  "@atlaskit/editor-plugin-emoji": "^3.7.0",
40
40
  "@atlaskit/editor-plugin-extension": "^5.5.0",
@@ -43,15 +43,15 @@
43
43
  "@atlaskit/editor-plugin-user-intent": "^0.1.0",
44
44
  "@atlaskit/editor-prosemirror": "7.0.0",
45
45
  "@atlaskit/emoji": "^69.3.0",
46
- "@atlaskit/icon": "^26.4.0",
46
+ "@atlaskit/icon": "^27.0.0",
47
47
  "@atlaskit/menu": "^8.0.0",
48
48
  "@atlaskit/modal-dialog": "^14.2.0",
49
49
  "@atlaskit/platform-feature-flags": "^1.1.0",
50
50
  "@atlaskit/primitives": "^14.8.0",
51
51
  "@atlaskit/select": "^20.7.0",
52
52
  "@atlaskit/theme": "^18.0.0",
53
- "@atlaskit/tmp-editor-statsig": "^7.0.0",
54
- "@atlaskit/tokens": "^5.1.0",
53
+ "@atlaskit/tmp-editor-statsig": "^7.1.0",
54
+ "@atlaskit/tokens": "^5.2.0",
55
55
  "@atlaskit/tooltip": "^20.3.0",
56
56
  "@babel/runtime": "^7.0.0",
57
57
  "@emotion/react": "^11.7.1",
@@ -140,9 +140,6 @@
140
140
  "platform_editor_user_intent_plugin": {
141
141
  "type": "boolean"
142
142
  },
143
- "platform_editor_controls_patch_6": {
144
- "type": "boolean"
145
- },
146
143
  "platform_editor_controls_patch_13": {
147
144
  "type": "boolean"
148
145
  },