lakelib 0.0.5 → 0.0.6

package/lib/lake.js

@@ -1,6 +1,7 @@
 import { Base64 } from 'js-base64';
 import EventEmitter from 'eventemitter3';
 import debounce from 'lodash/debounce';
+import isEqual from 'lodash/isEqual';
 import md5 from 'blueimp-md5';
 import { createKeybindingsHandler } from 'tinykeys';
 import { i18nObject as i18nObject$1 } from 'typesafe-i18n';
@@ -1392,7 +1393,7 @@ class Range {
             throw new Error(`The box cannot be selected because the box '${boxNode.attr('name')}' (id=${boxNode.id}) has not been rendered yet.`);
         }
         this.selectNodeContents(boxStrip.eq(0));
-        this.collapseToEnd();
+        this.collapseToStart();
     }
     // Sets the range to the start position of the box.
     selectBoxEnd(boxNode) {
@@ -1401,7 +1402,7 @@ class Range {
             throw new Error(`The box cannot be selected because the box '${boxNode.attr('name')}' (id=${boxNode.id}) has not been rendered yet.`);
         }
         this.selectNodeContents(boxStrip.eq(1));
-        this.collapseToEnd();
+        this.collapseToStart();
     }
     // Collapses the range and sets the range to the beginning of the contents of the specified node.
     shrinkBefore(node) {
@@ -4294,7 +4295,7 @@ class Dropdown {
     }
 }
 
