@atlaskit/editor-plugin-table 2.12.5 → 2.12.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-table
 
+## 2.12.6
+
+### Patch Changes
+
+- [`1f6e908f2bd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1f6e908f2bd) - Workaround invalid getPos error occuring for TableComponent
+
 ## 2.12.5
 
 ### Patch Changes

package/dist/cjs/plugins/table/nodeviews/TableComponent.js

@@ -415,7 +415,19 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           visibility: visible ? 'visible' : 'hidden'
         };
       });
-      var isNested = (0, _utils4.isTableNested)(view.state, getPos());
+
+      /**
+       *  ED-19838
+       *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
+       *  before CR6 lands in production
+       */
+      var tablePos;
+      try {
+        tablePos = getPos ? getPos() : undefined;
+      } catch (e) {
+        tablePos = undefined;
+      }
+      var isNested = (0, _utils4.isTableNested)(view.state, tablePos);
       return /*#__PURE__*/_react.default.createElement(_TableContainer.TableContainer, {
         className: (0, _classnames2.default)(_types.TableCssClassName.TABLE_CONTAINER, (_classnames = {}, (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.WITH_CONTROLS, allowControls && tableActive), (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.TABLE_STICKY, this.state.stickyHeader && hasHeaderRow), (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.HOVERED_DELETE_BUTTON, isInDanger), (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.TABLE_SELECTED, (0, _utils2.isTableSelected)(view.state.selection)), _classnames)),
         editorView: view,

package/dist/cjs/plugins/table/nodeviews/table.js

@@ -157,11 +157,11 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
           /**
            *  ED-19810
            *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
-           *  before CR6 lands in production
+           *  directly to confluence since this bug is now in production.
            */
           var tablePos;
           try {
-            tablePos = typeof props.getPos === 'function' ? props.getPos() : undefined;
+            tablePos = props.getPos ? props.getPos() : undefined;
           } catch (e) {
             tablePos = undefined;
           }

package/dist/es2019/plugins/table/nodeviews/TableComponent.js

@@ -407,7 +407,19 @@ class TableComponent extends React.Component {
     const shadowStyle = memoizeOne(visible => ({
       visibility: visible ? 'visible' : 'hidden'
     }));
-    const isNested = isTableNested(view.state, getPos());
+
+    /**
+     *  ED-19838
+     *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
+     *  before CR6 lands in production
+     */
+    let tablePos;
+    try {
+      tablePos = getPos ? getPos() : undefined;
+    } catch (e) {
+      tablePos = undefined;
+    }
+    const isNested = isTableNested(view.state, tablePos);
     return /*#__PURE__*/React.createElement(TableContainer, {
       className: classnames(ClassName.TABLE_CONTAINER, {
         [ClassName.WITH_CONTROLS]: allowControls && tableActive,

package/dist/es2019/plugins/table/nodeviews/table.js

@@ -129,11 +129,11 @@ export default class TableView extends ReactNodeView {
         /**
          *  ED-19810
          *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
-         *  before CR6 lands in production
+         *  directly to confluence since this bug is now in production.
          */
         let tablePos;
         try {
-          tablePos = typeof props.getPos === 'function' ? props.getPos() : undefined;
+          tablePos = props.getPos ? props.getPos() : undefined;
         } catch (e) {
           tablePos = undefined;
         }

package/dist/esm/plugins/table/nodeviews/TableComponent.js

@@ -408,7 +408,19 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           visibility: visible ? 'visible' : 'hidden'
         };
       });
-      var isNested = isTableNested(view.state, getPos());
+
+      /**
+       *  ED-19838
+       *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
+       *  before CR6 lands in production
+       */
+      var tablePos;
+      try {
+        tablePos = getPos ? getPos() : undefined;
+      } catch (e) {
+        tablePos = undefined;
+      }
+      var isNested = isTableNested(view.state, tablePos);
       return /*#__PURE__*/React.createElement(TableContainer, {
         className: classnames(ClassName.TABLE_CONTAINER, (_classnames = {}, _defineProperty(_classnames, ClassName.WITH_CONTROLS, allowControls && tableActive), _defineProperty(_classnames, ClassName.TABLE_STICKY, this.state.stickyHeader && hasHeaderRow), _defineProperty(_classnames, ClassName.HOVERED_DELETE_BUTTON, isInDanger), _defineProperty(_classnames, ClassName.TABLE_SELECTED, isTableSelected(view.state.selection)), _classnames)),
         editorView: view,

package/dist/esm/plugins/table/nodeviews/table.js

@@ -150,11 +150,11 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
           /**
            *  ED-19810
            *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
-           *  before CR6 lands in production
+           *  directly to confluence since this bug is now in production.
            */
           var tablePos;
           try {
-            tablePos = typeof props.getPos === 'function' ? props.getPos() : undefined;
+            tablePos = props.getPos ? props.getPos() : undefined;
           } catch (e) {
             tablePos = undefined;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "2.12.5",
+  "version": "2.12.6",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -38,7 +38,7 @@
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/platform-feature-flags": "^0.2.1",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.18.0",
+    "@atlaskit/tokens": "^1.19.0",
     "@atlaskit/tooltip": "^17.8.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",

package/src/plugins/table/nodeviews/TableComponent.tsx

@@ -342,7 +342,19 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
         ({ visibility: visible ? 'visible' : 'hidden' } as CSSProperties),
     );
 
-    const isNested = isTableNested(view.state, getPos());
+    /**
+     *  ED-19838
+     *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
+     *  before CR6 lands in production
+     */
+    let tablePos: number | undefined;
+    try {
+      tablePos = getPos ? getPos() : undefined;
+    } catch (e) {
+      tablePos = undefined;
+    }
+
+    const isNested = isTableNested(view.state, tablePos);
 
     return (
       <TableContainer

package/src/plugins/table/nodeviews/table.tsx

@@ -225,12 +225,11 @@ export default class TableView extends ReactNodeView<Props> {
           /**
            *  ED-19810
            *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
-           *  before CR6 lands in production
+           *  directly to confluence since this bug is now in production.
            */
           let tablePos: number | undefined;
           try {
-            tablePos =
-              typeof props.getPos === 'function' ? props.getPos() : undefined;
+            tablePos = props.getPos ? props.getPos() : undefined;
           } catch (e) {
             tablePos = undefined;
           }