@atlaskit/editor-common 111.8.4 → 111.8.6

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 (196) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/dist/cjs/analytics/types/enums.js +1 -0
  3. package/dist/cjs/extensibility/Extension/Extension/index.js +11 -7
  4. package/dist/cjs/extensibility/MultiBodiedExtension/index.js +11 -5
  5. package/dist/cjs/extensibility/utils/should-extension-breakout.js +32 -0
  6. package/dist/cjs/i18n/cs.js +1 -0
  7. package/dist/cjs/i18n/da.js +1 -0
  8. package/dist/cjs/i18n/de.js +1 -0
  9. package/dist/cjs/i18n/en.js +1 -0
  10. package/dist/cjs/i18n/en_GB.js +1 -0
  11. package/dist/cjs/i18n/en_ZZ.js +1 -0
  12. package/dist/cjs/i18n/es.js +1 -0
  13. package/dist/cjs/i18n/fi.js +1 -0
  14. package/dist/cjs/i18n/fr.js +1 -0
  15. package/dist/cjs/i18n/hr.js +1 -0
  16. package/dist/cjs/i18n/hu.js +1 -0
  17. package/dist/cjs/i18n/it.js +1 -0
  18. package/dist/cjs/i18n/ja.js +1 -0
  19. package/dist/cjs/i18n/ko.js +1 -0
  20. package/dist/cjs/i18n/nb.js +1 -0
  21. package/dist/cjs/i18n/nl.js +1 -0
  22. package/dist/cjs/i18n/pl.js +1 -0
  23. package/dist/cjs/i18n/pt_BR.js +1 -0
  24. package/dist/cjs/i18n/ru.js +1 -0
  25. package/dist/cjs/i18n/sk.js +1 -0
  26. package/dist/cjs/i18n/sl.js +1 -0
  27. package/dist/cjs/i18n/sr.js +1 -0
  28. package/dist/cjs/i18n/sr_RS.js +1 -0
  29. package/dist/cjs/i18n/sr_YR.js +1 -0
  30. package/dist/cjs/i18n/sv.js +1 -0
  31. package/dist/cjs/i18n/th.js +1 -0
  32. package/dist/cjs/i18n/tr.js +1 -0
  33. package/dist/cjs/i18n/uk.js +1 -0
  34. package/dist/cjs/i18n/vi.js +1 -0
  35. package/dist/cjs/i18n/zh.js +1 -0
  36. package/dist/cjs/i18n/zh_TW.js +1 -0
  37. package/dist/cjs/messages/company-hub-text-color.js +14 -0
  38. package/dist/cjs/messages/index.js +7 -0
  39. package/dist/cjs/messages/mentions.js +10 -0
  40. package/dist/cjs/monitoring/error.js +1 -1
  41. package/dist/cjs/ui/DropList/index.js +1 -1
  42. package/dist/es2019/analytics/types/enums.js +1 -0
  43. package/dist/es2019/extensibility/Extension/Extension/index.js +11 -7
  44. package/dist/es2019/extensibility/MultiBodiedExtension/index.js +11 -5
  45. package/dist/es2019/extensibility/utils/should-extension-breakout.js +26 -0
  46. package/dist/es2019/i18n/cs.js +1 -0
  47. package/dist/es2019/i18n/da.js +1 -0
  48. package/dist/es2019/i18n/de.js +1 -0
  49. package/dist/es2019/i18n/en.js +1 -0
  50. package/dist/es2019/i18n/en_GB.js +1 -0
  51. package/dist/es2019/i18n/en_ZZ.js +1 -0
  52. package/dist/es2019/i18n/es.js +1 -0
  53. package/dist/es2019/i18n/fi.js +1 -0
  54. package/dist/es2019/i18n/fr.js +1 -0
  55. package/dist/es2019/i18n/hr.js +1 -0
  56. package/dist/es2019/i18n/hu.js +1 -0
  57. package/dist/es2019/i18n/it.js +1 -0
  58. package/dist/es2019/i18n/ja.js +1 -0
  59. package/dist/es2019/i18n/ko.js +1 -0
  60. package/dist/es2019/i18n/nb.js +1 -0
  61. package/dist/es2019/i18n/nl.js +1 -0
  62. package/dist/es2019/i18n/pl.js +1 -0
  63. package/dist/es2019/i18n/pt_BR.js +1 -0
  64. package/dist/es2019/i18n/ru.js +1 -0
  65. package/dist/es2019/i18n/sk.js +1 -0
  66. package/dist/es2019/i18n/sl.js +1 -0
  67. package/dist/es2019/i18n/sr.js +1 -0
  68. package/dist/es2019/i18n/sr_RS.js +1 -0
  69. package/dist/es2019/i18n/sr_YR.js +1 -0
  70. package/dist/es2019/i18n/sv.js +1 -0
  71. package/dist/es2019/i18n/th.js +1 -0
  72. package/dist/es2019/i18n/tr.js +1 -0
  73. package/dist/es2019/i18n/uk.js +1 -0
  74. package/dist/es2019/i18n/vi.js +1 -0
  75. package/dist/es2019/i18n/zh.js +1 -0
  76. package/dist/es2019/i18n/zh_TW.js +1 -0
  77. package/dist/es2019/messages/company-hub-text-color.js +8 -0
  78. package/dist/es2019/messages/index.js +1 -0
  79. package/dist/es2019/messages/mentions.js +10 -0
  80. package/dist/es2019/monitoring/error.js +1 -1
  81. package/dist/es2019/ui/DropList/index.js +1 -1
  82. package/dist/esm/analytics/types/enums.js +1 -0
  83. package/dist/esm/extensibility/Extension/Extension/index.js +11 -7
  84. package/dist/esm/extensibility/MultiBodiedExtension/index.js +11 -5
  85. package/dist/esm/extensibility/utils/should-extension-breakout.js +26 -0
  86. package/dist/esm/i18n/cs.js +1 -0
  87. package/dist/esm/i18n/da.js +1 -0
  88. package/dist/esm/i18n/de.js +1 -0
  89. package/dist/esm/i18n/en.js +1 -0
  90. package/dist/esm/i18n/en_GB.js +1 -0
  91. package/dist/esm/i18n/en_ZZ.js +1 -0
  92. package/dist/esm/i18n/es.js +1 -0
  93. package/dist/esm/i18n/fi.js +1 -0
  94. package/dist/esm/i18n/fr.js +1 -0
  95. package/dist/esm/i18n/hr.js +1 -0
  96. package/dist/esm/i18n/hu.js +1 -0
  97. package/dist/esm/i18n/it.js +1 -0
  98. package/dist/esm/i18n/ja.js +1 -0
  99. package/dist/esm/i18n/ko.js +1 -0
  100. package/dist/esm/i18n/nb.js +1 -0
  101. package/dist/esm/i18n/nl.js +1 -0
  102. package/dist/esm/i18n/pl.js +1 -0
  103. package/dist/esm/i18n/pt_BR.js +1 -0
  104. package/dist/esm/i18n/ru.js +1 -0
  105. package/dist/esm/i18n/sk.js +1 -0
  106. package/dist/esm/i18n/sl.js +1 -0
  107. package/dist/esm/i18n/sr.js +1 -0
  108. package/dist/esm/i18n/sr_RS.js +1 -0
  109. package/dist/esm/i18n/sr_YR.js +1 -0
  110. package/dist/esm/i18n/sv.js +1 -0
  111. package/dist/esm/i18n/th.js +1 -0
  112. package/dist/esm/i18n/tr.js +1 -0
  113. package/dist/esm/i18n/uk.js +1 -0
  114. package/dist/esm/i18n/vi.js +1 -0
  115. package/dist/esm/i18n/zh.js +1 -0
  116. package/dist/esm/i18n/zh_TW.js +1 -0
  117. package/dist/esm/messages/company-hub-text-color.js +8 -0
  118. package/dist/esm/messages/index.js +1 -0
  119. package/dist/esm/messages/mentions.js +10 -0
  120. package/dist/esm/monitoring/error.js +1 -1
  121. package/dist/esm/ui/DropList/index.js +1 -1
  122. package/dist/types/analytics/types/ai-unified-events.d.ts +4 -1
  123. package/dist/types/analytics/types/enums.d.ts +1 -0
  124. package/dist/types/extensibility/utils/should-extension-breakout.d.ts +8 -0
  125. package/dist/types/i18n/cs.d.ts +1 -0
  126. package/dist/types/i18n/da.d.ts +1 -0
  127. package/dist/types/i18n/de.d.ts +1 -0
  128. package/dist/types/i18n/en.d.ts +1 -0
  129. package/dist/types/i18n/en_GB.d.ts +1 -0
  130. package/dist/types/i18n/en_ZZ.d.ts +1 -0
  131. package/dist/types/i18n/es.d.ts +1 -0
  132. package/dist/types/i18n/fi.d.ts +1 -0
  133. package/dist/types/i18n/fr.d.ts +1 -0
  134. package/dist/types/i18n/hr.d.ts +1 -0
  135. package/dist/types/i18n/hu.d.ts +1 -0
  136. package/dist/types/i18n/it.d.ts +1 -0
  137. package/dist/types/i18n/ja.d.ts +1 -0
  138. package/dist/types/i18n/ko.d.ts +1 -0
  139. package/dist/types/i18n/nb.d.ts +1 -0
  140. package/dist/types/i18n/nl.d.ts +1 -0
  141. package/dist/types/i18n/pl.d.ts +1 -0
  142. package/dist/types/i18n/pt_BR.d.ts +1 -0
  143. package/dist/types/i18n/ru.d.ts +1 -0
  144. package/dist/types/i18n/sk.d.ts +1 -0
  145. package/dist/types/i18n/sl.d.ts +1 -0
  146. package/dist/types/i18n/sr.d.ts +1 -0
  147. package/dist/types/i18n/sr_RS.d.ts +1 -0
  148. package/dist/types/i18n/sr_YR.d.ts +1 -0
  149. package/dist/types/i18n/sv.d.ts +1 -0
  150. package/dist/types/i18n/th.d.ts +1 -0
  151. package/dist/types/i18n/tr.d.ts +1 -0
  152. package/dist/types/i18n/uk.d.ts +1 -0
  153. package/dist/types/i18n/vi.d.ts +1 -0
  154. package/dist/types/i18n/zh.d.ts +1 -0
  155. package/dist/types/i18n/zh_TW.d.ts +1 -0
  156. package/dist/types/messages/company-hub-text-color.d.ts +7 -0
  157. package/dist/types/messages/index.d.ts +1 -0
  158. package/dist/types/messages/mentions.d.ts +10 -0
  159. package/dist/types-ts4.5/analytics/types/ai-unified-events.d.ts +4 -1
  160. package/dist/types-ts4.5/analytics/types/enums.d.ts +1 -0
  161. package/dist/types-ts4.5/extensibility/utils/should-extension-breakout.d.ts +8 -0
  162. package/dist/types-ts4.5/i18n/cs.d.ts +1 -0
  163. package/dist/types-ts4.5/i18n/da.d.ts +1 -0
  164. package/dist/types-ts4.5/i18n/de.d.ts +1 -0
  165. package/dist/types-ts4.5/i18n/en.d.ts +1 -0
  166. package/dist/types-ts4.5/i18n/en_GB.d.ts +1 -0
  167. package/dist/types-ts4.5/i18n/en_ZZ.d.ts +1 -0
  168. package/dist/types-ts4.5/i18n/es.d.ts +1 -0
  169. package/dist/types-ts4.5/i18n/fi.d.ts +1 -0
  170. package/dist/types-ts4.5/i18n/fr.d.ts +1 -0
  171. package/dist/types-ts4.5/i18n/hr.d.ts +1 -0
  172. package/dist/types-ts4.5/i18n/hu.d.ts +1 -0
  173. package/dist/types-ts4.5/i18n/it.d.ts +1 -0
  174. package/dist/types-ts4.5/i18n/ja.d.ts +1 -0
  175. package/dist/types-ts4.5/i18n/ko.d.ts +1 -0
  176. package/dist/types-ts4.5/i18n/nb.d.ts +1 -0
  177. package/dist/types-ts4.5/i18n/nl.d.ts +1 -0
  178. package/dist/types-ts4.5/i18n/pl.d.ts +1 -0
  179. package/dist/types-ts4.5/i18n/pt_BR.d.ts +1 -0
  180. package/dist/types-ts4.5/i18n/ru.d.ts +1 -0
  181. package/dist/types-ts4.5/i18n/sk.d.ts +1 -0
  182. package/dist/types-ts4.5/i18n/sl.d.ts +1 -0
  183. package/dist/types-ts4.5/i18n/sr.d.ts +1 -0
  184. package/dist/types-ts4.5/i18n/sr_RS.d.ts +1 -0
  185. package/dist/types-ts4.5/i18n/sr_YR.d.ts +1 -0
  186. package/dist/types-ts4.5/i18n/sv.d.ts +1 -0
  187. package/dist/types-ts4.5/i18n/th.d.ts +1 -0
  188. package/dist/types-ts4.5/i18n/tr.d.ts +1 -0
  189. package/dist/types-ts4.5/i18n/uk.d.ts +1 -0
  190. package/dist/types-ts4.5/i18n/vi.d.ts +1 -0
  191. package/dist/types-ts4.5/i18n/zh.d.ts +1 -0
  192. package/dist/types-ts4.5/i18n/zh_TW.d.ts +1 -0
  193. package/dist/types-ts4.5/messages/company-hub-text-color.d.ts +7 -0
  194. package/dist/types-ts4.5/messages/index.d.ts +1 -0
  195. package/dist/types-ts4.5/messages/mentions.d.ts +10 -0
  196. package/package.json +4 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,24 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 111.8.6
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 111.8.5
10
+
11
+ ### Patch Changes
12
+
13
+ - [`498fc3298e069`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/498fc3298e069) -
14
+ [ux] EDITOR-3463: Keep extension breakout aligned with page width in full-width and max modes. The
15
+ rollout is guarded by `confluence_max_width_content_appearance` and the new
16
+ `confluence_max_width_breakout_extension_fix` experiment so the bugfix can be toggled
17
+ independently.
18
+ - [`b34b724d67362`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b34b724d67362) -
19
+ Improve AI analytics by ensuring attributes are set and firing additional free gen events
20
+ - Updated dependencies
21
+
3
22
  ## 111.8.4
