use COMPLEX_OPTION_COMPARATORS for view options. fixes memoization, w…

…hich fixes recursion problems
fullcalendar · Jul 26, 2022 · 43609b4 · 43609b4
1 parent 1733a16
commit 43609b4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/packages/common/src/options.ts b/packages/common/src/options.ts
@@ -378,14 +378,15 @@ export type CalendarOptionsRefined =
 export const COMPLEX_OPTION_COMPARATORS: {
   [optionName in keyof CalendarOptions]: (a: CalendarOptions[optionName], b: CalendarOptions[optionName]) => boolean
 } = {
-  headerToolbar: isBoolComplexEqual,
-  footerToolbar: isBoolComplexEqual,
-  buttonText: isBoolComplexEqual,
-  buttonHints: isBoolComplexEqual,
-  buttonIcons: isBoolComplexEqual,
+  headerToolbar: isMaybeObjectsEqual,
+  footerToolbar: isMaybeObjectsEqual,
+  buttonText: isMaybeObjectsEqual,
+  buttonHints: isMaybeObjectsEqual,
+  buttonIcons: isMaybeObjectsEqual,
+  dateIncrement: isMaybeObjectsEqual,
 }
 
-function isBoolComplexEqual(a, b) {
+function isMaybeObjectsEqual(a, b) {
   if (typeof a === 'object' && typeof b === 'object' && a && b) { // both non-null objects
     return isPropsEqual(a, b)
   }

diff --git a/packages/common/src/reducers/CalendarDataManager.ts b/packages/common/src/reducers/CalendarDataManager.ts
@@ -527,10 +527,18 @@ export class CalendarDataManager {
     let extra = {}
 
     for (let optionName in raw) {
-      if (raw[optionName] === currentRaw[optionName]) {
+      if (
+        raw[optionName] === currentRaw[optionName] ||
+        (COMPLEX_OPTION_COMPARATORS[optionName] &&
+          COMPLEX_OPTION_COMPARATORS[optionName](raw[optionName], currentRaw[optionName]))
+      ) {
         refined[optionName] = currentRefined[optionName]
       } else {
-        if (raw[optionName] === this.currentCalendarOptionsInput[optionName]) {
+        if (
+          raw[optionName] === this.currentCalendarOptionsInput[optionName] ||
+          (COMPLEX_OPTION_COMPARATORS[optionName] &&
+            COMPLEX_OPTION_COMPARATORS[optionName](raw[optionName], this.currentCalendarOptionsInput[optionName]))
+        ) {
           if (optionName in this.currentCalendarOptionsRefined) { // might be an "extra" prop
             refined[optionName] = this.currentCalendarOptionsRefined[optionName]
           }