Fixed a huge fault that caused errors to occur when attempting to bul…

…k edit the JSON in a column (or single view).
williamtroup · Nov 18, 2024 · 73b3758 · 73b3758
1 parent 5967aa8
commit 73b3758
Show file tree

Hide file tree

Showing 7 changed files with 561 additions and 548 deletions.
diff --git a/dist/jsontree.esm.js b/dist/jsontree.esm.js
diff --git a/dist/jsontree.esm.js.map b/dist/jsontree.esm.js.map
diff --git a/dist/jsontree.js b/dist/jsontree.js
diff --git a/dist/jsontree.js.map b/dist/jsontree.js.map
diff --git a/dist/jsontree.min.js b/dist/jsontree.min.js
diff --git a/src/jsontree.ts b/src/jsontree.ts
@@ -339,6 +339,8 @@ type JsonTreeData = Record<string, BindingOptions>;
                             if ( dataIndex === bindingOptions._currentView.currentDataArrayPageIndex && bindingOptions._currentView.currentDataArrayPageIndex > 0 ) {
                                 bindingOptions._currentView.currentDataArrayPageIndex -= bindingOptions.paging!.columnsPerPage!
                             }
+
+                            updateColumnNodesAndControlButtonsForArrayIndexDeleted( bindingOptions, dataIndex );
                         }
 
                     } else {
@@ -708,6 +710,21 @@ type JsonTreeData = Record<string, BindingOptions>;
             bindingOptions.data = null;
         }
 
+        updateColumnNodesAndControlButtonsForArrayIndexDeleted( bindingOptions, dataIndex );
+        renderControlContainer( bindingOptions );
+        setFooterStatusText( bindingOptions, _configuration.text!.arrayJsonItemDeleted! );
+    }
+
+    function onCopy( bindingOptions: BindingOptions, data: any ) : void {
+        const copyDataJson: string  = JSON.stringify( Convert.toJsonStringifyClone( data, _configuration, bindingOptions ), bindingOptions.events!.onCopyJsonReplacer, bindingOptions.jsonIndentSpaces );
+
+        navigator.clipboard.writeText( copyDataJson );
+
+        setFooterStatusText( bindingOptions, _configuration.text!.copiedText! );
+        Trigger.customEvent( bindingOptions.events!.onCopy!, bindingOptions._currentView.element, copyDataJson );
+    }
+
+    function updateColumnNodesAndControlButtonsForArrayIndexDeleted( bindingOptions: BindingOptions, dataIndex: number ) : void {
         const newContentPanelsOpen = {} as ContentPanelsForArrayIndex;
         const newControlButtonsOpen = {} as ControlButtonsOpenStateArrayIndex;
 
@@ -736,18 +753,6 @@ type JsonTreeData = Record<string, BindingOptions>;
 
         bindingOptions._currentView.contentPanelsOpen = newContentPanelsOpen;
         bindingOptions._currentView.controlButtonsOpen = newControlButtonsOpen;
-
-        renderControlContainer( bindingOptions );
-        setFooterStatusText( bindingOptions, _configuration.text!.arrayJsonItemDeleted! );
-    }
-
-    function onCopy( bindingOptions: BindingOptions, data: any ) : void {
-        const copyDataJson: string  = JSON.stringify( Convert.toJsonStringifyClone( data, _configuration, bindingOptions ), bindingOptions.events!.onCopyJsonReplacer, bindingOptions.jsonIndentSpaces );
-
-        navigator.clipboard.writeText( copyDataJson );
-
-        setFooterStatusText( bindingOptions, _configuration.text!.copiedText! );
-        Trigger.customEvent( bindingOptions.events!.onCopy!, bindingOptions._currentView.element, copyDataJson );
     }
 
 

diff --git a/src/ts/data/convert.ts b/src/ts/data/convert.ts
@@ -45,7 +45,7 @@ export namespace Convert {
             result = object.toString();
 
         } else if ( Is.definedFunction( object ) ) {
-            result = Default.getFunctionName( object, configuration ).name;
+            result = Default.getFunctionName( object, configuration, bindingOptions ).name;
 
         } else if ( Is.definedRegExp( object ) ) {
             result = object.source;