1 files changed, 28 insertions, 34 deletions
diff --git a/src/client/views/collections/CollectionNoteTakingViewColumn.tsx b/src/client/views/collections/CollectionNoteTakingViewColumn.tsx
index 84d1c0205..829d055e5 100644
--- a/src/client/views/collections/CollectionNoteTakingViewColumn.tsx
+++ b/src/client/views/collections/CollectionNoteTakingViewColumn.tsx
@@ -44,8 +44,7 @@ interface CSVFieldColumnProps {
     observeHeight: (myref: any) => void;
     unobserveHeight: (myref: any) => void;
     editableViewProps: () => any;
-    resizeColumns: (isAdd: boolean, colWidth: number, colIndex: number) => boolean;
-    PanelWidth: number;
+    resizeColumns: (headers: SchemaHeaderField[]) => boolean;
     maxColWidth: number;
     dividerWidth: number;
     availableWidth: number;
@@ -141,18 +140,11 @@ export class CollectionNoteTakingViewColumn extends React.Component<CSVFieldColu
     @undoBatch
     @action
     deleteColumn = () => {
-        const acolumnHeaders = Cast(this.props.Document.columnHeaders, listSpec(SchemaHeaderField), null);
-        if (acolumnHeaders && this.props.headingObject) {
-            const index = acolumnHeaders.indexOf(this.props.headingObject);
-            const columnHeaders = acolumnHeaders; // new List<SchemaHeaderField>(acolumnHeaders.map(header => header[Copy]())); // needed for undo to work properly.  otherwise we end up changing field values in the undo stack since they are shared by reference
-            const newColIndex = index > 0 ? index - 1 : 1;
-            const newColHeader = this.props.columnHeaders ? this.props.columnHeaders[newColIndex] : undefined;
-            const newHeading = newColHeader ? newColHeader.heading : 'unset';
-            this.props.docList.forEach(d => (d[this.props.pivotField] = newHeading));
-            const colWidth = this.props.columnHeaders ? this.props.columnHeaders[index].width : 0;
-            columnHeaders.splice(index, 1);
-            //Doc.GetProto(this.props.Document).columnHeaders = columnHeaders;
-            this.props.resizeColumns(false, colWidth, index);
+        const columnHeaders = Array.from(Cast(this.props.Document.columnHeaders, listSpec(SchemaHeaderField), null));
+        if (this.props.headingObject) {
+            this.props.docList.forEach(d => (d[this.props.pivotField] = undefined));
+            columnHeaders.splice(columnHeaders.indexOf(this.props.headingObject), 1);
+            this.props.resizeColumns(columnHeaders);
         }
     };
 
@@ -262,28 +254,30 @@ export class CollectionNoteTakingViewColumn extends React.Component<CSVFieldColu
         return (
             <>
                 {headingView}
-                <div className="collectionNoteTakingView-columnStack">
-                    <div
-                        key={`${heading}-stack`}
-                        className={`collectionNoteTakingView-Nodes`}
-                        style={{
-                            padding: `${columnYMargin}px ${0}px ${this.props.yMargin}px ${0}px`,
-                            gridGap: this.props.gridGap,
-                            gridTemplateColumns: templatecols,
-                        }}>
-                        {this.props.renderChildren(this.props.docList)}
-                    </div>
+                <div className="collectionNoteTakingView-columnStackContainer">
+                    <div className="collectionNoteTakingView-columnStack">
+                        <div
+                            key={`${heading}-stack`}
+                            className={`collectionNoteTakingView-Nodes`}
+                            style={{
+                                padding: `${columnYMargin}px ${0}px ${this.props.yMargin}px ${0}px`,
+                                gridGap: this.props.gridGap,
+                                gridTemplateColumns: templatecols,
+                            }}>
+                            {this.props.renderChildren(this.props.docList)}
+                        </div>
 
-                    {!this.props.chromeHidden && type !== DocumentType.PRES ? (
-                        <div className="collectionNoteTakingView-DocumentButtons" style={{ marginBottom: 10 }}>
-                            <div key={`${heading}-add-document`} className="collectionNoteTakingView-addDocumentButton">
-                                <EditableView GetValue={returnEmptyString} SetValue={this.addNewTextDoc} textCallback={this.textCallback} placeholder={"Type ':' for commands"} contents={'+ New Node'} menuCallback={this.menuCallback} />
-                            </div>
-                            <div key={`${this.props.Document[Id]}-addGroup`} className="collectionNoteTakingView-addDocumentButton">
-                                <EditableView {...this.props.editableViewProps()} />
+                        {!this.props.chromeHidden && type !== DocumentType.PRES ? (
+                            <div className="collectionNoteTakingView-DocumentButtons" style={{ marginBottom: 10 }}>
+                                <div key={`${heading}-add-document`} className="collectionNoteTakingView-addDocumentButton">
+                                    <EditableView GetValue={returnEmptyString} SetValue={this.addNewTextDoc} textCallback={this.textCallback} placeholder={"Type ':' for commands"} contents={'+ New Node'} menuCallback={this.menuCallback} />
+                                </div>
+                                <div key={`${this.props.Document[Id]}-addGroup`} className="collectionNoteTakingView-addDocumentButton">
+                                    <EditableView {...this.props.editableViewProps()} />
+                                </div>
                             </div>
-                        </div>
-                    ) : null}
+                        ) : null}
+                    </div>
                 </div>
             </>
         );