@atlaskit/editor-plugin-table 11.1.0 → 11.1.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-table
 
+## 11.1.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 11.1.1
+
+### Patch Changes
+
+- [#185075](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/185075)
+  [`0ffa67091b61f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0ffa67091b61f) -
+  Adds resiliency for consumers that end up with multiple table plugins
+- Updated dependencies
+
 ## 11.1.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/TableComponent.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports._reset_tableComponentCount = void 0;
+exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -76,12 +76,15 @@ var isOverflowAnalyticsEnabled = false;
 // Prevent unnecessary parentWidth updates when table is nested inside of a node that is nested itself.
 var NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MIN_THRESHOLD = 2;
 var NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MAX_THRESHOLD = 20;
-var _tableComponentCount = 1;
-/**
- * Exported for test purposes only
- */
-var _reset_tableComponentCount = exports._reset_tableComponentCount = function _reset_tableComponentCount() {
-  return _tableComponentCount = 0;
+// Generate a unique ID to prevent collisions when multiple plugin versions exist on the same page
+var generateUniqueTableId = function generateUniqueTableId() {
+  // Use crypto.randomUUID() if available, fallback to Math.random() based approach
+  if (!globalThis.crypto || typeof globalThis.crypto.randomUUID !== 'function') {
+    // Fallback: for older environments (IE).
+    // Not the best fallback, but the crypto.randomUUID is widely available
+    return (Math.random() + 1).toString(36).substring(20);
+  }
+  return crypto.randomUUID();
 };
 
 // Ignored via go/ees005
@@ -96,7 +99,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       parentWidth: undefined
     }, _types.ShadowEvent.SHOW_BEFORE_SHADOW, false), _types.ShadowEvent.SHOW_AFTER_SHADOW, false), "tableWrapperWidth", undefined), "tableWrapperHeight", undefined));
     (0, _defineProperty3.default)(_this, "holdCompleted", false);
-    (0, _defineProperty3.default)(_this, "dispatchEventName", "tableResized-".concat(_tableComponentCount++));
+    (0, _defineProperty3.default)(_this, "dispatchEventName", "tableResized-".concat(generateUniqueTableId()));
     (0, _defineProperty3.default)(_this, "handleMouseOut", function (event) {
       if (!(0, _eventHandlers.isTableInFocus)(_this.props.view)) {
         return false;

package/dist/es2019/nodeviews/TableComponent.js

@@ -56,11 +56,16 @@ const isOverflowAnalyticsEnabled = false;
 // Prevent unnecessary parentWidth updates when table is nested inside of a node that is nested itself.
 const NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MIN_THRESHOLD = 2;
 const NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MAX_THRESHOLD = 20;
-let _tableComponentCount = 1;
-/**
- * Exported for test purposes only
- */
-export const _reset_tableComponentCount = () => _tableComponentCount = 0;
+// Generate a unique ID to prevent collisions when multiple plugin versions exist on the same page
+const generateUniqueTableId = () => {
+  // Use crypto.randomUUID() if available, fallback to Math.random() based approach
+  if (!globalThis.crypto || typeof globalThis.crypto.randomUUID !== 'function') {
+    // Fallback: for older environments (IE).
+    // Not the best fallback, but the crypto.randomUUID is widely available
+    return (Math.random() + 1).toString(36).substring(20);
+  }
+  return crypto.randomUUID();
+};
 
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -76,7 +81,7 @@ class TableComponent extends React.Component {
       tableWrapperHeight: undefined
     });
     _defineProperty(this, "holdCompleted", false);
-    _defineProperty(this, "dispatchEventName", `tableResized-${_tableComponentCount++}`);
+    _defineProperty(this, "dispatchEventName", `tableResized-${generateUniqueTableId()}`);
     _defineProperty(this, "handleMouseOut", event => {
       if (!isTableInFocus(this.props.view)) {
         return false;

package/dist/esm/nodeviews/TableComponent.js

@@ -70,12 +70,15 @@ var isOverflowAnalyticsEnabled = false;
 // Prevent unnecessary parentWidth updates when table is nested inside of a node that is nested itself.
 var NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MIN_THRESHOLD = 2;
 var NESTED_TABLE_IN_NESTED_PARENT_WIDTH_DIFF_MAX_THRESHOLD = 20;
-var _tableComponentCount = 1;
-/**
- * Exported for test purposes only
- */
-export var _reset_tableComponentCount = function _reset_tableComponentCount() {
-  return _tableComponentCount = 0;
+// Generate a unique ID to prevent collisions when multiple plugin versions exist on the same page
+var generateUniqueTableId = function generateUniqueTableId() {
+  // Use crypto.randomUUID() if available, fallback to Math.random() based approach
+  if (!globalThis.crypto || typeof globalThis.crypto.randomUUID !== 'function') {
+    // Fallback: for older environments (IE).
+    // Not the best fallback, but the crypto.randomUUID is widely available
+    return (Math.random() + 1).toString(36).substring(20);
+  }
+  return crypto.randomUUID();
 };
 
 // Ignored via go/ees005
@@ -90,7 +93,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       parentWidth: undefined
     }, ShadowEvent.SHOW_BEFORE_SHADOW, false), ShadowEvent.SHOW_AFTER_SHADOW, false), "tableWrapperWidth", undefined), "tableWrapperHeight", undefined));
     _defineProperty(_this, "holdCompleted", false);
-    _defineProperty(_this, "dispatchEventName", "tableResized-".concat(_tableComponentCount++));
+    _defineProperty(_this, "dispatchEventName", "tableResized-".concat(generateUniqueTableId()));
     _defineProperty(_this, "handleMouseOut", function (event) {
       if (!isTableInFocus(_this.props.view)) {
         return false;

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

@@ -40,10 +40,6 @@ interface ComponentProps {
     isWholeTableInDanger?: boolean;
     selection?: Selection;
 }
-/**
- * Exported for test purposes only
- */
-export declare const _reset_tableComponentCount: () => number;
 declare const _default: React.FC<import("react-intl-next").WithIntlProps<ComponentProps>> & {
     WrappedComponent: React.ComponentType<ComponentProps>;
 };

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

@@ -40,10 +40,6 @@ interface ComponentProps {
     isWholeTableInDanger?: boolean;
     selection?: Selection;
 }
-/**
- * Exported for test purposes only
- */
-export declare const _reset_tableComponentCount: () => number;
 declare const _default: React.FC<import("react-intl-next").WithIntlProps<ComponentProps>> & {
     WrappedComponent: React.ComponentType<ComponentProps>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "11.1.0",
+	"version": "11.1.2",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -28,7 +28,7 @@
 		"singleton": true
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^49.0.5",
+		"@atlaskit/adf-schema": "^49.0.6",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/custom-steps": "^0.11.0",
 		"@atlaskit/editor-palette": "^2.1.0",
@@ -52,11 +52,11 @@
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
 		"@atlaskit/primitives": "^14.10.0",
-		"@atlaskit/react-ufo": "^3.14.0",
+		"@atlaskit/react-ufo": "^4.0.0",
 		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tmp-editor-statsig": "^9.4.0",
+		"@atlaskit/tmp-editor-statsig": "^9.6.0",
 		"@atlaskit/toggle": "^15.0.0",
-		"@atlaskit/tokens": "^5.4.0",
+		"@atlaskit/tokens": "^5.5.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.7.0",
+		"@atlaskit/editor-common": "^107.8.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"

package/src/nodeviews/TableComponent.tsx

@@ -148,11 +148,16 @@ interface TableState {
 	tableWrapperHeight?: number;
 }
 
-let _tableComponentCount = 1;
-/**
- * Exported for test purposes only
- */
-export const _reset_tableComponentCount = () => (_tableComponentCount = 0);
+// Generate a unique ID to prevent collisions when multiple plugin versions exist on the same page
+const generateUniqueTableId = () => {
+	// Use crypto.randomUUID() if available, fallback to Math.random() based approach
+	if (!globalThis.crypto || typeof globalThis.crypto.randomUUID !== 'function') {
+		// Fallback: for older environments (IE).
+		// Not the best fallback, but the crypto.randomUUID is widely available
+		return (Math.random() + 1).toString(36).substring(20);
+	}
+	return crypto.randomUUID();
+};
 
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -191,7 +196,7 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 	private dragAndDropCleanupFn?: CleanupFn;
 	private nodeVisibilityObserverCleanupFn?: CleanupFn;
 	private holdCompleted = false;
-	private dispatchEventName = `tableResized-${_tableComponentCount++}`;
+	private dispatchEventName = `tableResized-${generateUniqueTableId()}`;
 
 	constructor(props: ComponentProps) {
 		super(props);

package/src/ui/TableFloatingColumnControls/ColumnControls/index.tsx

@@ -116,7 +116,7 @@ export const ColumnControls = ({
 	const hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
 
 	const rowControlStickyTop = 45;
-	const marginTop = hasHeaderRow && stickyTop !== undefined ? (rowControlStickyTop ?? 0) : 0;
+	const marginTop = hasHeaderRow && stickyTop !== undefined ? rowControlStickyTop ?? 0 : 0;
 
 	const handleClick = useCallback(
 		(event: MouseEvent) => {