@gravity-ui/dashkit 3.1.0-alpha.0 → 3.1.0-alpha.2

package/build/cjs/components/DashKitView/DashKitView.js

@@ -9,10 +9,10 @@ const MobileLayout_1 = tslib_1.__importDefault(require("../MobileLayout/MobileLa
 const withContext_1 = require("../../hocs/withContext");
 const useCalcLayout_1 = require("../../hooks/useCalcLayout");
 const b = (0, bem_cn_lite_1.default)('dashkit');
-function DashKitView() {
+function DashKitView(props) {
     const context = react_1.default.useContext(DashKitContext_1.DashKitContext);
     const { registerManager, forwardedMetaRef } = context;
-    return (react_1.default.createElement("div", { className: b({ theme: registerManager.settings.theme }) }, registerManager.settings.isMobile ? (react_1.default.createElement(MobileLayout_1.default, null)) : (react_1.default.createElement(GridLayout_1.default, { ref: forwardedMetaRef }))));
+    return (react_1.default.createElement("div", { className: b({ theme: registerManager.settings.theme }) }, registerManager.settings.isMobile ? (react_1.default.createElement(MobileLayout_1.default, null)) : (react_1.default.createElement(GridLayout_1.default, { ref: forwardedMetaRef, overlayControls: props.overlayControls }))));
 }
 const DashKitViewWithContext = (0, withContext_1.withContext)(DashKitView);
 const DashKitViewWithMemoContext = (0, withContext_1.withMemoContext)(DashKitView);

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

@@ -10,7 +10,8 @@ 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 { editMode, overlayControls } = this.context;
+        const { overlayControls } = this.props;
+        const { editMode } = this.context;
         if (!editMode || this.props.item.data._editActive) {
             return null;
         }
@@ -18,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 })));
+            react_1.default.createElement(OverlayControls_1.default, { configItem: item, items: controls, overlayControls: overlayControls })));
     }
     render() {
         // из-за бага, что Grid Items unmounts при изменении static, isDraggable, isResaizable
@@ -52,6 +53,7 @@ GridItem.propTypes = {
     item: prop_types_1.default.object,
     isDragging: prop_types_1.default.bool,
     layout: prop_types_1.default.array,
+    overlayControls: prop_types_1.default.object,
     forwardedPluginRef: prop_types_1.default.any,
     // from react-grid-layout:
     children: prop_types_1.default.node,

package/build/cjs/components/GridLayout/GridLayout.js

@@ -81,7 +81,7 @@ class GridLayout extends react_1.default.PureComponent {
             : null)), config.items.map((item, i) => {
             return (react_1.default.createElement(GridItem_1.default, { ref: (pluginRef) => {
                     this.pluginsRefs[i] = pluginRef;
-                }, key: item.id, id: item.id, item: item, layout: layout, adjustWidgetLayout: this.adjustWidgetLayout, isDragging: this.state.isDragging, noOverlay: noOverlay, withCustomHandle: Boolean(draggableHandleClassName) }));
+                }, key: item.id, id: item.id, item: item, layout: layout, adjustWidgetLayout: this.adjustWidgetLayout, isDragging: this.state.isDragging, noOverlay: noOverlay, withCustomHandle: Boolean(draggableHandleClassName), overlayControls: this.props.overlayControls }));
         })));
     }
 }

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

