From 56dfc7aa48286ee061b837922432f86ba6a751a7 Mon Sep 17 00:00:00 2001
From: guyonroche <guyon.roche@gmail.com>
Date: Mon, 15 Aug 2016 21:08:09 +0100
Subject: [PATCH] Really fixed the multi view problem

---
 README.md                                     | 24 +++--
 lib/doc/workbook.js                           |  5 +-
 lib/stream/xlsx/workbook-writer.js            | 16 ++--
 lib/stream/xlsx/worksheet-writer.js           |  7 +-
 lib/xlsx/xform/book/workbook-view-xform.js    | 23 +++--
 lib/xlsx/xform/book/workbook-xform.js         | 19 ----
 lib/xlsx/xform/sheet/sheet-view-xform.js      |  8 +-
 package.json                                  |  2 +-
 spec/integration/workbook.spec.js             | 95 +++++++++++++++----
 spec/testutils.js                             | 14 ++-
 spec/unit/xlsx/xform/book/data/book.1.3.json  |  2 +-
 .../xform/book/workbook-view-xform.spec.js    | 12 +--
 spec/unit/xlsx/xform/sheet/data/sheet.1.2.xml |  2 +-
 .../unit/xlsx/xform/sheet/data/sheet.2.0.json |  2 +-
 .../unit/xlsx/xform/sheet/data/sheet.2.1.json |  2 +-
 .../xlsx/xform/sheet/sheet-view-xform.spec.js | 25 ++---
 16 files changed, 154 insertions(+), 104 deletions(-)

diff --git a/README.md b/README.md
index 67cea333e..e6533d0cb 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ npm install exceljs
       Kudos to <a href="https://github.com/yonjah">yonjah</a> and <a href="https://www.youtube.com/watch?v=wCfE-9bhY2Y">Josh Emerson</a> for the resolution. 
     </li>
     <li>
-      Fix for <a href="https://github.com/guyonroche/exceljs/issues/162">Multiple Sheets opens in 'Group' mode in Excel</a>.
-      My bad - overzealous sheet view code.
+      Fixed <a href="https://github.com/guyonroche/exceljs/issues/162">Multiple Sheets opens in 'Group' mode in Excel</a> again.
+      Added <a href="#workbook-views">Workbook views</a>.
     </li>
     <li>Also fix for empty sheet generating invalid xlsx.</li>
 </ul>
@@ -40,6 +40,7 @@ npm install exceljs
         <ul>
             <li><a href="#create-a-workbook">Create a Workbook</a></li>
             <li><a href="#set-workbook-properties">Set Workbook Properties</a></li>
+            <li><a href="#workbook-views">Workbook Views</a></li>
             <li><a href="#add-a-worksheet">Add a Worksheet</a></li>
             <li><a href="#access-worksheets">Access Worksheets</a></li>
             <li><a href="#worksheet-properties">Worksheet Properties</a></li>
@@ -102,6 +103,17 @@ workbook.created = new Date(1985, 8, 30);
 workbook.modified = new Date();
 ```
 
+## Workbook Views
+
+```javascript
+workbook.views = [
+  {
+    x: 0, y: 0, width: 10000, height: 20000, 
+    firstSheet: 0, activeTab: 1, visibility: 'visible'
+  }
+]
+```
+
 ## Add a Worksheet
 
 ```javascript
@@ -185,11 +197,6 @@ Each view also supports various properties:
 | zoomScale         | 100       | Percentage zoom to use for the view |
 | zoomScaleNormal   | 100       | Normal zoom for the view |
 | style             | undefined | Presentation style - one of pageBreakPreview or pageLayout. Note pageLayout is not compatable with frozen views |
-| x                 | 0         | x position of the view's window |
-| y                 | 0         | y position of the view's window |
-| width             | 12000     | Width of the view's window |
-| height            | 24000     | Height of the view's window |
-| visibility        | 'visible' | Visibility of the view - one of 'visible' or 'hidden' |
 
 ### Frozen Views
 