4
23
 
5
24
  ### Patch Changes
@@ -43,6 +43,7 @@ var ACTION = exports.ACTION = /*#__PURE__*/function (ACTION) {
43
43
  ACTION["DECREMENTED"] = "decremented";
44
44
  ACTION["DELETED"] = "deleted";
45
45
  ACTION["DISCARDED_INVALID_STEPS_FROM_TRANSACTION"] = "discardedInvalidStepsFromTransaction";
46
+ ACTION["DISCARDED"] = "discarded";
46
47
  /** used in @atlassian/editor-referentiality */
47
48
  ACTION["DISCONNECTED_SOURCE"] = "disconnectedSource";
48
49
  /** used in @atlassian/editor-referentiality */
@@ -17,6 +17,7 @@ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
17
17
  var _hooks = require("../../../hooks");
18
18
  var _ui = require("../../../ui");
19
19
  var _utils = require("../../../utils");
20
+ var _shouldExtensionBreakout = require("../../utils/should-extension-breakout");
20
21
  var _LegacyContentHeader = require("../LegacyContentHeader");
21
22
  var _Lozenge = _interopRequireDefault(require("../Lozenge"));
22
23
  var _styles = require("../styles");
@@ -82,13 +83,16 @@ function ExtensionWithPluginState(props) {
82
83
  var pos = typeof getPos === 'function' ? getPos() : undefined;
83
84
  return typeof pos !== 'undefined' && !isNaN(pos) && view.state.doc.resolve(pos).depth === 0;
84
85
  }, [view, getPos]);