@@ -33,6 +33,7 @@ interface OverlayControlsDefaultProps {
 interface OverlayControlsProps extends OverlayControlsDefaultProps {
     configItem: ConfigItem;
     items?: OverlayControlItem[];
+    overlayControls?: Record<string, OverlayControlItem[]>;
 }
 declare class OverlayControls extends React.Component<OverlayControlsProps> {
     static contextType: React.Context<any>;

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

@@ -35,7 +35,7 @@ class OverlayControls extends react_1.default.Component {
             // выбираем только items-ы у которых проставлено поле `allWidgetsControls:true`
             // те контролы, которые будут показываться слева от меню
             let controls = [];
-            for (const controlItem of Object.values(this.context.overlayControls || {})) {
+            for (const controlItem of Object.values(this.props.overlayControls || {})) {
                 controls = controls.concat((controlItem.filter((item) => {
                     var _a;
                     // если тип виджета-плагина в списке исключаемых, то не показываем такой контрол

package/build/cjs/hocs/withContext.d.ts

@@ -26,7 +26,6 @@ export function withContext(Component: any): {
             getLayout: () => any;
             config: any;
             context: any;
-            overlayControls: any;
             noOverlay: any;
             defaultGlobalParams: any;
             globalParams: any;
@@ -98,7 +97,6 @@ export function withContext(Component: any): {
             getLayout: () => any;
             config: any;
             context: any;
-            overlayControls: any;
             noOverlay: any;
             defaultGlobalParams: any;
             globalParams: any;

package/build/cjs/hocs/withContext.js

@@ -154,7 +154,6 @@ function withContext(Component) {
                     getLayout: this._getLayout,
                     config: this.props.config,
                     context: this.props.context,
-                    overlayControls: this.props.overlayControls,
                     noOverlay: this.props.noOverlay,
                     defaultGlobalParams: this.props.globalParams,
                     globalParams: this.props.globalParams,
@@ -177,7 +176,7 @@ function withContext(Component) {
             }
             render() {
                 return (react_1.default.createElement(DashKitContext_1.DashKitContext.Provider, { value: this._contextValue },
-                    react_1.default.createElement(Component, null)));
+                    react_1.default.createElement(Component, { overlayControls: this.props.overlayControls })));
             }
         },
         _a.propTypes = {
@@ -264,16 +263,26 @@ function useMemoStateContext(props) {
         });
     }, [props.config, props.itemsStateAndParams, onChange]);
     const memorizeOriginalLayout = react_1.default.useCallback((widgetId, preAutoHeightLayout, postAutoHeightLayout) => {
+        let needUpdateLayout = false;
         if (!(widgetId in originalLayouts.current)) {
             originalLayouts.current[widgetId] = preAutoHeightLayout;
+            needUpdateLayout = true;
+        }
+        if (adjustedLayouts.current[widgetId] !== postAutoHeightLayout) {
+            adjustedLayouts.current[widgetId] = postAutoHeightLayout;
+            needUpdateLayout = true;
+        }
+        if (needUpdateLayout) {
+            forceUpdateLayout((prev) => prev + 1);
         }
-        adjustedLayouts.current[widgetId] = postAutoHeightLayout;
-        forceUpdateLayout((prev) => prev + 1);
     }, []);
     const revertToOriginalLayout = react_1.default.useCallback((widgetId) => {
+        const needUpdateLayout = widgetId in adjustedLayouts.current || widgetId in originalLayouts.current;
         delete adjustedLayouts.current[widgetId];
         delete originalLayouts.current[widgetId];
-        forceUpdateLayout((prev) => prev + 1);
+        if (needUpdateLayout) {
+            forceUpdateLayout((prev) => prev + 1);
+        }
     }, []);
     const itemsParams = react_1.default.useMemo(() => (0, shared_1.getItemsParams)({
         defaultGlobalParams: props.defaultGlobalParams,
@@ -322,7 +331,6 @@ function useMemoStateContext(props) {
         getLayout,
         config: props.config,
         context: props.context,
-        overlayControls: props.overlayControls,
         noOverlay: props.noOverlay,
         defaultGlobalParams: props.globalParams,
         globalParams: props.globalParams,
@@ -345,7 +353,6 @@ function useMemoStateContext(props) {
         getLayout,
         props.config,
         props.context,
-        props.overlayControls,
         props.noOverlay,
         props.globalParams,
         props.editMode,
@@ -369,7 +376,7 @@ function withMemoContext(Component) {
     const WithMemoContext = (props) => {
         const contextValue = useMemoStateContext(props);
         return (react_1.default.createElement(DashKitContext_1.DashKitContext.Provider, { value: contextValue },
-            react_1.default.createElement(Component, null)));
+            react_1.default.createElement(Component, { overlayControls: props.overlayControls })));
     };
     WithMemoContext.displayName = `withMemoContext(${Component.displayName || Component.name || 'Component'}`;
     return WithMemoContext;

package/build/esm/components/DashKitView/DashKitView.js

@@ -7,10 +7,10 @@ import { withContext, withMemoContext } from '../../hocs/withContext';
 import { useCalcPropsLayout } from '../../hooks/useCalcLayout';
 import './DashKitView.css';
 const b = block('dashkit');
-function DashKitView() {
+function DashKitView(props) {
     const context = React.useContext(DashKitContext);
     const { registerManager, forwardedMetaRef } = context;
-    return (React.createElement("div", { className: b({ theme: registerManager.settings.theme }) }, registerManager.settings.isMobile ? (React.createElement(MobileLayout, null)) : (React.createElement(GridLayout, { ref: forwardedMetaRef }))));
+    return (React.createElement("div", { className: b({ theme: registerManager.settings.theme }) }, registerManager.settings.isMobile ? (React.createElement(MobileLayout, null)) : (React.createElement(GridLayout, { ref: forwardedMetaRef, overlayControls: props.overlayControls }))));
 }
 const DashKitViewWithContext = withContext(DashKitView);
 const DashKitViewWithMemoContext = withMemoContext(DashKitView);

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

@@ -8,7 +8,8 @@ import OverlayControls from '../OverlayControls/OverlayControls';
 const b = block('dashkit-grid-item');
 class GridItem extends React.PureComponent {
     renderOverlay() {
-        const { editMode, overlayControls } = this.context;
+        const { overlayControls } = this.props;
+        const { editMode } = this.context;
         if (!editMode || this.props.item.data._editActive) {
             return null;
         }
@@ -16,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 })));
+            React.createElement(OverlayControls, { configItem: item, items: controls, overlayControls: overlayControls })));
     }
     render() {
         // из-за бага, что Grid Items unmounts при изменении static, isDraggable, isResaizable
@@ -50,6 +51,7 @@ GridItem.propTypes = {
     item: PropTypes.object,
     isDragging: PropTypes.bool,
     layout: PropTypes.array,
+    overlayControls: PropTypes.object,
     forwardedPluginRef: PropTypes.any,
     // from react-grid-layout:
     children: PropTypes.node,

package/build/esm/components/GridLayout/GridLayout.js

@@ -78,7 +78,7 @@ export default class GridLayout extends React.PureComponent {
             : null)), config.items.map((item, i) => {
             return (React.createElement(GridItem, { ref: (pluginRef) => {
                     this.pluginsRefs[i] = pluginRef;
-                }, key: item.id, id: item.id, item: item, layout: layout, adjustWidgetLayout: this.adjustWidgetLayout, isDragging: this.state.isDragging, noOverlay: noOverlay, withCustomHandle: Boolean(draggableHandleClassName) }));
+                }, key: item.id, id: item.id, item: item, layout: layout, adjustWidgetLayout: this.adjustWidgetLayout, isDragging: this.state.isDragging, noOverlay: noOverlay, withCustomHandle: Boolean(draggableHandleClassName), overlayControls: this.props.overlayControls }));
         })));
     }
 }

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

