@atlaskit/renderer 108.5.1 → 108.6.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/renderer
 
+## 108.6.0
+
+### Minor Changes
+
+- [`cb69e6847ec`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cb69e6847ec) - [ux] The table colgroup will always set the width to the min width when the custom-table-width flag is enabled
+
+### Patch Changes
+
+- [`0c22ffc68ac`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0c22ffc68ac) - Fix issue where attempting to add an inline comment (annotation) on inline code nodes wrapped in bidi warnings would result in the editor crashing
+- Updated dependencies
+
 ## 108.5.1
 
 ### Patch Changes

package/dist/cjs/react/nodes/table/colgroup.js

@@ -39,7 +39,7 @@ var fixColumnWidth = function fixColumnWidth(columnWidth, _tableWidth, _layoutWi
   // If the tables total width (including no zero widths col or cols without width) is less than the current layout
   // We scale up the columns to meet the minimum of the table layout.
   if (zeroWidthColumnsCount === 0 && scaleDownPercent) {
-    return Math.floor((1 - scaleDownPercent) * columnWidth);
+    return Math.max(Math.floor((1 - scaleDownPercent) * columnWidth), _styles.tableCellMinWidth);
   }
   return Math.max(
   // We need to take tableCellBorderWidth, to avoid unneccesary overflow.
@@ -59,7 +59,24 @@ var Colgroup = function Colgroup(props) {
     isNumberColumnEnabled = props.isNumberColumnEnabled,
     renderWidth = props.renderWidth,
     tableNode = props.tableNode;
-  if (!columnWidths || !isTableResized(columnWidths)) {
+  if (!columnWidths) {
+    return null;
+  }
+  var tableResized = isTableResized(columnWidths);
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.custom-table-width') && !tableResized) {
+    return /*#__PURE__*/_react.default.createElement("colgroup", null, isNumberColumnEnabled && /*#__PURE__*/_react.default.createElement("col", {
+      style: {
+        width: _editorSharedStyles.akEditorTableNumberColumnWidth
+      }
+    }), columnWidths.map(function (_, idx) {
+      return /*#__PURE__*/_react.default.createElement("col", {
+        key: idx,
+        style: {
+          width: "".concat(_styles.tableCellMinWidth, "px")
+        }
+      });
+    }));
+  } else if (!tableResized) {
     return null;
   }
   var tableContainerWidth;

package/dist/cjs/ui/Renderer/index.js

@@ -55,7 +55,7 @@ exports.NORMAL_SEVERITY_THRESHOLD = NORMAL_SEVERITY_THRESHOLD;
 var DEGRADED_SEVERITY_THRESHOLD = 3000;
 exports.DEGRADED_SEVERITY_THRESHOLD = DEGRADED_SEVERITY_THRESHOLD;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "108.5.1";
+var packageVersion = "108.6.0";
 var Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/dist/cjs/ui/annotations/draft/component.js

@@ -90,8 +90,12 @@ var TextWithAnnotationDraft = function TextWithAnnotationDraft(_ref3) {
       draftPosition: nextDraftPosition
     }, children);
   }
-  var offsets = (0, _text.calcTextSplitOffset)(nextDraftPosition, textPosition, children);
-  var texts = (0, _text.splitText)(children, offsets);
+  var textString = (0, _text.findTextString)(children);
+  if (!textString) {
+    return (0, _react2.jsx)(_react.Fragment, null, children);
+  }
+  var offsets = (0, _text.calcTextSplitOffset)(nextDraftPosition, textPosition, textString);
+  var texts = (0, _text.splitText)(textString, offsets);
   if (!texts) {
     return (0, _react2.jsx)(_react.Fragment, null, children);
   }

package/dist/cjs/ui/annotations/draft/text.js

@@ -1,9 +1,41 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.splitText = exports.calcTextSplitOffset = void 0;
+exports.splitText = exports.findTextString = exports.calcTextSplitOffset = void 0;
+var _react = _interopRequireDefault(require("react"));
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+var findTextString = function findTextString(reactNode) {
+  var result = null;
+  var children = _react.default.Children.toArray(reactNode);
+  var _iterator = _createForOfIteratorHelper(children),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var childNode = _step.value;
+      if (result) {
+        break;
+      } else if (typeof childNode === 'string') {
+        result = childNode;
+      } else if (isReactElement(childNode) && childNode.props.children) {
+        result = findTextString(childNode.props.children);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return result;
+};
+exports.findTextString = findTextString;
+function isReactElement(child) {
+  return !!child.type;
+}
 var splitText = function splitText(text, _ref) {
   var startOffset = _ref.startOffset,
     endOffset = _ref.endOffset;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "108.5.1",
+	"version": "108.6.0",
 	"sideEffects": false
 }

package/dist/es2019/react/nodes/table/colgroup.js

@@ -30,7 +30,7 @@ const fixColumnWidth = (columnWidth, _tableWidth, _layoutWidth, zeroWidthColumns
   // If the tables total width (including no zero widths col or cols without width) is less than the current layout
   // We scale up the columns to meet the minimum of the table layout.
   if (zeroWidthColumnsCount === 0 && scaleDownPercent) {
-    return Math.floor((1 - scaleDownPercent) * columnWidth);
+    return Math.max(Math.floor((1 - scaleDownPercent) * columnWidth), tableCellMinWidth);
   }
   return Math.max(
   // We need to take tableCellBorderWidth, to avoid unneccesary overflow.
@@ -52,7 +52,22 @@ export const Colgroup = props => {
     renderWidth,
     tableNode
   } = props;
-  if (!columnWidths || !isTableResized(columnWidths)) {
+  if (!columnWidths) {
+    return null;
+  }
+  const tableResized = isTableResized(columnWidths);
+  if (getBooleanFF('platform.editor.custom-table-width') && !tableResized) {
+    return /*#__PURE__*/React.createElement("colgroup", null, isNumberColumnEnabled && /*#__PURE__*/React.createElement("col", {
+      style: {
+        width: akEditorTableNumberColumnWidth
+      }
+    }), columnWidths.map((_, idx) => /*#__PURE__*/React.createElement("col", {
+      key: idx,
+      style: {
+        width: `${tableCellMinWidth}px`
+      }
+    })));
+  } else if (!tableResized) {
     return null;
   }
   let tableContainerWidth;

package/dist/es2019/ui/Renderer/index.js

@@ -35,7 +35,7 @@ import { RenderTracking } from '../../react/utils/performance/RenderTracking';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "108.5.1";
+const packageVersion = "108.6.0";
 export class Renderer extends PureComponent {
   constructor(props) {
     super(props);

package/dist/es2019/ui/annotations/draft/component.js

@@ -4,7 +4,7 @@ import React, { Fragment } from 'react';
 import { css, jsx } from '@emotion/react';
 import { InsertDraftPosition } from '../types';
 import { AnnotationsDraftContext } from '../context';
-import { splitText, calcTextSplitOffset } from './text';
+import { splitText, calcTextSplitOffset, findTextString } from './text';
 import { calcInsertDraftPositionOnText } from './position';
 import { dataAttributes } from './dom';
 import { AnnotationSharedCSSByState } from '@atlaskit/editor-common/styles';
@@ -80,8 +80,12 @@ export const TextWithAnnotationDraft = ({
       draftPosition: nextDraftPosition
     }, children);
   }
-  const offsets = calcTextSplitOffset(nextDraftPosition, textPosition, children);
-  const texts = splitText(children, offsets);
+  const textString = findTextString(children);
+  if (!textString) {
+    return jsx(Fragment, null, children);
+  }
+  const offsets = calcTextSplitOffset(nextDraftPosition, textPosition, textString);
+  const texts = splitText(textString, offsets);
   if (!texts) {
     return jsx(Fragment, null, children);
   }

package/dist/es2019/ui/annotations/draft/text.js

@@ -1,3 +1,21 @@
+import React from 'react';
+export const findTextString = reactNode => {
+  let result = null;
+  const children = React.Children.toArray(reactNode);
+  for (const childNode of children) {
+    if (result) {
+      break;
+    } else if (typeof childNode === 'string') {
+      result = childNode;
+    } else if (isReactElement(childNode) && childNode.props.children) {
+      result = findTextString(childNode.props.children);
+    }
+  }
+  return result;
+};
+function isReactElement(child) {
+  return !!child.type;
+}
 export const splitText = (text, {
   startOffset,
   endOffset

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "108.5.1",
+	"version": "108.6.0",
 	"sideEffects": false
 }

package/dist/esm/react/nodes/table/colgroup.js

@@ -32,7 +32,7 @@ var fixColumnWidth = function fixColumnWidth(columnWidth, _tableWidth, _layoutWi
   // If the tables total width (including no zero widths col or cols without width) is less than the current layout
   // We scale up the columns to meet the minimum of the table layout.
   if (zeroWidthColumnsCount === 0 && scaleDownPercent) {
-    return Math.floor((1 - scaleDownPercent) * columnWidth);
+    return Math.max(Math.floor((1 - scaleDownPercent) * columnWidth), tableCellMinWidth);
   }
   return Math.max(
   // We need to take tableCellBorderWidth, to avoid unneccesary overflow.
@@ -51,7 +51,24 @@ export var Colgroup = function Colgroup(props) {
     isNumberColumnEnabled = props.isNumberColumnEnabled,
     renderWidth = props.renderWidth,
     tableNode = props.tableNode;
-  if (!columnWidths || !isTableResized(columnWidths)) {
+  if (!columnWidths) {
+    return null;
+  }
+  var tableResized = isTableResized(columnWidths);
+  if (getBooleanFF('platform.editor.custom-table-width') && !tableResized) {
+    return /*#__PURE__*/React.createElement("colgroup", null, isNumberColumnEnabled && /*#__PURE__*/React.createElement("col", {
+      style: {
+        width: akEditorTableNumberColumnWidth
+      }
+    }), columnWidths.map(function (_, idx) {
+      return /*#__PURE__*/React.createElement("col", {
+        key: idx,
+        style: {
+          width: "".concat(tableCellMinWidth, "px")
+        }
+      });
+    }));
+  } else if (!tableResized) {
     return null;
   }
   var tableContainerWidth;

package/dist/esm/ui/Renderer/index.js

@@ -45,7 +45,7 @@ import { RenderTracking } from '../../react/utils/performance/RenderTracking';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "108.5.1";
+var packageVersion = "108.6.0";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/dist/esm/ui/annotations/draft/component.js

@@ -6,7 +6,7 @@ import React, { Fragment } from 'react';
 import { css, jsx } from '@emotion/react';
 import { InsertDraftPosition } from '../types';
 import { AnnotationsDraftContext } from '../context';
-import { splitText, calcTextSplitOffset } from './text';
+import { splitText, calcTextSplitOffset, findTextString } from './text';
 import { calcInsertDraftPositionOnText } from './position';
 import { dataAttributes } from './dom';
 import { AnnotationSharedCSSByState } from '@atlaskit/editor-common/styles';
@@ -77,8 +77,12 @@ export var TextWithAnnotationDraft = function TextWithAnnotationDraft(_ref3) {
       draftPosition: nextDraftPosition
     }, children);
   }
-  var offsets = calcTextSplitOffset(nextDraftPosition, textPosition, children);
-  var texts = splitText(children, offsets);
+  var textString = findTextString(children);
+  if (!textString) {
+    return jsx(Fragment, null, children);
+  }
+  var offsets = calcTextSplitOffset(nextDraftPosition, textPosition, textString);
+  var texts = splitText(textString, offsets);
   if (!texts) {
     return jsx(Fragment, null, children);
   }

package/dist/esm/ui/annotations/draft/text.js

@@ -1,3 +1,33 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import React from 'react';
+export var findTextString = function findTextString(reactNode) {
+  var result = null;
+  var children = React.Children.toArray(reactNode);
+  var _iterator = _createForOfIteratorHelper(children),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var childNode = _step.value;
+      if (result) {
+        break;
+      } else if (typeof childNode === 'string') {
+        result = childNode;
+      } else if (isReactElement(childNode) && childNode.props.children) {
+        result = findTextString(childNode.props.children);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return result;
+};
+function isReactElement(child) {
+  return !!child.type;
+}
 export var splitText = function splitText(text, _ref) {
   var startOffset = _ref.startOffset,
     endOffset = _ref.endOffset;

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "108.5.1",
+	"version": "108.6.0",
 	"sideEffects": false
 }

package/dist/types/react/nodes/text-wrapper.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import { ReactNode } from 'react';
 type Props = {
     startPos: number;
     endPos: number;
-    children?: string | null;
+    children?: ReactNode | null;
 };
 declare const TextWrapper: (props: Props) => JSX.Element | null;
 export default TextWrapper;

package/dist/types/ui/annotations/draft/component.d.ts

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { InsertDraftPosition, Position } from '../types';
 export declare const AnnotationDraft: React.FC<{
     draftPosition: Position;
@@ -14,7 +14,7 @@ export declare const applyAnnotationOnText: ({ texts, shouldApplyAnnotationAt, d
 type Props = {
     startPos: number;
     endPos: number;
-    children: string;
+    children: ReactNode;
 };
 export declare const TextWithAnnotationDraft: React.FC<Props>;
 export {};

package/dist/types/ui/annotations/draft/text.d.ts

@@ -1,4 +1,6 @@
+import React from 'react';
 import { TextPosition, Position } from '../types';
+export declare const findTextString: (reactNode: React.ReactNode) => string | null;
 type Offset = {
     startOffset: number;
     endOffset: number;

package/dist/types-ts4.5/react/nodes/text-wrapper.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import { ReactNode } from 'react';
 type Props = {
     startPos: number;
     endPos: number;
-    children?: string | null;
+    children?: ReactNode | null;
 };
 declare const TextWrapper: (props: Props) => JSX.Element | null;
 export default TextWrapper;

package/dist/types-ts4.5/ui/annotations/draft/component.d.ts

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { InsertDraftPosition, Position } from '../types';
 export declare const AnnotationDraft: React.FC<{
     draftPosition: Position;
@@ -14,7 +14,7 @@ export declare const applyAnnotationOnText: ({ texts, shouldApplyAnnotationAt, d
 type Props = {
     startPos: number;
     endPos: number;
-    children: string;
+    children: ReactNode;
 };
 export declare const TextWithAnnotationDraft: React.FC<Props>;
 export {};

package/dist/types-ts4.5/ui/annotations/draft/text.d.ts

@@ -1,4 +1,6 @@
+import React from 'react';
 import { TextPosition, Position } from '../types';
+export declare const findTextString: (reactNode: React.ReactNode) => string | null;
 type Offset = {
     startOffset: number;
     endOffset: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "108.5.1",
+  "version": "108.6.0",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -57,7 +57,7 @@
     "@atlaskit/status": "^1.3.0",
     "@atlaskit/task-decision": "^17.6.0",
     "@atlaskit/theme": "^12.5.0",
-    "@atlaskit/tokens": "^1.10.0",
+    "@atlaskit/tokens": "^1.11.0",
     "@atlaskit/tooltip": "^17.8.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",