feat: make newItemLayout optional in reflowLayout (#185)

gravity-ui · Sep 5, 2024 · 4309e8e · 4309e8e
1 parent 1af4306
commit 4309e8e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 21 deletions.
diff --git a/src/components/DashKit/DashKit.tsx b/src/components/DashKit/DashKit.tsx
@@ -168,12 +168,20 @@ export class DashKit extends React.PureComponent<DashKitInnerProps> {
         return UpdateManager.removeItem({id, config, itemsStateAndParams});
     }
 
-    static reflowLayout(
-        newLayoutItem: ConfigLayout,
-        layout: ConfigLayout[],
-        groups?: DashKitGroup[],
-    ) {
-        return reflowLayout(newLayoutItem, layout, getReflowGroupsConfig(groups));
+    static reflowLayout({
+        newLayoutItem,
+        layout,
+        groups,
+    }: {
+        newLayoutItem?: ConfigLayout;
+        layout: ConfigLayout[];
+        groups?: DashKitGroup[];
+    }) {
+        return reflowLayout({
+            newLayoutItem,
+            layout,
+            reflowLayoutOptions: getReflowGroupsConfig(groups),
+        });
     }
 
     metaRef = React.createRef<GridLayout>();

diff --git a/src/components/DashKit/__stories__/DashKitGroupsShowcase.tsx b/src/components/DashKit/__stories__/DashKitGroupsShowcase.tsx
@@ -167,11 +167,11 @@ export const DashKitGroupsShowcase: React.FC = () => {
 
             setConfig({
                 ...config,
-                layout: DashKit.reflowLayout(
-                    copyItem,
-                    config.layout.filter(({i}) => i !== itemId),
+                layout: DashKit.reflowLayout({
+                    newLayoutItem: copyItem,
+                    layout: config.layout.filter(({i}) => i !== itemId),
                     groups,
-                ),
+                }),
             });
         };
 

diff --git a/src/utils/update-manager.ts b/src/utils/update-manager.ts
@@ -391,11 +391,15 @@ function changeGroupParams({
     return update(itemsStateAndParams, obj);
 }
 
-export function reflowLayout(
-    newLayoutItem: ConfigLayout,
-    layout: ConfigLayout[],
-    reflowLayoutOptions: ReflowLayoutOptions,
-) {
+export function reflowLayout({
+    newLayoutItem,
+    layout,
+    reflowLayoutOptions,
+}: {
+    newLayoutItem?: ConfigLayout;
+    layout: ConfigLayout[];
+    reflowLayoutOptions: ReflowLayoutOptions;
+}) {
     const byGroup: Record<string, ConfigLayout[]> = {};
     const reducer = (
         memo: Record<string, number>,
@@ -421,7 +425,10 @@ export function reflowLayout(
     };
 
     const orderById = layout.reduce<Record<string, number>>(reducer, {});
-    reducer(orderById, newLayoutItem, layout.length, layout, true);
+
+    if (newLayoutItem) {
+        reducer(orderById, newLayoutItem, layout.length, layout, true);
+    }
 
     const {defaultProps} = reflowLayoutOptions;
 
@@ -489,11 +496,11 @@ export class UpdateManager {
             const newLayoutItem = {...saveDefaultLayout, i: newItem.id};
 
             if (options.reflowLayoutOptions) {
-                newLayout = reflowLayout(
+                newLayout = reflowLayout({
                     newLayoutItem,
-                    config.layout.map((t) => ({...t, ...(byId[t.i] || {})})),
-                    options.reflowLayoutOptions,
-                );
+                    layout: config.layout.map((t) => ({...t, ...(byId[t.i] || {})})),
+                    reflowLayoutOptions: options.reflowLayoutOptions,
+                });
             } else {
                 newLayout = [
                     ...config.layout.map((t) => ({...t, ...(byId[t.i] || {})})),
@@ -511,7 +518,11 @@ export class UpdateManager {
             const newLayoutItem = {...saveDefaultLayout, i: newItem.id};
 
             if (options.reflowLayoutOptions) {
-                newLayout = reflowLayout(newLayoutItem, config.layout, options.reflowLayoutOptions);
+                newLayout = reflowLayout({
+                    newLayoutItem,
+                    layout: config.layout,
+                    reflowLayoutOptions: options.reflowLayoutOptions,
+                });
             } else {
                 newLayout = [...config.layout, newLayoutItem];
             }