2
0
Adam Shaw 6 жил өмнө
parent
commit
ce7ae626f0

+ 1 - 1
packages-premium

@@ -1 +1 @@
-Subproject commit 1771a4058dbfb506d4882968e15594b6ee8800d5
+Subproject commit 2675c463b35f6629751d1cd1be898db0a615a998

+ 1 - 1
packages/core/src/scrollgrid/Scroller.tsx

@@ -22,7 +22,7 @@ export default class Scroller extends BaseComponent<ScrollerProps> implements Sc
 
 
   render(props: ScrollerProps) {
-    let className = [ 'scroller' ]
+    let className = [ 'fc-scroller' ]
 
     if (props.className) {
       className = className.concat(props.className)

+ 3 - 3
packages/core/src/styles/_scrollgrid.scss

@@ -32,15 +32,15 @@
 .clippedscroller {
   position: relative;
   overflow: hidden;
-  direction: ltr; // hack for chrome doing the .scroller's right/left wrong for rtl. undone below...
+  direction: ltr; // hack for chrome doing the scroller's right/left wrong for rtl. undone below...
 }
 
-.fc-rtl .clippedscroller > .scroller { // undo hack
+.fc-rtl .clippedscroller > .fc-scroller { // undo hack
   direction: rtl;
 }
 
 
-.scroller {
+.fc-scroller {
   position: relative; // for abs-positioned elements within
 }
 

+ 3 - 3
packages/daygrid/src/Table.tsx

@@ -235,8 +235,8 @@ export default class Table extends BaseComponent<TableProps, TableState> {
       colCnt,
       selectedInstanceId: props.eventSelection,
       hiddenInstances: // TODO: more convenient
-        (props.eventDrag ? props.eventDrag.affectedInstances : null) ||
-        (props.eventResize ? props.eventResize.affectedInstances : null),
+        (props.eventDrag && props.eventDrag.segs.length ? props.eventDrag.affectedInstances : null) ||
+        (props.eventResize && props.eventResize.segs.length ? props.eventResize.affectedInstances : null),
       isDragging: false,
       isResizing: false,
       isSelecting: false
@@ -244,7 +244,7 @@ export default class Table extends BaseComponent<TableProps, TableState> {
 
     this.rowStructs = eventsRenderer.rowStructs
 
-    if (props.eventResize) {
+    if (props.eventResize && props.eventResize.segs.length) { // messy check
       this.renderMirrorEvents({
         colGroupNode: props.colGroupNode,
         renderIntro: props.renderIntro,

+ 3 - 3
packages/timegrid/src/TimeCols.tsx

@@ -257,8 +257,8 @@ export default class TimeCols extends BaseComponent<TimeColsProps> {
         segs: props.fgEventSegs,
         selectedInstanceId: props.eventSelection,
         hiddenInstances: // TODO: more convenient
-          (props.eventDrag ? props.eventDrag.affectedInstances : null) ||
-          (props.eventResize ? props.eventResize.affectedInstances : null),
+          (props.eventDrag && props.eventDrag.segs.length ? props.eventDrag.affectedInstances : null) ||
+          (props.eventResize && props.eventResize.segs.length ? props.eventResize.affectedInstances : null),
         isDragging: false,
         isResizing: false,
         isSelecting: false,
@@ -281,7 +281,7 @@ export default class TimeCols extends BaseComponent<TimeColsProps> {
         forPrint: props.forPrint
       })
 
-    } else if (props.eventResize) {
+    } else if (props.eventResize && props.eventResize.segs.length) {
       return this.renderMirrorEvents({
         containerEls: mirrorContainerEls,
         segs: props.eventResize.segs,