office-viewer 0.3.5 → 0.3.7

package/esm/common/autoParse.js

@@ -2,11 +2,17 @@ import { __values } from 'tslib';
 import { ANY_KEY } from '../openxml/Attributes.js';
 import { normalizeBoolean } from '../OpenXML.js';
 
+var replaceCache = new Map();
 /**
  * 目前不支持这两种 name space
  */
 function removeNamespace(tag) {
-    return tag.replace('a:', '').replace('xdr:', '').replace('c:', '');
+    if (replaceCache.has(tag)) {
+        return replaceCache.get(tag);
+    }
+    var result = tag.replace('a:', '').replace('xdr:', '').replace('c:', '');
+    replaceCache.set(tag, result);
+    return result;
 }
 /**
  * 通用属性解析

package/esm/excel/edit/ui/CellEditor.d.ts

@@ -18,6 +18,7 @@ export declare class CellEditor {
     sheet: Sheet;
     row: number;
     col: number;
+    removeOnClickOutside: () => void;
     constructor(dataContainer: HTMLElement, workbook: Workbook, hitTest: HitTestResult);
     handleInput(value: string): void;
     /**

package/esm/excel/edit/ui/CellEditor.js

@@ -1,7 +1,8 @@
-import { onClickOutside } from '../../../util/onClickOutside.js';
+import { onClickOutsideOnce } from '../../../util/onClickOutsideOnce.js';
 import { Input } from '../../render/ui/Input.js';
 import { updateValue } from '../../types/worksheet/CellData.js';
 
+var lastCellEditor;
 /**
  * 单元格编辑
  */
