feat(annotations): Enable annotations for non-spreadsheet iWork files (…

…#1227)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

src/lib/extensions.js

@@ -48,16 +48,14 @@ export const CODE_EXTENSIONS = [
     'yaml',
 ];
 
-// Should not include 'xlsb' cause xlsb conversion to pdf is not supported
+// Should not include 'xlsb', since xlsb conversion to pdf is not supported
 // However, office viewer supports xlsb, xlsm, and xlsx (new formats), but not xls (old)
 export const EXCEL_EXTENSIONS = ['xls', 'xlsm', 'xlsx'];
-
-export const IWORK_EXTENSIONS = ['pages', 'numbers', 'key'];
+export const EXCLUDED_EXTENSIONS = EXCEL_EXTENSIONS.concat(['numbers']);
 
 export const DOCUMENT_EXTENSIONS = CODE_EXTENSIONS.concat(NON_CODE_EXTENSIONS)
     .concat(HTML_EXTENSIONS)
     .concat(EXCEL_EXTENSIONS)
-    .concat(IWORK_EXTENSIONS)
     .concat([
         'doc',
         'docx',
@@ -66,10 +64,13 @@ export const DOCUMENT_EXTENSIONS = CODE_EXTENSIONS.concat(NON_CODE_EXTENSIONS)
         'gsheet',
         'gslide',
         'gslides',
+        'key',
         'msg',
+        'numbers',
         'odp',
         'ods',
         'odt',
+        'pages',
         'pdf',
         'ppt',
         'pptx',

src/lib/viewers/BaseViewer.js

@@ -31,9 +31,9 @@ import {
     STATUS_SUCCESS,
     STATUS_VIEWABLE,
 } from '../constants';
+import { EXCLUDED_EXTENSIONS } from '../extensions';
 import { getIconFromExtension, getIconFromName } from '../icons/icons';
 import { VIEWER_EVENT, ERROR_CODE, LOAD_METRIC, DOWNLOAD_REACHABILITY_METRICS } from '../events';
-import { EXCEL_EXTENSIONS, IWORK_EXTENSIONS } from '../extensions';
 import { AnnotationMode } from '../AnnotationControls';
 import PreviewError from '../PreviewError';
 import Timer from '../Timer';
@@ -1151,8 +1151,8 @@ class BaseViewer extends EventEmitter {
             return false;
         }
 
-        // Disable new annotations for Excel and iWork formats
-        if (EXCEL_EXTENSIONS.includes(extension) || IWORK_EXTENSIONS.includes(extension)) {
+        // Disable new annotations for spreadsheet formats
+        if (EXCLUDED_EXTENSIONS.includes(extension)) {
             return false;
         }
 

src/lib/viewers/__tests__/BaseViewer-test.js

@@ -9,8 +9,8 @@ import intl from '../../i18n';
 import * as util from '../../util';
 import * as icons from '../../icons/icons';
 import * as constants from '../../constants';
+import { EXCLUDED_EXTENSIONS } from '../../extensions';
 import { VIEWER_EVENT, LOAD_METRIC, ERROR_CODE } from '../../events';
-import { EXCEL_EXTENSIONS, IWORK_EXTENSIONS } from '../../extensions';
 import { AnnotationMode } from '../../AnnotationControls';
 import Timer from '../../Timer';
 import Api from '../../api';
@@ -1463,7 +1463,7 @@ describe('lib/viewers/BaseViewer', () => {
             expect(base.areNewAnnotationsEnabled()).to.be.false;
         });
 
-        EXCEL_EXTENSIONS.concat(IWORK_EXTENSIONS).forEach(extension => {
+        EXCLUDED_EXTENSIONS.forEach(extension => {
             it(`should return false if the file is ${extension} format`, () => {
                 base.options.file.extension = extension;
                 base.options.showAnnotationsControls = true;