85
- var shouldBreakout =
86
- // Extension should breakout when the layout is set to 'full-width' or 'wide'.
87
- ['full-width', 'wide'].includes(node.attrs.layout) &&
88
- // Extension breakout state should only be respected for top level nodes.
89
- isTopLevelNode &&
90
- // Extension breakout state should not be respected when the editor appearance is full-width mode
91
- editorAppearance !== 'full-width';
86
+ var layout = node.attrs.layout;
87
+ var legacyShouldBreakout = ['full-width', 'wide'].includes(layout) && isTopLevelNode && editorAppearance !== 'full-width';
88
+ var tinymceFullWidthModeEnabled = (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true);
89
+ var breakoutExtensionFixEnabled = (0, _expValEquals.expValEquals)('confluence_max_width_breakout_extension_fix', 'isEnabled', true);
90
+ var shouldUseBreakoutFix = tinymceFullWidthModeEnabled && breakoutExtensionFixEnabled;
91
+ var shouldBreakout = shouldUseBreakoutFix ? (0, _shouldExtensionBreakout.shouldExtensionBreakout)({
92
+ layout: layout,
93
+ isTopLevelNode: isTopLevelNode,
94
+ editorAppearance: editorAppearance
95
+ }) : legacyShouldBreakout;
92
96
 
93
97
  // We don't want to show border for non-empty 1p bodied extensions in live pages
94
98
  var show1PBodiedExtensionBorder = showUpdatedLivePages1PBodiedExtensionUI ? (0, _extensionUtils.isEmptyBodiedMacro)(node) : true;
@@ -20,6 +20,7 @@ var _hooks = require("../../hooks");
20
20
  var _MultiBodiedExtension = require("../../ui/MultiBodiedExtension");
21
21
  var _utils = require("../../utils");
22
22
  var _Lozenge = _interopRequireDefault(require("../Extension/Lozenge"));
23
+ var _shouldExtensionBreakout = require("../utils/should-extension-breakout");
23
24
  var _actionApi = require("./action-api");
24
25
  var _styles = require("./styles");
25
26
  var _excluded = ["url"];
@@ -152,11 +153,16 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
152
153
  var extensionHandlerResult = _react.default.useMemo(function () {
153
154
  return tryExtensionHandler(actions);
154
155
  }, [tryExtensionHandler, actions]);
155
- var shouldBreakout =
156
- // Extension should breakout when the layout is set to 'full-width' or 'wide'.
157
- ['full-width', 'wide'].includes(node.attrs.layout) &&
158
- // Extension breakout state should not be respected when the editor appearance is full-width mode
159
- editorAppearance !== 'full-width';
156
+ var layout = node.attrs.layout;
157
+ var legacyShouldBreakout = ['full-width', 'wide'].includes(layout) && editorAppearance !== 'full-width';
158
+ var tinymceFullWidthModeEnabled = (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true);
159
+ var breakoutExtensionFixEnabled = (0, _expValEquals.expValEquals)('confluence_max_width_breakout_extension_fix', 'isEnabled', true);
160
+ var shouldUseBreakoutFix = tinymceFullWidthModeEnabled && breakoutExtensionFixEnabled;
161
+ var shouldBreakout = shouldUseBreakoutFix ? (0, _shouldExtensionBreakout.shouldExtensionBreakout)({
162
+ layout: layout,
163
+ editorAppearance: editorAppearance,
164
+ isTopLevelNode: true
165
+ }) : legacyShouldBreakout;
160
166
  var mbeWrapperStyles = {};
