[FEATURE] #299 Fix merging of api-state and persisted state (#300)

omines · Apr 21, 2023 · 27ddbea · 27ddbea
1 parent 2b25e0d
commit 27ddbea
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/Resources/public/js/datatables.js b/src/Resources/public/js/datatables.js
@@ -77,10 +77,9 @@
                             data = null;
                             if (Object.keys(state).length) {
                                 var api = new $.fn.dataTable.Api( settings );
-                                var merged = $.extend(true, {}, api.state(), state);
-
+                                var merged = Object.assign({}, api.state(), state)
                                 api
-                                    .order(state.order ?? api.state().order)
+                                    .order(Array.isArray(merged.order) && merged.order.length > 0 ? merged.order : api.state().order)
                                     .search(merged.search.search)
                                     .page.len(merged.length)
                                     .page(merged.start / merged.length)