Skip to content

Fix/remove input inner model #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 25, 2021
Merged

Fix/remove input inner model #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee82d01
removed model from SInput
Nikita-Polyakov Feb 25, 2021
6658001
up package version
Nikita-Polyakov Feb 25, 2021
e983927
fix paste input handler
Nikita-Polyakov Feb 25, 2021
7aa6f0f
add change emitter on file change
Nikita-Polyakov Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@soramitsu/soramitsu-js-ui",
"version": "0.7.3",
"version": "0.7.4",
"private": false,
"publishConfig": {
"registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/"
Expand Down
27 changes: 10 additions & 17 deletions src/components/Input/SInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
class="s-input"
:class="computedClasses"
>
<span v-if="model && !isMediumInput" class="s-placeholder">{{ placeholder }}</span>
<span v-if="value && !isMediumInput" class="s-placeholder">{{ placeholder }}</span>
<el-input
ref="el-input"
:value="value"
:type="computedType"
:placeholder="placeholder"
v-model="model"
:disabled="disabled"
:show-password="showPassword && isTextInput"
:readonly="readonly"
Expand All @@ -27,9 +27,9 @@
:suffix-icon="suffix"
@input="handleInput"
@change="handleChange"
@paste="handlePaste"
@blur="handleBlur"
@focus="handleFocus"
@paste.native="handlePaste"
/>
<template v-if="type === InputType.TEXT_FILE">
<i class="s-icon-file-upload"></i>
Expand Down Expand Up @@ -138,7 +138,6 @@ export default class SInput extends Mixins(BorderRadiusMixin) {

focused = false
autofill = false
model = this.value

mounted (): void {
this.$el.addEventListener('animationstart', this.changeAutofillValue)
Expand All @@ -152,17 +151,6 @@ export default class SInput extends Mixins(BorderRadiusMixin) {
this.autofill = e.animationName === 'onAutoFillStart'
}

@Watch('value')
private handlePropChange (value: string | number): void {
this.model = value
}

@Watch('model')
private handleValueChange (value: string | number): void {
this.$emit('input', value)
this.$emit('change', value)
}

get isTextInput (): boolean {
return this.type === InputType.TEXT
}
Expand Down Expand Up @@ -223,7 +211,10 @@ export default class SInput extends Mixins(BorderRadiusMixin) {
this.$emit('change', value)
}

handlePaste (value: string | number): void {
handlePaste (event: ClipboardEvent): void {
if (!event || !event.clipboardData) return

const value = event.clipboardData.getData('text')
this.$emit('paste', value)
}

Expand Down Expand Up @@ -254,7 +245,9 @@ export default class SInput extends Mixins(BorderRadiusMixin) {
const file = input.files[0]
const fr = new FileReader()
fr.onload = (event: ProgressEvent<FileReader>) => {
this.model = ((event.target || {}).result as string)
const result = (event.target || {}).result as string
this.handleInput(result)
this.handleChange(result)
}
fr.readAsText(file)
}
Expand Down