Address upgrade issues

This commit is contained in:
Francisco Hodge
2020-08-26 00:54:56 -04:00
parent 44cdc2bbb0
commit fd0c48390d
5 changed files with 20 additions and 37 deletions
+7 -25
View File
@@ -5,17 +5,10 @@ class Utilities {
/**
* Creates an instance of the Utility service
*/
constructor({
getOptions,
setCaretPosition,
getCaretPosition,
getCaretPositionEnd,
dispatch
}) {
constructor({ getOptions, getCaretPosition, getCaretPositionEnd, dispatch }) {
this.getOptions = getOptions;
this.getCaretPosition = getCaretPosition;
this.getCaretPositionEnd = getCaretPositionEnd;
this.setCaretPosition = setCaretPosition;
this.dispatch = dispatch;
/**
@@ -203,15 +196,10 @@ class Utilities {
*/
updateCaretPos(length, minus) {
const newCaretPos = this.updateCaretPosAction(length, minus);
const { syncInstanceInputs } = this.getOptions();
if (syncInstanceInputs) {
this.dispatch(instance => {
instance.setCaretPosition(newCaretPos);
});
} else {
this.setCaretPosition(newCaretPos);
}
this.dispatch(instance => {
instance.setCaretPosition(newCaretPos);
});
}
/**
@@ -285,8 +273,6 @@ class Utilities {
positionEnd = source.length,
moveCaret = false
) {
const { syncInstanceInputs } = this.getOptions();
if (position === 0 && positionEnd === 0) {
return source;
}
@@ -328,13 +314,9 @@ class Utilities {
} else {
output = source.slice(0, position) + source.slice(positionEnd);
if (moveCaret) {
if (syncInstanceInputs) {
this.dispatch(instance => {
instance.setCaretPosition(position);
});
} else {
this.setCaretPosition(position);
}
this.dispatch(instance => {
instance.setCaretPosition(position);
});
}
}
+2 -2
View File
@@ -490,11 +490,11 @@ it('Keyboard removeAt will propagate caretPosition', () => {
keyboard.getButtonElement('{bksp}').onclick();
expect(keyboard.getCaretPosition()).toBe(1);
expect(keyboard2.getCaretPosition()).toBe(null);
expect(keyboard2.getCaretPosition()).toBe(1);
expect(keyboard.getInput()).toBe('hlo');
expect(keyboard.getCaretPositionEnd()).toBe(1);
expect(keyboard2.getCaretPositionEnd()).toBe(null);
expect(keyboard2.getCaretPositionEnd()).toBe(1);
});
it('Keyboard removeAt will propagate caretPosition in a syncInstanceInputs setting', () => {