[6.x] Fix customized listing columns being overridden by default preferences

src/Preferences/Preferences.php

@@ -140,7 +140,30 @@ protected function arrayDotPreferences($array)
  }
  }
 
- return array_merge(Arr::dot($array), $preserve);
+ return array_merge($this->dotPreferences($array), $preserve);
+ }
+
+ /**
+ * Flatten preferences into dotted keys, like `Arr::dot()`, but treating list values
+ * as leaves so they get replaced by higher precedence levels instead of merged.
+ *
+ * @param array $array
+ * @param string $prepend
+ * @return array
+ */
+ protected function dotPreferences($array, $prepend = '')
+ {
+ $results = [];
+
+ foreach ($array as $key => $value) {
+ if (is_array($value) && ! empty($value) && ! array_is_list($value)) {
+ $results = array_merge($results, $this->dotPreferences($value, $prepend.$key.'.'));
+ } else {
+ $results[$prepend.$key] = $value;
+ }
+ }
+
+ return $results;
  }
 
  /**

tests/Preferences/PrecedenceTest.php

@@ -245,6 +245,28 @@ public function it_gives_precedence_to_user_and_role_preferences_over_default_pr
  $this->assertTrue(Preference::get('deeply.nested.default'));
  }
 
+ #[Test]
+ public function it_replaces_list_preferences_instead_of_merging_them()
+ {
+ $this->actingAs(User::make()->preferences([
+ 'collections' => [
+ 'orders' => [
+ 'columns' => ['date', 'title', 'customer'],
+ ],
+ ],
+ ]));
+
+ Preference::default()->set([
+ 'collections' => [
+ 'orders' => [
+ 'columns' => ['date', 'title', 'customer', 'grand_total', 'order_status'],
+ ],
+ ],
+ ])->save();
+
+ $this->assertEquals(['date', 'title', 'customer'], Preference::get('collections.orders.columns'));
+ }
+
  #[Test]
  public function it_merges_preferences_at_every_level_unless_otherwise_configured()
  {