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

fix bug with rendering interactions

Adam Shaw 5 лет назад
Родитель
Сommit
40f79c5716
3 измененных файлов с 13 добавлено и 13 удалено
  1. 1 1
      packages-premium
  2. 4 4
      packages/daygrid/src/TableRow.tsx
  3. 8 8
      packages/timegrid/src/TimeCol.tsx

+ 1 - 1
packages-premium

@@ -1 +1 @@
-Subproject commit 834007ce5577451e121d3fb759e6b8d89dc36844
+Subproject commit 5a40fd07a1accb1f35331995639c6cc9a96fa053

+ 4 - 4
packages/daygrid/src/TableRow.tsx

@@ -90,8 +90,8 @@ export default class TableRow extends DateComponent<TableRowProps, TableRowState
     )
 
     let selectedInstanceHash = // TODO: messy way to compute this
-      (props.eventDrag ? props.eventDrag.affectedInstances : null) ||
-      (props.eventResize ? props.eventResize.affectedInstances : null) ||
+      (props.eventDrag && props.eventDrag.affectedInstances) ||
+      (props.eventResize && props.eventResize.affectedInstances) ||
       {}
 
     return (
@@ -114,8 +114,8 @@ export default class TableRow extends DateComponent<TableRowProps, TableRowState
             {},
             {},
             props.todayRange,
-            Boolean(props.eventDrag && props.eventDrag.segs.length), // messy check
-            Boolean(props.eventResize && props.eventResize.segs.length), // messy check
+            Boolean(props.eventDrag),
+            Boolean(props.eventResize),
             false // date-selecting (because mirror is never drawn for date selection)
           )
 

+ 8 - 8
packages/timegrid/src/TimeCol.tsx

@@ -32,14 +32,14 @@ export default class TimeCol extends BaseComponent<TimeColProps> {
     let { options } = context
 
     let mirrorSegs: Seg[] = // yuck
-      (props.eventDrag && props.eventDrag.segs.length ? props.eventDrag.segs : null) ||
-      (props.eventResize && props.eventResize.segs.length ? props.eventResize.segs : null) ||
-      (options.selectMirror ? props.dateSelectionSegs : null) ||
+      (props.eventDrag && props.eventDrag.segs) ||
+      (props.eventResize && props.eventResize.segs) ||
+      (options.selectMirror && props.dateSelectionSegs) ||
       []
 
     let interactionAffectedInstances = // TODO: messy way to compute this
-      (props.eventDrag && props.eventDrag.segs.length ? props.eventDrag.affectedInstances : null) ||
-      (props.eventResize && props.eventResize.segs.length ? props.eventResize.affectedInstances : null) ||
+      (props.eventDrag && props.eventDrag.affectedInstances) ||
+      (props.eventResize && props.eventResize.affectedInstances) ||
       {}
 
     return (
@@ -58,9 +58,9 @@ export default class TimeCol extends BaseComponent<TimeColProps> {
                   {this.renderFgSegs(
                     mirrorSegs as TimeColsSeg[],
                     {},
-                    Boolean(props.eventDrag && props.eventDrag.segs.length), // messy check!
-                    Boolean(props.eventResize && props.eventResize.segs.length), // messy check!
-                    Boolean(options.selectMirror && props.dateSelectionSegs.length) // messy check!
+                    Boolean(props.eventDrag),
+                    Boolean(props.eventResize),
+                    Boolean(options.selectMirror)
                     // TODO: pass in left/right instead of using only computeSegTopBottomCss
                   )}
                 </Fragment>