@gravity-ui/dashkit 5.5.0 → 5.6.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [5.6.1](https://github.com/gravity-ui/dashkit/compare/v5.6.0...v5.6.1) (2023-06-15)
+
+
+### Bug Fixes
+
+* **react-grid-layout:** fixed react-grid-layout issue ([#59](https://github.com/gravity-ui/dashkit/issues/59)) ([bdb3f87](https://github.com/gravity-ui/dashkit/commit/bdb3f87731cf82b8267c913bb0010c65f7014018))
+
+## [5.6.0](https://github.com/gravity-ui/dashkit/compare/v5.5.0...v5.6.0) (2023-04-18)
+
+
+### Features
+
+* add item state to overlay dropdown menu action handler ([#57](https://github.com/gravity-ui/dashkit/issues/57)) ([78b13fa](https://github.com/gravity-ui/dashkit/commit/78b13fa4107e94abd93c6e469a36840b61b6a10a))
+
 ## [5.5.0](https://github.com/gravity-ui/dashkit/compare/v5.4.0...v5.5.0) (2023-04-17)
 
 

package/build/cjs/components/GridItem/GridItem.js

@@ -10,7 +10,7 @@ const OverlayControls_1 = tslib_1.__importDefault(require("../OverlayControls/Ov
 const b = (0, bem_cn_lite_1.default)('dashkit-grid-item');
 class GridItem extends react_1.default.PureComponent {
     renderOverlay() {
-        const { overlayControls } = this.props;
+        const { overlayControls, isDragging } = this.props;
         const { editMode } = this.context;
         if (!editMode || this.props.item.data._editActive) {
             return null;
@@ -19,7 +19,7 @@ class GridItem extends react_1.default.PureComponent {
         const controls = overlayControls && overlayControls[item.type];
         return (react_1.default.createElement(react_1.default.Fragment, null,
             react_1.default.createElement("div", { className: b('overlay') }),
-            react_1.default.createElement(OverlayControls_1.default, { configItem: item, items: controls, overlayControls: overlayControls })));
+            react_1.default.createElement(OverlayControls_1.default, { configItem: item, items: controls, isDragging: isDragging, overlayControls: overlayControls })));
     }
     render() {
         // из-за бага, что Grid Items unmounts при изменении static, isDraggable, isResaizable

package/build/cjs/components/OverlayControls/OverlayControls.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ButtonView, ButtonSize, IconProps, MenuItemProps } from '@gravity-ui/uikit';
-import { ConfigItem, PluginBase, StringParams, Config } from '../../shared';
+import { ConfigItem, PluginBase, StringParams, Config, ItemState } from '../../shared';
 import type { RegisterManager } from '../../utils/register-manager';
 export declare enum OverlayControlsPosition {
     TopRight = "top_right",
@@ -23,7 +23,7 @@ export interface OverlayCustomControlItem {
     title?: string;
     icon?: MenuItemProps['icon'];
     iconSize?: number | string;
-    handler?: (item: ConfigItem, params: StringParams) => void;
+    handler?: (item: ConfigItem, params: StringParams, state: ItemState) => void;
     visible?: (item: ConfigItem) => boolean;
     className?: string;
     qa?: string;
@@ -34,6 +34,7 @@ interface OverlayControlsDefaultProps {
     size: ButtonSize;
 }
 interface OverlayControlsProps extends OverlayControlsDefaultProps {
+    isDragging?: boolean;
     configItem: ConfigItem;
     items?: OverlayControlItem[];
     overlayControls?: Record<string, OverlayControlItem[]>;
@@ -41,6 +42,7 @@ interface OverlayControlsProps extends OverlayControlsDefaultProps {
 type DashKitCtx = React.Context<{
     registerManager: RegisterManager;
     itemsParams: Record<string, StringParams>;
+    itemsState: Record<string, ItemState>;
     editItem: (item: ConfigItem) => void;
     removeItem: (id: string) => void;
     config: Config;

package/build/cjs/components/OverlayControls/OverlayControls.js

@@ -76,6 +76,11 @@ class OverlayControls extends react_1.default.Component {
             this.context.editItem(this.props.configItem);
         };
         this.onRemoveItem = () => {
+            // Otherwise it will crush an app dute to the issue in react-grid-layout
+            // https://github.com/react-grid-layout/react-grid-layout/issues/1836
+            if (this.props.isDragging) {
+                return;
+            }
             const { id } = this.props.configItem;
             this.context.removeItem(id);
         };
@@ -143,9 +148,10 @@ class OverlayControls extends react_1.default.Component {
     }
     renderDropdownMenu() {
         const { view, size } = this.props;
-        const { registerManager, itemsParams } = this.context;
+        const { registerManager, itemsParams, itemsState } = this.context;
         const configItem = this.props.configItem;
         const itemParams = itemsParams[configItem.id];
+        const itemState = itemsState[configItem.id];
         let menu = registerManager.settings.menu;
         if (!menu.length) {
             menu = DEFAULT_DROPDOWN_MENU;
@@ -164,7 +170,7 @@ class OverlayControls extends react_1.default.Component {
                 }
                 const itemHandler = item.handler;
                 const itemAction = typeof itemHandler === 'function'
-                    ? () => itemHandler(configItem, itemParams)
+                    ? () => itemHandler(configItem, itemParams, itemState)
                     : ((_a = this.getDropDownMenuItemConfig(item.id)) === null || _a === void 0 ? void 0 : _a.action) || (() => { });
                 return {
                     text: item.title || (0, i18n_1.default)(item.id),

package/build/esm/components/GridItem/GridItem.js

@@ -8,7 +8,7 @@ import OverlayControls from '../OverlayControls/OverlayControls';
 const b = block('dashkit-grid-item');
 class GridItem extends React.PureComponent {
     renderOverlay() {
-        const { overlayControls } = this.props;
+        const { overlayControls, isDragging } = this.props;
         const { editMode } = this.context;
         if (!editMode || this.props.item.data._editActive) {
             return null;
@@ -17,7 +17,7 @@ class GridItem extends React.PureComponent {
         const controls = overlayControls && overlayControls[item.type];
         return (React.createElement(React.Fragment, null,
             React.createElement("div", { className: b('overlay') }),
-            React.createElement(OverlayControls, { configItem: item, items: controls, overlayControls: overlayControls })));
+            React.createElement(OverlayControls, { configItem: item, items: controls, isDragging: isDragging, overlayControls: overlayControls })));
     }
     render() {
         // из-за бага, что Grid Items unmounts при изменении static, isDraggable, isResaizable

package/build/esm/components/OverlayControls/OverlayControls.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ButtonView, ButtonSize, IconProps, MenuItemProps } from '@gravity-ui/uikit';
-import { ConfigItem, PluginBase, StringParams, Config } from '../../shared';
+import { ConfigItem, PluginBase, StringParams, Config, ItemState } from '../../shared';
 import type { RegisterManager } from '../../utils/register-manager';
 import './OverlayControls.css';
 export declare enum OverlayControlsPosition {
@@ -24,7 +24,7 @@ export interface OverlayCustomControlItem {
     title?: string;
     icon?: MenuItemProps['icon'];
     iconSize?: number | string;
-    handler?: (item: ConfigItem, params: StringParams) => void;
+    handler?: (item: ConfigItem, params: StringParams, state: ItemState) => void;
     visible?: (item: ConfigItem) => boolean;
     className?: string;
     qa?: string;
@@ -35,6 +35,7 @@ interface OverlayControlsDefaultProps {
     size: ButtonSize;
 }
 interface OverlayControlsProps extends OverlayControlsDefaultProps {
+    isDragging?: boolean;
     configItem: ConfigItem;
     items?: OverlayControlItem[];
     overlayControls?: Record<string, OverlayControlItem[]>;
@@ -42,6 +43,7 @@ interface OverlayControlsProps extends OverlayControlsDefaultProps {
 type DashKitCtx = React.Context<{
     registerManager: RegisterManager;
     itemsParams: Record<string, StringParams>;
+    itemsState: Record<string, ItemState>;
     editItem: (item: ConfigItem) => void;
     removeItem: (id: string) => void;
     config: Config;

package/build/esm/components/OverlayControls/OverlayControls.js

@@ -73,6 +73,11 @@ class OverlayControls extends React.Component {
             this.context.editItem(this.props.configItem);
         };
         this.onRemoveItem = () => {
+            // Otherwise it will crush an app dute to the issue in react-grid-layout
+            // https://github.com/react-grid-layout/react-grid-layout/issues/1836
+            if (this.props.isDragging) {
+                return;
+            }
             const { id } = this.props.configItem;
             this.context.removeItem(id);
         };
@@ -140,9 +145,10 @@ class OverlayControls extends React.Component {
     }
     renderDropdownMenu() {
         const { view, size } = this.props;
-        const { registerManager, itemsParams } = this.context;
+        const { registerManager, itemsParams, itemsState } = this.context;
         const configItem = this.props.configItem;
         const itemParams = itemsParams[configItem.id];
+        const itemState = itemsState[configItem.id];
         let menu = registerManager.settings.menu;
         if (!menu.length) {
             menu = DEFAULT_DROPDOWN_MENU;
@@ -161,7 +167,7 @@ class OverlayControls extends React.Component {
                 }
                 const itemHandler = item.handler;
                 const itemAction = typeof itemHandler === 'function'
-                    ? () => itemHandler(configItem, itemParams)
+                    ? () => itemHandler(configItem, itemParams, itemState)
                     : ((_a = this.getDropDownMenuItemConfig(item.id)) === null || _a === void 0 ? void 0 : _a.action) || (() => { });
                 return {
                     text: item.title || i18n(item.id),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/dashkit",
-  "version": "5.5.0",
+  "version": "5.6.1",
   "description": "Library for rendering dashboard grid layout",
   "license": "MIT",
   "repository": {