File tree Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -40,12 +40,20 @@ def use_inertia_instance_props
40
40
def _inertia_configuration
41
41
@_inertia_configuration ||= begin
42
42
config = superclass . try ( :_inertia_configuration ) || ::InertiaRails . configuration
43
- @inertia_config ? config . merge ( @inertia_config ) . freeze : config
43
+ @inertia_config ? config . merge ( @inertia_config . freeze ) . freeze : config
44
44
end
45
45
end
46
46
47
47
def _inertia_shared_data
48
- @_inertia_shared_data ||= [ *superclass . try ( :_inertia_shared_data ) , *@inertia_share ] . freeze
48
+ @_inertia_shared_data ||= begin
49
+ shared_data = superclass . try ( :_inertia_shared_data )
50
+
51
+ if @inertia_share && shared_data . present?
52
+ shared_data + @inertia_share . freeze
53
+ else
54
+ @inertia_share || shared_data || [ ]
55
+ end . freeze
56
+ end
49
57
end
50
58
end
51
59
You can’t perform that action at this time.
0 commit comments