@aochuang/client-sdk 1.0.281 → 1.0.283

package/components/chat-editor/chat-editor.vue

@@ -20,8 +20,10 @@
                 @paste="handleInputPaste"
                 @keydown="handleInputKeydown"
                 @keyup="handleInputKeyup"
+                @mouseup="handleInputMouseup"
                 @input="handleInputValueChange"
                 @focus="handleInputFocus"
+                @blur="handleInputBlur"
             ></div>
         </div>
         <template v-if="$slots.addon">
@@ -147,7 +149,7 @@ export default {
             if (this.disabled) {
                 return
             }
-            this.cacheInputRange = this.getSelectionTextRange()
+            this.cacheCurrentInputRange()
         },
         handleBeforeInput (evt) {
             if (this.disabled) {
@@ -199,7 +201,19 @@ export default {
             if (this.disabled) {
                 return
             }
-            this.cacheInputRange = this.getSelectionTextRange()
+            this.cacheCurrentInputRange()
+        },
+        handleInputMouseup () {
+            if (this.disabled) {
+                return
+            }
+            this.cacheCurrentInputRange()
+        },
+        handleInputBlur () {
+            if (this.disabled) {
+                return
+            }
+            this.cacheCurrentInputRange()
         },
         handleInputPaste (evt) {
             if (this.disabled) {
@@ -268,7 +282,7 @@ export default {
             if (!this.hasMaxlength()) {
                 return Infinity
             }
-            const range = this.getSelectionTextRange()
+            const range = this.getSafeRange() ? this.getSelectionTextRange() : (this.cacheInputRange || this.getSelectionTextRange())
             const selectedLength = Math.max(0, range.end - range.start)
             return Math.max(0, this.maxlength - (this.getInputText().length - selectedLength))
         },
@@ -408,12 +422,23 @@ export default {
             }
             return range
         },
-        focus () {
+        cacheCurrentInputRange () {
+            const range = this.getSafeRange()
+            if (!range) {
+                return false
+            }
+            this.cacheInputRange = {
+                start: this.getTextOffsetByDomPoint(range.startContainer, range.startOffset),
+                end: this.getTextOffsetByDomPoint(range.endContainer, range.endOffset)
+            }
+            return true
+        },
+        focus (options = {}) {
             if (!this.$refs.input || this.disabled) {
                 return
             }
             this.$refs.input.focus()
-            if (!this.getSafeRange()) {
+            if (options.resetCursor || !this.getSafeRange()) {
                 this.setCursorByTextOffset(this.getInputText().length)
             }
         },
@@ -626,7 +651,12 @@ export default {
             return ['DIV', 'P', 'LI'].includes(node.tagName)
         },
         insertNodesAtSelection (nodes) {
+            const cachedRange = this.cacheInputRange ? Object.assign({}, this.cacheInputRange) : null
+            const shouldRestoreCachedRange = !this.getSafeRange() && cachedRange
             this.focus()
+            if (shouldRestoreCachedRange) {
+                this.setSelectionByTextRange(cachedRange.start, cachedRange.end)
+            }
             let range = this.getSafeRange()
             if (!range) {
                 this.setCursorByTextOffset(this.getInputText().length)
@@ -644,6 +674,7 @@ export default {
             })
             if (lastNode) {
                 this.setCursorAfterNode(lastNode)
+                this.cacheCurrentInputRange()
             }
         },
         insertFragmentAtSelection (fragment) {
@@ -787,7 +818,7 @@ export default {
                 this.setInputText(this.inputValue.slice(0, this.maxlength))
                 this.setCursorByTextOffset(this.inputValue.length)
             }
-            this.cacheInputRange = this.getSelectionTextRange()
+            this.cacheCurrentInputRange()
             if (this._skipNextSuggestionsLoad) {
                 this._skipNextSuggestionsLoad = false
             } else {

package/components/contacts-room-select/contacts-room-select.vue

@@ -67,7 +67,7 @@ export default {
         },
         avatarField: {
             type: String,
-            default: 'avatar'
+            default: 'chatroomAvatar'
         },
         disabledMethod: { 
             type: Function

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.281",
+  "version": "1.0.283",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"