-var version = "0.0.4";
+var version = "0.0.6";
 
 // Inserts a box into the specified range.
 function insertBox(range, boxName, boxValue) {
@@ -4742,7 +4743,7 @@ class History {
     pause() {
         this.canSave = false;
     }
-    save() {
+    save(emitSaveEvent = true) {
         if (!this.canSave) {
             return;
         }
@@ -4758,7 +4759,9 @@ class History {
             this.list.shift();
             this.index = this.list.length;
         }
-        this.event.emit('save', value);
+        if (emitSaveEvent) {
+            this.event.emit('save', denormalizeValue(value));
+        }
         debug(`History saved, the last index is ${this.index}`);
     }
 }
@@ -4902,11 +4905,17 @@ const defaultConfig = {
 class Editor {
     constructor(config) {
         this.unsavedInputData = '';
+        this.stateData = {
+            appliedItems: [],
+            disabledNameMap: new Map(),
+            selectedNameMap: new Map(),
+            selectedValuesMap: new Map(),
+        };
         this.isComposing = false;
         this.event = new EventEmitter();
         this.box = Editor.box;
         this.beforeunloadListener = () => {
-            this.commitUnsavedInputData();
+            this.history.save();
         };
         this.selectionchangeListener = () => {
             this.selection.syncByRange();
@@ -5002,10 +5011,14 @@ class Editor {
                 selectedNameMap,
                 selectedValuesMap,
             };
+            if (isEqual(stateData, this.stateData)) {
+                return;
+            }
             if (this.toolbar) {
                 this.toolbar.updateState(stateData);
             }
             this.event.emit('statechange', stateData);
+            this.stateData = stateData;
         }, 100, {
             leading: false,
             trailing: true,
@@ -5076,11 +5089,18 @@ class Editor {
         this.container.on('compositionend', () => {
             this.isComposing = false;
         });
-        this.container.on('beforeinput', () => {
+        this.container.on('beforeinput', event => {
+            const inputEvent = event;
             const range = this.selection.range;
             if (range.isBoxStart || range.isBoxEnd) {
                 this.commitUnsavedInputData();
+                return;
+            }
+            if (inputEvent.inputType === 'insertText' ||
+                inputEvent.inputType === 'insertCompositionText') {
+                return;
             }
+            this.commitUnsavedInputData();
         });
         this.container.on('input', event => {
             const inputEvent = event;
@@ -5096,21 +5116,22 @@ class Editor {
                     this.event.emit('input', inputEvent);
                     return;
                 }
+                if (range.isBoxStart || range.isBoxEnd) {
+                    this.inputInBoxStrip();
+                    this.history.save();
+                    this.event.emit('input', inputEvent);
+                    return;
+                }
                 if (inputEvent.inputType === 'insertText' ||
                     inputEvent.inputType === 'insertCompositionText') {
-                    if (range.isBoxStart || range.isBoxEnd) {
-                        this.inputInBoxStrip();
-                    }
-                    else {
-                        this.unsavedInputData += (_a = inputEvent.data) !== null && _a !== void 0 ? _a : '';
-                        if (this.unsavedInputData.length < this.config.minChangeSize) {
-                            this.event.emit('input', inputEvent);
-                            return;
-                        }
+                    this.unsavedInputData += (_a = inputEvent.data) !== null && _a !== void 0 ? _a : '';
+                    if (this.unsavedInputData.length < this.config.minChangeSize) {
+                        this.event.emit('input', inputEvent);
+                        this.emitChangeEvent(this.getValue());
+                        return;
                     }
                 }
                 this.history.save();
-                this.unsavedInputData = '';
                 this.event.emit('input', inputEvent);
             }, 0);
         });
@@ -5168,7 +5189,7 @@ class Editor {
     // Saves the input data which is unsaved.
     commitUnsavedInputData() {
         if (this.unsavedInputData.length > 0) {
-            this.history.save();
+            this.history.save(false);
             this.unsavedInputData = '';
         }
     }
@@ -6374,9 +6395,9 @@ class Toolbar {
         });
     }
     // Updates state of each item such as disabled, selected.
-    updateState(data) {
+    updateState(stateData) {
         var _a;
-        const { appliedItems, disabledNameMap, selectedNameMap, selectedValuesMap } = data;
+        const { appliedItems, disabledNameMap, selectedNameMap, selectedValuesMap } = stateData;
         for (const item of this.buttonItemList) {
             const selectedClass = 'lake-button-selected';
             const buttonNode = this.container.find(`button[name="${item.name}"]`);
@@ -6645,6 +6666,7 @@ function openFullScreen(box) {
         dataSource,
         mainClass: 'lake-pswp',
         zoom: false,
+        returnFocus: false,
         arrowPrevSVG: icons.get('left'),
         arrowNextSVG: icons.get('right'),
         closeSVG: icons.get('close'),
@@ -6699,6 +6721,9 @@ function openFullScreen(box) {
     lightbox.on('openingAnimationEnd', () => {
         box.event.emit('openfullscreen');
     });
+    lightbox.on('closingAnimationEnd', () => {
+        box.event.emit('closefullscreen');
+    });
     lightbox.init();
     lightbox.loadAndOpen(currentIndex);
 }
@@ -7952,9 +7977,10 @@ class LinkPopup {
                 if (!this.linkNode) {
                     return;
                 }
+                const linkNode = this.linkNode;
                 this.save();
                 this.hide();
-                this.event.emit('save');
+                this.event.emit('save', linkNode);
             },
         });
         button.render();
@@ -7970,9 +7996,10 @@ class LinkPopup {
                 if (!this.linkNode) {
                     return;
                 }
+                const lastChild = this.linkNode.last();
                 this.linkNode.remove(true);
                 this.hide();
-                this.event.emit('remove');
+                this.event.emit('remove', lastChild);
             },
         });
         button.render();
@@ -8068,10 +8095,18 @@ class LinkPopup {
 
 var link = (editor) => {
     const popup = new LinkPopup(editor.popupContainer);
-    popup.event.on('save', () => {
+    popup.event.on('save', node => {
+        const range = editor.selection.range;
+        range.setStartAfter(node);
+        range.collapseToStart();
+        editor.selection.addRangeToNativeSelection();
         editor.history.save();
     });
-    popup.event.on('remove', () => {
+    popup.event.on('remove', node => {
+        const range = editor.selection.range;
+        range.setStartAfter(node);
+        range.collapseToStart();
+        editor.selection.addRangeToNativeSelection();
         editor.history.save();
     });
     editor.root.on('scroll', () => {