@@ -1196,5 +1203,4 @@ In practical terms, this error only seems to arise with over 98 sheets (or 49 sh
 | 0.2.10  | <ul><li>Refactoring Complete. All unit and integration tests pass.</li></ul> |
 | 0.2.11  | <ul><li><a href="#outline-level">Outline Levels</a> thanks to <a href="https://github.com/cricri">cricri</a> for the contribution.</li><li><a href="#worksheet-properties">Worksheet Properties</a></li><li>Further refactoring of worksheet writer.</li></ul> |
 | 0.2.12  | <ul><li><a href="#worksheet-views">Sheet Views</a> thanks to <a href="https://github.com/cricri">cricri</a> again for the contribution.</li></ul> |
-
-
+| 0.2.13  | <ul><li>Fix for <a href="https://github.com/guyonroche/exceljs/issues">exceljs might be vulnerable for regular expression denial of service</a>. Kudos to <a href="https://github.com/yonjah">yonjah</a> and <a href="https://www.youtube.com/watch?v=wCfE-9bhY2Y">Josh Emerson</a> for the resolution.</li><li>Fix for <a href="https://github.com/guyonroche/exceljs/issues/162">Multiple Sheets opens in 'Group' mode in Excel</a>. My bad - overzealous sheet view code.</li><li>Also fix for empty sheet generating invalid xlsx.</li></ul>
diff --git a/lib/doc/workbook.js b/lib/doc/workbook.js
index 8cdfd57c6..011bae22f 100644
--- a/lib/doc/workbook.js
+++ b/lib/doc/workbook.js
@@ -38,6 +38,7 @@ var Workbook = module.exports = function() {
   this.created = new Date();
   this.modified = this.created;
   this._worksheets = [];
+  this.views = [];
   this._definedNames = new DefinedNames();
 };
 
@@ -139,7 +140,8 @@ Workbook.prototype = {
       created: this.created,
       modified: this.modified,
       worksheets: this._worksheets.map(function(worksheet) { return worksheet.model; }),
-      definedNames: this._definedNames.model
+      definedNames: this._definedNames.model,
+      views: this.views
     };
   },
   set model(value) {
@@ -164,5 +166,6 @@ Workbook.prototype = {
     });
 
     this._definedNames.model = value.definedNames;
+    this.views = value.views;
   }
 };
\ No newline at end of file
diff --git a/lib/stream/xlsx/workbook-writer.js b/lib/stream/xlsx/workbook-writer.js
index f7f735d32..ec49664ba 100644
--- a/lib/stream/xlsx/workbook-writer.js
+++ b/lib/stream/xlsx/workbook-writer.js
@@ -63,7 +63,7 @@ var WorkbookWriter = module.exports = function(options) {
   this._definedNames = new DefinedNames();
 
   this._worksheets = [];
-  this._views = [];
+  this.views = [];
 
   this.zip = Archiver('zip');
   if (options.stream) {
@@ -283,17 +283,17 @@ WorkbookWriter.prototype = {
     });
   },
   addWorkbook: function() {
-    var self = this;
+    var zip = this.zip;
+    var model = {
+      worksheets: this._worksheets,
+      definedNames: this._definedNames.model,
+      views: this.views
+    };
 
     return new Bluebird(function(resolve) {
-      var model = {
-        worksheets: self._worksheets,
-        definedNames: self._definedNames.model
-      };
-
       var xform = new WorkbookXform();
       xform.prepare(model);
-      self.zip.append(xform.toXml(model), {name: '/xl/workbook.xml'});
+      zip.append(xform.toXml(model), {name: '/xl/workbook.xml'});
       resolve();
     });
   },
