Third time's a charm

outl1ne · Feb 27, 2024 · d02be48 · d02be48
1 parent fadbc01
commit d02be48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.5.4] - 27-02-2024
+
+### Changed
+
+- Fixed issue with (soft-)deleted models throwing an exception when rendering field
+
 ## [4.5.3] - 27-02-2024
 
 ### Changed

diff --git a/src/Multiselect.php b/src/Multiselect.php
@@ -384,7 +384,7 @@ public function setOptionsFromModels(Collection $models, $resourceClass)
             $models
                 ->mapInto($resourceClass)
                 ->mapWithKeys(function ($associatedResource) {
-                    $keyName = $this->keyName ?? $associatedResource->getKeyName() ?? null;
+                    $keyName = $this->keyName ?? ($associatedResource ? $associatedResource->getKeyName() : null);
                     if (!$keyName) return null;
 
                     $resourceKey = $associatedResource->{$keyName};