@atlaskit/editor-plugin-table 9.4.1 → 9.5.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-table
 
+## 9.5.0
+
+### Minor Changes
+
+- [#112673](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/112673)
+  [`df389f09ee177`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/df389f09ee177) -
+  ED-25870 disable table sticky header inside layout for Safari
+
 ## 9.4.1
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableRow.js

@@ -14,6 +14,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _throttle = _interopRequireDefault(require("lodash/throttle"));
 var _ui = require("@atlaskit/editor-common/ui");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _pluginKey = require("../pm-plugins/plugin-key");
 var _commands = require("../pm-plugins/sticky-headers/commands");
@@ -343,7 +345,7 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
         return;
       }
       var table = tree.table;
-      var shouldStick = this.isHeaderSticky();
+      var shouldStick = this.shouldSticky();
       if (this.isSticky !== shouldStick) {
         if (shouldStick) {
           var _this$sentinelData$to;
@@ -355,6 +357,30 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
         }
       }
     }
+  }, {
+    key: "shouldSticky",
+    value: function shouldSticky() {
+      if (
+      // is Safari
+      navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome') && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_4')) {
+        var pos = this.getPos();
+        if (typeof pos === 'number') {
+          var $tableRowPos = this.view.state.doc.resolve(pos);
+
+          // layout -> layout column -> table -> table row
+          if ($tableRowPos.depth >= 3) {
+            var _findParentNodeCloses;
+            var isInsideLayout = (_findParentNodeCloses = (0, _utils.findParentNodeClosestToPos)($tableRowPos, function (node) {
+              return node.type.name === 'layoutColumn';
+            })) === null || _findParentNodeCloses === void 0 ? void 0 : _findParentNodeCloses.node;
+            if (isInsideLayout) {
+              return false;
+            }
+          }
+        }
+      }
+      return this.isHeaderSticky();
+    }
   }, {
     key: "isHeaderSticky",
     value: function isHeaderSticky() {

package/dist/es2019/nodeviews/TableRow.js

@@ -2,6 +2,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
+import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
 import { updateStickyState } from '../pm-plugins/sticky-headers/commands';
@@ -311,7 +313,7 @@ export default class TableRow extends TableNodeView {
     const {
       table
     } = tree;
-    const shouldStick = this.isHeaderSticky();
+    const shouldStick = this.shouldSticky();
     if (this.isSticky !== shouldStick) {
       if (shouldStick) {
         var _this$sentinelData$to;
@@ -323,6 +325,28 @@ export default class TableRow extends TableNodeView {
       }
     }
   }
+  shouldSticky() {
+    if (
+    // is Safari
+    navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome') && fg('platform_editor_advanced_layouts_post_fix_patch_4')) {
+      const pos = this.getPos();
+      if (typeof pos === 'number') {
+        const $tableRowPos = this.view.state.doc.resolve(pos);
+
+        // layout -> layout column -> table -> table row
+        if ($tableRowPos.depth >= 3) {
+          var _findParentNodeCloses;
+          const isInsideLayout = (_findParentNodeCloses = findParentNodeClosestToPos($tableRowPos, node => {
+            return node.type.name === 'layoutColumn';
+          })) === null || _findParentNodeCloses === void 0 ? void 0 : _findParentNodeCloses.node;
+          if (isInsideLayout) {
+            return false;
+          }
+        }
+      }
+    }
+    return this.isHeaderSticky();
+  }
   isHeaderSticky() {
     var _sentinelTop$rootBoun;
     /*

package/dist/esm/nodeviews/TableRow.js

@@ -9,6 +9,8 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
+import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
 import { updateStickyState } from '../pm-plugins/sticky-headers/commands';
@@ -336,7 +338,7 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
         return;
       }
       var table = tree.table;
-      var shouldStick = this.isHeaderSticky();
+      var shouldStick = this.shouldSticky();
       if (this.isSticky !== shouldStick) {
         if (shouldStick) {
           var _this$sentinelData$to;
@@ -348,6 +350,30 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
         }
       }
     }
+  }, {
+    key: "shouldSticky",
+    value: function shouldSticky() {
+      if (
+      // is Safari
+      navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome') && fg('platform_editor_advanced_layouts_post_fix_patch_4')) {
+        var pos = this.getPos();
+        if (typeof pos === 'number') {
+          var $tableRowPos = this.view.state.doc.resolve(pos);
+
+          // layout -> layout column -> table -> table row
+          if ($tableRowPos.depth >= 3) {
+            var _findParentNodeCloses;
+            var isInsideLayout = (_findParentNodeCloses = findParentNodeClosestToPos($tableRowPos, function (node) {
+              return node.type.name === 'layoutColumn';
+            })) === null || _findParentNodeCloses === void 0 ? void 0 : _findParentNodeCloses.node;
+            if (isInsideLayout) {
+              return false;
+            }
+          }
+        }
+      }
+      return this.isHeaderSticky();
+    }
   }, {
     key: "isHeaderSticky",
     value: function isHeaderSticky() {

package/dist/types/nodeviews/TableRow.d.ts

@@ -42,6 +42,7 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
     private createResizeObserver;
     private createIntersectionObserver;
     private refreshStickyState;
+    private shouldSticky;
     private isHeaderSticky;
     private onTablePluginState;
     private updateStickyHeaderWidth;

package/dist/types-ts4.5/nodeviews/TableRow.d.ts

@@ -42,6 +42,7 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
     private createResizeObserver;
     private createIntersectionObserver;
     private refreshStickyState;
+    private shouldSticky;
     private isHeaderSticky;
     private onTablePluginState;
     private updateStickyHeaderWidth;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "9.4.1",
+	"version": "9.5.0",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -146,6 +146,9 @@
 		},
 		"platform_editor_table_layout_shift_fix": {
 			"type": "boolean"
+		},
+		"platform_editor_advanced_layouts_post_fix_patch_4": {
+			"type": "boolean"
 		}
 	}
 }

package/src/nodeviews/TableRow.ts

@@ -4,7 +4,9 @@ import throttle from 'lodash/throttle';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
@@ -384,7 +386,7 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
 			return;
 		}
 		const { table } = tree;
-		const shouldStick = this.isHeaderSticky();
+		const shouldStick = this.shouldSticky();
 		if (this.isSticky !== shouldStick) {
 			if (shouldStick) {
 				// The rootRect is kept in sync across sentinels so it doesn't matter which one we use.
@@ -396,6 +398,33 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
 		}
 	}
 
+	private shouldSticky() {
+		if (
+			// is Safari
+			navigator.userAgent.includes('AppleWebKit') &&
+			!navigator.userAgent.includes('Chrome') &&
+			fg('platform_editor_advanced_layouts_post_fix_patch_4')
+		) {
+			const pos = this.getPos();
+			if (typeof pos === 'number') {
+				const $tableRowPos = this.view.state.doc.resolve(pos);
+
+				// layout -> layout column -> table -> table row
+				if ($tableRowPos.depth >= 3) {
+					const isInsideLayout = findParentNodeClosestToPos($tableRowPos, (node) => {
+						return node.type.name === 'layoutColumn';
+					})?.node;
+
+					if (isInsideLayout) {
+						return false;
+					}
+				}
+			}
+		}
+
+		return this.isHeaderSticky();
+	}
+
 	private isHeaderSticky() {
 		/*
     # Overview