161
167
  if (shouldBreakout) {
162
168
  var _calculateBreakoutSty = (0, _utils.calculateBreakoutStyles)({
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.shouldExtensionBreakout = void 0;
7
+ var breakoutLayouts = new Set(['full-width', 'wide']);
8
+ var shouldRespectBreakoutForAppearance = function shouldRespectBreakoutForAppearance(appearance) {
9
+ if (!appearance) {
10
+ return true;
11
+ }
12
+ if (appearance === 'full-width') {
13
+ return false;
14
+ }
15
+ if (appearance === 'max') {
16
+ return false;
17
+ }
18
+ return true;
19
+ };
20
+ var shouldExtensionBreakout = exports.shouldExtensionBreakout = function shouldExtensionBreakout(_ref) {
21
+ var layout = _ref.layout,
22
+ _ref$isTopLevelNode = _ref.isTopLevelNode,
23
+ isTopLevelNode = _ref$isTopLevelNode === void 0 ? true : _ref$isTopLevelNode,
24
+ editorAppearance = _ref.editorAppearance;
25
+ if (!layout || !breakoutLayouts.has(layout)) {
26
+ return false;
27
+ }
28
+ if (!isTopLevelNode) {
29
+ return false;
30
+ }
31
+ return shouldRespectBreakoutForAppearance(editorAppearance);
32
+ };
@@ -839,6 +839,7 @@ var _default = exports.default = {
839
839
  'fabric.editor.textColor': 'Barva textu: {selectedColorName}',
840
840
  'fabric.editor.textColorHighlightTooltip': 'Barva textu a zvýraznění',
841
841
  'fabric.editor.textColorTooltip': 'Barva textu',
842
+ 'companyHub.editor.textColor.pickerTitle': 'Barva textu',
842
843
  'fabric.editor.textFormat': 'Formátování textu',
843
844
  'fabric.editor.textFormatting': 'Formátování textu',
844
845
  'fabric.editor.textStyles': 'Styly textu: {blockTypeName}',
@@ -836,6 +836,7 @@ var _default = exports.default = {
836
836
  'fabric.editor.textColor': '{selectedColorName} tekstfarve',
837
837
  'fabric.editor.textColorHighlightTooltip': 'Farve på tekst og fremhævning',
838
838
  'fabric.editor.textColorTooltip': 'Tekstfarve',
839
+ 'companyHub.editor.textColor.pickerTitle': 'Tekstfarve',
839
840
  'fabric.editor.textFormat': 'Formatér tekst',
840
841
  'fabric.editor.textFormatting': 'Tekstformatering',
841
842
  'fabric.editor.textStyles': '{blockTypeName} tekstformatering',
@@ -838,6 +838,7 @@ var _default = exports.default = {
838
838
  'fabric.editor.textColor': 'Textfarbe: {selectedColorName}',
839
839
  'fabric.editor.textColorHighlightTooltip': 'Farbe für Text und Hervorhebungen',
840
840
  'fabric.editor.textColorTooltip': 'Textfarbe',
841
+ 'companyHub.editor.textColor.pickerTitle': 'Textfarbe',
841
842
  'fabric.editor.textFormat': 'Text formatieren',
842
843
  'fabric.editor.textFormatting': 'Textformatierung',
843
844
  'fabric.editor.textStyles': 'Textstile: {blockTypeName}',
@@ -921,6 +921,7 @@ var _default = exports.default = {
921
921
  'fabric.editor.textColor': '{selectedColorName} Text color',
922
922
  'fabric.editor.textColorHighlightTooltip': 'Text and Highlight color',
923
923
  'fabric.editor.textColorTooltip': 'Text color',
924
+ 'companyHub.editor.textColor.pickerTitle': 'Text color',
924
925
  'fabric.editor.textFormat': 'Format text',
925
926
  'fabric.editor.textFormatting': 'Text formatting',
926
927
  'fabric.editor.textStyles': '{blockTypeName} Text styles',
@@ -921,6 +921,7 @@ var _default = exports.default = {
921
921
  'fabric.editor.textColor': '{selectedColorName} Text colour',
922
922
  'fabric.editor.textColorHighlightTooltip': 'Text and Highlight colour',
923
923
  'fabric.editor.textColorTooltip': 'Text colour',
924
+ 'companyHub.editor.textColor.pickerTitle': 'Text colour',
924
925
  'fabric.editor.textFormat': 'Format text',
925
926
  'fabric.editor.textFormatting': 'Text formatting',
926
927
  'fabric.editor.textStyles': '{blockTypeName} Text styles',
@@ -920,6 +920,7 @@ var _default = exports.default = {
920
920
  'fabric.editor.textColor': '⁣⁢{selectedColorName} Text color؜⁠⁠‌؜⁡⁡‌‌⁡⁡⁠‌⁡‌‌⁣⁤',
921
921
  'fabric.editor.textColorHighlightTooltip': '⁣⁢Text and Highlight color⁡⁡⁡⁠⁣⁤',
922
922
  'fabric.editor.textColorTooltip': '⁣⁢Text color‍؜؜؜⁡⁡؜؜؜⁠‍⁣⁤',
923
+ 'companyHub.editor.textColor.pickerTitle': '⁣⁢Text color‍؜؜؜⁡⁡؜؜؜⁠‍⁣⁤',
923
924
  'fabric.editor.textFormat': '⁣⁢Format text‍⁠؜‌⁠⁡‍‍‌⁣⁤',
924
925
  'fabric.editor.textFormatting': '⁣⁢Text formatting‌‍؜‌؜؜‌⁠⁠⁠؜⁣⁤',
925
926
  'fabric.editor.textStyles': '⁣⁢{blockTypeName} Text styles⁡؜‌⁠⁡؜؜⁡⁠؜‌⁣⁤',
@@ -837,6 +837,7 @@ var _default = exports.default = {
837
837
  'fabric.editor.textColor': 'Color de texto {selectedColorName}',
838
838
  'fabric.editor.textColorHighlightTooltip': 'Color de texto y resaltado',
839
839
  'fabric.editor.textColorTooltip': 'Color del texto',
840
+ 'companyHub.editor.textColor.pickerTitle': 'Color del texto',
840
841
  'fabric.editor.textFormat': 'Dar formato al texto',
841
842
  'fabric.editor.textFormatting': 'Formato de texto',
842
843
  'fabric.editor.textStyles': 'Estilos de texto {blockTypeName}',
@@ -839,6 +839,7 @@ var _default = exports.default = {
839
839
  'fabric.editor.textColor': '{selectedColorName} tekstin väri',
840
840
  'fabric.editor.textColorHighlightTooltip': 'Teksti- ja korostusväri',
841
841
  'fabric.editor.textColorTooltip': 'Tekstin väri',
842
+ 'companyHub.editor.textColor.pickerTitle': 'Tekstin väri',
842
843
  'fabric.editor.textFormat': 'Muotoile tekstiä',
843
844
  'fabric.editor.textFormatting': 'Tekstin muotoilu',
844
845
  'fabric.editor.textStyles': 'Tekstityylit: {blockTypeName}',
@@ -837,6 +837,7 @@ var _default = exports.default = {
837
837
  'fabric.editor.textColor': 'Couleur de texte {selectedColorName}',
838
838
  'fabric.editor.textColorHighlightTooltip': 'Couleur du texte et de surbrillance',
839
839
  'fabric.editor.textColorTooltip': 'Couleur du texte',
840
+ 'companyHub.editor.textColor.pickerTitle': 'Couleur du texte',
840
841
  'fabric.editor.textFormat': 'Mettre en forme le texte',
841
842
  'fabric.editor.textFormatting': 'Mise en forme de texte',
842
843
  'fabric.editor.textStyles': 'Styles de texte {blockTypeName}',
@@ -898,6 +898,7 @@ var _default = exports.default = {
898
898
  'fabric.editor.textColor': '{selectedColorName} Boja teksta',
899
899
  'fabric.editor.textColorHighlightTooltip': 'Tekst i istakni boju',
900
900
  'fabric.editor.textColorTooltip': 'Boja teksta',
901
+ 'companyHub.editor.textColor.pickerTitle': 'Boja teksta',
901
902
  'fabric.editor.textFormat': 'Formatiraj tekst',
902
903
  'fabric.editor.textFormatting': 'Formatiranje teksta',
903
904
  'fabric.editor.textStyles': '{blockTypeName} Stilovi teksta',
@@ -836,6 +836,7 @@ var _default = exports.default = {
836
836
  'fabric.editor.textColor': '{selectedColorName} szövegszín',
837
837
  'fabric.editor.textColorHighlightTooltip': 'Szöveg és kiemelés színe',
838
838
  'fabric.editor.textColorTooltip': 'Szövegszín',
839
+ 'companyHub.editor.textColor.pickerTitle': 'Szövegszín',
839
840
  'fabric.editor.textFormat': 'Szöveg formázása',
840
841
  'fabric.editor.textFormatting': 'Szöveg formázása',
841
842
  'fabric.editor.textStyles': '{blockTypeName} jellegű szövegstílusok',
@@ -836,6 +836,7 @@ var _default = exports.default = {
836
836
  'fabric.editor.textColor': 'Colore del testo {selectedColorName}',
837
837
  'fabric.editor.textColorHighlightTooltip': 'Testo e colore di evidenziazione',
838
838
  'fabric.editor.textColorTooltip': 'Colore del testo',
839
+ 'companyHub.editor.textColor.pickerTitle': 'Colore del testo',
839
840
  'fabric.editor.textFormat': 'Formatta testo',
840
841
  'fabric.editor.textFormatting': 'Formattazione del testo',
841
842
  'fabric.editor.textStyles': 'Stili del testo {blockTypeName}',
@@ -837,6 +837,7 @@ var _default = exports.default = {
837
837
  'fabric.editor.textColor': '「{selectedColorName}」テキスト カラー',
838
838
  'fabric.editor.textColorHighlightTooltip': 'テキストとハイライトの色',
839
839
  'fabric.editor.textColorTooltip': 'テキストの色',
840
+ 'companyHub.editor.textColor.pickerTitle': 'テキストの色',
840
841
  'fabric.editor.textFormat': 'テキストを書式設定',
841
842
  'fabric.editor.textFormatting': 'テキスト書式設定',
842
843
  'fabric.editor.textStyles': '「{blockTypeName}」テキスト スタイル',
@@ -837,6 +837,7 @@ var _default = exports.default = {
837
837
  'fabric.editor.textColor': '{selectedColorName} 텍스트 색상',
838
838
  'fabric.editor.textColorHighlightTooltip': '텍스트 및 강조 색',
839
839
  'fabric.editor.textColorTooltip': '텍스트 색상',
840
+ 'companyHub.editor.textColor.pickerTitle': '텍스트 색상',
840
841
  'fabric.editor.textFormat': '텍스트 서식',
841
842
  'fabric.editor.textFormatting': '텍스트 서식',
842
843
  'fabric.editor.textStyles': '{blockTypeName} 텍스트 스타일',
@@ -836,6 +836,7 @@ var _default = exports.default = {
836
836
  'fabric.editor.textColor': 'Tekstfargen {selectedColorName}',
837
837
  'fabric.editor.textColorHighlightTooltip': 'Tekst- og fremhevingsfarge',
838
838
  'fabric.editor.textColorTooltip': 'Tekstfarge',
839
+ 'companyHub.editor.textColor.pickerTitle': 'Tekstfarge',
839
840
  'fabric.editor.textFormat': 'Formater tekst',
840
841
  'fabric.editor.textFormatting': 'Tekstformatering',
841
842
  'fabric.editor.textStyles': 'Tekststiler {blockTypeName}',
@@ -836,6 +836,7 @@ var _default = exports.default = {
836
836
  'fabric.editor.textColor': '{selectedColorName} Tekstkleur',
837
837
  'fabric.editor.textColorHighlightTooltip': 'Kleur markeren en tekst',
838
838
  'fabric.editor.textColorTooltip': 'Tekstkleur',
839
+ 'companyHub.editor.textColor.pickerTitle': 'Tekstkleur',
839
840
  'fabric.editor.textFormat': 'Tekst opmaken',
840
841
  'fabric.editor.textFormatting': 'Tekstopmaak',
841
842
  'fabric.editor.textStyles': '{blockTypeName} Tekststijlen',
@@ -839,6 +839,7 @@ var _default = exports.default = {
839
839
  'fabric.editor.textColor': 'Kolor tekstu: {selectedColorName}',
840
840
  'fabric.editor.textColorHighlightTooltip': 'Kolor tekstu i wyróżnienia',
841
841
  'fabric.editor.textColorTooltip': 'Kolor tekstu',
842
+ 'companyHub.editor.textColor.pickerTitle': 'Kolor tekstu',
842
843
  'fabric.editor.textFormat': 'Formatuj tekst',
843
844
  'fabric.editor.textFormatting': 'Formatowanie tekstu',
844
845
  'fabric.editor.textStyles': 'Style tekstu: {blockTypeName}',
@@ -835,6 +835,7 @@ var _default = exports.default = {
835
835
  'fabric.editor.textColor': 'Cor do texto {selectedColorName}',
836
836
  'fabric.editor.textColorHighlightTooltip': 'Cor do texto e de destaque',
837
837
  'fabric.editor.textColorTooltip': 'Cor do texto',
838
+ 'companyHub.editor.textColor.pickerTitle': 'Cor do texto',
838
839
  'fabric.editor.textFormat': 'Formatar texto',
839
840
  'fabric.editor.textFormatting': 'Formatação de texto',
840
841
  'fabric.editor.textStyles': 'Estilos de texto {blockTypeName}',
@@ -839,6 +839,7 @@ var _default = exports.default = {
839
839
  'fabric.editor.textColor': 'Цвет текста: {selectedColorName}',
840
840
  'fabric.editor.textColorHighlightTooltip': 'Цвет текста и выделения',
841
841
  'fabric.editor.textColorTooltip': 'Цвет текста',
842
+ 'companyHub.editor.textColor.pickerTitle': 'Цвет текста',
842
843
  'fabric.editor.textFormat': 'Форматировать текст',
843
844
  'fabric.editor.textFormatting': 'Форматирование текста',
844
845
  'fabric.editor.textStyles': 'Стили текста: {blockTypeName}',
@@ -772,6 +772,7 @@ var _default = exports.default = {
772
772
  'fabric.editor.text.formatting.off': 'Formátovanie textu vypnuté',
773
773
  'fabric.editor.textColor': 'Farba textu: {selectedColorName}',
774
774
  'fabric.editor.textColorTooltip': 'Farba textu',
775
+ 'companyHub.editor.textColor.pickerTitle': 'Farba textu',
775
776
  'fabric.editor.textFormat': 'Formátovať text',
776
777
  'fabric.editor.textFormatting': 'Formátovanie textu',
777
778
  'fabric.editor.textStyles': 'Štýly textu: {blockTypeName}',
@@ -890,6 +890,7 @@ var _default = exports.default = {
890
890
  'fabric.editor.textColor': '{selectedColorName} barva besedila',
891
891
  'fabric.editor.textColorHighlightTooltip': 'Barva besedila in označevanja',
892
892
  'fabric.editor.textColorTooltip': 'Barva besedila',
893
+ 'companyHub.editor.textColor.pickerTitle': 'Barva besedila',
893
894
  'fabric.editor.textFormat': 'Oblikovanje besedila',
894
895
  'fabric.editor.textFormatting': 'Oblikovanje besedila',
895
896
  'fabric.editor.textStyles': '{blockTypeName} slogi besedila',
@@ -772,6 +772,7 @@ var _default = exports.default = {
772
772
  'fabric.editor.text.formatting.off': 'Isključeno formatiranje teksta',
773
773
  'fabric.editor.textColor': '{selectedColorName} boja teksta',
774
774
  'fabric.editor.textColorTooltip': 'Boja teksta',
775
+ 'companyHub.editor.textColor.pickerTitle': 'Boja teksta',
775
776
  'fabric.editor.textFormat': 'Formatiraj tekst',
776
777
  'fabric.editor.textFormatting': 'Formatiranje teksta',
777
778
  'fabric.editor.textStyles': '{blockTypeName} stilovi teksta',
@@ -898,6 +898,7 @@ var _default = exports.default = {
898
898
  'fabric.editor.textColor': '{selectedColorName} boja teksta',
899
899
  'fabric.editor.textColorHighlightTooltip': 'Boja teksta i boja za isticanje',
900
900
  'fabric.editor.textColorTooltip': 'Boja teksta',
901
+ 'companyHub.editor.textColor.pickerTitle': 'Boja teksta',
901
902
  'fabric.editor.textFormat': 'Formatiraj tekst',
902
903
  'fabric.editor.textFormatting': 'Formatiranje teksta',
903
904
  'fabric.editor.textStyles': '{blockTypeName} stilovi teksta',
@@ -898,6 +898,7 @@ var _default = exports.default = {
898
898
  'fabric.editor.textColor': '{selectedColorName} боја текста',
899
899
  'fabric.editor.textColorHighlightTooltip': 'Боја текста и боја за истицање',
900
900
  'fabric.editor.textColorTooltip': 'Боја текста',
901
+ 'companyHub.editor.textColor.pickerTitle': 'Боја текста',
901
902
  'fabric.editor.textFormat': 'Форматирај текст',
902
903
  'fabric.editor.textFormatting': 'Форматирање текста',
903
904
  'fabric.editor.textStyles': '{blockTypeName} стилови текста',
@@ -836,6 +836,7 @@ var _default = exports.default = {
836
836
  'fabric.editor.textColor': 'Textfärg {selectedColorName}',
837
837
  'fabric.editor.textColorHighlightTooltip': 'Text- och markeringsfärg',
838
838
  'fabric.editor.textColorTooltip': 'Textfärg',
839
+ 'companyHub.editor.textColor.pickerTitle': 'Textfärg',
839
840
  'fabric.editor.textFormat': 'Formatera text',
840
841
  'fabric.editor.textFormatting': 'Textformatering',
841
842
  'fabric.editor.textStyles': 'Textstilar {blockTypeName}',
@@ -822,6 +822,7 @@ var _default = exports.default = {
822
822
  'fabric.editor.textColor': 'สีข้อความ {selectedColorName}',
823
823
  'fabric.editor.textColorHighlightTooltip': 'ข้อความและสีไฮไลท์',
824
824
  'fabric.editor.textColorTooltip': 'สีข้อความ',
825
+ 'companyHub.editor.textColor.pickerTitle': 'สีข้อความ',
825
826
  'fabric.editor.textFormat': 'รูปแบบข้อความ',
826
827
  'fabric.editor.textFormatting': 'การจัดรูปแบบข้อความ',
827
828
  'fabric.editor.textStyles': 'รูปแบบข้อความ {blockTypeName}',
@@ -837,6 +837,7 @@ var _default = exports.default = {
837
837
  'fabric.editor.textColor': '{selectedColorName} Metin rengi',
838
838
  'fabric.editor.textColorHighlightTooltip': 'Metin ve Vurgu rengi',
839
839
  'fabric.editor.textColorTooltip': 'Metin rengi',
840
+ 'companyHub.editor.textColor.pickerTitle': 'Metin rengi',
840
841
  'fabric.editor.textFormat': 'Metni biçimlendir',
841
842
  'fabric.editor.textFormatting': 'Metin biçimlendirmesi',
842
843
  'fabric.editor.textStyles': '{blockTypeName} Metin stilleri',
@@ -822,6 +822,7 @@ var _default = exports.default = {
822
822
  'fabric.editor.textColor': 'Колір тексту: {selectedColorName}',
823
823
  'fabric.editor.textColorHighlightTooltip': 'Текст і колір його позначення',
824
824
  'fabric.editor.textColorTooltip': 'Колір тексту',
825
+ 'companyHub.editor.textColor.pickerTitle': 'Колір тексту',
825
826
  'fabric.editor.textFormat': 'Форматувати текст',
826
827
  'fabric.editor.textFormatting': 'Форматування у вигляді тексту',
827
828
  'fabric.editor.textStyles': 'Стилі тексту: {blockTypeName}',
@@ -822,6 +822,7 @@ var _default = exports.default = {
822
822
  'fabric.editor.textColor': 'Màu văn bản {selectedColorName}',
823
823
  'fabric.editor.textColorHighlightTooltip': 'Màu văn bản và phần tô sáng',
824
824
  'fabric.editor.textColorTooltip': 'Màu văn bản',
825
+ 'companyHub.editor.textColor.pickerTitle': 'Màu văn bản',
825
826
  'fabric.editor.textFormat': 'Định dạng văn bản',
826
827
  'fabric.editor.textFormatting': 'Định dang văn bản',
827
828
  'fabric.editor.textStyles': 'Kiểu văn bản {blockTypeName}',
@@ -837,6 +837,7 @@ var _default = exports.default = {
837
837
  'fabric.editor.textColor': '{selectedColorName}文本颜色',
838
838
  'fabric.editor.textColorHighlightTooltip': '文本和突出显示颜色',
839
839
  'fabric.editor.textColorTooltip': '文本颜色',
840
+ 'companyHub.editor.textColor.pickerTitle': '文本颜色',
840
841
  'fabric.editor.textFormat': '设置文本格式',
841
842
  'fabric.editor.textFormatting': '文本格式设置',
842
843
  'fabric.editor.textStyles': '"{blockTypeName}" 文本样式',
@@ -837,6 +837,7 @@ var _default = exports.default = {
837
837
  'fabric.editor.textColor': '{selectedColorName}的文字顏色',
838
838
  'fabric.editor.textColorHighlightTooltip': '文字和醒目提示顏色',
839
839
  'fabric.editor.textColorTooltip': '文字顏色',
840
+ 'companyHub.editor.textColor.pickerTitle': '文字顏色',
840
841
  'fabric.editor.textFormat': '設定文字格式',
841
842
  'fabric.editor.textFormatting': '文字格式設定',
842
843
  'fabric.editor.textStyles': '{blockTypeName}的文字樣式',
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.companyHubTextColorMessages = void 0;
7
+ var _reactIntlNext = require("react-intl-next");
8
+ var companyHubTextColorMessages = exports.companyHubTextColorMessages = (0, _reactIntlNext.defineMessages)({
9
+ colorPickerTitle: {
10
+ id: 'company-hub-text-color.color-picker-dropdown.picker-title',
11
+ description: 'Header of color picker dropdown for customizing text color of Company Hub',
12
+ defaultMessage: 'Text Color'
13
+ }
14
+ });
@@ -69,6 +69,12 @@ Object.defineProperty(exports, "colorPickerButtonMessages", {
69
69
  return _colorPickerButton.colorPickerButtonMessages;
70
70
  }
71
71
  });
72
+ Object.defineProperty(exports, "companyHubTextColorMessages", {
73
+ enumerable: true,
74
+ get: function get() {
75
+ return _companyHubTextColor.companyHubTextColorMessages;
76
+ }
77
+ });
72
78
  Object.defineProperty(exports, "contextPanelMessages", {
73
79
  enumerable: true,
74
80
  get: function get() {
@@ -299,6 +305,7 @@ var _contextPanel = require("./context-panel");
299
305
  var _trackChanges = require("./track-changes");
300
306
  var _syncBlock = require("./syncBlock");
301
307
  var _limitedMode = require("./limited-mode");
308
+ var _companyHubTextColor = require("./company-hub-text-color");
302
309
  // Disable no-re-export rule for entry point files
303
310
  /* eslint-disable @atlaskit/editor/no-re-export */
304
311
  var _default = exports.default = (0, _reactIntlNext.defineMessages)({
@@ -30,5 +30,15 @@ var mentionMessages = exports.mentionMessages = (0, _reactIntlNext.defineMessage
30
30
  id: 'fabric.editor.unknown.label',
31
31
  defaultMessage: 'Unknown',
32
32
  description: 'Label to indicate unknown mention node'
33
+ },
34
+ inviteTeammateInvalidEmail: {
35
+ id: 'fabric.editor.inviteItem.invalidEmail',
36
+ defaultMessage: 'Enter a valid email address',
37
+ description: 'By line text for invite teammate option shown in mentions when the email is invalid. This is a placeholder for the actual error message that will be shown to the user.'
38
+ },
39
+ sendInvite: {
40
+ id: 'fabric.editor.inviteItem.sendInvite',
41
+ defaultMessage: 'Send request to invite teammate',
42
+ description: 'By line text for send request to invite teammate option shown in mentions.'
33
43
  }
34
44
  });
@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
19
19
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
20
20
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
21
21
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
22
- var packageVersion = "111.8.3";
22
+ var packageVersion = "111.8.5";
23
23
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
24
24
  // Remove URL as it has UGC
25
25
  // Ignored via go/ees007
@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
24
24
  * @jsx jsx
25
25
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
26
26
  var packageName = "@atlaskit/editor-common";
27
- var packageVersion = "111.8.3";
27
+ var packageVersion = "111.8.5";
28
28
  var halfFocusRing = 1;
29
29
  var dropOffset = '0, 8';
30
30
  var fadeIn = (0, _react2.keyframes)({
@@ -37,6 +37,7 @@ export let ACTION = /*#__PURE__*/function (ACTION) {
37
37
  ACTION["DECREMENTED"] = "decremented";
38
38
  ACTION["DELETED"] = "deleted";
39
39
  ACTION["DISCARDED_INVALID_STEPS_FROM_TRANSACTION"] = "discardedInvalidStepsFromTransaction";
40
+ ACTION["DISCARDED"] = "discarded";
40
41
  /** used in @atlassian/editor-referentiality */
41
42
  ACTION["DISCONNECTED_SOURCE"] = "disconnectedSource";
42
43
  /** used in @atlassian/editor-referentiality */
@@ -14,6 +14,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
14
14
  import { useSharedPluginStateWithSelector } from '../../../hooks';
15
15
  import { overflowShadow } from '../../../ui';
16
16
  import { calculateBreakoutStyles } from '../../../utils';
17
+ import { shouldExtensionBreakout } from '../../utils/should-extension-breakout';
17
18
  import { LegacyContentHeader } from '../LegacyContentHeader';
18
19
  import ExtensionLozenge from '../Lozenge';
19
20
  import { overlay } from '../styles';
@@ -75,13 +76,16 @@ function ExtensionWithPluginState(props) {
75
76
  const pos = typeof getPos === 'function' ? getPos() : undefined;
76
77
  return typeof pos !== 'undefined' && !isNaN(pos) && view.state.doc.resolve(pos).depth === 0;
77
78
  }, [view, getPos]);
78
- const shouldBreakout =
79
- // Extension should breakout when the layout is set to 'full-width' or 'wide'.
80
- ['full-width', 'wide'].includes(node.attrs.layout) &&
81
- // Extension breakout state should only be respected for top level nodes.
82
- isTopLevelNode &&
83
- // Extension breakout state should not be respected when the editor appearance is full-width mode
84
- editorAppearance !== 'full-width';
79
+ const layout = node.attrs.layout;
80
+ const legacyShouldBreakout = ['full-width', 'wide'].includes(layout) && isTopLevelNode && editorAppearance !== 'full-width';
81
+ const tinymceFullWidthModeEnabled = expValEquals('confluence_max_width_content_appearance', 'isEnabled', true);
82
+ const breakoutExtensionFixEnabled = expValEquals('confluence_max_width_breakout_extension_fix', 'isEnabled', true);
83
+ const shouldUseBreakoutFix = tinymceFullWidthModeEnabled && breakoutExtensionFixEnabled;
84
+ const shouldBreakout = shouldUseBreakoutFix ? shouldExtensionBreakout({
85
+ layout,
86
+ isTopLevelNode,
87
+ editorAppearance
88
+ }) : legacyShouldBreakout;
85
89
 
86
90
  // We don't want to show border for non-empty 1p bodied extensions in live pages
87
91
  const show1PBodiedExtensionBorder = showUpdatedLivePages1PBodiedExtensionUI ? isEmptyBodiedMacro(node) : true;
@@ -16,6 +16,7 @@ import { useSharedPluginStateWithSelector } from '../../hooks';
16
16
  import { removeMarginsAndBorder, sharedMultiBodiedExtensionStyles } from '../../ui/MultiBodiedExtension';
17
17
  import { calculateBreakoutStyles, getExtensionLozengeData } from '../../utils';
18
18
  import ExtensionLozenge from '../Extension/Lozenge';
19
+ import { shouldExtensionBreakout } from '../utils/should-extension-breakout';
19
20
  import { useMultiBodiedExtensionActions } from './action-api';
20
21
  import { mbeExtensionWrapperCSSStyles, overlayStyles } from './styles';
21
22
  const getContainerCssExtendedStyles = (activeChildIndex, showMacroInteractionDesignUpdates) =>
@@ -142,11 +143,16 @@ const MultiBodiedExtensionWithWidth = ({
142
143
  const extensionHandlerResult = React.useMemo(() => {
143
144
  return tryExtensionHandler(actions);
144
145
  }, [tryExtensionHandler, actions]);
145
- const shouldBreakout =
146
- // Extension should breakout when the layout is set to 'full-width' or 'wide'.
147
- ['full-width', 'wide'].includes(node.attrs.layout) &&
148
- // Extension breakout state should not be respected when the editor appearance is full-width mode
149
- editorAppearance !== 'full-width';
146
+ const layout = node.attrs.layout;
147
+ const legacyShouldBreakout = ['full-width', 'wide'].includes(layout) && editorAppearance !== 'full-width';
148
+ const tinymceFullWidthModeEnabled = expValEquals('confluence_max_width_content_appearance', 'isEnabled', true);
149
+ const breakoutExtensionFixEnabled = expValEquals('confluence_max_width_breakout_extension_fix', 'isEnabled', true);
150
+ const shouldUseBreakoutFix = tinymceFullWidthModeEnabled && breakoutExtensionFixEnabled;
151
+ const shouldBreakout = shouldUseBreakoutFix ? shouldExtensionBreakout({
152
+ layout,
153
+ editorAppearance,
154
+ isTopLevelNode: true
155
+ }) : legacyShouldBreakout;
150
156
  let mbeWrapperStyles = {};
151
157
  if (shouldBreakout) {
152
158
  const {
@@ -0,0 +1,26 @@
1
+ const breakoutLayouts = new Set(['full-width', 'wide']);
2
+ const shouldRespectBreakoutForAppearance = appearance => {
3
+ if (!appearance) {
4
+ return true;
5
+ }
6
+ if (appearance === 'full-width') {
7
+ return false;
8
+ }
9
+ if (appearance === 'max') {
10
+ return false;
11
+ }
12
+ return true;
13
+ };
14
+ export const shouldExtensionBreakout = ({
15
+ layout,
16
+ isTopLevelNode = true,
17
+ editorAppearance
18
+ }) => {
19
+ if (!layout || !breakoutLayouts.has(layout)) {
20
+ return false;
21
+ }
22
+ if (!isTopLevelNode) {
23
+ return false;
24
+ }
25
+ return shouldRespectBreakoutForAppearance(editorAppearance);
26
+ };
@@ -833,6 +833,7 @@ export default {
833
833
  'fabric.editor.textColor': 'Barva textu: {selectedColorName}',
834
834
  'fabric.editor.textColorHighlightTooltip': 'Barva textu a zvýraznění',
835
835
  'fabric.editor.textColorTooltip': 'Barva textu',
836
+ 'companyHub.editor.textColor.pickerTitle': 'Barva textu',
836
837
  'fabric.editor.textFormat': 'Formátování textu',
837
838
  'fabric.editor.textFormatting': 'Formátování textu',
838
839
  'fabric.editor.textStyles': 'Styly textu: {blockTypeName}',