@@ -34,6 +34,7 @@ interface OverlayControlsDefaultProps {
 interface OverlayControlsProps extends OverlayControlsDefaultProps {
     configItem: ConfigItem;
     items?: OverlayControlItem[];
+    overlayControls?: Record<string, OverlayControlItem[]>;
 }
 declare class OverlayControls extends React.Component<OverlayControlsProps> {
     static contextType: React.Context<any>;

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

@@ -32,7 +32,7 @@ class OverlayControls extends React.Component {
             // выбираем только items-ы у которых проставлено поле `allWidgetsControls:true`
             // те контролы, которые будут показываться слева от меню
             let controls = [];
-            for (const controlItem of Object.values(this.context.overlayControls || {})) {
+            for (const controlItem of Object.values(this.props.overlayControls || {})) {
                 controls = controls.concat((controlItem.filter((item) => {
                     var _a;
                     // если тип виджета-плагина в списке исключаемых, то не показываем такой контрол

package/build/esm/hocs/withContext.d.ts

@@ -26,7 +26,6 @@ export function withContext(Component: any): {
             getLayout: () => any;
             config: any;
             context: any;
-            overlayControls: any;
             noOverlay: any;
             defaultGlobalParams: any;
             globalParams: any;
@@ -98,7 +97,6 @@ export function withContext(Component: any): {
             getLayout: () => any;
             config: any;
             context: any;
-            overlayControls: any;
             noOverlay: any;
             defaultGlobalParams: any;
             globalParams: any;

package/build/esm/hocs/withContext.js

@@ -150,7 +150,6 @@ export function withContext(Component) {
                     getLayout: this._getLayout,
                     config: this.props.config,
                     context: this.props.context,
-                    overlayControls: this.props.overlayControls,
                     noOverlay: this.props.noOverlay,
                     defaultGlobalParams: this.props.globalParams,
                     globalParams: this.props.globalParams,
@@ -173,7 +172,7 @@ export function withContext(Component) {
             }
             render() {
                 return (React.createElement(DashKitContext.Provider, { value: this._contextValue },
-                    React.createElement(Component, null)));
+                    React.createElement(Component, { overlayControls: this.props.overlayControls })));
             }
         },
         _a.propTypes = {
@@ -259,16 +258,26 @@ function useMemoStateContext(props) {
         });
     }, [props.config, props.itemsStateAndParams, onChange]);
     const memorizeOriginalLayout = React.useCallback((widgetId, preAutoHeightLayout, postAutoHeightLayout) => {
+        let needUpdateLayout = false;
         if (!(widgetId in originalLayouts.current)) {
             originalLayouts.current[widgetId] = preAutoHeightLayout;
+            needUpdateLayout = true;
+        }
+        if (adjustedLayouts.current[widgetId] !== postAutoHeightLayout) {
+            adjustedLayouts.current[widgetId] = postAutoHeightLayout;
+            needUpdateLayout = true;
+        }
+        if (needUpdateLayout) {
+            forceUpdateLayout((prev) => prev + 1);
         }
-        adjustedLayouts.current[widgetId] = postAutoHeightLayout;
-        forceUpdateLayout((prev) => prev + 1);
     }, []);
     const revertToOriginalLayout = React.useCallback((widgetId) => {
+        const needUpdateLayout = widgetId in adjustedLayouts.current || widgetId in originalLayouts.current;
         delete adjustedLayouts.current[widgetId];
         delete originalLayouts.current[widgetId];
-        forceUpdateLayout((prev) => prev + 1);
+        if (needUpdateLayout) {
+            forceUpdateLayout((prev) => prev + 1);
+        }
     }, []);
     const itemsParams = React.useMemo(() => getItemsParams({
         defaultGlobalParams: props.defaultGlobalParams,
@@ -317,7 +326,6 @@ function useMemoStateContext(props) {
         getLayout,
         config: props.config,
         context: props.context,
-        overlayControls: props.overlayControls,
         noOverlay: props.noOverlay,
         defaultGlobalParams: props.globalParams,
         globalParams: props.globalParams,
@@ -340,7 +348,6 @@ function useMemoStateContext(props) {
         getLayout,
         props.config,
         props.context,
-        props.overlayControls,
         props.noOverlay,
         props.globalParams,
         props.editMode,
@@ -364,7 +371,7 @@ export function withMemoContext(Component) {
     const WithMemoContext = (props) => {
         const contextValue = useMemoStateContext(props);
         return (React.createElement(DashKitContext.Provider, { value: contextValue },
-            React.createElement(Component, null)));
+            React.createElement(Component, { overlayControls: props.overlayControls })));
     };
     WithMemoContext.displayName = `withMemoContext(${Component.displayName || Component.name || 'Component'}`;
     return WithMemoContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/dashkit",
-  "version": "3.1.0-alpha.0",
+  "version": "3.1.0-alpha.2",
   "description": "Library for rendering dashboard grid layout",
   "license": "MIT",
   "repository": {