diff --git a/lib/stream/xlsx/worksheet-writer.js b/lib/stream/xlsx/worksheet-writer.js
index 663e3f4d5..9a0018336 100644
--- a/lib/stream/xlsx/worksheet-writer.js
+++ b/lib/stream/xlsx/worksheet-writer.js
@@ -110,12 +110,7 @@ var WorksheetWriter = module.exports = function(options) {
   this._workbook = options.workbook;
 
   // views
-  this._views = options.views || [{state: 'normal'}];
-  var workbookViews = this._workbook._views;
-  _.each(this._views, function(view) {
-    view.workbookViewId = workbookViews.length;
-    workbookViews.push(view);
-  });
+  this._views = options.views || [];
 
   // start writing to stream now
   this._writeOpenWorksheet();
diff --git a/lib/xlsx/xform/book/workbook-view-xform.js b/lib/xlsx/xform/book/workbook-view-xform.js
index fb48a3474..56c40630d 100644
--- a/lib/xlsx/xform/book/workbook-view-xform.js
+++ b/lib/xlsx/xform/book/workbook-view-xform.js
@@ -36,14 +36,13 @@ utils.inherits(WorkbookViewXform, BaseXform, {
       xWindow: model.x || 0,
       yWindow: model.y || 0,
       windowWidth: model.width || 12000,
-      windowHeight: model.height || 24000
+      windowHeight: model.height || 24000,
+      firstSheet: model.firstSheet,
+      activeTab: model.activeTab
     };
     if (model.visibility && model.visibility !== 'visible') {
       attributes.visibility = model.visibility;
     }
-    if (model.active) {
-      attributes.activeTab = 1;
-    }
     xmlStream.leafNode('workbookView', attributes);
   },
   
@@ -51,20 +50,24 @@ utils.inherits(WorkbookViewXform, BaseXform, {
     if (node.name === 'workbookView') {
       var model = this.model = {};
       var addS = function(name, value, dflt) {
-        model[name] = (value !== undefined) ? model[name] = value : dflt;
+        var s = (value !== undefined) ? model[name] = value : dflt;
+        if (s !== undefined) {
+          model[name] = s;
+        }
       };
       var addN = function(name, value, dflt) {
-        model[name] = (value !== undefined) ? model[name] = parseInt(value) : dflt;
-      };
-      var addB = function(name, value, dflt) {
-        model[name] = (value !== undefined) ? model[name] = value === '1' : dflt;
+        var n = (value !== undefined) ? model[name] = parseInt(value) : dflt;
+        if (n !== undefined) {
+          model[name] = n;
+        }
       };
       addN('x', node.attributes.xWindow, 0);
       addN('y', node.attributes.yWindow,  0);
       addN('width', node.attributes.windowWidth, 25000);
       addN('height', node.attributes.windowHeight, 10000);
       addS('visibility', node.attributes.visibility, 'visible');
-      addB('active', node.attributes.activeTab, false);
+      addN('activeTab', node.attributes.activeTab, undefined);
+      addN('firstSheet', node.attributes.firstSheet, undefined);
       return true;
     } else {
       return false;
diff --git a/lib/xlsx/xform/book/workbook-xform.js b/lib/xlsx/xform/book/workbook-xform.js
index 6c55cc35c..9a77f32fd 100644
--- a/lib/xlsx/xform/book/workbook-xform.js
+++ b/lib/xlsx/xform/book/workbook-xform.js
@@ -88,16 +88,6 @@ utils.inherits(WorkbookXform, BaseXform, {
 
   prepare: function(model) {
     model.sheets = model.worksheets;
-
-    // prepare bookViews
-    var views = _.flatten(
-      model.worksheets.filter(function(worksheet) { return worksheet.views; })
-        .map(function(worksheet) { return worksheet.views; })
-    );
-    if (views && views.length) {
-      model.views = views;
-      _.each(views, function(view, index) { view.workbookViewId = index; });
-    }
   },
 
   render: function(xmlStream, model) {
@@ -177,14 +167,5 @@ utils.inherits(WorkbookXform, BaseXform, {
       worksheet.name = sheet.name;
       worksheet.id = sheet.id;
     });
-
-    // reconcile bookViews
-    _.each(model.worksheets, function(sheet) {
-      _.each(sheet.views, function(view) {
-        var bookView =  model.views[view.workbookViewId];
-        _.extend(view, bookView);
-        delete view.workbookViewId;
-      });
-    });
   }
 });
diff --git a/lib/xlsx/xform/sheet/sheet-view-xform.js b/lib/xlsx/xform/sheet/sheet-view-xform.js
index 6f7bfccae..711ac971d 100644
--- a/lib/xlsx/xform/sheet/sheet-view-xform.js
+++ b/lib/xlsx/xform/sheet/sheet-view-xform.js
@@ -52,14 +52,14 @@ utils.inherits(SheetViewXform, BaseXform, {
 
   render: function(xmlStream, model) {
     xmlStream.openNode('sheetView', {
-      workbookViewId: model.workbookViewId,
-      tabSelected: 1
+      workbookViewId: model.workbookViewId || 0
     });
     var add = function(name, value, included) {
       if (included) {
         xmlStream.addAttribute(name, value);
       }
     };
+    add('tabSelected', '1', model.tabSelected);
     add('showRuler', '0', model.showRuler === false);
     add('showRowColHeaders', '0', model.showRowColHeaders === false);
     add('showGridlines', '0', model.showGridlines === false);
@@ -188,7 +188,7 @@ utils.inherits(SheetViewXform, BaseXform, {
           if (this.sheetView.style) {
             model.style = this.sheetView.style;
           }
-        } else if (this.sheetView.tabSelected) {
+        } else {
           model = this.model = {
             workbookViewId: this.sheetView.workbookViewId,
             state: 'normal',
@@ -205,8 +205,6 @@ utils.inherits(SheetViewXform, BaseXform, {
           if (this.sheetView.style) {
             model.style = this.sheetView.style;
           }
-        } else {
-          this.model = undefined;
         }
         return false;
       default:
diff --git a/package.json b/package.json
index cf251d04c..92f9ff27a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "exceljs",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "description": "Excel Workbook Manager - Read and Write xlsx and csv Files.",
   "private": false,
   "license": "MIT",
diff --git a/spec/integration/workbook.spec.js b/spec/integration/workbook.spec.js
index 90b596a7f..7a2bc4935 100644
--- a/spec/integration/workbook.spec.js
+++ b/spec/integration/workbook.spec.js
@@ -40,9 +40,11 @@ describe('Workbook', function() {
       var wb = new Excel.Workbook();
       var ws1 = wb.addWorksheet('Hello, World!');
       expect(ws1.name).to.equal('Hello, World!');
+      ws1.getCell('A1').value = 'Hello, World!';
 
       var ws2 = wb.addWorksheet();
       expect(ws2.name).to.match(/sheet\d+/);
+      ws2.getCell('A1').value = ws2.name;
 
       wb.addWorksheet('This & That');
 
@@ -486,19 +488,16 @@ describe('Workbook', function() {
           expect(ws2.getCell('A1').value).to.equal('Let it Snow!');
           expect(ws2.views).to.deep.equal([
             {
-              state: 'frozen', xSplit: 2, ySplit: 3, topLeftCell: 'C4',
-              activeCell: 'D5', showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100,
-              x: 0, y: 0, width: 12000, height: 24000, active: false, visibility: 'visible'
+              workbookViewId: 0, state: 'frozen', xSplit: 2, ySplit: 3, topLeftCell: 'C4',
+              activeCell: 'D5', showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100
             },
             {
-              state: 'frozen', xSplit: 0, ySplit: 1, topLeftCell: 'A2',
-              showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100,
-              x: 0, y: 0, width: 12000, height: 24000, active: false, visibility: 'visible'
+              workbookViewId: 0, state: 'frozen', xSplit: 0, ySplit: 1, topLeftCell: 'A2',
+              showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100
             },
             {
-              state: 'frozen', xSplit: 1, ySplit: 0, topLeftCell: 'B1',
-              showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100,
-              x: 0, y: 0, width: 12000, height: 24000, active: false, visibility: 'visible'
+              workbookViewId: 0, state: 'frozen', xSplit: 1, ySplit: 0, topLeftCell: 'B1',
+              showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100
             }
           ])
         });
@@ -524,22 +523,82 @@ describe('Workbook', function() {
           expect(ws2.getCell('A1').value).to.equal('Do the splits!');
           expect(ws2.views).to.deep.equal([
             {
-              state: 'split', xSplit: 2000, ySplit: 3000, topLeftCell: 'C4', activeCell: 'D5', activePane: 'bottomRight',
-              showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100,
-              x: 0, y: 0, width: 12000, height: 24000, active: false, visibility: 'visible'
+              workbookViewId: 0, state: 'split', xSplit: 2000, ySplit: 3000, topLeftCell: 'C4', activeCell: 'D5', activePane: 'bottomRight',
+              showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100
             },
             {
-              state: 'split', xSplit: 0, ySplit: 1500, topLeftCell: 'A10', activePane: 'bottomLeft',
-              showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100,
-              x: 0, y: 0, width: 12000, height: 24000, active: false, visibility: 'visible'
+              workbookViewId: 0, state: 'split', xSplit: 0, ySplit: 1500, topLeftCell: 'A10', activePane: 'bottomLeft',
+              showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100
             },
             {
-              state: 'split', xSplit: 1500, ySplit: 0, topLeftCell: undefined, activePane: 'topRight',
-              showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100,
-              x: 0, y: 0, width: 12000, height: 24000, active: false, visibility: 'visible'
+              workbookViewId: 0, state: 'split', xSplit: 1500, ySplit: 0, topLeftCell: undefined, activePane: 'topRight',
+              showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100
             }
           ])
         });
     });
+    it('multiple book views', function() {
+      var wb = new Excel.Workbook();
+      wb.views = [
+        {
+          x: 0, y: 0, width: 10000, height: 20000,
+          firstSheet: 0, activeTab: 1, visibility: 'visible'
+        },
+        {
+          x: 1, y: 2, width: 10001, height: 20002,
+          firstSheet: 1, activeTab: 1, visibility: 'hidden'
+        }
+      ];
+
+      var ws1 = wb.addWorksheet('one');
+      ws1.views = [
+        {
+          workbookViewId: 0,
+          state: 'frozen',
+          xSplit: 2,
+          ySplit: 3,
+          topLeftCell: 'C4',
+          activeCell: 'D5',
+          showRuler: true,
+          showGridlines: true,
+          showRowColHeaders: true,
+          zoomScale: 100,
+          zoomScaleNormal: 100
+        }
+      ];
+
+      var ws2 = wb.addWorksheet('two');
+      ws2.views = [
+        {
+          workbookViewId: 1,
+          state: 'split',
+          xSplit: 2000,
+          ySplit: 3000,
+          topLeftCell: 'C4',
+          activeCell: 'D5',
+          activePane: 'bottomRight',
+          showRuler: true,
+          showGridlines: true,
+          showRowColHeaders: true,
+          zoomScale: 100,
+          zoomScaleNormal: 100
+        }
+      ];
+
+      return wb.xlsx.writeFile('./wb.test.xlsx')
+        .then(function () {
+          var wb2 = new Excel.Workbook();
+          return wb2.xlsx.readFile('./wb.test.xlsx');
+        })
+        .then(function (wb2) {
+          expect(wb2.views).to.deep.equal(wb.views);
+
+          var ws1b = wb2.getWorksheet('one');
+          expect(ws1b.views).to.deep.equal(ws1.views);
+
+          var ws2b = wb2.getWorksheet('two');
+          expect(ws2b.views).to.deep.equal(ws2.views);
+        });
+    });
   });
 });
diff --git a/spec/testutils.js b/spec/testutils.js
index 02b65aa7a..cb00925f0 100644
--- a/spec/testutils.js
+++ b/spec/testutils.js
@@ -284,6 +284,11 @@ var utils = module.exports = {
 
   createTestBook: function(checkBadAlignments, WorkbookClass, options) {
     var wb = new WorkbookClass(options);
+
+    wb.views = [
+      {x: 1, y: 2, width: 10000, height: 20000, firstSheet: 0, activeTab: 0}
+    ];
+
     var ws = wb.addWorksheet('blort', {
       properties: {
         outlineLevelCol: 1,
@@ -382,7 +387,7 @@ var utils = module.exports = {
 
   checkTestBook: function(wb, docType, useStyles) {
     var sheetName;
-    var checkFormulas, checkMerges, checkStyles, checkBadAlignments, checkSheetProperties;
+    var checkFormulas, checkMerges, checkStyles, checkBadAlignments, checkSheetProperties, checkViews;
     var dateAccuracy;
     switch(docType) {
       case 'xlsx':
@@ -393,6 +398,7 @@ var utils = module.exports = {
         checkBadAlignments = useStyles;
         checkSheetProperties = true;
         dateAccuracy = 3;
+        checkViews = true;
         break;
       case 'model':
         sheetName = 'blort';
@@ -402,6 +408,7 @@ var utils = module.exports = {
         checkSheetProperties = true;
         checkBadAlignments = false;
         dateAccuracy = 3;
+        checkViews = true;
         break;
       case 'csv':
         sheetName = 'sheet1';
@@ -411,11 +418,16 @@ var utils = module.exports = {
         checkBadAlignments = false;
         checkSheetProperties = false;
         dateAccuracy = 1000;
+        checkViews = false;
         break;
     }
 
     expect(wb).to.not.be.undefined;
 
+    if (checkViews) {
+      expect(wb.views).to.deep.equal([{x: 1, y: 2, width: 10000, height: 20000, firstSheet: 0, activeTab: 0, visibility: 'visible'}]);
+    }
+    
     var ws = wb.getWorksheet(sheetName);
     expect(ws).to.not.be.undefined;
 
diff --git a/spec/unit/xlsx/xform/book/data/book.1.3.json b/spec/unit/xlsx/xform/book/data/book.1.3.json
index 5abe14fb9..22d6b84e7 100644
--- a/spec/unit/xlsx/xform/book/data/book.1.3.json
+++ b/spec/unit/xlsx/xform/book/data/book.1.3.json
@@ -1,6 +1,6 @@
 {
   "views": [
-    {"visibility": "hidden", "x": 0, "y": 0, "width": 12000, "height": 24000, "active": false}
+    {"visibility": "hidden", "x": 0, "y": 0, "width": 12000, "height": 24000}
   ],
   "sheets": [
     {"name": "Values", "id": 1, "rId": "rId1"}
diff --git a/spec/unit/xlsx/xform/book/workbook-view-xform.spec.js b/spec/unit/xlsx/xform/book/workbook-view-xform.spec.js
index 3b5be9231..55df17555 100644
--- a/spec/unit/xlsx/xform/book/workbook-view-xform.spec.js
+++ b/spec/unit/xlsx/xform/book/workbook-view-xform.spec.js
@@ -9,7 +9,7 @@ var expectations = [
     create:  function() { return new WorkbookViewXform()},
     preparedModel: {},
     xml:  '<workbookView xWindow="0" yWindow="0" windowWidth="12000" windowHeight="24000"/>',
-    parsedModel: {x: 0, y: 0, width: 12000, height: 24000, active: false, visibility: 'visible'},
+    parsedModel: {x: 0, y: 0, width: 12000, height: 24000, visibility: 'visible'},
     tests: ['render', 'renderIn', 'parse']
   },
   {
@@ -17,15 +17,15 @@ var expectations = [
     create:  function() { return new WorkbookViewXform()},
     preparedModel: {visibility: 'hidden'},
     xml:  '<workbookView visibility="hidden" xWindow="0" yWindow="0" windowWidth="12000" windowHeight="24000"/>',
-    parsedModel: {visibility: 'hidden', x: 0, y: 0, width: 12000, height: 24000, active: false},
+    parsedModel: {visibility: 'hidden', x: 0, y: 0, width: 12000, height: 24000},
     tests: ['render', 'renderIn', 'parse']
   },
   {
-    title: 'Active',
+    title: 'Active Tab & First Sheet',
     create:  function() { return new WorkbookViewXform()},
-    preparedModel: {active: true},
-    xml:  '<workbookView xWindow="0" yWindow="0" windowWidth="12000" windowHeight="24000" activeTab="1"/>',
-    parsedModel: {visibility: 'visible', x: 0, y: 0, width: 12000, height: 24000, active: true},
+    preparedModel: {activeTab: 2, firstSheet: 3},
+    xml:  '<workbookView xWindow="0" yWindow="0" windowWidth="12000" windowHeight="24000" activeTab="2" firstSheet="3"/>',
+    parsedModel: {visibility: 'visible', x: 0, y: 0, width: 12000, height: 24000, activeTab: 2, firstSheet: 3},
     tests: ['render', 'renderIn', 'parse']
   }
 ];
diff --git a/spec/unit/xlsx/xform/sheet/data/sheet.1.2.xml b/spec/unit/xlsx/xform/sheet/data/sheet.1.2.xml
index fe662f502..01bd830ac 100644
--- a/spec/unit/xlsx/xform/sheet/data/sheet.1.2.xml
+++ b/spec/unit/xlsx/xform/sheet/data/sheet.1.2.xml
@@ -2,7 +2,7 @@
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">
     <dimension ref="A1:B6"/>
     <sheetViews>
-        <sheetView workbookViewId="0" tabSelected="1"/>
+        <sheetView workbookViewId="0"/>
     </sheetViews>
     <sheetFormatPr defaultRowHeight="15" x14ac:dyDescent="0.25"/>
     <cols>
diff --git a/spec/unit/xlsx/xform/sheet/data/sheet.2.0.json b/spec/unit/xlsx/xform/sheet/data/sheet.2.0.json
index 36245aecc..34192d828 100644
--- a/spec/unit/xlsx/xform/sheet/data/sheet.2.0.json
+++ b/spec/unit/xlsx/xform/sheet/data/sheet.2.0.json
@@ -1,7 +1,7 @@
 {
   "dimensions": "A1:C7",
   "properties": {"defaultRowHeight": 14.4, "dyDescent": 0.55, "outlineLevelRow": 2},
-  "views": [{"state": "normal", "workbookViewId": 0}],
+  "views": [{"state": "normal", "workbookViewId": 0, "tabSelected": true}],
   "rows": [
     {
       "number": 1, "min": 1, "max": 3,
diff --git a/spec/unit/xlsx/xform/sheet/data/sheet.2.1.json b/spec/unit/xlsx/xform/sheet/data/sheet.2.1.json
index eb19a88ae..eac2fd353 100644
--- a/spec/unit/xlsx/xform/sheet/data/sheet.2.1.json
+++ b/spec/unit/xlsx/xform/sheet/data/sheet.2.1.json
@@ -1,7 +1,7 @@
 {
   "dimensions": "A1:C7",
   "properties": {"defaultRowHeight": 14.4, "dyDescent": 0.55, "outlineLevelRow": 2},
-  "views": [{"state": "normal", "workbookViewId": 0}],
+  "views": [{"state": "normal", "workbookViewId": 0, "tabSelected": true}],
   "rows": [
     {
       "number": 1, "min": 1, "max": 3,
diff --git a/spec/unit/xlsx/xform/sheet/sheet-view-xform.spec.js b/spec/unit/xlsx/xform/sheet/sheet-view-xform.spec.js
index 50f958524..d1cf2fd8c 100644
--- a/spec/unit/xlsx/xform/sheet/sheet-view-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/sheet-view-xform.spec.js
@@ -10,7 +10,7 @@ var expectations = [
     title: 'Normal',
     create:  function() { return new SheetViewXform()},
     preparedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4'},
-    xml:  '<sheetView tabSelected="1" workbookViewId="0">' +
+    xml:  '<sheetView workbookViewId="0">' +
             '<selection activeCell="G4" sqref="G4"/>' +
           '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100},
@@ -20,7 +20,7 @@ var expectations = [
     title: 'Normal Zoom',
     create:  function() { return new SheetViewXform()},
     preparedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', zoomScale: 60, zoomScaleNormal: 80},
-    xml:  '<sheetView tabSelected="1" workbookViewId="0" zoomScale="60" zoomScaleNormal="80">' +
+    xml:  '<sheetView workbookViewId="0" zoomScale="60" zoomScaleNormal="80">' +
             '<selection activeCell="G4" sqref="G4"/>' +
           '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 60, zoomScaleNormal: 80},
@@ -30,7 +30,7 @@ var expectations = [
     title: 'Normal unruly noliney nohdr',
     create:  function() { return new SheetViewXform()},
     preparedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: false, showGridlines: false, showRowColHeaders: false},
-    xml:  '<sheetView tabSelected="1" workbookViewId="0" showRuler="0" showGridlines="0" showRowColHeaders="0">' +
+    xml:  '<sheetView workbookViewId="0" showRuler="0" showGridlines="0" showRowColHeaders="0">' +
             '<selection activeCell="G4" sqref="G4"/>' +
           '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: false, showGridlines: false, showRowColHeaders: false, zoomScale: 100, zoomScaleNormal: 100},
@@ -40,7 +40,7 @@ var expectations = [
     title: 'Page Break Preview',
     create:  function() { return new SheetViewXform()},
     preparedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', style: 'pageBreakPreview'},
-    xml:  '<sheetView tabSelected="1" workbookViewId="0" view="pageBreakPreview">' +
+    xml:  '<sheetView workbookViewId="0" view="pageBreakPreview">' +
             '<selection activeCell="G4" sqref="G4"/>' +
           '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100, style: 'pageBreakPreview'},
@@ -50,7 +50,7 @@ var expectations = [
     title: 'Split',
     create:  function() { return new SheetViewXform()},
     preparedModel: {workbookViewId: 0, state: 'split', xSplit: 1234, ySplit: 3456, topLeftCell: 'C3', activeCell: 'B1', activePane: 'bottomRight'},
-    xml:  '<sheetView tabSelected="1" workbookViewId="0">' +
+    xml:  '<sheetView workbookViewId="0">' +
             '<pane xSplit="1234" ySplit="3456" topLeftCell="C3" activePane="bottomRight"/>' +
             '<selection pane="bottomRight" activeCell="B1" sqref="B1"/>' +
           '</sheetView>',
@@ -61,7 +61,7 @@ var expectations = [
     title: 'Split Top Left',
     create:  function() { return new SheetViewXform()},
     preparedModel: {workbookViewId: 0, state: 'split', xSplit: 1234, ySplit: 3456, topLeftCell: 'C3', activeCell: 'A1', activePane: 'topLeft'},
-    xml:  '<sheetView tabSelected="1" workbookViewId="0">' +
+    xml:  '<sheetView workbookViewId="0">' +
             '<pane xSplit="1234" ySplit="3456" topLeftCell="C3"/>' +
             '<selection activeCell="A1" sqref="A1"/>' +
           '</sheetView>',
@@ -72,20 +72,13 @@ var expectations = [
     title: 'Frozen',
     create:  function() { return new SheetViewXform()},
     preparedModel: {workbookViewId: 0, state: 'frozen', xSplit: 2, ySplit: 3, topLeftCell: 'C4', activeCell: 'D5'},
-    xml:  '<sheetView tabSelected="1" workbookViewId="0">' +
+    xml:  '<sheetView workbookViewId="0">' +
             '<pane xSplit="2" ySplit="3" topLeftCell="C4" activePane="bottomRight" state="frozen"/>' +
             '<selection pane="bottomRight" activeCell="D5" sqref="D5"/>' +
           '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'frozen', xSplit: 2, ySplit: 3, topLeftCell: 'C4', activeCell: 'D5', showRuler: true, showGridlines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100},
     tests: ['render', 'renderIn', 'parse']
   },
-  {
-    title: 'Undefined',
-    create:  function() { return new SheetViewXform()},
-    xml:  '<sheetView workbookViewId="0" />',
-    parsedModel: undefined,
-    tests: ['parse']
-  },
   {
     title: 'List',
     create:  function() { return new ListXform({tag: 'sheetViews', count: false, childXform: new SheetViewXform()}) },
@@ -94,10 +87,10 @@ var expectations = [
       {workbookViewId: 1, state: 'frozen', xSplit: 2, ySplit: 3, topLeftCell: 'C4', activeCell: 'D5'}
     ],
     xml:  '<sheetViews>' +
-            '<sheetView tabSelected="1" workbookViewId="0">' +
+            '<sheetView workbookViewId="0">' +
               '<selection activeCell="G4" sqref="G4"/>' +
             '</sheetView>' +
-            '<sheetView tabSelected="1" workbookViewId="1">' +
+            '<sheetView workbookViewId="1">' +
               '<pane xSplit="2" ySplit="3" topLeftCell="C4" activePane="bottomRight" state="frozen"/>' +
               '<selection pane="bottomRight" activeCell="D5" sqref="D5"/>' +
             '</sheetView>'  +