This commit fixes a bug related to setting a new react component as title via mergeOptions. When a title component was set, and the user tried to replace the existing title with a new title via mergeOptions, the new title was not created and instead the current title was reapplied. Fixes #5377
|
|
||
177 |
|
177 |
|
178 |
|
178 |
|
179 |
|
179 |
|
180 |
|
|
|
|
180 |
|
|
181 |
|
181 |
|
182 |
|
|
|
|
182 |
|
|
183 |
|
183 |
|
184 |
|
184 |
|
185 |
|
|
|
186 |
|
185 |
|
187 |
|
|
|
|
186 |
|
|
188 |
|
187 |
|
189 |
|
188 |
|
190 |
|
189 |
|
|
|
||
415 |
|
414 |
|
416 |
|
415 |
|
417 |
|
416 |
|
418 |
|
|
|
419 |
|
417 |
|
420 |
|
418 |
|
421 |
|
419 |
|
422 |
|
|
|
423 |
|
|
|
424 |
|
|
|
425 |
|
|
|
426 |
|
|
|
427 |
|
|
|
|
420 |
|
|
|
421 |
|
|
|
422 |
|
|
|
423 |
|
|
428 |
|
424 |
|
429 |
|
|
|
430 |
|
425 |
|
|
426 |
|
|
|
427 |
|
|
|
428 |
|
|
|
429 |
|
|
431 |
|
430 |
|
432 |
|
431 |
|
433 |
|
432 |
|
|
|
||
478 |
|
477 |
|
479 |
|
478 |
|
480 |
|
479 |
|
|
480 |
|
|
|
481 |
|
|
|
482 |
|
|
|
483 |
|
|
|
484 |
|
|
|
485 |
|
|
|
486 |
|
|
|
487 |
|
|
|
488 |
|
|
|
489 |
|
|
481 |
|
490 |
|
482 |
|
491 |
|
483 |
|
492 |
|
|
|
||
13 |
|
13 |
|
14 |
|
14 |
|
15 |
|
15 |
|
16 |
|
|
|
|
16 |
|
|
17 |
|
17 |
|
18 |
|
|
|
|
18 |
|
|
|
19 |
|
|
|
20 |
|
|
|
21 |
|
|
|
22 |
|
|
19 |
|
23 |
|
20 |
|
24 |
|
|
25 |
|
|
21 |
|
26 |
|
22 |
|
27 |
|
23 |
|
28 |
|
|
|
||
49 |
|
54 |
|
50 |
|
55 |
|
51 |
|
56 |
|
52 |
|
|
|
53 |
|
|
|
54 |
|
|
|
55 |
|
|
|
56 |
|
57 |
|
|
|
||
6 |
|
6 |
|
7 |
|
7 |
|
8 |
|
8 |
|
|
9 |
|
|
9 |
|
10 |
|
10 |
|
11 |
|
11 |
|
12 |
|
|
|
||
93 |
|
94 |
|
94 |
|
95 |
|
95 |
|
96 |
|
|
97 |
|
|
|
98 |
|
|
|
99 |
|
|
|
100 |
|
|
96 |
|
101 |
|
|
|
||
29 |
|
29 |
|
30 |
|
30 |
|
31 |
|
31 |
|
|
32 |
|
|
32 |
|
33 |
|
33 |
|
34 |
|
34 |
|
35 |
|
|
|
||
70 |
|
71 |
|
71 |
|
72 |
|
72 |
|
73 |
|
|
74 |
|
|
73 |
|
75 |
|
74 |
|
76 |
|
75 |
|
77 |
|
|
|
||
175 |
|
177 |
|
176 |
|
178 |
|
177 |
|
179 |
|
178 |
|
|
|
|
180 |
|
|
179 |
|
181 |
|
180 |
|
182 |
|
181 |
|
183 |
|
|
|
||
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
|
38 |
|
|
|
39 |
|
|
|
40 |
|
|
|
41 |
|
|
|
42 |
|
|
|
43 |
|
|
|
44 |
|
|
38 |
|
45 |
|
39 |
|
46 |
|
40 |
|
47 |
|
|
|
||
84 |
|
84 |
|
85 |
|
85 |
|
86 |
|
86 |
|
|
87 |
|
|
|
88 |
|
|
87 |
|
89 |
|
88 |
|
90 |
|
89 |
|
|
|
90 |
|
91 |
|
91 |
|
92 |
|
92 |
|
93 |
|
|
|
||
98 |
|
99 |
|
99 |
|
100 |
|
100 |
|
101 |
|
101 |
|
|
|
|
102 |
|
|
102 |
|
103 |
|
103 |
|
104 |
|
104 |
|
105 |
|
|
|
||
309 |
|
310 |
|
310 |
|
311 |
|
311 |
|
312 |
|
|
313 |
|
|
|
314 |
|
|
|
315 |
|
|
|
316 |
|
|
|
317 |
|
|
|
318 |
|
|
|
319 |
|
|
|
320 |
|
|
|
321 |
|
|
|
322 |
|
|
|
323 |
|
|
|
324 |
|
|
|
325 |
|
|
|
326 |
|
|
|
327 |
|
|
|
328 |
|
|
|
329 |
|
|
|
330 |
|
|
|
331 |
|
|
|
332 |
|
|
|
333 |
|
|
|
334 |
|
|
|
335 |
|
|
|
336 |
|
|
|
337 |
|
|
|
338 |
|
|
|
339 |
|
|
|
340 |
|
|
|
341 |
|
|
|
342 |
|
|
|
343 |
|
|
|
344 |
|
|
|
345 |
|
|
|
346 |
|
|
|
347 |
|
|
|
348 |
|
|
|
349 |
|
|
|
350 |
|
|
|
351 |
|
|
|
352 |
|
|
|
353 |
|
|
|
354 |
|
|
|
355 |
|
|
|
356 |
|
|
|
357 |
|
|
|
358 |
|
|
|
359 |
|
|
|
360 |
|
|
|
361 |
|
|
|
362 |
|
|
|
363 |
|
|
|
364 |
|
|
|
365 |
|
|
312 |
|
366 |
|
313 |
|
367 |
|
314 |
|
368 |
|
|
|
||
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
|
|
27 |
|
|
|
28 |
|
|
|
|
26 |
|
|
|
27 |
|
|
29 |
|
28 |
|
30 |
|
29 |
|
31 |
|
30 |
|
|
|
||
34 |
|
33 |
|
35 |
|
34 |
|
36 |
|
35 |
|
37 |
|
|
|
38 |
|
|
|
|
36 |
|
|
|
37 |
|
|
39 |
|
38 |
|
40 |
|
39 |
|
|
40 |
|
|
41 |
|
41 |
|
42 |
|
42 |
|
|
|
||
124 |
|
124 |
|
125 |
|
125 |
|
126 |
|
126 |
|
|
127 |
|
|
|
128 |
|
|
|
129 |
|
|
|
130 |
|
|
|
131 |
|
|
|
132 |
|
|
|
133 |
|
|
|
134 |
|
|
|
135 |
|
|
127 |
|
136 |
|
128 |
|
137 |
|
129 |
|
138 |
|
|
|
||
141 |
|
150 |
|
142 |
|
151 |
|
143 |
|
152 |
|
144 |
|
|
|
|
153 |
|
|
145 |
|
154 |
|
146 |
|
155 |
|
147 |
|
156 |
|
|
|
||
3 |
|
3 |
|
4 |
|
4 |
|
5 |
|
5 |
|
6 |
|
|
|
7 |
|
6 |
|
8 |
|
7 |
|
9 |
|
8 |
|