Просмотр исходного кода

restore setting height options via mutateOptions

Adam Shaw 6 лет назад
Родитель
Сommit
17d7c3f67c
1 измененных файлов с 6 добавлено и 1 удалено
  1. 6 1
      packages/core/src/Calendar.tsx

+ 6 - 1
packages/core/src/Calendar.tsx

@@ -436,6 +436,7 @@ export default class Calendar {
     let specialUpdates = {}
     let specialUpdates = {}
     let oldDateEnv = this.dateEnv // do this before onOptionsChange
     let oldDateEnv = this.dateEnv // do this before onOptionsChange
     let isTimeZoneDirty = false
     let isTimeZoneDirty = false
+    let isSizeDirty = false
     let anyDifficultOptions = Boolean(removals.length)
     let anyDifficultOptions = Boolean(removals.length)
 
 
     for (let name in updates) {
     for (let name in updates) {
@@ -447,7 +448,9 @@ export default class Calendar {
     }
     }
 
 
     for (let name in normalUpdates) {
     for (let name in normalUpdates) {
-      if (/^(defaultDate|defaultView)$/.test(name)) {
+      if (/^(height|contentHeight|aspectRatio)$/.test(name)) {
+        isSizeDirty = true
+      } else if (/^(defaultDate|defaultView)$/.test(name)) {
         // can't change date this way. use gotoDate instead
         // can't change date this way. use gotoDate instead
       } else {
       } else {
         anyDifficultOptions = true // I guess all options are "difficult" ?
         anyDifficultOptions = true // I guess all options are "difficult" ?
@@ -484,6 +487,8 @@ export default class Calendar {
           viewType: this.state.viewType
           viewType: this.state.viewType
         })
         })
 
 
+      } else if (isSizeDirty) {
+        this.updateSize()
       }
       }
 
 
       // special updates
       // special updates