@atlaskit/editor-plugin-grid 5.0.0 → 6.0.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-grid
 
+## 6.0.1
+
+### Patch Changes
+
+- [`49d845e4c0ec3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/49d845e4c0ec3) -
+  ED-29167: fix grid hydration
+- Updated dependencies
+
+## 6.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.0.0
 
 ### Patch Changes

package/dist/cjs/gridPlugin.js

@@ -10,10 +10,12 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 var GRID_SIZE = exports.GRID_SIZE = 12;
@@ -201,6 +203,12 @@ var gridPlugin = exports.gridPlugin = function gridPlugin(_ref5) {
     },
     contentComponent: function contentComponent(_ref6) {
       var editorView = _ref6.editorView;
+      if (!editorView) {
+        return null;
+      }
+      if ((0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) && (0, _coreUtils.isSSR)()) {
+        return null;
+      }
       return /*#__PURE__*/_react.default.createElement(ContentComponent, {
         editorView: editorView,
         options: options,

package/dist/es2019/gridPlugin.js

@@ -3,10 +3,12 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { withTheme } from '@emotion/react';
 import classnames from 'classnames';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { akEditorBreakoutPadding, akEditorFullPageMaxWidth, breakoutWideScaleRatio } from '@atlaskit/editor-shared-styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const GRID_SIZE = 12;
 const key = new PluginKey('gridPlugin');
 const createDisplayGrid = view => props => {
@@ -195,10 +197,18 @@ export const gridPlugin = ({
     },
     contentComponent: ({
       editorView
-    }) => /*#__PURE__*/React.createElement(ContentComponent, {
-      editorView: editorView,
-      options: options,
-      api: api
-    })
+    }) => {
+      if (!editorView) {
+        return null;
+      }
+      if (expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) && isSSR()) {
+        return null;
+      }
+      return /*#__PURE__*/React.createElement(ContentComponent, {
+        editorView: editorView,
+        options: options,
+        api: api
+      });
+    }
   };
 };

package/dist/esm/gridPlugin.js

@@ -5,10 +5,12 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { withTheme } from '@emotion/react';
 import classnames from 'classnames';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { akEditorBreakoutPadding, akEditorFullPageMaxWidth, breakoutWideScaleRatio } from '@atlaskit/editor-shared-styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export var GRID_SIZE = 12;
 var key = new PluginKey('gridPlugin');
 var createDisplayGrid = function createDisplayGrid(view) {
@@ -194,6 +196,12 @@ export var gridPlugin = function gridPlugin(_ref5) {
     },
     contentComponent: function contentComponent(_ref6) {
       var editorView = _ref6.editorView;
+      if (!editorView) {
+        return null;
+      }
+      if (expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) && isSSR()) {
+        return null;
+      }
       return /*#__PURE__*/React.createElement(ContentComponent, {
         editorView: editorView,
         options: options,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-grid",
-	"version": "5.0.0",
+	"version": "6.0.1",
 	"description": "Grid plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -21,15 +21,16 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/editor-plugin-width": "^6.0.0",
+		"@atlaskit/editor-plugin-width": "^7.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
+		"@atlaskit/tmp-editor-statsig": "^12.32.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"classnames": "^2.2.5"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.0.0",
+		"@atlaskit/editor-common": "^110.4.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},