@@ -9,6 +10,9 @@ var CellEditor = /** @class */ (function () {
     function CellEditor(dataContainer, workbook, hitTest) {
         var _this = this;
         var _a, _b;
+        if (lastCellEditor) {
+            lastCellEditor.close();
+        }
         this.workbook = workbook;
         this.editorContainer = document.createElement('div');
         this.editorContainer.className = 'excel-cell-editor';
@@ -29,17 +33,26 @@ var CellEditor = /** @class */ (function () {
         height = height - padding * 2;
         this.initValue = cellInfo.value;
         this.value = cellInfo.value;
-        var input = new Input(this.editorContainer, '', cellInfo.value, function (value) {
-            _this.handleInput(value);
-        }, 'borderLess');
+        var input = new Input({
+            container: this.editorContainer,
+            value: cellInfo.value,
+            onChange: function (value) {
+                _this.handleInput(value);
+            },
+            onEnter: function (value) {
+                _this.close();
+            },
+            style: 'borderLess'
+        });
         input.force();
         this.editorContainer.style.left = "".concat(x, "px");
         this.editorContainer.style.top = "".concat(y, "px");
         this.editorContainer.style.width = "".concat(width, "px");
         this.editorContainer.style.height = "".concat(height, "px");
-        onClickOutside(this.editorContainer, function () {
+        onClickOutsideOnce(this.editorContainer, function () {
             _this.close();
         });
+        lastCellEditor = this;
     }
     CellEditor.prototype.handleInput = function (value) {
         this.value = value;

package/esm/excel/io/excel/util/Range.d.ts

@@ -1,7 +1,7 @@
 /**
  * 处理选区相关的工具函数
  */
-import { ViewRange } from 'src/excel/sheet/ViewRange';
+import { ViewRange } from '../../../sheet/ViewRange';
 import { RangeRef } from '../../../types/RangeRef';
 /**
  * 解析选区字符串，比如 A1:B2

package/esm/excel/render/autoFilter/AutoFilterIconUI.d.ts

@@ -19,6 +19,7 @@ export declare class AutoFilterIconUI {
     rangeRef: RangeRef;
     colIndex: number;
     autoFilter: CT_AutoFilter;
+    removeClickOutsideEvent: () => void;
     constructor(sheet: Sheet, dataContainer: HTMLElement, autoFilter: CT_AutoFilter, rangeRef: RangeRef, colIndex: number, fid: string, headerRowCount?: number);
     /**
      * 更新过滤图标
@@ -30,4 +31,5 @@ export declare class AutoFilterIconUI {
     showMenu(): void;
     hideMenu(): void;
     hide(): void;
+    destroy(): void;
 }

package/esm/excel/render/autoFilter/AutoFilterIconUI.js

@@ -29,7 +29,7 @@ var AutoFilterIconUI = /** @class */ (function () {
         this.filterIcon = filterIcon;
         this.filterMenu = new AutoFilterMenuUI(this, filterIconContainer, sheet, autoFilter, rangeRef, colIndex, headerRowCount);
         filterIcon.addEventListener('click', this.handleClick.bind(this));
-        onClickOutside(filterIconContainer, function () {
+        this.removeClickOutsideEvent = onClickOutside(filterIconContainer, function () {
             _this.hideMenu();
         });
     }
@@ -79,6 +79,10 @@ var AutoFilterIconUI = /** @class */ (function () {
     AutoFilterIconUI.prototype.hide = function () {
         this.filterIconContainer.style.display = 'none';
     };
+    AutoFilterIconUI.prototype.destroy = function () {
+        this.filterIconContainer.remove();
+        this.removeClickOutsideEvent();
+    };
     return AutoFilterIconUI;
 }());
 

package/esm/excel/render/autoFilter/filterColumn/CustomFiltersUI.js

@@ -116,9 +116,15 @@ var CustomFiltersUI = /** @class */ (function () {
         var select = new Select(customFilterItemInput, this.operatorOptions, toOperatorUI(operator, value), function () {
             _this.syncCustomFilters();
         });
-        var input = new Input(customFilterItemInput, '', value, function () {
-            _this.syncCustomFilters();
-        }, 'normal', this.texts);
+        var input = new Input({
+            container: customFilterItemInput,
+            value: value,
+            onChange: function () {
+                _this.syncCustomFilters();
+            },
+            style: 'normal',
+            options: this.texts
+        });
         this.customFilterItems.push({ input: input, select: select });
     };
     /**

package/esm/excel/render/cell/drawCells.js

@@ -16,7 +16,7 @@ function drawCells(excelRender, currentSheet, excelRenderOptions, canvas, displa
             }
             var cellInfo = currentSheet.getCellInfo(row, col);
             if (cellInfo) {
-                cellInfoMap.set("".concat(row, ",").concat(col), __assign(__assign({}, cellInfo), { width: width, height: height }));
+                cellInfoMap.set("".concat(row, ",").concat(col), __assign(__assign({}, JSON.parse(JSON.stringify(cellInfo))), { width: width, height: height }));
             }
         }
     }

package/esm/excel/render/cell/frozen/drawFrozen.d.ts

@@ -1,10 +1,10 @@
 import { ExcelRenderOptions } from '../../../sheet/ExcelRenderOptions';
 import { Sheet } from '../../../sheet/Sheet';
 import { SheetCanvas } from '../../SheetCanvas';
-import { ViewRange } from 'src/excel/sheet/ViewRange';
 import { IDataProvider } from '../../../types/IDataProvider';
 import { LinkPosition } from '../LinkPosition';
 import { ExcelRender } from '../../ExcelRender';
+import { ViewRange } from '../../../sheet/ViewRange';
 export type FrozenViewRange = {
     topViewRange: ViewRange | null;
     leftViewRange: ViewRange | null;

package/esm/excel/render/cell/frozen/getFrozenLeftViewPointRange.d.ts

@@ -1,5 +1,5 @@
+import { ViewRange } from '../../../sheet/ViewRange';
 import { IndexInfo } from '../../../sheet/getViewRange';
-import { ViewRange } from 'src/excel/sheet/ViewRange';
 /**
  * 获取左边冻结的范围
  * @param xSplit

package/esm/excel/render/cell/frozen/getFrozenTopLeftViewPointRange.d.ts

@@ -1,4 +1,4 @@
-import { ViewRange } from 'src/excel/sheet/ViewRange';
+import { ViewRange } from '../../../sheet/ViewRange';
 /**
  * 获取左上角冻结区域的访问
  */

package/esm/excel/render/cell/frozen/getFrozenTopViewPointRange.d.ts

@@ -1,5 +1,5 @@
+import { ViewRange } from '../../../sheet/ViewRange';
 import { HiddenRange, IndexInfo } from '../../../sheet/getViewRange';
-import { ViewRange } from 'src/excel/sheet/ViewRange';
 /**
  * 获取顶部冻结的范围
  * @param ySplit

package/esm/excel/render/dnd/DragState.d.ts

@@ -1,5 +1,5 @@
 import type { Workbook } from '../../Workbook';
-import { Region } from 'src/excel/sheet/ViewRange';
+import { Region } from '../../sheet/ViewRange';
 import { SheetSelection } from '../selection/SheetSelection';
 import { HitTestResult } from '../selection/hitTest';
 export interface DragState {

package/esm/excel/render/drawing/drawDrawing.d.ts

@@ -1,7 +1,7 @@
 import { Sheet } from '../../sheet/Sheet';
 import { SheetCanvas } from '../SheetCanvas';
-import { ViewRange } from 'src/excel/sheet/ViewRange';
 import { ExcelRender } from '../ExcelRender';
+import { ViewRange } from '../../sheet/ViewRange';
 /**
  * 绘制 sheet 里的图片及文本框
  */

package/esm/excel/render/drawing/findPositionInViewRange.d.ts

@@ -1,5 +1,5 @@
 import { Sheet } from '../../sheet/Sheet';
-import { ViewRange } from 'src/excel/sheet/ViewRange';
+import { ViewRange } from '../../sheet/ViewRange';
 import { Rect } from '../Rect';
 /**
  * 在 viewRange 中找到 row 和 col 的位置

package/esm/excel/render/drawing/getRectFromAnchorPoint.d.ts

@@ -1,6 +1,6 @@
 import { CT_Marker } from '../../../openxml/ExcelTypes';
 import { Sheet } from '../../sheet/Sheet';
-import { ViewRange } from 'src/excel/sheet/ViewRange';
+import { ViewRange } from '../../sheet/ViewRange';
 export declare function getRectFromOneAnchorPoint(currentSheet: Sheet, cell: CT_Marker, viewRange: ViewRange): {
     x: number;
     y: number;

package/esm/excel/render/formulaBar/FormulaBar.js

@@ -35,9 +35,13 @@ var FormulaBar = /** @class */ (function () {
             parent: this.dom
         });
         this.textBox = textBox;
-        var textInput = new Input(textBox, '', '', function (value) {
-            _this.changeCellValue(value);
-        }, 'borderLess');
+        var textInput = new Input({
+            container: textBox,
+            onChange: function (value) {
+                _this.changeCellValue(value);
+            },
+            style: 'borderLess'
+        });
         this.textInput = textInput;
     };
     FormulaBar.prototype.getActiveCell = function () {

package/esm/excel/render/grid/drawGridLines.d.ts

@@ -1,6 +1,6 @@
 import { GridLineOptions } from '../../sheet/ExcelRenderOptions';
 import { Sheet } from '../../sheet/Sheet';
-import { ViewRange } from 'src/excel/sheet/ViewRange';
+import { ViewRange } from '../../sheet/ViewRange';
 import { SheetCanvas, Line } from '../SheetCanvas';
 /**
  * 生成网格线

package/esm/excel/render/header/drawRowColHeaders.d.ts

@@ -1,6 +1,6 @@
 import { ExcelRenderOptions } from '../../sheet/ExcelRenderOptions';
 import { Sheet } from '../../sheet/Sheet';
-import { ViewRange } from 'src/excel/sheet/ViewRange';
+import { ViewRange } from '../../sheet/ViewRange';
 import { FontSize } from '../../types/FontSize';
 import { FontStyle } from '../../types/FontStyle';
 import { SheetCanvas } from '../SheetCanvas';

package/esm/excel/render/header/drawRowColHeaders.js

@@ -7,6 +7,9 @@ import { genFontStr } from '../cell/genFontStr.js';
  */
 function drawRowColHeaders(currentSheet, viewRange, sheetCanvas, renderOptions, defaultFontSize, defaultFontStyle) {
     var e_1, _a, e_2, _b;
+    if (currentSheet.showRowColHeaders() === false) {
+        return;
+    }
     var rows = viewRange.rows, startRowOffset = viewRange.startRowOffset, height = viewRange.height, width = viewRange.width, cols = viewRange.cols, startColOffset = viewRange.startColOffset;
     var _c = currentSheet.getRowColSize(), rowHeaderWidth = _c.rowHeaderWidth, colHeaderHeight = _c.colHeaderHeight;
     var gridLineColor = renderOptions.gridLineColor, rowColHeadersBgColor = renderOptions.rowColHeadersBackgroundColor, hiddenRowColHeadersLineColor = renderOptions.hiddenRowColHeadersLineColor;

package/esm/excel/render/selection/SheetSelection.d.ts

@@ -1,4 +1,4 @@
-import { Region } from 'src/excel/sheet/ViewRange';
+import { Region } from '../../sheet/ViewRange';
 import { RangeRef } from '../../types/RangeRef';
 import { HitTestResult } from './hitTest';
 /**

package/esm/excel/render/selection/binarySearchSize.d.ts

@@ -1,4 +1,4 @@
-import { Size } from 'src/excel/sheet/ViewRange';
+import { Size } from '../../sheet/ViewRange';
 /**
  * 二分查找到到 hitTest 的位置
  * @param sizes 位置信息

package/esm/excel/render/selection/findCell.d.ts

@@ -1,4 +1,4 @@
-import { Region, ViewRange } from 'src/excel/sheet/ViewRange';
+import { Region, ViewRange } from '../../sheet/ViewRange';
 import { RangeRef } from '../../types/RangeRef';
 import { HitTestResult } from './hitTest';
 /**

package/esm/excel/render/selection/findInViewRange.d.ts

@@ -1,4 +1,4 @@
-import { ViewRange } from 'src/excel/sheet/ViewRange';
+import { ViewRange } from '../../sheet/ViewRange';
 /**
  * 在视图范围内查找
  */

package/esm/excel/render/selection/findInViewRangeX.d.ts

@@ -1,4 +1,4 @@
-import { ViewRange } from 'src/excel/sheet/ViewRange';
+import { ViewRange } from '../../sheet/ViewRange';
 /**
  * 在视图范围水平方向内查找
  */

package/esm/excel/render/selection/findInViewRangeY.d.ts

@@ -1,4 +1,4 @@
-import { ViewRange } from 'src/excel/sheet/ViewRange';
+import { ViewRange } from '../../sheet/ViewRange';
 /**
  * 在视图范围垂直方向内查找
  */

package/esm/excel/render/selection/getCellPosition.d.ts

@@ -1,9 +1,9 @@
 /**
  * 获取单元格的位置信息
  */
-import { Region } from 'src/excel/sheet/ViewRange';
 import { Position } from './Position';
 import { Sheet } from '../../sheet/Sheet';
+import { Region } from '../../sheet/ViewRange';
 /**
  * 获取单元格的行位置
  */

package/esm/excel/render/selection/getRangePosition.d.ts

@@ -1,5 +1,5 @@
 import { Workbook } from '../../Workbook';
-import { Region } from 'src/excel/sheet/ViewRange';
+import { Region } from '../../sheet/ViewRange';
 import { RangeRef } from '../../types/RangeRef';
 /**
  * 算出选中区域的位置信息

package/esm/excel/render/selection/hitTest.d.ts

@@ -1,8 +1,8 @@
-import { Region, ViewRange } from 'src/excel/sheet/ViewRange';
 import { RangeRef } from '../../types/RangeRef';
 import { FrozenViewRange } from '../cell/frozen/drawFrozen';
 import { Position } from './Position';
 import { IAbsoluteAnchor, IOneCellAnchor, ITwoCellAnchor } from '../../types/IDrawing';
+import { Region, ViewRange } from '../../sheet/ViewRange';
 export type HitTestCommon = Position & RangeRef;
 /**
  * 点击到表头的最左上角

package/esm/excel/render/selection/hitTestInRange.d.ts

@@ -1,4 +1,4 @@
-import { Region, ViewRange } from 'src/excel/sheet/ViewRange';
+import { Region, ViewRange } from '../../sheet/ViewRange';
 import { RangeRef } from '../../types/RangeRef';
 import { HitTestResult } from './hitTest';
 /**

package/esm/excel/render/sparkline/drawSparkline.d.ts

@@ -2,6 +2,6 @@
  * 绘制 sparkline
  */
 import { Sheet } from '../../sheet/Sheet';
-import { ViewRange } from 'src/excel/sheet/ViewRange';
 import { SheetCanvas } from '../SheetCanvas';
+import { ViewRange } from '../../sheet/ViewRange';
 export declare function drawSparkline(currentSheet: Sheet, viewRange: ViewRange, canvas: SheetCanvas): void;

package/esm/excel/render/ui/CheckBoxList.js

@@ -17,8 +17,12 @@ var CheckBoxList = /** @class */ (function () {
             className: 'excel-checkbox-list-wrapper',
             parent: container
         });
-        var searchInput = new Input(wrapper, searchPlaceholder, '', function (text) {
-            _this.handleSearch(text);
+        var searchInput = new Input({
+            container: wrapper,
+            placeholder: searchPlaceholder,
+            onChange: function (text) {
+                _this.handleSearch(text);
+            }
         });
         this.searchInput = searchInput;
         var listContainer = H('div', {

package/esm/excel/render/ui/Input.d.ts

@@ -3,7 +3,15 @@
  */
 export declare class Input {
     input: HTMLInputElement;
-    constructor(container: HTMLElement, placeholder: string, value: string, onChange: (value: string) => void, style?: 'normal' | 'borderLess', options?: string[]);
+    constructor(args: {
+        container: HTMLElement;
+        placeholder?: string;
+        value?: string;
+        onChange: (value: string) => void;
+        onEnter?: (value: string) => void;
+        style?: 'normal' | 'borderLess';
+        options?: string[];
+    });
     getElement(): HTMLInputElement;
     getValue(): string;
     setValue(text: string): void;

package/esm/excel/render/ui/Input.js

@@ -3,26 +3,30 @@
  */
 var inputId = 0;
 var Input = /** @class */ (function () {
-    function Input(container, placeholder, value, onChange, style, options) {
-        if (style === void 0) { style = 'normal'; }
-        if (options === void 0) { options = []; }
+    function Input(args) {
         var _this = this;
         this.input = document.createElement('input');
-        this.input.value = value;
-        this.input.placeholder = placeholder;
-        container.appendChild(this.input);
+        this.input.value = args.value || '';
+        this.input.placeholder = args.placeholder || '';
+        args.container.appendChild(this.input);
         this.input.className = 'excel-input';
-        if (style === 'borderLess') {
+        if (args.style === 'borderLess') {
             this.input.classList.add('excel-input-border-less');
         }
         this.input.oninput = function () {
-            onChange(_this.input.value);
+            args.onChange(_this.input.value);
         };
-        if (options.length) {
+        this.input.onkeydown = function (e) {
+            var _a;
+            if (e.key === 'Enter') {
+                (_a = args.onEnter) === null || _a === void 0 ? void 0 : _a.call(args, _this.input.value);
+            }
+        };
+        if (args.options && args.options.length) {
             var datalist_1 = document.createElement('datalist');
             datalist_1.id = "".concat(inputId++, "-list");
-            container.appendChild(datalist_1);
-            options.forEach(function (option) {
+            args.container.appendChild(datalist_1);
+            args.options.forEach(function (option) {
                 var optionElement = document.createElement('option');
                 optionElement.value = option;
                 datalist_1.appendChild(optionElement);

package/esm/excel/types/X14Sparkline/X14SparklineGroup.d.ts

@@ -3,7 +3,7 @@
  */
 import { Attributes } from '../../../openxml/Attributes';
 import { CT_Color } from '../CT_Color';
-import { X14Sparklines } from './x14:sparklines';
+import { X14Sparklines } from './x14Sparklines';
 export type ST_SparklineAxisMinMax = 'individual' | 'groupMax' | 'group';
 export type X14SparklineGroup = {
     'displayEmptyCellsAs'?: 'gap' | 'zero' | 'span';

package/esm/excel/types/X14Sparkline/X14SparklineGroup.js

@@ -1,5 +1,5 @@
 import { CT_Color_Attributes } from '../CT_Color.js';
-import { X14Sparklines_Attributes } from './x14_sparklines.js';
+import { X14Sparklines_Attributes } from './x14Sparklines.js';
 
 /**
  * 目前先简单实现，后面再改成自动解析

package/esm/excel/types/worksheet/CellData.js

@@ -29,6 +29,16 @@ function updateValue(value, cellData) {
     if (typeof cellData === 'string') {
         return value;
     }
+    if ('type' in cellData && cellData.type === 'blank') {
+        if (cellData.s !== undefined) {
+            return {
+                type: 'style',
+                value: value,
+                s: cellData.s
+            };
+        }
+        return value;
+    }
     if ('value' in cellData) {
         return __assign(__assign({}, cellData), { value: value });
     }

package/esm/util/__tests__/replaceVar.test.d.ts

@@ -1,2 +1,2 @@
-import Word from '../../Word';
+import { Word } from '../../index';
 export declare function createWord(fileName: string, data: any): Word;

package/esm/util/__tests__/xmlToNode.test.d.ts

@@ -0,0 +1 @@
+export {};

package/esm/util/onClickOutside.d.ts

@@ -1,4 +1,4 @@
 /**
- * 点击元素外部时触发回调
+ * 点击元素外部时触发回调，用于一直存在的对象，需要手动调用删除监听器
  */
-export declare function onClickOutside(element: HTMLElement, onClickOutside: () => void): void;
+export declare function onClickOutside(element: HTMLElement, onClickOutside: () => void): () => void;

package/esm/util/onClickOutside.js

@@ -1,5 +1,5 @@
 /**
- * 点击元素外部时触发回调
+ * 点击元素外部时触发回调，用于一直存在的对象，需要手动调用删除监听器
  */
 function onClickOutside(element, onClickOutside) {
     var outsideClickListener = function (event) {
@@ -8,6 +8,9 @@ function onClickOutside(element, onClickOutside) {
         }
     };
     document.addEventListener('mousedown', outsideClickListener);
+    return function () {
+        document.removeEventListener('mousedown', outsideClickListener);
+    };
 }
 
 export { onClickOutside };

package/esm/util/onClickOutsideOnce.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 点击元素外部时触发回调，只触发一次，用于临时对象
+ */
+export declare function onClickOutsideOnce(element: HTMLElement, onClickOutside: () => void): void;

package/esm/util/onClickOutsideOnce.js

@@ -0,0 +1,14 @@
+/**
+ * 点击元素外部时触发回调，只触发一次，用于临时对象
+ */
+function onClickOutsideOnce(element, onClickOutside) {
+    var outsideClickListener = function (event) {
+        if (event.target instanceof Node && !element.contains(event.target)) {
+            onClickOutside();
+            document.removeEventListener('mousedown', outsideClickListener);
+        }
+    };
+    document.addEventListener('mousedown', outsideClickListener);
+}
+
+export { onClickOutsideOnce };

package/esm/util/xmlToNode.d.ts

@@ -0,0 +1,5 @@
+import { XMLNode } from './xml';
+/**
+ * 简单 XML 解析，目前看和 SaxesParser 比快不了多少，10 万行快了 1 秒，因为实现可能不完全准确，目前先不用
+ */
+export declare function xmlToNode(xml: string): XMLNode;

package/lib/common/autoParse.js

@@ -6,11 +6,17 @@ var tslib = require('tslib');
 var Attributes = require('../openxml/Attributes.js');
 var OpenXML = require('../OpenXML.js');
 
+var replaceCache = new Map();
 /**
  * 目前不支持这两种 name space
  */
 function removeNamespace(tag) {
-    return tag.replace('a:', '').replace('xdr:', '').replace('c:', '');
+    if (replaceCache.has(tag)) {
+        return replaceCache.get(tag);
+    }
+    var result = tag.replace('a:', '').replace('xdr:', '').replace('c:', '');
+    replaceCache.set(tag, result);
+    return result;
 }
 /**
  * 通用属性解析

package/lib/excel/edit/ui/CellEditor.d.ts

@@ -18,6 +18,7 @@ export declare class CellEditor {
     sheet: Sheet;
     row: number;
     col: number;
+    removeOnClickOutside: () => void;
     constructor(dataContainer: HTMLElement, workbook: Workbook, hitTest: HitTestResult);
     handleInput(value: string): void;
     /**

package/lib/excel/edit/ui/CellEditor.js

@@ -2,10 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var onClickOutside = require('../../../util/onClickOutside.js');
+var onClickOutsideOnce = require('../../../util/onClickOutsideOnce.js');
 var Input = require('../../render/ui/Input.js');
 var CellData = require('../../types/worksheet/CellData.js');
 
+var lastCellEditor;
 /**
  * 单元格编辑
  */
@@ -13,6 +14,9 @@ var CellEditor = /** @class */ (function () {
     function CellEditor(dataContainer, workbook, hitTest) {
         var _this = this;
         var _a, _b;
+        if (lastCellEditor) {
+            lastCellEditor.close();
+        }
         this.workbook = workbook;
         this.editorContainer = document.createElement('div');
         this.editorContainer.className = 'excel-cell-editor';
@@ -33,17 +37,26 @@ var CellEditor = /** @class */ (function () {
         height = height - padding * 2;
         this.initValue = cellInfo.value;
         this.value = cellInfo.value;
-        var input = new Input.Input(this.editorContainer, '', cellInfo.value, function (value) {
-            _this.handleInput(value);
-        }, 'borderLess');
+        var input = new Input.Input({
+            container: this.editorContainer,
+            value: cellInfo.value,
+            onChange: function (value) {
+                _this.handleInput(value);
+            },
+            onEnter: function (value) {
+                _this.close();
+            },
+            style: 'borderLess'
+        });
         input.force();
         this.editorContainer.style.left = "".concat(x, "px");
         this.editorContainer.style.top = "".concat(y, "px");
         this.editorContainer.style.width = "".concat(width, "px");
         this.editorContainer.style.height = "".concat(height, "px");
-        onClickOutside.onClickOutside(this.editorContainer, function () {
+        onClickOutsideOnce.onClickOutsideOnce(this.editorContainer, function () {
             _this.close();
         });
+        lastCellEditor = this;
     }
     CellEditor.prototype.handleInput = function (value) {
         this.value = value;